From 89c87f002cec1c1df86f30d994409a83b4a1d14c Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Wed, 16 Sep 2020 22:29:40 -0700
Subject: [PATCH] Rename message ids.

---
 components/WebsiteList.js              |  7 ++-----
 components/layout/Footer.js            |  2 +-
 components/layout/Header.js            |  4 ++--
 components/metrics/ActiveUsers.js      |  2 +-
 components/settings/AccountSettings.js |  2 +-
 components/settings/ProfileSettings.js |  2 +-
 components/settings/Settings.js        |  6 +++---
 components/settings/WebsiteSettings.js |  8 ++++----
 lang/de-DE.json                        | 22 +++++++++++-----------
 lang/en-US.json                        | 22 +++++++++++-----------
 lang/es-MX.json                        | 22 +++++++++++-----------
 lang/fr-FR.json                        | 22 +++++++++++-----------
 lang/ja-JP.json                        | 22 +++++++++++-----------
 lang/mn-MN.json                        | 22 +++++++++++-----------
 lang/nl-NL.json                        | 22 +++++++++++-----------
 lang/ru-RU.json                        | 22 +++++++++++-----------
 lang/tr-TR.json                        | 22 +++++++++++-----------
 lang/zh-CN.json                        | 22 +++++++++++-----------
 18 files changed, 125 insertions(+), 128 deletions(-)

diff --git a/components/WebsiteList.js b/components/WebsiteList.js
index 051d523a..e66fde58 100644
--- a/components/WebsiteList.js
+++ b/components/WebsiteList.js
@@ -28,17 +28,14 @@ export default function WebsiteList({ userId }) {
         <EmptyPlaceholder
           msg={
             <FormattedMessage
-              id="placeholder.message.no-websites-configured"
+              id="message.no-websites-configured"
               defaultMessage="You don't have any websites configured."
             />
           }
         >
           <Button icon={<Arrow />} size="medium" onClick={() => router.push('/settings')}>
             <div>
-              <FormattedMessage
-                id="placeholder.message.go-to-settings"
-                defaultMessage="Go to settings"
-              />
+              <FormattedMessage id="message.go-to-settings" defaultMessage="Go to settings" />
             </div>
           </Button>
         </EmptyPlaceholder>
diff --git a/components/layout/Footer.js b/components/layout/Footer.js
index 41810f26..7bd1ebd3 100644
--- a/components/layout/Footer.js
+++ b/components/layout/Footer.js
@@ -11,7 +11,7 @@ export default function Footer() {
         <div />
         <div>
           <FormattedMessage
-            id="footer.powered-by"
+            id="message.powered-by"
             defaultMessage="Powered by {name}"
             values={{
               name: (
diff --git a/components/layout/Header.js b/components/layout/Header.js
index 7df55d0d..f275bda3 100644
--- a/components/layout/Header.js
+++ b/components/layout/Header.js
@@ -26,10 +26,10 @@ export default function Header() {
             {user ? (
               <>
                 <Link href="/dashboard">
-                  <FormattedMessage id="header.nav.dashboard" defaultMessage="Dashboard" />
+                  <FormattedMessage id="label.dashboard" defaultMessage="Dashboard" />
                 </Link>
                 <Link href="/settings">
-                  <FormattedMessage id="header.nav.settings" defaultMessage="Settings" />
+                  <FormattedMessage id="label.settings" defaultMessage="Settings" />
                 </Link>
                 <LanguageButton menuAlign="right" />
                 <UserButton />
diff --git a/components/metrics/ActiveUsers.js b/components/metrics/ActiveUsers.js
index 83ae00b8..3335bd74 100644
--- a/components/metrics/ActiveUsers.js
+++ b/components/metrics/ActiveUsers.js
@@ -20,7 +20,7 @@ export default function ActiveUsers({ websiteId, className }) {
       <div className={styles.text}>
         <div>
           <FormattedMessage
-            id="active-users.message"
+            id="message.active-users"
             defaultMessage="{x} current {x, plural, one {visitor} other {visitors}}"
             values={{ x: count }}
           />
diff --git a/components/settings/AccountSettings.js b/components/settings/AccountSettings.js
index 21ca04f5..bc555a0f 100644
--- a/components/settings/AccountSettings.js
+++ b/components/settings/AccountSettings.js
@@ -92,7 +92,7 @@ export default function AccountSettings() {
     <>
       <PageHeader>
         <div>
-          <FormattedMessage id="settings.accounts" defaultMessage="Accounts" />
+          <FormattedMessage id="label.accounts" defaultMessage="Accounts" />
         </div>
         <Button icon={<Plus />} size="small" onClick={() => setAddAccount(true)}>
           <div>
diff --git a/components/settings/ProfileSettings.js b/components/settings/ProfileSettings.js
index 9d9b011a..7c5444a7 100644
--- a/components/settings/ProfileSettings.js
+++ b/components/settings/ProfileSettings.js
@@ -23,7 +23,7 @@ export default function ProfileSettings() {
     <>
       <PageHeader>
         <div>
-          <FormattedMessage id="settings.profile" defaultMessage="Profile" />
+          <FormattedMessage id="label.profile" defaultMessage="Profile" />
         </div>
         <Button icon={<Dots />} size="small" onClick={() => setChangePassword(true)}>
           <div>
diff --git a/components/settings/Settings.js b/components/settings/Settings.js
index dd875824..be9feb35 100644
--- a/components/settings/Settings.js
+++ b/components/settings/Settings.js
@@ -20,16 +20,16 @@ export default function Settings() {
 
   const menuOptions = [
     {
-      label: <FormattedMessage id="settings.websites" defaultMessage="Websites" />,
+      label: <FormattedMessage id="label.websites" defaultMessage="Websites" />,
       value: WEBSITES,
     },
     {
-      label: <FormattedMessage id="settings.accounts" defaultMessage="Accounts" />,
+      label: <FormattedMessage id="label.accounts" defaultMessage="Accounts" />,
       value: ACCOUNTS,
       hidden: !user.is_admin,
     },
     {
-      label: <FormattedMessage id="settings.profile" defaultMessage="Profile" />,
+      label: <FormattedMessage id="label.profile" defaultMessage="Profile" />,
       value: PROFILE,
     },
   ];
diff --git a/components/settings/WebsiteSettings.js b/components/settings/WebsiteSettings.js
index e38fd198..3754e4dc 100644
--- a/components/settings/WebsiteSettings.js
+++ b/components/settings/WebsiteSettings.js
@@ -37,7 +37,7 @@ export default function WebsiteSettings() {
         <Button
           icon={<LinkIcon />}
           size="small"
-          tooltip={<FormattedMessage id="tooltip.get-share-url" defaultMessage="Get share URL" />}
+          tooltip={<FormattedMessage id="message.get-share-url" defaultMessage="Get share URL" />}
           tooltipId={`button-share-${row.website_id}`}
           onClick={() => setShowUrl(row)}
         />
@@ -46,7 +46,7 @@ export default function WebsiteSettings() {
         icon={<Code />}
         size="small"
         tooltip={
-          <FormattedMessage id="tooltip.get-tracking-code" defaultMessage="Get tracking code" />
+          <FormattedMessage id="message.get-tracking-code" defaultMessage="Get tracking code" />
         }
         tooltipId={`button-code-${row.website_id}`}
         onClick={() => setShowCode(row)}
@@ -111,7 +111,7 @@ export default function WebsiteSettings() {
     <EmptyPlaceholder
       msg={
         <FormattedMessage
-          id="placeholder.message.no-websites-configured"
+          id="message.no-websites-configured"
           defaultMessage="You don't have any websites configured."
         />
       }
@@ -128,7 +128,7 @@ export default function WebsiteSettings() {
     <>
       <PageHeader>
         <div>
-          <FormattedMessage id="settings.websites" defaultMessage="Websites" />
+          <FormattedMessage id="label.websites" defaultMessage="Websites" />
         </div>
         <Button icon={<Plus />} size="small" onClick={() => setAddWebsite(true)}>
           <div>
diff --git a/lang/de-DE.json b/lang/de-DE.json
index 728d2e1c..e1d3f7c6 100644
--- a/lang/de-DE.json
+++ b/lang/de-DE.json
@@ -1,5 +1,5 @@
 {
-  "active-users.message": "{x} {x, plural, one {aktiver Besucher} other {aktive Besucher}}",
+  "message.active-users": "{x} {x, plural, one {aktiver Besucher} other {aktive Besucher}}",
   "button.add-account": "Konto hinzufügen",
   "button.add-website": "Webseite hinzufügen",
   "button.back": "Zurück",
@@ -20,9 +20,9 @@
   "device.laptop": "Laptop",
   "device.mobile": "Mobile",
   "device.tablet": "Tablet",
-  "footer.powered-by": "Powered by {name}",
-  "header.nav.dashboard": "Übersicht",
-  "header.nav.settings": "Einstellungen",
+  "message.powered-by": "Powered by {name}",
+  "label.dashboard": "Übersicht",
+  "label.settings": "Einstellungen",
   "label.administrator": "Administrator",
   "label.confirm-password": "Passwort wiederholen",
   "label.current-password": "Derzeitiges Passwort",
@@ -75,11 +75,11 @@
   "metrics.unique-visitors": "Eindeutige Besucher",
   "metrics.views": "Aufrufe",
   "metrics.visitors": "Besucher",
-  "placeholder.message.go-to-settings": "Zu den Einstellungen",
-  "placeholder.message.no-websites-configured": "Es ist keine Webseite vorhanden.",
-  "settings.accounts": "Konten",
-  "settings.profile": "Profil",
-  "settings.websites": "Webseiten",
+  "message.go-to-settings": "Zu den Einstellungen",
+  "message.no-websites-configured": "Es ist keine Webseite vorhanden.",
+  "label.accounts": "Konten",
+  "label.profile": "Profil",
+  "label.websites": "Webseiten",
   "title.add-account": "Konto hinzugfügen",
   "title.add-website": "Webseite hinzufügen",
   "title.change-password": "Passwort ändern",
@@ -89,6 +89,6 @@
   "title.edit-website": "Webseite bearbeiten",
   "title.share-url": "Freigabe-URL",
   "title.tracking-code": "Tracking Kennung",
-  "tooltip.get-share-url": "Freigabe-URL abrufen",
-  "tooltip.get-tracking-code": "Erstelle Tracking Kennung"
+  "message.get-share-url": "Freigabe-URL abrufen",
+  "message.get-tracking-code": "Erstelle Tracking Kennung"
 }
diff --git a/lang/en-US.json b/lang/en-US.json
index 3b6f8063..13acd1a2 100644
--- a/lang/en-US.json
+++ b/lang/en-US.json
@@ -1,5 +1,5 @@
 {
-  "active-users.message": "{x} current {x, plural, one {visitor} other {visitors}}",
+  "message.active-users": "{x} current {x, plural, one {visitor} other {visitors}}",
   "button.add-account": "Add account",
   "button.add-website": "Add website",
   "button.back": "Back",
@@ -20,9 +20,9 @@
   "device.laptop": "Laptop",
   "device.mobile": "Mobile",
   "device.tablet": "Tablet",
-  "footer.powered-by": "Powered by {name}",
-  "header.nav.dashboard": "Dashboard",
-  "header.nav.settings": "Settings",
+  "message.powered-by": "Powered by {name}",
+  "label.dashboard": "Dashboard",
+  "label.settings": "Settings",
   "label.administrator": "Administrator",
   "label.confirm-password": "Confirm password",
   "label.current-password": "Current password",
@@ -75,11 +75,11 @@
   "metrics.unique-visitors": "Unique visitors",
   "metrics.views": "Views",
   "metrics.visitors": "Visitors",
-  "placeholder.message.go-to-settings": "Go to settings",
-  "placeholder.message.no-websites-configured": "You don't have any websites configured.",
-  "settings.accounts": "Accounts",
-  "settings.profile": "Profile",
-  "settings.websites": "Websites",
+  "message.go-to-settings": "Go to settings",
+  "message.no-websites-configured": "You don't have any websites configured.",
+  "label.accounts": "Accounts",
+  "label.profile": "Profile",
+  "label.websites": "Websites",
   "title.add-account": "Add account",
   "title.add-website": "Add website",
   "title.change-password": "Change password",
@@ -89,6 +89,6 @@
   "title.edit-website": "Edit website",
   "title.share-url": "Share URL",
   "title.tracking-code": "Tracking code",
-  "tooltip.get-share-url": "Get share URL",
-  "tooltip.get-tracking-code": "Get tracking code"
+  "message.get-share-url": "Get share URL",
+  "message.get-tracking-code": "Get tracking code"
 }
diff --git a/lang/es-MX.json b/lang/es-MX.json
index c3015352..0cfca546 100644
--- a/lang/es-MX.json
+++ b/lang/es-MX.json
@@ -1,5 +1,5 @@
 {
-  "active-users.message": "{x} {x, plural, one {activo} other {activos}}",
+  "message.active-users": "{x} {x, plural, one {activo} other {activos}}",
   "button.add-account": "Agregar usuario",
   "button.add-website": "Agregar sitio",
   "button.back": "Atrás",
@@ -20,9 +20,9 @@
   "device.laptop": "Laptop",
   "device.mobile": "Mobile",
   "device.tablet": "Tablet",
-  "footer.powered-by": "Desarrollado con {name}",
-  "header.nav.dashboard": "Panel de control",
-  "header.nav.settings": "Configuraciones",
+  "message.powered-by": "Desarrollado con {name}",
+  "label.dashboard": "Panel de control",
+  "label.settings": "Configuraciones",
   "label.administrator": "Administrador",
   "label.confirm-password": "Confirmar contraseña",
   "label.current-password": "Contraseña actual",
@@ -75,11 +75,11 @@
   "metrics.unique-visitors": "Visitantes únicos",
   "metrics.views": "Vistas",
   "metrics.visitors": "Visitantes",
-  "placeholder.message.go-to-settings": "Ir a la configuración",
-  "placeholder.message.no-websites-configured": "No tienes ningún sitio configurado.",
-  "settings.accounts": "Usuarios",
-  "settings.profile": "Perfil",
-  "settings.websites": "Sitios",
+  "message.go-to-settings": "Ir a la configuración",
+  "message.no-websites-configured": "No tienes ningún sitio configurado.",
+  "label.accounts": "Usuarios",
+  "label.profile": "Perfil",
+  "label.websites": "Sitios",
   "title.add-account": "Agregar usuario",
   "title.add-website": "Agregar sitio",
   "title.change-password": "Cambiar contraseña",
@@ -89,6 +89,6 @@
   "title.edit-website": "Editar sitio",
   "title.share-url": "Compartir URL",
   "title.tracking-code": "Código de rastreo",
-  "tooltip.get-share-url": "Obtener URL para compartir",
-  "tooltip.get-tracking-code": "Obtener código de rastreo"
+  "message.get-share-url": "Obtener URL para compartir",
+  "message.get-tracking-code": "Obtener código de rastreo"
 }
diff --git a/lang/fr-FR.json b/lang/fr-FR.json
index 105290f1..8a9c9b19 100644
--- a/lang/fr-FR.json
+++ b/lang/fr-FR.json
@@ -1,5 +1,5 @@
 {
-  "active-users.message": "{x} {x, plural, one {visiteur} other {visiteurs}} actuellement",
+  "message.active-users": "{x} {x, plural, one {visiteur} other {visiteurs}} actuellement",
   "button.add-account": "Ajouter un compte",
   "button.add-website": "Ajouter un site",
   "button.back": "Retour",
@@ -20,9 +20,9 @@
   "device.laptop": "Laptop",
   "device.mobile": "Mobile",
   "device.tablet": "Tablet",
-  "footer.powered-by": "Propulsé par {name}",
-  "header.nav.dashboard": "Tableau de bord",
-  "header.nav.settings": "Paramètres",
+  "message.powered-by": "Propulsé par {name}",
+  "label.dashboard": "Tableau de bord",
+  "label.settings": "Paramètres",
   "label.administrator": "Administrateur",
   "label.confirm-password": "Confirmation du mot de passe",
   "label.current-password": "Mot de passe actuel",
@@ -75,11 +75,11 @@
   "metrics.unique-visitors": "Visiteurs uniques",
   "metrics.views": "Vues",
   "metrics.visitors": "Visiteurs",
-  "placeholder.message.go-to-settings": "Aller aux paramètres",
-  "placeholder.message.no-websites-configured": "Vous n'avez configuré aucun site Web.",
-  "settings.accounts": "Comptes",
-  "settings.profile": "Profile",
-  "settings.websites": "Sites",
+  "message.go-to-settings": "Aller aux paramètres",
+  "message.no-websites-configured": "Vous n'avez configuré aucun site Web.",
+  "label.accounts": "Comptes",
+  "label.profile": "Profile",
+  "label.websites": "Sites",
   "title.add-account": "Ajouter un compte",
   "title.add-website": "Ajouter un site",
   "title.change-password": "Changer le mot de passe",
@@ -89,6 +89,6 @@
   "title.edit-website": "Modifier le site",
   "title.share-url": "Partager l'URL",
   "title.tracking-code": "Code de suivi",
-  "tooltip.get-share-url": "Obtenez l'URL de partage",
-  "tooltip.get-tracking-code": "Obtenez le code de suivi"
+  "message.get-share-url": "Obtenez l'URL de partage",
+  "message.get-tracking-code": "Obtenez le code de suivi"
 }
diff --git a/lang/ja-JP.json b/lang/ja-JP.json
index 2b42b74b..7157173c 100644
--- a/lang/ja-JP.json
+++ b/lang/ja-JP.json
@@ -1,5 +1,5 @@
 {
-  "active-users.message": "{x}人が閲覧中です。",
+  "message.active-users": "{x}人が閲覧中です。",
   "button.add-account": "アカウントを追加する",
   "button.add-website": "Webサイトを追加する",
   "button.back": "戻る",
@@ -20,9 +20,9 @@
   "device.laptop": "Laptop",
   "device.mobile": "Mobile",
   "device.tablet": "Tablet",
-  "footer.powered-by": "Powered by {name}",
-  "header.nav.dashboard": "ダッシュボード",
-  "header.nav.settings": "設定",
+  "message.powered-by": "Powered by {name}",
+  "label.dashboard": "ダッシュボード",
+  "label.settings": "設定",
   "label.administrator": "管理者",
   "label.confirm-password": "パスワード（確認）",
   "label.current-password": "現在のパスワード",
@@ -75,11 +75,11 @@
   "metrics.unique-visitors": "ユニーク訪問者数",
   "metrics.views": "閲覧数",
   "metrics.visitors": "訪問者数",
-  "placeholder.message.go-to-settings": "設定する",
-  "placeholder.message.no-websites-configured": "Webサイトが設定されていません。",
-  "settings.accounts": "アカウント",
-  "settings.profile": "プロファイル",
-  "settings.websites": "Webサイト",
+  "message.go-to-settings": "設定する",
+  "message.no-websites-configured": "Webサイトが設定されていません。",
+  "label.accounts": "アカウント",
+  "label.profile": "プロファイル",
+  "label.websites": "Webサイト",
   "title.add-account": "アカウントの追加",
   "title.add-website": "Webサイトの追加",
   "title.change-password": "パスワード変更",
@@ -89,6 +89,6 @@
   "title.edit-website": "Webサイトの編集",
   "title.share-url": "共有リンク",
   "title.tracking-code": "トラッキングコード",
-  "tooltip.get-share-url": "共有リンクを取得",
-  "tooltip.get-tracking-code": "トラッキングコードを取得"
+  "message.get-share-url": "共有リンクを取得",
+  "message.get-tracking-code": "トラッキングコードを取得"
 }
diff --git a/lang/mn-MN.json b/lang/mn-MN.json
index a0141895..29e92fc8 100644
--- a/lang/mn-MN.json
+++ b/lang/mn-MN.json
@@ -1,5 +1,5 @@
 {
-  "active-users.message": "одоо {x} {x, plural, one {зочин} other {зочин}} байна",
+  "message.active-users": "одоо {x} {x, plural, one {зочин} other {зочин}} байна",
   "button.add-account": "Хэрэглэгч нэмэх",
   "button.add-website": "Веб нэмэх",
   "button.back": "Буцах",
@@ -20,9 +20,9 @@
   "device.laptop": "Laptop",
   "device.mobile": "Mobile",
   "device.tablet": "Tablet",
-  "footer.powered-by": "Powered by {name}",
-  "header.nav.dashboard": "Хянах самбар",
-  "header.nav.settings": "Тохиргоо",
+  "message.powered-by": "Powered by {name}",
+  "label.dashboard": "Хянах самбар",
+  "label.settings": "Тохиргоо",
   "label.administrator": "Админ",
   "label.confirm-password": "Шинэ нууц үгээ давтах",
   "label.current-password": "Ашиглаж буй нууц үг",
@@ -75,11 +75,11 @@
   "metrics.unique-visitors": "Зочид",
   "metrics.views": "Үзсэн",
   "metrics.visitors": "Зочид",
-  "placeholder.message.go-to-settings": "Тохиргоо руу очих",
-  "placeholder.message.no-websites-configured": "Та ямар нэгэн веб тохируулаагүй байна.",
-  "settings.accounts": "Хэрэглэгчид",
-  "settings.profile": "Бүртгэл",
-  "settings.websites": "Вебүүд",
+  "message.go-to-settings": "Тохиргоо руу очих",
+  "message.no-websites-configured": "Та ямар нэгэн веб тохируулаагүй байна.",
+  "label.accounts": "Хэрэглэгчид",
+  "label.profile": "Бүртгэл",
+  "label.websites": "Вебүүд",
   "title.add-account": "Хэрэглэгч нэмэх",
   "title.add-website": "Веб нэмэх",
   "title.change-password": "Нууц үг солих",
@@ -89,6 +89,6 @@
   "title.edit-website": "Веб засах",
   "title.share-url": "Хуваалцах холбоос",
   "title.tracking-code": "Мөрдөх код",
-  "tooltip.get-share-url": "Хуваалцах холбоос авах",
-  "tooltip.get-tracking-code": "Мөрдөх код авах"
+  "message.get-share-url": "Хуваалцах холбоос авах",
+  "message.get-tracking-code": "Мөрдөх код авах"
 }
diff --git a/lang/nl-NL.json b/lang/nl-NL.json
index 538392e7..f981bf24 100644
--- a/lang/nl-NL.json
+++ b/lang/nl-NL.json
@@ -1,5 +1,5 @@
 {
-  "active-users.message": "{x} actieve {x, plural, one {bezoeker} other {bezoekers}}",
+  "message.active-users": "{x} actieve {x, plural, one {bezoeker} other {bezoekers}}",
   "button.add-account": "Account toevoegen",
   "button.add-website": "Website toevoegen",
   "button.back": "Terug",
@@ -20,9 +20,9 @@
   "device.laptop": "Laptop",
   "device.mobile": "Mobile",
   "device.tablet": "Tablet",
-  "footer.powered-by": "mogelijk gemaakt door {name}",
-  "header.nav.dashboard": "Dashboard",
-  "header.nav.settings": "Instellingen",
+  "message.powered-by": "mogelijk gemaakt door {name}",
+  "label.dashboard": "Dashboard",
+  "label.settings": "Instellingen",
   "label.administrator": "Administrator",
   "label.confirm-password": "Wachtwoord bevestigen",
   "label.current-password": "Huidig wachtwoord",
@@ -75,11 +75,11 @@
   "metrics.unique-visitors": "Unieke bezoekers",
   "metrics.views": "Weergaven",
   "metrics.visitors": "Bezoekers",
-  "placeholder.message.go-to-settings": "Naar instellingen",
-  "placeholder.message.no-websites-configured": "Je hebt geen websites ingesteld.",
-  "settings.accounts": "Accounts",
-  "settings.profile": "Profiel",
-  "settings.websites": "Websites",
+  "message.go-to-settings": "Naar instellingen",
+  "message.no-websites-configured": "Je hebt geen websites ingesteld.",
+  "label.accounts": "Accounts",
+  "label.profile": "Profiel",
+  "label.websites": "Websites",
   "title.add-account": "Account toevoegen",
   "title.add-website": "Website toevoegen",
   "title.change-password": "Wachtwoord wijzigen",
@@ -89,6 +89,6 @@
   "title.edit-website": "Website bewerken",
   "title.share-url": "URL delen",
   "title.tracking-code": "Tracking code",
-  "tooltip.get-share-url": "Openbare URL",
-  "tooltip.get-tracking-code": "Tracking code"
+  "message.get-share-url": "Openbare URL",
+  "message.get-tracking-code": "Tracking code"
 }
diff --git a/lang/ru-RU.json b/lang/ru-RU.json
index bd6aec22..d8cd32ef 100644
--- a/lang/ru-RU.json
+++ b/lang/ru-RU.json
@@ -1,5 +1,5 @@
 {
-  "active-users.message": "{x} текущих посетителей",
+  "message.active-users": "{x} текущих посетителей",
   "button.add-account": "Добавить аккаунт",
   "button.add-website": "Добавить сайт",
   "button.back": "Назад",
@@ -20,9 +20,9 @@
   "device.laptop": "Laptop",
   "device.mobile": "Mobile",
   "device.tablet": "Tablet",
-  "footer.powered-by": "на движке {name}",
-  "header.nav.dashboard": "Информационная панель",
-  "header.nav.settings": "Настройки",
+  "message.powered-by": "на движке {name}",
+  "label.dashboard": "Информационная панель",
+  "label.settings": "Настройки",
   "label.administrator": "Администратор",
   "label.confirm-password": "Подтвердить пароль",
   "label.current-password": "Текущий пароль",
@@ -75,11 +75,11 @@
   "metrics.unique-visitors": "Уникальные посетители",
   "metrics.views": "Просмотры",
   "metrics.visitors": "Посетители",
-  "placeholder.message.go-to-settings": "Перейти к настройкам",
-  "placeholder.message.no-websites-configured": "У вас нет настроенных сайтов.",
-  "settings.accounts": "Аккаунты",
-  "settings.profile": "Профиль",
-  "settings.websites": "Сайты",
+  "message.go-to-settings": "Перейти к настройкам",
+  "message.no-websites-configured": "У вас нет настроенных сайтов.",
+  "label.accounts": "Аккаунты",
+  "label.profile": "Профиль",
+  "label.websites": "Сайты",
   "title.add-account": "Добавить аккаунт",
   "title.add-website": "Добавить сайт",
   "title.change-password": "Изменить пароль",
@@ -89,6 +89,6 @@
   "title.edit-website": "Редактировать сайт",
   "title.share-url": "Поделиться ссылкой",
   "title.tracking-code": "Код отслеживания",
-  "tooltip.get-share-url": "Получить публичную ссылку",
-  "tooltip.get-tracking-code": "Получить код отслеживания"
+  "message.get-share-url": "Получить публичную ссылку",
+  "message.get-tracking-code": "Получить код отслеживания"
 }
diff --git a/lang/tr-TR.json b/lang/tr-TR.json
index f65fdf70..cd5c14ed 100644
--- a/lang/tr-TR.json
+++ b/lang/tr-TR.json
@@ -1,5 +1,5 @@
 {
-  "active-users.message": "{x} aktif ziyaretçi",
+  "message.active-users": "{x} aktif ziyaretçi",
   "button.add-account": "Yeni Hesap Ekle",
   "button.add-website": "Web sitesi ekle",
   "button.back": "Geri",
@@ -20,9 +20,9 @@
   "device.laptop": "Laptop",
   "device.mobile": "Mobile",
   "device.tablet": "Tablet",
-  "footer.powered-by": "Sağlayıcı: {name}",
-  "header.nav.dashboard": "Kontrol Paneli",
-  "header.nav.settings": "Ayarlar",
+  "message.powered-by": "Sağlayıcı: {name}",
+  "label.dashboard": "Kontrol Paneli",
+  "label.settings": "Ayarlar",
   "label.administrator": "Yönetici",
   "label.confirm-password": "Parolayı onayla",
   "label.current-password": "Mevcut parola",
@@ -75,11 +75,11 @@
   "metrics.unique-visitors": "Tekil kullanıcı",
   "metrics.views": "Görüntüleme",
   "metrics.visitors": "Ziyaretçi",
-  "placeholder.message.go-to-settings": "Ayarlara git",
-  "placeholder.message.no-websites-configured": "Henüz hiç web sitesi tanımlamadınız",
-  "settings.accounts": "Hesaplar",
-  "settings.profile": "Profil",
-  "settings.websites": "Web siteleri",
+  "message.go-to-settings": "Ayarlara git",
+  "message.no-websites-configured": "Henüz hiç web sitesi tanımlamadınız",
+  "label.accounts": "Hesaplar",
+  "label.profile": "Profil",
+  "label.websites": "Web siteleri",
   "title.add-account": "Hesap ekle",
   "title.add-website": "Web sitesi ekle",
   "title.change-password": "Şifre değiştir",
@@ -89,6 +89,6 @@
   "title.edit-website": "Web sitesini düzenle",
   "title.share-url": "Paylaşım adresi",
   "title.tracking-code": "İzleme kodu",
-  "tooltip.get-share-url": "Paylaşım adresini al",
-  "tooltip.get-tracking-code": "İzleme kodunu al"
+  "message.get-share-url": "Paylaşım adresini al",
+  "message.get-tracking-code": "İzleme kodunu al"
 }
diff --git a/lang/zh-CN.json b/lang/zh-CN.json
index 28747c87..c4d64168 100644
--- a/lang/zh-CN.json
+++ b/lang/zh-CN.json
@@ -1,5 +1,5 @@
 {
-  "active-users.message": "当前在线 {x} 人",
+  "message.active-users": "当前在线 {x} 人",
   "button.add-account": "添加账户",
   "button.add-website": "添加网站",
   "button.back": "返回",
@@ -20,9 +20,9 @@
   "device.laptop": "Laptop",
   "device.mobile": "Mobile",
   "device.tablet": "Tablet",
-  "footer.powered-by": "运行 {name}",
-  "header.nav.dashboard": "仪表板",
-  "header.nav.settings": "设置",
+  "message.powered-by": "运行 {name}",
+  "label.dashboard": "仪表板",
+  "label.settings": "设置",
   "label.administrator": "管理员",
   "label.confirm-password": "确认密码",
   "label.current-password": "目前密码",
@@ -75,11 +75,11 @@
   "metrics.unique-visitors": "独立访客",
   "metrics.views": "页面流量",
   "metrics.visitors": "独立访客",
-  "placeholder.message.go-to-settings": "去设置",
-  "placeholder.message.no-websites-configured": "你还没有设置任何网站.",
-  "settings.accounts": "账户",
-  "settings.profile": "个人资料",
-  "settings.websites": "网站",
+  "message.go-to-settings": "去设置",
+  "message.no-websites-configured": "你还没有设置任何网站.",
+  "label.accounts": "账户",
+  "label.profile": "个人资料",
+  "label.websites": "网站",
   "title.add-account": "添加账户",
   "title.add-website": "添加网站",
   "title.change-password": "更新密码",
@@ -89,6 +89,6 @@
   "title.edit-website": "编辑网站",
   "title.share-url": "共享链接",
   "title.tracking-code": "跟踪代码",
-  "tooltip.get-share-url": "获得共享链接",
-  "tooltip.get-tracking-code": "获得跟踪代码"
+  "message.get-share-url": "获得共享链接",
+  "message.get-tracking-code": "获得跟踪代码"
 }