Merge branch 'master' into dev

components/settings/AccountSettings.js

@@ -80,7 +80,9 @@ export default function AccountSettings() {
   return (
     <>
       <PageHeader>
-        <div>Accounts</div>
+        <div>
+          <FormattedMessage id="settings.accounts" defaultMessage="Accounts" />
+        </div>
         <Button icon={<Plus />} size="small" onClick={() => setAddAccount(true)}>
           <div>
             <FormattedMessage id="button.add-account" defaultMessage="Add account" />

lang/de-DE.json

@@ -0,0 +1,239 @@
+{
+    "active-users.message": {
+    "defaultMessage": "{x} {x, plural, one {aktiver Besucher} other {aktive Besucher}}"
+    },
+    "button.add-account": {
+      "defaultMessage": "Konto hinzufügen"
+    },
+    "button.add-website": {
+      "defaultMessage": "Webseite hinzufügen"
+    },
+    "button.back": {
+      "defaultMessage": "Zurück"
+    },
+    "button.cancel": {
+      "defaultMessage": "Abbrechen"
+    },
+    "button.change-password": {
+      "defaultMessage": "Passwort ändern"
+    },
+    "button.copy-to-clipboard": {
+    "defaultMessage": "In die Zwischenablage kopieren"
+    },
+    "button.delete": {
+      "defaultMessage": "Löschen"
+    },
+    "button.edit": {
+      "defaultMessage": "Bearbeiten"
+    },
+    "button.login": {
+    "defaultMessage": "Anmelden"
+    },
+    "button.more": {
+      "defaultMessage": "Mehr"
+    },
+    "button.save": {
+      "defaultMessage": "Speichern"
+    },
+    "button.view-details": {
+    "defaultMessage": "Details anzeigen"
+    },
+    "footer.powered-by": {
+      "defaultMessage": "powered by"
+    },
+    "header.nav.dashboard": {
+      "defaultMessage": "Übersicht"
+    },
+    "header.nav.settings": {
+      "defaultMessage": "Einstellungen"
+    },
+    "label.administrator": {
+      "defaultMessage": "Administrator"
+    },
+    "label.confirm-password": {
+      "defaultMessage": "Passwort wiederholen"
+    },
+    "label.current-password": {
+      "defaultMessage": "Derzeitiges Passwort"
+    },
+    "label.domain": {
+    "defaultMessage": "Domain"
+    },
+    "label.enable-share-url": {
+    "defaultMessage": "Freigabe-URL aktivieren"
+    },
+    "label.invalid": {
+      "defaultMessage": "Ungültig"
+    },
+    "label.invalid-domain": {
+    "defaultMessage": "Ungültige Domain"
+    },
+    "label.last-days": {
+      "defaultMessage": "Letzten {x} Tage"
+    },
+    "label.last-hours": {
+      "defaultMessage": "Letzten {x} Stunden"
+    },
+    "label.logged-in-as": {
+    "defaultMessage": "Angemeldet als {username}"
+    },
+    "label.logout": {
+      "defaultMessage": "Abmelden"
+    },
+    "label.name": {
+      "defaultMessage": "Name"
+    },
+    "label.new-password": {
+      "defaultMessage": "Neues Passwort"
+    },
+    "label.password": {
+      "defaultMessage": "Passwort"
+    },
+    "label.passwords-dont-match": {
+      "defaultMessage": "Passwörter stimmen nicht überein"
+    },
+    "label.required": {
+      "defaultMessage": "Erforderlich"
+    },
+    "label.this-month": {
+      "defaultMessage": "Diesen Monat"
+    },
+    "label.this-week": {
+      "defaultMessage": "Diese Woche"
+    },
+    "label.this-year": {
+      "defaultMessage": "Dieses Jahr"
+    },
+    "label.today": {
+      "defaultMessage": "Heute"
+    },
+    "label.username": {
+      "defaultMessage": "Benutzername"
+    },
+    "message.confirm-delete": {
+      "defaultMessage": "Sind sie sich sicher {target} zu löschen?"
+    },
+    "message.copied": {
+      "defaultMessage": "In Zwischenablage kopiert!"
+    },
+    "message.delete-warning": {
+    "defaultMessage": "Alle zugehörigen Daten werden auch gelöscht."
+    },
+    "message.failure": {
+      "defaultMessage": "Es it ein Fehler aufgetreten."
+    },
+    "message.incorrect-username-password": {
+      "defaultMessage": "Falsches Passwort oder Benutzername."
+    },
+    "message.no-data-available": {
+    "defaultMessage": "Keine Daten vorhanden."
+    },
+    "message.save-success": {
+      "defaultMessage": "Erfolgreich gespeichert."
+    },
+    "message.share-url": {
+      "defaultMessage": "Dies ist der öffentliche URL zum Teilen für {target}."
+    },
+    "message.track-stats": {
+      "defaultMessage": "Um die Statistiken für {target} zu übermitteln, platzieren Sie bitte den folgenden Quelltext im {head} ihrer Homepage." 
+    },
+    "message.type-delete": {
+    "defaultMessage": "Geben Sie {delete} in das Feld unten ein um zu bestätigen."
+    },
+    "metrics.actions": {
+      "defaultMessage": "Aktionen"
+    },
+    "metrics.average-visit-time": {
+    "defaultMessage": "Durchschn. Besuchszeit"
+    },
+    "metrics.bounce-rate": {
+    "defaultMessage": "Absprungrate"
+    },
+    "metrics.browsers": {
+      "defaultMessage": "Browsers"
+    },
+    "metrics.countries": {
+      "defaultMessage": "Länder"
+    },
+    "metrics.devices": {
+      "defaultMessage": "Geräte"
+    },
+    "metrics.events": {
+      "defaultMessage": "Events"
+    },
+    "metrics.filter.combined": {
+      "defaultMessage": "Kombiniert"
+    },
+    "metrics.filter.domain-only": {
+      "defaultMessage": "Nur diese Domain"
+    },
+    "metrics.filter.raw": {
+    "defaultMessage": "Rohdaten"
+    },
+    "metrics.operating-system": {
+      "defaultMessage": "Betriebssystem"
+    },
+    "metrics.page-views": {
+      "defaultMessage": "Seitenaufrufe"
+    },
+    "metrics.pages": {
+      "defaultMessage": "Seiten"
+    },
+    "metrics.referrers": {
+      "defaultMessage": "Referrers"
+    },
+    "metrics.unique-visitors": {
+      "defaultMessage": "Eindeutige Besucher"
+    },
+    "metrics.views": {
+    "defaultMessage": "Aufrufe"
+    },
+    "metrics.visitors": {
+      "defaultMessage": "Besucher"
+    },
+    "placeholder.message.go-to-settings": {
+    "defaultMessage": "Zu den Einstellungen"
+    },
+    "placeholder.message.no-websites-configured": {
+      "defaultMessage": "Es ist keine Webseite vorhanden."
+    },
+    "settings.accounts": {
+      "defaultMessage": "Konten"
+    },
+    "settings.profile": {
+      "defaultMessage": "Profil"
+    },
+    "settings.websites": {
+      "defaultMessage": "Webseiten"
+    },
+    "title.add-account": {
+      "defaultMessage": "Konto hinzugfügen"
+    },
+    "title.add-website": {
+      "defaultMessage": "Webseite hinzufügen"
+    },
+    "title.delete-account": {
+      "defaultMessage": "Konto löschen"
+    },
+    "title.delete-website": {
+      "defaultMessage": "Webseite löschen"
+    },
+    "title.edit-account": {
+      "defaultMessage": "Konto bearbeiten"
+    },
+    "title.edit-website": {
+      "defaultMessage": "Webseite bearbeiten"
+    },
+    "title.share-url": {
+    "defaultMessage": "Freigabe-URL"
+    },
+    "title.tracking-code": {
+      "defaultMessage": "Tracking Kennung"
+    },
+    "tooltip.get-share-url": {
+    "defaultMessage": "Freigabe-URL abrufen"
+    },
+    "tooltip.get-tracking-code": {
+      "defaultMessage": "Erstelle Tracking Kennung"
+    }
+  }

lang/ru-RU.json

@@ -0,0 +1,239 @@
+{
+  "active-users.message": {
+    "defaultMessage": "{x} текущих посетителей"
+  },
+  "button.add-account": {
+    "defaultMessage": "Добавить аккаунт"
+  },
+  "button.add-website": {
+    "defaultMessage": "Добавить сайт"
+  },
+  "button.back": {
+    "defaultMessage": "Назад"
+  },
+  "button.cancel": {
+    "defaultMessage": "Отменить"
+  },
+  "button.change-password": {
+    "defaultMessage": "Изменить пароль"
+  },
+  "button.copy-to-clipboard": {
+    "defaultMessage": "Скопировать в буфер обмена"
+  },
+  "button.delete": {
+    "defaultMessage": "Удалить"
+  },
+  "button.edit": {
+    "defaultMessage": "Редактировать"
+  },
+  "button.login": {
+    "defaultMessage": "Войти"
+  },
+  "button.more": {
+    "defaultMessage": "Больше"
+  },
+  "button.save": {
+    "defaultMessage": "Сохранить"
+  },
+  "button.view-details": {
+    "defaultMessage": "Посмотреть детали"
+  },
+  "footer.powered-by": {
+    "defaultMessage": "на движке"
+  },
+  "header.nav.dashboard": {
+    "defaultMessage": "Информационная панель"
+  },
+  "header.nav.settings": {
+    "defaultMessage": "Настройки"
+  },
+  "label.administrator": {
+    "defaultMessage": "Администратор"
+  },
+  "label.confirm-password": {
+    "defaultMessage": "Подтвердить пароль"
+  },
+  "label.current-password": {
+    "defaultMessage": "Текущий пароль"
+  },
+  "label.domain": {
+    "defaultMessage": "Домен"
+  },
+  "label.enable-share-url": {
+    "defaultMessage": "Разрешить делиться ссылкой"
+  },
+  "label.invalid": {
+    "defaultMessage": "Некорректный"
+  },
+  "label.invalid-domain": {
+    "defaultMessage": "Некорректный домен"
+  },
+  "label.last-days": {
+    "defaultMessage": "Последние {x} дней"
+  },
+  "label.last-hours": {
+    "defaultMessage": "Последние {x} часа"
+  },
+  "label.logged-in-as": {
+    "defaultMessage": "Вы вошли как {username}"
+  },
+  "label.logout": {
+    "defaultMessage": "Выйти"
+  },
+  "label.name": {
+    "defaultMessage": "Имя"
+  },
+  "label.new-password": {
+    "defaultMessage": "Новый пароль"
+  },
+  "label.password": {
+    "defaultMessage": "Пароль"
+  },
+  "label.passwords-dont-match": {
+    "defaultMessage": "Пароли не совпадают"
+  },
+  "label.required": {
+    "defaultMessage": "Обязательное"
+  },
+  "label.this-month": {
+    "defaultMessage": "Этот месяц"
+  },
+  "label.this-week": {
+    "defaultMessage": "Эта неделя"
+  },
+  "label.this-year": {
+    "defaultMessage": "Этот год"
+  },
+  "label.today": {
+    "defaultMessage": "Сегодня"
+  },
+  "label.username": {
+    "defaultMessage": "Имя пользователя"
+  },
+  "message.confirm-delete": {
+    "defaultMessage": "Вы уверены, что хотите удалить {target}?"
+  },
+  "message.copied": {
+    "defaultMessage": "Скопировано!"
+  },
+  "message.delete-warning": {
+    "defaultMessage": "Все связанные данные будут также удалены."
+  },
+  "message.failure": {
+    "defaultMessage": "Что-то пошло не так."
+  },
+  "message.incorrect-username-password": {
+    "defaultMessage": "Неверное имя пользователя/пароль."
+  },
+  "message.no-data-available": {
+    "defaultMessage": "Нет данных."
+  },
+  "message.save-success": {
+    "defaultMessage": "Успешно сохранено."
+  },
+  "message.share-url": {
+    "defaultMessage": "Это публичная ссылка для {target}."
+  },
+  "message.track-stats": {
+    "defaultMessage": "Чтобы отслеживать статистику для {target}, поместите следующий код в раздел {head} вашего сайта."
+  },
+  "message.type-delete": {
+    "defaultMessage": "Напишите {delete} в поле ниже, чтобы подтвердить."
+  },
+  "metrics.actions": {
+    "defaultMessage": "Действия"
+  },
+  "metrics.average-visit-time": {
+    "defaultMessage": "Среднее время посещения"
+  },
+  "metrics.bounce-rate": {
+    "defaultMessage": "Отказы"
+  },
+  "metrics.browsers": {
+    "defaultMessage": "Браузеры"
+  },
+  "metrics.countries": {
+    "defaultMessage": "Страны"
+  },
+  "metrics.devices": {
+    "defaultMessage": "Устройства"
+  },
+  "metrics.events": {
+    "defaultMessage": "События"
+  },
+  "metrics.filter.combined": {
+    "defaultMessage": "Объединенные"
+  },
+  "metrics.filter.domain-only": {
+    "defaultMessage": "Только домен"
+  },
+  "metrics.filter.raw": {
+    "defaultMessage": "Сырые данные"
+  },
+  "metrics.operating-system": {
+    "defaultMessage": "Операционная система"
+  },
+  "metrics.page-views": {
+    "defaultMessage": "Просмотры страниц"
+  },
+  "metrics.pages": {
+    "defaultMessage": "Страницы"
+  },
+  "metrics.referrers": {
+    "defaultMessage": "Источники"
+  },
+  "metrics.unique-visitors": {
+    "defaultMessage": "Уникальные посетители"
+  },
+  "metrics.views": {
+    "defaultMessage": "Просмотры"
+  },
+  "metrics.visitors": {
+    "defaultMessage": "Посетители"
+  },
+  "placeholder.message.go-to-settings": {
+    "defaultMessage": "Перейти к настройкам"
+  },
+  "placeholder.message.no-websites-configured": {
+    "defaultMessage": "У вас нет настроенных сайтов."
+  },
+  "settings.accounts": {
+    "defaultMessage": "Аккаунты"
+  },
+  "settings.profile": {
+    "defaultMessage": "Профиль"
+  },
+  "settings.websites": {
+    "defaultMessage": "Сайты"
+  },
+  "title.add-account": {
+    "defaultMessage": "Добавить аккаунт"
+  },
+  "title.add-website": {
+    "defaultMessage": "Добавить сайт"
+  },
+  "title.delete-account": {
+    "defaultMessage": "Удалить аккаунт"
+  },
+  "title.delete-website": {
+    "defaultMessage": "Удалить сайт"
+  },
+  "title.edit-account": {
+    "defaultMessage": "Редактировать аккаунт"
+  },
+  "title.edit-website": {
+    "defaultMessage": "Редактировать сайт"
+  },
+  "title.share-url": {
+    "defaultMessage": "Поделиться ссылкой"
+  },
+  "title.tracking-code": {
+    "defaultMessage": "Код отслеживания"
+  },
+  "tooltip.get-share-url": {
+    "defaultMessage": "Получить публичную ссылку"
+  },
+  "tooltip.get-tracking-code": {
+    "defaultMessage": "Получить код отслеживания"
+  }
+}

lang/tr-TR.json

@@ -0,0 +1,239 @@
+{
+  "active-users.message": {
+    "defaultMessage": "{x} aktif ziyaretçi"
+  },
+  "button.add-account": {
+    "defaultMessage": "Yeni Hesap Ekle"
+  },
+  "button.add-website": {
+    "defaultMessage": "Web sitesi ekle"
+  },
+  "button.back": {
+    "defaultMessage": "Geri"
+  },
+  "button.cancel": {
+    "defaultMessage": "İptal"
+  },
+  "button.change-password": {
+    "defaultMessage": "Şifre değiştir"
+  },
+  "button.copy-to-clipboard": {
+    "defaultMessage": "Panoya kopyala"
+  },
+  "button.delete": {
+    "defaultMessage": "Sil"
+  },
+  "button.edit": {
+    "defaultMessage": "Düzenle"
+  },
+  "button.login": {
+    "defaultMessage": "Giriş Yap"
+  },
+  "button.more": {
+    "defaultMessage": "Detaylı göster"
+  },
+  "button.save": {
+    "defaultMessage": "Kaydet"
+  },
+  "button.view-details": {
+    "defaultMessage": "Detayı incele"
+  },
+  "footer.powered-by": {
+    "defaultMessage": "Sağlayıcı:"
+  },
+  "header.nav.dashboard": {
+    "defaultMessage": "Kontrol Paneli"
+  },
+  "header.nav.settings": {
+    "defaultMessage": "Ayarlar"
+  },
+  "label.administrator": {
+    "defaultMessage": "Yönetici"
+  },
+  "label.confirm-password": {
+    "defaultMessage": "Parolayı onayla"
+  },
+  "label.current-password": {
+    "defaultMessage": "Mevcut parola"
+  },
+  "label.domain": {
+    "defaultMessage": "Alan adı"
+  },
+  "label.enable-share-url": {
+    "defaultMessage": "Anonim paylaşım URL'i aktif"
+  },
+  "label.invalid": {
+    "defaultMessage": "Geçeriz"
+  },
+  "label.invalid-domain": {
+    "defaultMessage": "Geçersiz alan adı"
+  },
+  "label.last-days": {
+    "defaultMessage": "Son {x} gün"
+  },
+  "label.last-hours": {
+    "defaultMessage": "Son {x} saat"
+  },
+  "label.logged-in-as": {
+    "defaultMessage": "{username} olarak giriş yapıldı."
+  },
+  "label.logout": {
+    "defaultMessage": "Çıkış Yap"
+  },
+  "label.name": {
+    "defaultMessage": "İsim"
+  },
+  "label.new-password": {
+    "defaultMessage": "Yeni parola"
+  },
+  "label.password": {
+    "defaultMessage": "Parola"
+  },
+  "label.passwords-dont-match": {
+    "defaultMessage": "Parolalar uyuşmuyor"
+  },
+  "label.required": {
+    "defaultMessage": "Zorunlu alan"
+  },
+  "label.this-month": {
+    "defaultMessage": "Bu ay"
+  },
+  "label.this-week": {
+    "defaultMessage": "Bu hafta"
+  },
+  "label.this-year": {
+    "defaultMessage": "Bu yıl"
+  },
+  "label.today": {
+    "defaultMessage": "Bugün"
+  },
+  "label.username": {
+    "defaultMessage": "Kullanıcı adı"
+  },
+  "message.confirm-delete": {
+    "defaultMessage": "{target} kaydını silmek istediğinizden emin misiniz?"
+  },
+  "message.copied": {
+    "defaultMessage": "Panoya kopyalandı!"
+  },
+  "message.delete-warning": {
+    "defaultMessage": "İlişkili tüm veriler de  silinecektir."
+  },
+  "message.failure": {
+    "defaultMessage": "Bir şeyler ters gitti!"
+  },
+  "message.incorrect-username-password": {
+    "defaultMessage": "Hatalı kullanıcı adı ya da parola."
+  },
+  "message.no-data-available": {
+    "defaultMessage": "Henüz hiç veri yok."
+  },
+  "message.save-success": {
+    "defaultMessage": "Başarıyla kaydedildi."
+  },
+  "message.share-url": {
+    "defaultMessage": "{target} için kullanılabilir anonim paylaşım adresidir."
+  },
+  "message.track-stats": {
+    "defaultMessage": "{target} alanı adı istatistiklerini takip etmek için, aşağıdaki kodu web sitenizin {head} bloğuna yerleştirin."
+  },
+  "message.type-delete": {
+    "defaultMessage": "Onaylamak için kutuya {delete} yazın."
+  },
+  "metrics.actions": {
+    "defaultMessage": "Actions"
+  },
+  "metrics.average-visit-time": {
+    "defaultMessage": "Ortalama ziyaret süresi"
+  },
+  "metrics.bounce-rate": {
+    "defaultMessage": "Çıkma oranı"
+  },
+  "metrics.browsers": {
+    "defaultMessage": "Tarayıcılar"
+  },
+  "metrics.countries": {
+    "defaultMessage": "Ülkeler"
+  },
+  "metrics.devices": {
+    "defaultMessage": "Cihazlar"
+  },
+  "metrics.events": {
+    "defaultMessage": "Olaylar"
+  },
+  "metrics.filter.combined": {
+    "defaultMessage": "Birleşik"
+  },
+  "metrics.filter.domain-only": {
+    "defaultMessage": "Yalnızca alan adı"
+  },
+  "metrics.filter.raw": {
+    "defaultMessage": "Ham"
+  },
+  "metrics.operating-system": {
+    "defaultMessage": "İşletim sistemi"
+  },
+  "metrics.page-views": {
+    "defaultMessage": "Sayfa görünümü"
+  },
+  "metrics.pages": {
+    "defaultMessage": "Sayfalar"
+  },
+  "metrics.referrers": {
+    "defaultMessage": "Yönlendirenler"
+  },
+  "metrics.unique-visitors": {
+    "defaultMessage": "Tekil kullanıcı"
+  },
+  "metrics.views": {
+    "defaultMessage": "Görüntüleme"
+  },
+  "metrics.visitors": {
+    "defaultMessage": "Ziyaretçi"
+  },
+  "placeholder.message.go-to-settings": {
+    "defaultMessage": "Ayarlara git"
+  },
+  "placeholder.message.no-websites-configured": {
+    "defaultMessage": "Henüz hiç web sitesi tanımlamadınız"
+  },
+  "settings.accounts": {
+    "defaultMessage": "Hesaplar"
+  },
+  "settings.profile": {
+    "defaultMessage": "Profil"
+  },
+  "settings.websites": {
+    "defaultMessage": "Web siteleri"
+  },
+  "title.add-account": {
+    "defaultMessage": "Hesap ekle"
+  },
+  "title.add-website": {
+    "defaultMessage": "Web sitesi ekle"
+  },
+  "title.delete-account": {
+    "defaultMessage": "Hesabı sil"
+  },
+  "title.delete-website": {
+    "defaultMessage": "Web sitesini sil"
+  },
+  "title.edit-account": {
+    "defaultMessage": "Hesabı düzenle"
+  },
+  "title.edit-website": {
+    "defaultMessage": "Web sitesini düzenle"
+  },
+  "title.share-url": {
+    "defaultMessage": "Paylaşım adresi"
+  },
+  "title.tracking-code": {
+    "defaultMessage": "İzleme kodu"
+  },
+  "tooltip.get-share-url": {
+    "defaultMessage": "Paylaşım adresini al"
+  },
+  "tooltip.get-tracking-code": {
+    "defaultMessage": "İzleme kodunu al"
+  }
+}

lib/lang.js

@@ -1,25 +1,37 @@
 import enMessages from 'lang-compiled/en.json';
 import nlMessages from 'lang-compiled/nl-NL.json';
 import zhCNMessages from 'lang-compiled/zh-CN.json';
+import trTRMessages from 'lang-compiled/tr-TR.json';
+import ruRUMessages from 'lang-compiled/ru-RU.json';
+import deDEMessages from 'lang-compiled/de-DE.json';
 import { format } from 'date-fns';
-import { enUS, nl, zhCN } from 'date-fns/locale';
+import { enUS, nl, zhCN , tr, ru, de} from 'date-fns/locale';
 
 export const messages = {
   en: enMessages,
   'nl-NL': nlMessages,
   'zh-CN': zhCNMessages,
+  'de-DE': deDEMessages,
+  'ru-RU': ruRUMessages,
+  'tr-TR': trTRMessages,
 };
 
 export const dateLocales = {
   en: enUS,
   'nl-NL': nl,
   'zh-CN': zhCN,
+  'de-DE': de,
+  'ru-RU': ru,
+  'tr-TR': tr,
 };
 
 export const menuOptions = [
   { label: 'English', value: 'en', display: 'EN' },
   { label: 'Nederlands', value: 'nl-NL', display: 'NL' },
   { label: '中文 (Chinese Simplified)', value: 'zh-CN', display: '中文' },
+  { label: 'Deutsch' , value:"de-DE", display: 'DE'},
+  { label: 'Русский', value: 'ru-RU', display: 'РУ' },
+  { label: 'Turkish', value: 'tr-TR', display: 'TR' },
 ];
 
 export function dateFormat(date, str, locale) {