diff --git a/lang/da.yml b/lang/da.yml
index 43a9f7f4..8743b9b2 100644
--- a/lang/da.yml
+++ b/lang/da.yml
@@ -2,9 +2,7 @@ da:
   TractorCow\Fluent\Control\LocaleAdmin:
     MENUTITLE: Sprog
   TractorCow\Fluent\Extension\FluentBadgeExtension:
-    BadgeDefault: ''
-    BadgeInvisible: ''
-    BadgeLocalised: ''
+    BadgeDefault: 'Standard sprog'
   TractorCow\Fluent\Extension\FluentExtension:
     FLUENT_ICON_TOOLTIP: 'Dette felt kan oversættes'
   TractorCow\Fluent\Extension\FluentFilteredExtension:
@@ -12,12 +10,14 @@ da:
     LOCALEFILTEREDHELP: 'Denne side er ikke synlig på dette sprog'
     LOCALEFILTEREDSHORT: Filteret
     TAB_LOCALES: Sprog
+  TractorCow\Fluent\Extension\FluentIsolatedExtension:
+    has_one_Locale: Sprog
   TractorCow\Fluent\Extension\FluentSiteTreeExtension:
     LOCALECOPYANDPUBLISH: 'Kopier & udgiv'
     LOCALECOPYTODRAFT: 'Kopier til kladde'
     LOCALESTATUSFLUENTINVISIBLE: 'Denne side er ikke synlig på dette sprog indtil den er tilføjet og udgivet.'
-    LOCALESTATUSFLUENTDRAFT: ''
-    LOCALESTATUSFLUENTINHERITED: ''
+  TractorCow\Fluent\Forms\VisibleLocalesColumn:
+    LocalesTitle: Sprog
   TractorCow\Fluent\Model\Domain:
     DEFAULT: 'Standard sprog'
     DEFAULT_NONE: (ingen)
@@ -29,6 +29,9 @@ da:
       other: '{count} domæner'
     SINGULARNAME: Domæne
     UnsavedNotice: 'Du kan tilføje sprog efter du har gemt domænet.'
+    db_Domain: Domæne
+    has_many_Locales: Sprog
+    has_one_DefaultLocale: 'Standard sprog'
   TractorCow\Fluent\Model\FallbackLocale:
     LOCALE: Sprog
     PLURALNAME: 'Fald-tilbage sprog'
@@ -36,18 +39,20 @@ da:
       one: 'Et fald-tilbage sprog'
       other: '{count} fald-tilbage sprog'
     SINGULARNAME: 'Fald-tilbage sprog'
+    has_one_Locale: Sprog
   TractorCow\Fluent\Model\Locale:
-    DEFAULT_NONE: (none)
     DOMAIN: Domæne
     FALLBACKS: 'Sprog at falde tilbage til'
     IS_DEFAULT: 'Dette er det globale standard sprog'
     IS_DEFAULT_DESCRIPTION: 'Bemærk: Per-domæne specifikke sprog can gives på Sprog fanen, og vil overskrive denne værdi for specifikke domæner.'
     LOCALE: Sprog
     LOCALE_TITLE: Titel
-    LOCALE_URL: 'URL Segment'
     PLURALNAME: Sprog
     PLURALS:
       one: 'Et sprog'
       other: '{count} sprog'
     SINGULARNAME: Sprog
     UnsavedNotice: 'Du kan tilføje fald-tilbage sprog når du har gemt dette sprog.'
+    db_Locale: Sprog
+    db_Title: Titel
+    has_one_Domain: Domæne
diff --git a/lang/de.yml b/lang/de.yml
index 70001530..477f08ee 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -1,79 +1,101 @@
 de:
+  SilverStripe\CMS\Controllers\CMSMain:
+    ARCHIVE: Archiv
+  SilverStripe\CMS\Model\SiteTree:
+    BUTTONPUBLISHED: Veröffentlicht
+    BUTTONSAVEPUBLISH: Öffentlich
   TractorCow\Fluent\Control\LocaleAdmin:
     MENUTITLE: Gebietsschemata
   TractorCow\Fluent\Extension\FluentBadgeExtension:
-    BadgeDefault: 'Standardgebietsschema'
+    BadgeDefault: Standardgebietsschema
     BadgeInvisible: 'Übersetzt nach {locale}'
     BadgeLocalised: '{type} ist nicht sichtbar in diesem Gebietsschema'
   TractorCow\Fluent\Extension\FluentExtension:
-    FLUENT_ICON_TOOLTIP: 'Übersetzbares Feld'
     COPY_FROM: 'In {locale} von kopieren:'
     COPY_TO: 'Von {locale} in kopieren:'
+    FLUENT_ICON_TOOLTIP: 'Übersetzbares Feld'
+    LOCALISED: Lokalisiert
+    NOTLOCALISED: 'Nicht lokalisiert'
+    UnlocaliseTooltip: '{Name} aus dem aktuellen Gebietsschema entfernen'
   TractorCow\Fluent\Extension\FluentFilteredExtension:
     FILTERED_LOCALES: 'Wird in folgenden Gebietsschemata angezeigt'
     LOCALEFILTEREDHELP: 'Diese Seite ist nicht sichbar in diesem Gebietsschema'
     TAB_LOCALES: Gebietsschemata
+  TractorCow\Fluent\Extension\FluentIsolatedExtension:
+    has_one_Locale: Standardgebietsschema
   TractorCow\Fluent\Extension\FluentSiteTreeExtension:
     LOCALECOPYANDPUBLISH: 'Kopieren & veröffentlichen'
     LOCALECOPYTODRAFT: 'Als Entwurf kopieren'
     LOCALESTATUSFLUENTDRAFT: 'Für dieses Gebietsschema wurde ein Entwurf erstellt. Veröffentlichte Inhalte können jedoch weiterhin von einem anderen geerbt werden. Verwenden Sie die bereitgestellte Aktion "Speichern und veröffentlichen", um diesen Inhalt für dieses Gebietsschema zu veröffentlichen.'
     LOCALESTATUSFLUENTINHERITED: 'Der Inhalt dieser Seite wird möglicherweise von einem anderen Gebietsschema geerbt. Wenn Sie eine unabhängige Kopie dieser Seite erstellen möchten, verwenden Sie bitte eine der bereitgestellten Aktionen "Kopieren".'
-    LOCALESTATUSFLUENTINVISIBLE: 'This page will not be visible in this locale until it has been published.'
+    LOCALESTATUSFLUENTUNKNOWN: 'Für diese Seite ist kein Inhalt verfügbar. Bitte lokalisieren Sie diese Seite oder stellen Sie ein Gebietsschema als Ersatz bereit.'
+  TractorCow\Fluent\Extension\FluentVersionedExtension:
+    DRAFT: Entwurf
+    LIVENO: Nein
+    LIVEYES: Ja
+    MODIFIED: Geändert
+    NOTLOCALISED: 'Nicht lokalisiert'
+    PUBLISHED: Veröffentlicht
+  TractorCow\Fluent\Extension\Traits\FluentAdminTrait:
+    ArchiveNotice: "'{title}' und alle seine Lokalisierungen wurden gelöscht."
+    ClearAllNotice: 'Alle Übersetzungen sind entfern worden.'
+    CopyNotice: "'{title}' wurde in alle anderen Gebietsschemas kopiert."
+    DeleteNotice: '"{title}" und alle seine Lokalisierungen wurden gelöscht.'
+    HideNotice: "'{title}' wird in {locale} nicht mehr angezeigt."
+    Label_archiveFluent: 'Veröffentlichungen zurücknehmen und archivieren (alle Sprachen)'
+    Label_clearFluent: "Alle ausser '{title}' löschen"
+    Label_copyFluent: "'{title}' in alle anderen Sprachen kopieren"
+    Label_deleteFluent: 'Löschen (alle Sprachen)'
+    Label_hideFluent: "In '{title}' verstecken"
+    Label_publishFluent: 'Speichern & veröffentlichen (alle Sprachen)'
+    Label_showFluent: "In '{title}' anzeigen"
+    Label_unpublishFluent: 'Veröffentlichung zurücknehmen (alle Sprachen)'
+    Localisation: Übersetzungen
+    PublishNotice: "'{title}' ist in allen Gebietsschemata veröffentlicht worden."
+    ShowNotice: "'{title}' ist nun in {locale} sichtbar"
+    UnpublishNotice: "Veröffentlichung '{title}' in allen Gebietsschemas enfernt."
+  TractorCow\Fluent\Extension\Traits\FluentBadgeTrait:
+    BadgeDraft: 'Als Entwurf in {locale} gespeichert'
+    BadgeLocalised: 'Übersetzt nach {locale}'
+    BadgePublished: 'In {locale} veröffentlicht'
+    BaggeInvisible: '{type} ist in dieser Sprache nicht sichtbar'
+  TractorCow\Fluent\Extension\Traits\FluentObjectTrait:
+    TAB_LOCALISATION: Übersetzungen
+  TractorCow\Fluent\Forms\LocaleToggleColumn:
+    DISPLAY_IN: 'Sichtbar?'
+  TractorCow\Fluent\Forms\VisibleLocalesColumn:
+    LocalesTitle: Gebietsschemata
   TractorCow\Fluent\Model\Domain:
-    DEFAULT: 'Standardgebietsschema'
-    DEFAULT_NONE: '(keine)'
-    DOMAIN_HOSTNAME: 'Domain Hostname'
+    DEFAULT: Standardgebietsschema
+    DEFAULT_NONE: (keine)
     DOMAIN_LOCALES: Standardgebietsschema
-    PLURALNAME: Domains
     PLURALS:
-      one: 'Domain'
+      one: Domain
       other: '{count} Domains'
-    SINGULARNAME: Domain
     UnsavedNotice: 'Sie können Gebietsschemas hinzufügen, sobald Sie die Domain gespeichert haben.'
+    has_many_Locales: Gebietsschemata
+    has_one_DefaultLocale: Standardgebietsschema
   TractorCow\Fluent\Model\FallbackLocale:
     LOCALE: Standardgebietsschema
-    PLURALNAME: 'Fallback-Gebietsschemata'
+    PLURALNAME: Fallback-Gebietsschemata
     PLURALS:
-      one: 'Fallback-Gebietsschema'
+      one: Fallback-Gebietsschema
       other: '{count} Fallback-Gebietsschemata'
-    SINGULARNAME: 'Fallback-Gebietsschema'
+    SINGULARNAME: Fallback-Gebietsschema
+    has_one_Locale: Standardgebietsschema
   TractorCow\Fluent\Model\Locale:
-    DEFAULT_NONE: '(keine)'
-    DOMAIN: Domain
-    FALLBACKS: 'Fallback-Gebietsschemata'
-    IS_DEFAULT: 'This is the global default locale'
+    DEFAULT_NONE: (keine)
+    EDIT_LOCALE: 'Zugriff "{title}" ({locale})'
+    FALLBACKS: Fallback-Gebietsschemata
     IS_DEFAULT_DESCRIPTION: 'Hinweis: Das domänenspezifische Gebietsschema kann auf der Registerkarte "Gebietsschemas" zugewiesen werden und überschreibt diesen Wert für bestimmte Domänen.'
     LOCALE: Gebietsschema
     LOCALE_TITLE: Titel
-    LOCALE_URL: 'URL-Segment'
+    LOCALE_URL: URL-Segment
     PLURALNAME: Gebietsschemata
     PLURALS:
-      one: 'Gebietsschema'
+      one: Gebietsschema
       other: '{count} Gebietsschemata'
     SINGULARNAME: Gebietsschema
     UnsavedNotice: 'Sie können Fallbacks hinzufügen, sobald Sie das Gebietsschema gespeichert haben.'
-  TractorCow\Fluent\Extension\Traits\FluentAdminTrait:
-    ClearAllNotice: 'Alle Übersetzungen sind entfern worden.'
-    CopyNotice: "'{title}' wurde in alle anderen Gebietsschemas kopiert."
-    UnpublishNotice: "Veröffentlichung '{title}' in allen Gebietsschemas enfernt."
-    ArchiveNotice: "'{title}' und alle seine Lokalisierungen wurden gelöscht."
-    ShowNotice: "'{title}' ist nun in {locale} sichtbar"
-    HideNotice: "'{title}' wird in {locale} nicht mehr angezeigt."
-    PublishNotice: "'{title}' ist in allen Gebietsschemata veröffentlicht worden."
-    Localisation: 'Übersetzungen'
-    Label_clearFluent: "Alle ausser '{title}' löschen"
-    Label_copyFluent: "'{title}' in alle anderen Sprachen kopieren"
-    Label_unpublishFluent: 'Veröffentlichung zurücknehmen (alle Sprachen)'
-    Label_archiveFluent: 'Veröffentlichungen zurücknehmen und archivieren (alle Sprachen)'
-    Label_publishFluent: 'Speichern & veröffentlichen (alle Sprachen)'
-    Label_deleteFluent: 'Löschen (alle Sprachen)'
-    Label_hideFluent: "In '{title}' verstecken"
-    Label_showFluent: "In '{title}' anzeigen"
-
-  TractorCow\Fluent\Extension\Traits\FluentBadgeTrait:
-    BadgePublished: 'In {locale} veröffentlicht'
-    BadgeDraft: 'Als Entwurf in {locale} gespeichert'
-    BaggeInvisible: '{type} ist in dieser Sprache nicht sichtbar'
-
-  TractorCow\Fluent\Extension\Traits\FluentObjectTrait:
-    TAB_LOCALISATION: 'Übersetzungen'
+    db_Locale: Standardgebietsschema
+    db_Title: Titel
diff --git a/lang/es.yml b/lang/es.yml
new file mode 100644
index 00000000..b365ceaa
--- /dev/null
+++ b/lang/es.yml
@@ -0,0 +1,140 @@
+es:
+  SilverStripe\CMS\Controllers\CMSMain:
+    ARCHIVE: Archivar
+  SilverStripe\CMS\Model\SiteTree:
+    BUTTONPUBLISHED: Publicado
+    BUTTONSAVEPUBLISH: Publicar
+  TractorCow\Fluent\Control\LocaleAdmin:
+    MENUTITLE: 'Configuraciones regionales'
+  TractorCow\Fluent\Extension\FluentBadgeExtension:
+    BadgeDefault: 'Configuración regional por defecto'
+    BadgeInvisible: 'Localizado en {locale}'
+    BadgeLocalised: '{type} no es visible en esta configuración regional'
+  TractorCow\Fluent\Extension\FluentExtension:
+    COPY_FROM: 'Copiar a {locale} desde:'
+    COPY_TO: 'Copiar desde {locale} a:'
+    FLUENT_ICON_TOOLTIP: 'Campo traducible'
+    LOCALISED: Localizado
+    Localise: Localizar
+    NOSOURCE: 'Sin fuentes'
+    NOTLOCALISED: 'No localizado'
+    Unlocalise: Deslocalizar
+    UnlocaliseTooltip: 'Remover {name} de la configuración regional actual'
+  TractorCow\Fluent\Extension\FluentFilteredExtension:
+    FILTERED_LOCALES: 'Mostrar en las siguientes configuraciones regionales'
+    LOCALEFILTEREDHELP: 'Esta página no es visible en esta configuración regional'
+    TAB_LOCALES: 'Configuraciones regionales'
+    many_many_FilteredLocales: 'Configuraciones regionales filtradas'
+  TractorCow\Fluent\Extension\FluentIsolatedExtension:
+    has_one_Locale: 'Configuración regional'
+  TractorCow\Fluent\Extension\FluentSiteTreeExtension:
+    LOCALECOPYANDPUBLISH: 'Copiar y publicar'
+    LOCALECOPYTODRAFT: 'Copiar a borrador'
+    LOCALESTATUSFLUENTDRAFT: 'Un borrador ha sido creado para esta configuración local, sin embargo, el contenido publicado puede seguir siendo heredado de otra configuración regional. Para publicar este contenido para esta configuración regional, usa la acción "Guardar y publicar".'
+    LOCALESTATUSFLUENTINHERITED: 'El contenido de esta página puede estar heredando desde otra configuración regional. Si desea hacer una copia independiente de esta página, por favor use un de las acciones "Copiar" que se dan.'
+    LOCALESTATUSFLUENTINVISIBLE: 'Esta página no será visible en esta configuración local hasta que sea publicada.'
+    LOCALESTATUSFLUENTUNKNOWN: 'No hay contenido disponible para esta página. Por favor localize esta página o provea una configuración regional de respaldo.'
+  TractorCow\Fluent\Extension\FluentVersionedExtension:
+    DRAFT: Borrador
+    LIVENO: 'No'
+    LIVEYES: Sí
+    MODIFIED: Modificado
+    NOSOURCE: 'Sin fuentes'
+    NOTLOCALISED: 'No localizado'
+    PUBLISHED: Publicado
+  TractorCow\Fluent\Extension\Traits\FluentAdminTrait:
+    ArchiveNotice: '"{title}" y todas sus configuraciones regionales fueron archivadas.'
+    ClearAllNotice: "Todas las configuraciones regionales se han limpiado para '{title}'."
+    CopyNotice: "Copiar '{title}' a todas las demás configuraciones regionales."
+    DeleteNotice: "'{title}' y todas sus configuraciones regionales se borraron."
+    HideNotice: "El registro '{title}' ahora está oculto en {locale}"
+    Label_archiveFluent: 'Despublicar y Archivar (todas las configuraciones regionales)'
+    Label_clearFluent: "Limpiar de todos exceptos '{title}'"
+    Label_copyFluent: "Copiar '{title}' a otras configuraciones locales"
+    Label_deleteFluent: 'Borrar (todas las configuraciones locales)'
+    Label_hideFluent: "Esconder de '{title}'"
+    Label_publishFluent: 'Guardar y Publicar (todas las configuraciones locales)'
+    Label_showFluent: "Mostrar en '{title}'"
+    Label_unpublishFluent: 'Despublicar (todas las configuraciones locales)'
+    Localisation: Localización
+    PublishNotice: "Publicado '{title}' para todas las configuraciones regionales."
+    ShowNotice: "El registro '{title}' es ahora visible en {locale}"
+    UnpublishNotice: "Se despublicó '{title}' de todas las configuraciones regionales"
+  TractorCow\Fluent\Extension\Traits\FluentBadgeTrait:
+    BadgeInherited: 'Heredado de {locale}'
+    BadgeLocalised: 'Localizado en {locale}'
+    BaggeInvisible: '{type} no tiene contenido disponible en {locale}, localizar el {type} o proveer una configuración regional de respaldo'
+  TractorCow\Fluent\Extension\Traits\FluentObjectTrait:
+    TAB_LOCALISATION: Localización
+  TractorCow\Fluent\Forms\DeleteAllLocalesAction:
+    Delete: 'Borrar registro de todas las configuraciones locales'
+  TractorCow\Fluent\Forms\DeleteLocaleAction:
+    DELETE: 'Borrar en esta configuración local'
+  TractorCow\Fluent\Forms\LocaleToggleColumn:
+    DISPLAY_IN: '¿Es visible?'
+  TractorCow\Fluent\Forms\PublishAction:
+    PUBLISH: 'Publicar en esta configuración regional'
+  TractorCow\Fluent\Forms\SaveLocaleAction:
+    SAVE: 'Guardar en esta configuración regional'
+  TractorCow\Fluent\Forms\UnpublishAction:
+    UNPUBLISH: 'Despublicar de esta configuración regional'
+  TractorCow\Fluent\Forms\VisibleLocalesColumn:
+    LocalesTitle: 'Configuraciones regionales'
+  TractorCow\Fluent\Model\Domain:
+    DEFAULT: 'Configuración regional por defecto'
+    DEFAULT_NONE: (ninguno)
+    DOMAIN_HOSTNAME: 'Nombre del host de dominio'
+    DOMAIN_LOCALES: 'Configuraciones regionales'
+    PLURALNAME: Dominios
+    PLURALS:
+      many: '{count} dominios'
+      one: 'Un dominio'
+      other: '{count} dominios'
+    SINGULARNAME: Dominio
+    UnsavedNotice: 'Puede agregar configuraciones regionales una vez que guarde el dominio.'
+    db_Domain: Dominio
+    has_many_Locales: 'Configuraciones regionales'
+    has_one_DefaultLocale: 'Configuración regional por defecto'
+  TractorCow\Fluent\Model\FallbackLocale:
+    LOCALE: 'Configuración regional'
+    PLURALNAME: 'Configuraciones regionales de respaldo'
+    PLURALS:
+      many: '{} configuraciones regionales de respaldo'
+      one: 'Una configuración regional de respaldo'
+      other: '{} configuraciones regionales de respaldo'
+    SINGULARNAME: 'Configuración regional de respaldo'
+    db_Sort: Ordenar
+    has_one_Locale: 'Configuración regional'
+    has_one_Parent: Padre
+  TractorCow\Fluent\Model\Locale:
+    DEFAULT_NONE: (ninguno)
+    DOMAIN: Dominio
+    EDIT_LOCALE: 'Acceder "{title}" ({locale})'
+    FALLBACKS: 'Configuraciones regionales de respaldo'
+    IS_DEFAULT: 'Esta es la configuración regional por defecto global'
+    IS_DEFAULT_DESCRIPTION: 'Nota: la configuración regional específica por dominio puede ser asignada en la pestaña Configuraciones regionales y sobreescribirá este valor para dominios específicos.'
+    LOCALE: 'Configuración regional'
+    LOCALE_TITLE: Título
+    LOCALE_URL: 'Segmento de URL'
+    MULTI_LOCALE: 'Acceso a acciones en múltiples configuraciones regionales (Ejemplo: guardar en todas las configuraciones regionales)'
+    PERMISSION: Localización
+    PLURALNAME: 'Configuraciones regionales'
+    PLURALS:
+      many: '{count} configuraciones regionales'
+      one: 'Una configuración regional'
+      other: '{count} configuraciones regionales'
+    SINGULARNAME: 'Configuración regional'
+    TIMEZONE: 'Huso horario'
+    USE_X_DEFAULT: 'Usar {code} como código de lenguaje SEO (tratar como global)'
+    USE_X_DEFAULT_DESCRIPTION: 'El uso de este código indica a los motores de búsqueda que esta es una página de destino global sin localizar'
+    UnsavedNotice: 'Puede agregar respaldos una vez que guarde la configuración regional.'
+    db_IsGlobalDefault: 'Es por defecto global'
+    db_Locale: 'Configuración regional'
+    db_Sort: Ordenar
+    db_Timezone: 'Huso horario'
+    db_Title: Título
+    db_URLSegment: 'Segmento de URL'
+    db_UseDefaultCode: 'Usar código por defecto'
+    has_many_FallbackLocales: 'Configuraciones regionales de respaldo'
+    has_one_Domain: Dominio
+    many_many_Fallbacks: Respaldos
diff --git a/lang/fi.yml b/lang/fi.yml
index 2ed9bde4..dcca1498 100644
--- a/lang/fi.yml
+++ b/lang/fi.yml
@@ -3,10 +3,10 @@ fi:
     BadgeHiddenHelp: 'Sivu on piilotettu tämän kielen osalta'
     BadgeHiddenShort: Piilotettu
     ChangeLocale: 'Vaihda kieltä'
+    DefaultLocale: 'Tämä on oletuskieli'
+    DefaultLocaleIs: 'Oletuskieli on'
+    EditingIn: 'Huomautus! Olet muokkaamassa kielellä'
     LocaleFilter: Kielisuodatin
     LocaleFilterDescription: 'Valitse kieli näyttääksesi tämän sivun/tietueen kyseisellä kielellä'
     LocaleMenuFilterDescription: 'Valitse kielet joilla tämä sivu/tietue näytetään valikoissa'
     TABLOCALES: Kielet
-    DefaultLocale: 'Tämä on oletuskieli'
-    DefaultLocaleIs: 'Oletuskieli on'
-    EditingIn: 'Huomautus! Olet muokkaamassa kielellä'
diff --git a/lang/it.yml b/lang/it.yml
index dc5d8766..fc510ae0 100644
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -1,59 +1,116 @@
 it:
+  SilverStripe\CMS\Controllers\CMSMain:
+    ARCHIVE: Archivia
+  SilverStripe\CMS\Model\SiteTree:
+    BUTTONPUBLISHED: Pubblicato
+    BUTTONSAVEPUBLISH: Pubblica
   TractorCow\Fluent\Control\LocaleAdmin:
-    MENUTITLE: Lingue
+    MENUTITLE: Localizzazione
   TractorCow\Fluent\Extension\FluentBadgeExtension:
-    BadgeDefault: 'Lingua di default'
-    BadgeInvisible: 'Localizzato in {locale}'
-    BadgeLocalised: '{type} non è visibile per questa lingua'
+    BadgeDefault: 'Lingua predefinita'
+    BadgeInvisible: 'Tradotto in {locale}'
+    BadgeLocalised: '{type} non è visibile in questa lingua'
   TractorCow\Fluent\Extension\FluentExtension:
+    COPY_FROM: 'Copia in {locale} da:'
+    COPY_TO: 'Copia da {locale} a:'
     FLUENT_ICON_TOOLTIP: 'Campo traducibile'
+    LOCALISED: Tradotto
+    Localise: Tradurre
+    NOSOURCE: 'Nessun originale'
+    NOTLOCALISED: 'Non tradotto'
+    Unlocalise: 'Elimina traduzione'
+    UnlocaliseTooltip: 'Togli {name} dalla lingua attiva'
   TractorCow\Fluent\Extension\FluentFilteredExtension:
-    FILTERED_LOCALES: 'Mostra nelle seguenti lingue'
+    FILTERED_LOCALES: 'Mostrare nelle seguenti lingue'
     LOCALEFILTEREDHELP: 'Questa pagina non è visibile in questa lingua'
-    TAB_LOCALES: Lingue
+    TAB_LOCALES: Localizzazione
+  TractorCow\Fluent\Extension\FluentIsolatedExtension:
+    has_one_Locale: Lingua
   TractorCow\Fluent\Extension\FluentSiteTreeExtension:
-    LOCALECOPYANDPUBLISH: 'Copia & pubblica'
-    LOCALECOPYTODRAFT: 'Copia in bozza'
-    LOCALESTATUSFLUENTDRAFT: 'È stata creata una bozza per questa lingua, tuttavia, il contenuto pubblicato potrebbe ancora essere ereditato da un altro. Per pubblicare questo contenuto per questa lingua, utilizza l''azione fornita "Salva e pubblica".'
+    LOCALECOPYANDPUBLISH: 'Salva e pubblica'
+    LOCALECOPYTODRAFT: 'Copia nella bozza'
+    LOCALESTATUSFLUENTDRAFT: 'Una bozza è stata creata per questa lingua ma il contenuto pubblicato può essere ancora quello di un''altra. Per pubblicare nuovo contenuto in questa lingua usare il pulsante "Salva e pubblica".'
     LOCALESTATUSFLUENTINHERITED: 'Il contenuto di questa pagina potrebbe essere ereditato da un''altra lingua. Se desideri creare una copia indipendente di questa pagina, utilizza una delle azioni "Copia" fornite.'
-    LOCALESTATUSFLUENTINVISIBLE: 'Questa pagina non sarà visibile in questa lingua fino a quando non sarà stata pubblicata.'
+    LOCALESTATUSFLUENTINVISIBLE: 'Questa pagina non sarà visibile in questa lingua fino a quando verrà pubblicata.'
+    LOCALESTATUSFLUENTUNKNOWN: 'Contenuto non disponibile per questa pagina. Localizzare la pagina o fornire una lingua alternativa.'
+  TractorCow\Fluent\Extension\FluentVersionedExtension:
+    DRAFT: Bozza
+    LIVEYES: Sì
+    MODIFIED: Modificato
+    NOSOURCE: 'Nessun originale'
+    NOTLOCALISED: 'Non tradotto'
+    PUBLISHED: Pubblicato
+  TractorCow\Fluent\Extension\Traits\FluentAdminTrait:
+    ArchiveNotice: "Archiviato '{title}' e tutte le sue traduzioni."
+    ClearAllNotice: "Tutte le traduzioni sono state eliminate per '{title}'."
+    CopyNotice: "'{title}' copiato in tutte le altre lingue."
+    DeleteNotice: "Eliminato '{title}' e tutte le sue traduzioni."
+    Localisation: Localizzazione
+    PublishNotice: "'{title}' pubblicato in tutte le lingue."
+    UnpublishNotice: "'{title}' nascosto in tutte le lingue."
+  TractorCow\Fluent\Extension\Traits\FluentBadgeTrait:
+    BadgeLocalised: 'Tradotto in {locale}'
+  TractorCow\Fluent\Extension\Traits\FluentObjectTrait:
+    TAB_LOCALISATION: Localizzazione
+  TractorCow\Fluent\Forms\DeleteAllLocalesAction:
+    Delete: 'Elimina i dati da tutte le lingue'
+  TractorCow\Fluent\Forms\DeleteLocaleAction:
+    DELETE: 'Elimina da questa lingua'
+  TractorCow\Fluent\Forms\LocaleToggleColumn:
+    DISPLAY_IN: 'Visibile?'
+  TractorCow\Fluent\Forms\PublishAction:
+    PUBLISH: 'Pubblica in questa lingua'
+  TractorCow\Fluent\Forms\SaveLocaleAction:
+    SAVE: 'Salva in questa lingua'
+  TractorCow\Fluent\Forms\UnpublishAction:
+    UNPUBLISH: 'Nascondi in questa lingua'
+  TractorCow\Fluent\Forms\VisibleLocalesColumn:
+    LocalesTitle: Localizzazione
   TractorCow\Fluent\Model\Domain:
-    DEFAULT: 'Lingua di default'
-    DEFAULT_NONE: (nessuna)
-    DOMAIN_HOSTNAME: 'Nome host del dominio'
+    DEFAULT: 'Lingua predefinita'
+    DEFAULT_NONE: (nessuno)
+    DOMAIN_HOSTNAME: 'Host del Dominio'
     DOMAIN_LOCALES: Lingue
     PLURALNAME: Domini
     PLURALS:
-      one: 'Un dominio'
-      other: '{count} domini'
+      many: '{count} Domini'
+      one: 'Un Dominio'
+      other: '{count} Domini'
     SINGULARNAME: Dominio
     UnsavedNotice: 'Puoi aggiungere lingue una volta salvato il dominio.'
+    db_Domain: Dominio
+    has_many_Locales: Lingue
+    has_one_DefaultLocale: 'Lingua predefinita'
   TractorCow\Fluent\Model\FallbackLocale:
-    LOCALE: Lingue
-    PLURALNAME: 'Lingue di riserva'
+    LOCALE: Lingua
+    PLURALNAME: 'Lingue Alternative'
     PLURALS:
-      one: 'Una lingua di riserva'
-      other: '{count} lingue di riserva'
-    SINGULARNAME: 'Lingua di riserva'
+      many: '{count} Lingue Alternative'
+      one: 'Una Lingua Alternativa'
+      other: '{count} Lingue Alternative'
+    SINGULARNAME: 'Lingua Alternativa'
+    has_one_Locale: Lingua
   TractorCow\Fluent\Model\Locale:
     DEFAULT_NONE: (nessuna)
     DOMAIN: Dominio
-    FALLBACKS: 'Lingue di riserva'
-    IS_DEFAULT: 'Questa è la lingua predefinita globale'
-    IS_DEFAULT_DESCRIPTION: 'Nota: le impostazioni internazionali specifiche per dominio possono essere assegnate nella tab Lingue e sovrascriveranno questo valore per domini specifici.'
+    EDIT_LOCALE: 'Accesso a "{title}" ({locale})'
+    FALLBACKS: 'Lingue Alternative'
+    IS_DEFAULT: 'Questa è la lingua principale di default'
+    IS_DEFAULT_DESCRIPTION: 'Attenzione: nella scheda Lingue possono essere impostate lingue diverse per dominio e avranno la precedenza su questo valore nei domini specificati.'
     LOCALE: Lingua
     LOCALE_TITLE: Titolo
     LOCALE_URL: 'Segmento URL'
+    MULTI_LOCALE: 'Accesso ad azioni multilingua (per esempio Salva in tutte le lingue)'
+    PERMISSION: Localizzazione
     PLURALNAME: Lingue
     PLURALS:
-      one: 'Una lingua'
-      other: '{count} lingue'
-    SINGULARNAME: Lingue
-    UnsavedNotice: 'Puoi aggiungere lingue di riserva dopo aver salvato la lingua.'
-  TractorCow\Fluent\Extension\Traits\FluentAdminTrait:
-    ClearAllNotice: 'Tutte le localizzazioni sono state cancellate per ''{title}''.'
-    CopyNotice: 'Copiato ''{title}'' nelle altre lingue.'
-    DeleteNotice: 'Cancellato ''{title}'' e tutte le sue lingue.'
-    UnpublishNotice: 'Depubblicato ''{title}'' in tutte le lingue.'
-    ArchiveNotice: 'Archiviato ''{title}'' e tutte le sue lingue.'
-    PublishNotice: 'Pubblicato ''{title}'' in tutte le lingue.'
+      many: '{count} Lingue'
+      one: 'Una Lingua'
+      other: '{count} Lingue'
+    SINGULARNAME: Lingua
+    USE_X_DEFAULT: 'Usare {code} come codice lingua SEO (da considerare globale)'
+    USE_X_DEFAULT_DESCRIPTION: "L'uso di questo codice suggerisce ai motori di ricerca che questa è una pagina di destinazione globale non localizzata"
+    UnsavedNotice: 'Puoi aggiungere alternative una volta salvata la lingua.'
+    db_Locale: Lingua
+    db_Title: Titolo
+    has_one_Domain: Dominio
diff --git a/lang/nl.yml b/lang/nl.yml
new file mode 100644
index 00000000..0acb8e00
--- /dev/null
+++ b/lang/nl.yml
@@ -0,0 +1,113 @@
+nl:
+  SilverStripe\CMS\Controllers\CMSMain:
+    ARCHIVE: Archiveer
+  SilverStripe\CMS\Model\SiteTree:
+    BUTTONPUBLISHED: Gepubliceerd
+    BUTTONSAVEPUBLISH: Publiceer
+  TractorCow\Fluent\Control\LocaleAdmin:
+    MENUTITLE: Talen
+  TractorCow\Fluent\Extension\FluentBadgeExtension:
+    BadgeDefault: 'Standaard taal'
+    BadgeInvisible: 'Vertaald in {locale}'
+    BadgeLocalised: '{type} is niet zichtbaar in deze taal'
+  TractorCow\Fluent\Extension\FluentExtension:
+    COPY_FROM: 'Kopieer naar {locale} vanuit:'
+    COPY_TO: 'Kopieer vanuit {locale} naar:'
+    FLUENT_ICON_TOOLTIP: 'Vertaalbaar veld'
+    LOCALISED: Vertaald
+    Localise: Vertaal
+    NOSOURCE: 'Geen bron'
+    NOTLOCALISED: 'Niet vertaald'
+    Unlocalise: Niet-vertaalbaar
+    UnlocaliseTooltip: 'Verwijder {name} van huidige taal'
+  TractorCow\Fluent\Extension\FluentFilteredExtension:
+    FILTERED_LOCALES: 'Toon in de volgende talen'
+    LOCALEFILTEREDHELP: 'Deze pagina is niet zichtbaar in deze taal'
+    TAB_LOCALES: Vertalingen
+  TractorCow\Fluent\Extension\FluentIsolatedExtension:
+    has_one_Locale: Talen
+  TractorCow\Fluent\Extension\FluentSiteTreeExtension:
+    LOCALECOPYANDPUBLISH: 'Kopieer en publiceer'
+    LOCALECOPYTODRAFT: 'Kopieer naar concept'
+    LOCALESTATUSFLUENTDRAFT: 'Er is een concept klaargezet voor deze taal, maar de live inhoud kan nog steeds worden overgenomen van een andere. Gebruik de actie "Opslaan en publiceren" om deze vertaling te publiceren.'
+    LOCALESTATUSFLUENTINVISIBLE: 'Deze pagina is pas zichtbaar in deze taal, als deze gepubliceerd is.'
+    LOCALESTATUSFLUENTUNKNOWN: 'Er is geen inhoud beschikbaar voor deze pagina. Vertaal deze pagina of stel een taal in waarop teruggevallen kan worden.'
+  TractorCow\Fluent\Extension\FluentVersionedExtension:
+    DRAFT: Concept
+    LIVENO: Nee
+    LIVEYES: Ja
+    MODIFIED: Aangepast
+    NOSOURCE: 'Geen bron'
+    NOTLOCALISED: 'Niet vertaald'
+    PUBLISHED: Gepubliceerd
+  TractorCow\Fluent\Extension\Traits\FluentAdminTrait:
+    ArchiveNotice: "'{title}' is gearchiveerd bij alle talen"
+    ClearAllNotice: "Alle vertalingen zijn verwijderd voor '{title}'."
+    CopyNotice: "'{title}' is gekopieerd naar alle talen."
+    DeleteNotice: "'{title}' is verwijderd van alle talen"
+    Localisation: Vertalingen
+    PublishNotice: "'{title}' is gepubliceerd in alle talen."
+    UnpublishNotice: "'{title}' is ge-depubliceerd bij alle talen."
+  TractorCow\Fluent\Extension\Traits\FluentBadgeTrait:
+    BadgeLocalised: 'Vertaald in {locale}'
+  TractorCow\Fluent\Extension\Traits\FluentObjectTrait:
+    TAB_LOCALISATION: Vertalingen
+  TractorCow\Fluent\Forms\DeleteAllLocalesAction:
+    Delete: 'Verwijder item in alle talen'
+  TractorCow\Fluent\Forms\DeleteLocaleAction:
+    DELETE: 'Verwijder in deze taal'
+  TractorCow\Fluent\Forms\LocaleToggleColumn:
+    DISPLAY_IN: 'Zichtbaar?'
+  TractorCow\Fluent\Forms\PublishAction:
+    PUBLISH: 'Publiceer in deze taal'
+  TractorCow\Fluent\Forms\SaveLocaleAction:
+    SAVE: 'Opslaan in deze taal'
+  TractorCow\Fluent\Forms\UnpublishAction:
+    UNPUBLISH: 'Publicatie intrekken voor deze taal'
+  TractorCow\Fluent\Forms\VisibleLocalesColumn:
+    LocalesTitle: Vertalingen
+  TractorCow\Fluent\Model\Domain:
+    DEFAULT: 'Standaard taal'
+    DEFAULT_NONE: (geen)
+    DOMAIN_HOSTNAME: Domeinnaam
+    DOMAIN_LOCALES: Vertalingen
+    PLURALNAME: Domeinnamen
+    PLURALS:
+      one: 'Een domeinnaam'
+      other: '{count} domeinnamen'
+    SINGULARNAME: Domeinnaam
+    UnsavedNotice: 'Na het opslaan van de taal kunnen er domeinnamen toegevoegd worden'
+    db_Domain: Domeinnaam
+    has_many_Locales: Talen
+    has_one_DefaultLocale: 'Standaard taal'
+  TractorCow\Fluent\Model\FallbackLocale:
+    LOCALE: Talen
+    PLURALNAME: Terugval-taal
+    PLURALS:
+      one: Terugval-taal
+      other: '{count} terugval-talen'
+    SINGULARNAME: Terugval-taal
+    has_one_Locale: Talen
+  TractorCow\Fluent\Model\Locale:
+    DEFAULT_NONE: (geen)
+    DOMAIN: Domeinnaam
+    EDIT_LOCALE: 'Toegang "{title}" ({locale})'
+    FALLBACKS: Terugval-taal
+    IS_DEFAULT: 'Dit is de standaard taal'
+    IS_DEFAULT_DESCRIPTION: 'Let op: Per domein kan een taal worden gekozen (op het tabblad Talen) en overschrijft deze waarde voor dat specifieke domein.'
+    LOCALE: Talen
+    LOCALE_TITLE: Titel
+    LOCALE_URL: 'URL segment'
+    MULTI_LOCALE: 'Toegang tot multi-taal-mogelijkheden (zoals opslaan in alle talen)'
+    PERMISSION: Vertalingen
+    PLURALNAME: Talen
+    PLURALS:
+      one: Taal
+      other: '{count} Talen'
+    SINGULARNAME: Talen
+    USE_X_DEFAULT: 'Gebruik {code} als SEO taalcode (als site-standaard)'
+    USE_X_DEFAULT_DESCRIPTION: 'Het gebruik van deze code geeft aan zoekmachines aan dat dit een niet-vertaalde landingspagina is'
+    UnsavedNotice: 'Een terugval-taal kan ingesteld worden na het opslaan'
+    db_Locale: Talen
+    db_Title: Titel
+    has_one_Domain: Domeinnaam
diff --git a/lang/pl.yml b/lang/pl.yml
new file mode 100644
index 00000000..65dc3db5
--- /dev/null
+++ b/lang/pl.yml
@@ -0,0 +1,119 @@
+pl:
+  SilverStripe\CMS\Controllers\CMSMain:
+    ARCHIVE: Archiwum
+  SilverStripe\CMS\Model\SiteTree:
+    BUTTONPUBLISHED: Opublikowano
+    BUTTONSAVEPUBLISH: Publikuj
+  TractorCow\Fluent\Control\LocaleAdmin:
+    MENUTITLE: Języki
+  TractorCow\Fluent\Extension\FluentBadgeExtension:
+    BadgeDefault: 'Domyślny język'
+    BadgeInvisible: 'Przetłumaczono w {locale}'
+    BadgeLocalised: '{type} nie jest widoczny w tym języku'
+  TractorCow\Fluent\Extension\FluentExtension:
+    COPY_FROM: 'Skopiuj do {locale} z:'
+    COPY_TO: 'Skopiuj z {locale} do:'
+    FLUENT_ICON_TOOLTIP: 'Pole do przetłumaczenia'
+    LOCALISED: Przetłumaczone
+    Localise: Lokalizacja
+    NOSOURCE: 'Brak źródła'
+    NOTLOCALISED: 'Brak lokalizacji'
+    Unlocalise: Niezlokalizuj
+    UnlocaliseTooltip: 'Usuń {name} z bieżącego języka'
+  TractorCow\Fluent\Extension\FluentFilteredExtension:
+    FILTERED_LOCALES: 'Wyświetlaj w następujących lokalizacjach'
+    LOCALEFILTEREDHELP: 'Ta strona nie jest widoczna w tym języku'
+    TAB_LOCALES: Lokalizacje
+  TractorCow\Fluent\Extension\FluentIsolatedExtension:
+    has_one_Locale: Język
+  TractorCow\Fluent\Extension\FluentSiteTreeExtension:
+    LOCALECOPYANDPUBLISH: 'Kopiuj i publikuj'
+    LOCALECOPYTODRAFT: Kopiuj
+    LOCALESTATUSFLUENTDRAFT: 'Utworzono wersję roboczą dla tego języka, jednak opublikowana treść może nadal być dziedziczona z innej. Aby opublikować tę treść dla tej lokalizacji, użyj udostępnionej akcji „Zapisz i opublikuj”.'
+    LOCALESTATUSFLUENTINVISIBLE: 'Ta strona nie będzie widoczna w tej lokalizacji, dopóki nie zostanie opublikowana.'
+    LOCALESTATUSFLUENTUNKNOWN: 'Brak treści dla tej strony. Zlokalizuj tę stronę lub podaj zastępczą wersję regionalną.'
+  TractorCow\Fluent\Extension\FluentVersionedExtension:
+    DRAFT: Szkic
+    LIVENO: Nie
+    LIVEYES: Tak
+    MODIFIED: Zmodyfikowano
+    NOSOURCE: 'Brak źródła'
+    NOTLOCALISED: 'Nie określono'
+    PUBLISHED: Opublikowano
+  TractorCow\Fluent\Extension\Traits\FluentAdminTrait:
+    ArchiveNotice: 'Zarchiwizowany „{title}” i wszystkie jego lokalizacje.'
+    ClearAllNotice: 'Wszystkie lokalizacje zostały wyczyszczone dla „{title}”.'
+    CopyNotice: 'Skopiowano „{title}” do wszystkich innych lokalizacji.'
+    DeleteNotice: 'Usunięto „{title}” i wszystkie jego lokalizacje.'
+    Localisation: 'Lokalizacja, język'
+    PublishNotice: 'Opublikowano „{title}” we wszystkich lokalizacjach.'
+    UnpublishNotice: 'Nieopublikowany „{title}” we wszystkich językach.'
+  TractorCow\Fluent\Extension\Traits\FluentBadgeTrait:
+    BadgeLocalised: 'Przetłumaczono w {locale}'
+  TractorCow\Fluent\Extension\Traits\FluentObjectTrait:
+    TAB_LOCALISATION: 'Lokalizacja, język'
+  TractorCow\Fluent\Forms\DeleteAllLocalesAction:
+    Delete: 'Usuń wszędzie'
+  TractorCow\Fluent\Forms\DeleteLocaleAction:
+    DELETE: 'Usuń ten język'
+  TractorCow\Fluent\Forms\LocaleToggleColumn:
+    DISPLAY_IN: 'Widoczny?'
+  TractorCow\Fluent\Forms\PublishAction:
+    PUBLISH: 'Opublikuj w tym języku'
+  TractorCow\Fluent\Forms\SaveLocaleAction:
+    SAVE: 'Zapisz w tym języku'
+  TractorCow\Fluent\Forms\UnpublishAction:
+    UNPUBLISH: 'Cofnij publikację w tym języku'
+  TractorCow\Fluent\Forms\VisibleLocalesColumn:
+    LocalesTitle: Języki
+  TractorCow\Fluent\Model\Domain:
+    DEFAULT: 'Domyślny język'
+    DEFAULT_NONE: (brak)
+    DOMAIN_HOSTNAME: 'Nazwa hosta domeny'
+    DOMAIN_LOCALES: Języki
+    PLURALNAME: Domeny
+    PLURALS:
+      few: 'Domen {count}'
+      many: 'Domen {count}'
+      one: Domena
+      other: 'Domeny {count}'
+    SINGULARNAME: Domena
+    UnsavedNotice: 'Po zapisaniu domeny możesz dodać języki.'
+    db_Domain: Domena
+    has_many_Locales: Języki
+    has_one_DefaultLocale: 'Domyślny język'
+  TractorCow\Fluent\Model\FallbackLocale:
+    LOCALE: Język
+    PLURALNAME: 'Język zastępczy'
+    PLURALS:
+      few: 'Języków zastępczych {count}'
+      many: 'Języków zastępczych {count}'
+      one: 'Język zastępczy'
+      other: 'Język zastępczy {count}'
+    SINGULARNAME: 'Język zastępczy'
+    has_one_Locale: Język
+  TractorCow\Fluent\Model\Locale:
+    DEFAULT_NONE: (brak)
+    DOMAIN: Domena
+    EDIT_LOCALE: 'Uzyskaj dostęp do „{title}” ({locale})'
+    FALLBACKS: 'Języki zastępcze'
+    IS_DEFAULT: 'To jest globalne domyślne ustawienie regionalne'
+    IS_DEFAULT_DESCRIPTION: 'Uwaga: ustawienia regionalne dla poszczególnych domen można przypisać na karcie Ustawienia regionalne i zastąpią one tę wartość dla określonych domen.'
+    LOCALE: Język
+    LOCALE_TITLE: Tytuł
+    LOCALE_URL: URL
+    MULTI_LOCALE: 'Dostęp do działań w wielu lokalizacjach (np. zapisywanie we wszystkich lokalizacjach)'
+    PERMISSION: 'Lokalizacja, język'
+    PLURALNAME: Języki
+    PLURALS:
+      few: 'Lokalizacje, języki {count}'
+      many: 'Lokalizacji, języków {count}'
+      one: 'Lokalizacja, język'
+      other: 'Lokalizacje, języki {count}'
+    SINGULARNAME: Język
+    USE_X_DEFAULT: 'Użyj {code} jako kodu języka SEO (traktuj jako globalny)'
+    USE_X_DEFAULT_DESCRIPTION: 'Użycie tego kodu wskazuje wyszukiwarkom, że jest to nie-określona globalna strona docelowa'
+    UnsavedNotice: 'Po zapisaniu domeny możesz dodać języki.'
+    db_Locale: Język
+    db_Title: Tytuł
+    has_one_Domain: Domena
diff --git a/lang/ru.yml b/lang/ru.yml
index f2a07996..e5e013ac 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -1,6 +1,23 @@
 ru:
   TractorCow\Fluent\Control\LocaleAdmin:
     MENUTITLE: Языки
+  TractorCow\Fluent\Extension\FluentBadgeExtension:
+    BadgeDefault: 'Стандартный язык'
+  TractorCow\Fluent\Extension\FluentFilteredExtension:
+    TAB_LOCALES: Языки
+  TractorCow\Fluent\Extension\FluentIsolatedExtension:
+    has_one_Locale: Язык
+  TractorCow\Fluent\Extension\FluentSiteTreeExtension:
+    LOCALECOPYANDPUBLISH: 'Скопировать и опубликовать'
+    LOCALECOPYTODRAFT: 'Скопировать в Черновик'
+    LOCALEDRAFTEDHELP: 'Черновая редакция перевода не опубликована'
+    LOCALEDRAFTEDSHORT: 'Язык в черновиках'
+    LOCALEINHERITEDHELP: 'Данные страницы унаследованы от резевного языка'
+    LOCALEINHERITEDSHORT: Унаследовано
+    LOCALESTATUSDRAFT: 'Черновая версия перевода была создана для этого языка, однако, опубликованное содержимое всё ещё на другом языке. Для публикации этого языка воспользуйтесь кнопкой "Сохранить и Опубликовать".'
+    LOCALESTATUSINHERITED: 'Данные страницы унаследованы от резевного языка. Если вы хотите сделать независимую копию страницы. Пожалуйста воскользуйтесь одной из кнопок "Скопировать".'
+  TractorCow\Fluent\Forms\VisibleLocalesColumn:
+    LocalesTitle: Языки
   TractorCow\Fluent\Model\Domain:
     DEFAULT: 'Стандартный язык'
     DEFAULT_NONE: '(не выбран)'
@@ -12,6 +29,9 @@ ru:
       other: '{count} Доменов'
     SINGULARNAME: Домен
     UnsavedNotice: 'Вы можете добавить языки для домена как только его сохраните.'
+    db_Domain: Домен
+    has_many_Locales: Языки
+    has_one_DefaultLocale: 'Стандартный язык'
   TractorCow\Fluent\Model\FallbackLocale:
     LOCALE: Язык
     PLURALNAME: 'Резервные Языки'
@@ -19,6 +39,7 @@ ru:
       one: 'Резервный Язык'
       other: '{count} Резервных Языков'
     SINGULARNAME: 'Резервный Язык'
+    has_one_Locale: Язык
   TractorCow\Fluent\Model\Locale:
     DEFAULT_NONE: '(не выбран)'
     DOMAIN: Домен
@@ -33,12 +54,6 @@ ru:
       one: Язык
       other: '{count} Языков'
     SINGULARNAME: Язык
-  TractorCow\Fluent\Extension\FluentSiteTreeExtension:
-    LOCALECOPYTODRAFT: 'Скопировать в Черновик'
-    LOCALECOPYANDPUBLISH: 'Скопировать и опубликовать'
-    LOCALEDRAFTEDSHORT: 'Язык в черновиках'
-    LOCALEDRAFTEDHELP: 'Черновая редакция перевода не опубликована'
-    LOCALEINHERITEDSHORT: Унаследовано
-    LOCALEINHERITEDHELP: 'Данные страницы унаследованы от резевного языка'
-    LOCALESTATUSINHERITED: 'Данные страницы унаследованы от резевного языка. Если вы хотите сделать независимую копию страницы. Пожалуйста воскользуйтесь одной из кнопок "Скопировать".'
-    LOCALESTATUSDRAFT: 'Черновая версия перевода была создана для этого языка, однако, опубликованное содержимое всё ещё на другом языке. Для публикации этого языка воспользуйтесь кнопкой "Сохранить и Опубликовать".'
+    db_Locale: Язык
+    db_Title: Название
+    has_one_Domain: Домен
diff --git a/lang/sl.yml b/lang/sl.yml
index 19a05939..9bbb7c81 100644
--- a/lang/sl.yml
+++ b/lang/sl.yml
@@ -1,22 +1,85 @@
 sl:
+  SilverStripe\CMS\Controllers\CMSMain:
+    ARCHIVE: Arhiv
+  SilverStripe\CMS\Model\SiteTree:
+    BUTTONPUBLISHED: Objavljeno
+    BUTTONSAVEPUBLISH: Objavi
   TractorCow\Fluent\Control\LocaleAdmin:
     MENUTITLE: Lokalizacije
   TractorCow\Fluent\Extension\FluentBadgeExtension:
-    BadgeDefault: 'Privzeto'
+    BadgeDefault: Privzeto
     BadgeInvisible: 'Lokalizirano v {locale}'
     BadgeLocalised: 'Tip {type} je skrit za to lokalizacijo'
   TractorCow\Fluent\Extension\FluentExtension:
+    COPY_FROM: 'Kopiraj v {locale} iz: '
+    COPY_TO: 'Kopiraj iz {locale} v:'
     FLUENT_ICON_TOOLTIP: 'Lokalizirano polje'
+    LOCALISED: Lokalizirano
+    Localise: Lokaliziraj
+    NOSOURCE: (brez)
+    NOTLOCALISED: 'Ni lokalizirano'
+    Unlocalise: 'Odstrani lokalizacijo'
+    UnlocaliseTooltip: "Odstrani element '{name}' iz trenutne lokalizacije"
   TractorCow\Fluent\Extension\FluentFilteredExtension:
     FILTERED_LOCALES: 'Prikaži te lokalizacije'
     LOCALEFILTEREDHELP: 'Stran za to lokalizacijo ni vidna'
     TAB_LOCALES: Lokalizacije
+    many_many_FilteredLocales: 'Pofiltrirane lokalizacije'
+  TractorCow\Fluent\Extension\FluentIsolatedExtension:
+    has_one_Locale: Lokalizacija
   TractorCow\Fluent\Extension\FluentSiteTreeExtension:
     LOCALECOPYANDPUBLISH: 'Kopiraj in objavi'
     LOCALECOPYTODRAFT: 'Kopiraj v osnutek'
     LOCALESTATUSFLUENTDRAFT: 'Ustvarili smo osnutek strani za izbrano lokalizacijo, a je na strani lahko še vedno objavljena vsebina iz izvorne lokalizacije. Za objavo vsebine iz te lokalizacije kliknite "Kopiraj in objavi".'
-    LOCALESTATUSFLUENTINHERITED: 'Stran lahko prevzema vsebino iz druge lokalizacije. Če želite ustvariti nepovezano kopijo strani, uporabite eno od akcij kopiranja, ki so na voljo.'
+    LOCALESTATUSFLUENTINHERITED: 'Lahko, da je stran prevzela vsebino iz druge lokalizacije. Če želite ustvariti nepovezano kopijo strani, uporabite eno od akcij kopiranja, ki so na voljo.'
     LOCALESTATUSFLUENTINVISIBLE: 'Stran ne bo vidna dokler ne bo objavljena za to lokalizacijo.'
+    LOCALESTATUSFLUENTUNKNOWN: 'Vsebina za to stran ne obstaja. Lokalizirajte vsebino ali definirajte nadomestno lokalizacijo.'
+  TractorCow\Fluent\Extension\FluentVersionedExtension:
+    DRAFT: Osnutek
+    LIVENO: Ne
+    LIVEYES: Da
+    MODIFIED: Spremenjeno
+    NOSOURCE: (brez)
+    NOTLOCALISED: 'Ni lokalizirano'
+    PUBLISHED: Objavljeno
+  TractorCow\Fluent\Extension\Traits\FluentAdminTrait:
+    ArchiveNotice: "Stran '{title}' in njene lokalizacije so arhivirane."
+    ClearAllNotice: "Vse lokalizacije strani '{title}' so odstranjene."
+    CopyNotice: "Stran '{title}' je skopirana v vse ostale lokalizacije."
+    DeleteNotice: "Stran '{title}' je izbrisana in vse lokalizacije odstranjene."
+    HideNotice: "Zapis '{title}' je sedaj skrit v {locale}"
+    Label_archiveFluent: 'Umakni iz objave in arhiviraj (vse lokalizacije)'
+    Label_clearFluent: "Počisti iz vseh, razen iz '{title}'"
+    Label_copyFluent: "Skopiraj '{title}' v ostale lokalizacije"
+    Label_deleteFluent: 'Izbriši (vse lokalizacije)'
+    Label_hideFluent: "Skrij iz '{title}'"
+    Label_publishFluent: 'Shrani in objavi (vse lokalizacije)'
+    Label_showFluent: "Prikazano v '{title}'"
+    Label_unpublishFluent: 'Umakni iz objave (vse lokalizacije)'
+    Localisation: Lokalizacija
+    PublishNotice: "Vse lokalizacije strani '{title}' so objavljene."
+    ShowNotice: "Zapis '{title}' je sedaj viden v {locale}"
+    UnpublishNotice: "Vse lokalizacije strani '{title}' so umaknjene iz objave."
+  TractorCow\Fluent\Extension\Traits\FluentBadgeTrait:
+    BadgeInherited: 'Preneseno iz {locale}'
+    BadgeLocalised: 'Lokalizirano v {locale}'
+    BaggeInvisible: '{type} je brez vsebine v {locale}. Lokalizirajte {type} ali zagotovite nadomestno lokalizacijo.'
+  TractorCow\Fluent\Extension\Traits\FluentObjectTrait:
+    TAB_LOCALISATION: Lokalizacija
+  TractorCow\Fluent\Forms\DeleteAllLocalesAction:
+    Delete: 'Izbriši zapise v vseh lokalizacijah'
+  TractorCow\Fluent\Forms\DeleteLocaleAction:
+    DELETE: 'Izbriši to lokalizacijo'
+  TractorCow\Fluent\Forms\LocaleToggleColumn:
+    DISPLAY_IN: 'Vidno?'
+  TractorCow\Fluent\Forms\PublishAction:
+    PUBLISH: 'Objavi to lokalizacijo'
+  TractorCow\Fluent\Forms\SaveLocaleAction:
+    SAVE: 'Shrani to lokalizacijo'
+  TractorCow\Fluent\Forms\UnpublishAction:
+    UNPUBLISH: 'Umakni iz objave'
+  TractorCow\Fluent\Forms\VisibleLocalesColumn:
+    LocalesTitle: Lokalizacije
   TractorCow\Fluent\Model\Domain:
     DEFAULT: 'Privzeta lokalizacija'
     DEFAULT_NONE: (brez)
@@ -24,35 +87,57 @@ sl:
     DOMAIN_LOCALES: Lokalizacije
     PLURALNAME: Domene
     PLURALS:
-      one: 'Domena'
-      two: '{count} domeni'
       few: '{count} domen'
+      one: Domena
       other: '{count} domen'
+      two: '{count} domeni'
     SINGULARNAME: Domena
     UnsavedNotice: 'Lokalizacije boste lahko dodajali, ko boste shranili domeno.'
+    db_Domain: Domena
+    has_many_Locales: Lokalizacije
+    has_one_DefaultLocale: 'Privzeta lokalizacija'
   TractorCow\Fluent\Model\FallbackLocale:
     LOCALE: Lokalizacija
     PLURALNAME: 'Nadomestne lokalizacije'
     PLURALS:
-      one: 'Nadomestna lokalizacija'
-      two: '{count} nadomestni lokalizaciji'
       few: '{count} nadomestnih lokalizacij'
+      one: 'Nadomestna lokalizacija'
       other: '{count} nadomestnih lokalizacij'
+      two: '{count} nadomestni lokalizaciji'
     SINGULARNAME: 'Nadomestna lokalizacija'
+    db_Sort: Razvrsti
+    has_one_Locale: Lokalizacija
+    has_one_Parent: Nadrejena
   TractorCow\Fluent\Model\Locale:
     DEFAULT_NONE: (brez)
     DOMAIN: Domena
+    EDIT_LOCALE: 'Dostop do "{title}" ({locale})'
     FALLBACKS: 'Nadomestne lokalizacije'
-    IS_DEFAULT: 'Splošno privzeta lokalizacija'
-    IS_DEFAULT_DESCRIPTION: 'Opomba: Lokalizacije, vezane na posamezno domeno, je mogoče nastaviti v zavihku Lokalizacije. V tem primeru bo specifična lokalizacija prevladala nad splošno privzeto.'
+    IS_DEFAULT: 'Privzeta (osnovna) lokalizacija'
+    IS_DEFAULT_DESCRIPTION: "Nastavitev, ki je z izbirnikom 'Domena' vezana na posamezno domeno, bo za tisto domeno prevladala nad splošno."
     LOCALE: Lokalizacija
-    LOCALE_TITLE: Naslov
-    LOCALE_URL: 'URL segment'
+    LOCALE_TITLE: Naziv
+    LOCALE_URL: 'Predpona URL'
+    MULTI_LOCALE: 'Dostop do paketnega urejanja lokalizacij, npr. shrani vse lokalizacije.'
+    PERMISSION: Lokalizacija
     PLURALNAME: Lokalizacije
     PLURALS:
-      one: 'Lokalizacija'
-      two: '{count} lokalizaciji'
       few: '{count} lokalizacij/e'
+      one: Lokalizacija
       other: '{count} lokalizacij/e'
+      two: '{count} lokalizaciji'
     SINGULARNAME: Lokalizacija
+    TIMEZONE: 'Časovni pas'
+    USE_X_DEFAULT: 'Uporabi kot privzeto ({code}) jezikovno kodo za SEO'
+    USE_X_DEFAULT_DESCRIPTION: 'S to izbiro boste iskalnikom nakazali, da je izbrana lokalizacija privzeta za vse situacije, ko specifična lokalizacija ni na voljo'
     UnsavedNotice: 'Nadomestne lokalizacije boste lahko dodali, ko boste shranili trenutno lokalizacijo.'
+    db_IsGlobalDefault: 'Privzeta (globalna)'
+    db_Locale: Lokalizacija
+    db_Sort: Razvrsti
+    db_Timezone: 'Časovni pas'
+    db_Title: Naziv
+    db_URLSegment: 'Predpona URL'
+    db_UseDefaultCode: 'Uporabi privzeto kodo'
+    has_many_FallbackLocales: 'Nadomestne lokalizacije'
+    has_one_Domain: Domena
+    many_many_Fallbacks: Nadomestne
diff --git a/src/Extension/FluentExtension.php b/src/Extension/FluentExtension.php
index c0f0fe3f..1a4750bf 100644
--- a/src/Extension/FluentExtension.php
+++ b/src/Extension/FluentExtension.php
@@ -248,7 +248,7 @@ public function getLocalisedFields($class = null)
         // List of DB fields
         $fields = DataObject::getSchema()->databaseFields($class, false);
         $filter = Config::inst()->get($class, 'translate', Config::UNINHERITED);
-        if ($filter === self::TRANSLATE_NONE || empty($fields)) {
+        if ($filter === FluentExtension::TRANSLATE_NONE || empty($fields)) {
             return $this->localisedFields[$class] = [];
         }
 
@@ -274,7 +274,7 @@ protected function isFieldLocalised($field, $type, $class)
     {
         // Explicit per-table filter
         $filter = Config::inst()->get($class, 'translate', Config::UNINHERITED);
-        if ($filter === self::TRANSLATE_NONE) {
+        if ($filter === FluentExtension::TRANSLATE_NONE) {
             return false;
         }
         if ($filter && is_array($filter)) {
@@ -406,7 +406,7 @@ protected function validateBaseConfig()
         $fluents = 0;
         $extensions = $this->owner->get_extensions();
         foreach ($extensions as $extension) {
-            if (is_a($extension, self::class, true)) {
+            if (is_a($extension, FluentExtension::class, true)) {
                 $fluents++;
             }
         }
@@ -434,7 +434,7 @@ protected function validateChildConfig()
         $extensions = array_filter(array_values($extensions));
         foreach ($extensions as $extension) {
             $extensionClass = Extension::get_classname_without_arguments($extension);
-            if (is_a($extensionClass, self::class, true)) {
+            if (is_a($extensionClass, FluentExtension::class, true)) {
                 $name = get_class($this->owner);
                 DB::alteration_message(
                     "Invalid config: {$name} has FluentExtension, but this should be applied only on the base class",
@@ -492,11 +492,11 @@ public function augmentSQL(SQLSelect $query, DataQuery $dataQuery = null)
 
         // Resolve content inheritance (this drives what content is shown)
         $inheritanceMode = $this->getInheritanceMode();
-        if ($inheritanceMode === self::INHERITANCE_MODE_EXACT) {
+        if ($inheritanceMode === FluentExtension::INHERITANCE_MODE_EXACT) {
             $joinAlias = $this->getLocalisedTable($this->owner->baseTable(), $locale->Locale);
             $where = sprintf('"%s"."ID" IS NOT NULL', $joinAlias);
             $query->addWhereAny($where);
-        } elseif ($inheritanceMode === self::INHERITANCE_MODE_FALLBACK) {
+        } elseif ($inheritanceMode === FluentExtension::INHERITANCE_MODE_FALLBACK) {
             $conditions = [];
 
             foreach ($locale->getChain() as $joinLocale) {
@@ -836,7 +836,7 @@ protected function localiseManipulationTable(&$manipulation, $table, $localeTabl
      */
     public function getLocalisedTable($tableName, $locale = '')
     {
-        $localisedTable = $tableName . '_' . self::SUFFIX;
+        $localisedTable = $tableName . '_' . FluentExtension::SUFFIX;
         if ($locale) {
             $localisedTable .= '_' . $locale;
         }
@@ -1176,17 +1176,17 @@ protected function getInheritanceMode(): string
         // Detect legacy type
         if (is_bool($inheritanceMode)) {
             $inheritanceMode = $inheritanceMode
-                ? self::INHERITANCE_MODE_EXACT
-                : self::INHERITANCE_MODE_ANY;
+                ? FluentExtension::INHERITANCE_MODE_EXACT
+                : FluentExtension::INHERITANCE_MODE_ANY;
         }
 
         if (!in_array($inheritanceMode, [
-            self::INHERITANCE_MODE_EXACT,
-            self::INHERITANCE_MODE_FALLBACK,
-            self::INHERITANCE_MODE_ANY,
+            FluentExtension::INHERITANCE_MODE_EXACT,
+            FluentExtension::INHERITANCE_MODE_FALLBACK,
+            FluentExtension::INHERITANCE_MODE_ANY,
         ])) {
             // Default mode
-            $inheritanceMode = self::INHERITANCE_MODE_ANY;
+            $inheritanceMode = FluentExtension::INHERITANCE_MODE_ANY;
         }
 
         return $inheritanceMode;
@@ -1301,10 +1301,10 @@ public function updateLocalisationTabColumns(&$summaryColumns)
                 }
 
                 if ($object->RecordLocale()->IsDraft()) {
-                    return _t(self::class . '.LOCALISED', 'Localised');
+                    return _t(FluentExtension::class . '.LOCALISED', 'Localised');
                 }
 
-                return _t(self::class . '.NOTLOCALISED', 'Not localised');
+                return _t(FluentExtension::class . '.NOTLOCALISED', 'Not localised');
             }
         ];
 
@@ -1321,7 +1321,7 @@ public function updateLocalisationTabColumns(&$summaryColumns)
                     return $sourceLocale->getLongTitle();
                 }
 
-                return _t(self::class . '.NOSOURCE', 'No source');
+                return _t(FluentExtension::class . '.NOSOURCE', 'No source');
             }
         ];
     }
diff --git a/src/Extension/FluentFilteredExtension.php b/src/Extension/FluentFilteredExtension.php
index b7dac66c..eaa8cf45 100644
--- a/src/Extension/FluentFilteredExtension.php
+++ b/src/Extension/FluentFilteredExtension.php
@@ -119,7 +119,7 @@ public function augmentSQL(SQLSelect $query, DataQuery $dataQuery = null)
         }
 
         $table = $this->owner->baseTable();
-        $filteredLocalesTable = $table . '_' . self::SUFFIX;
+        $filteredLocalesTable = $table . '_' . FluentFilteredExtension::SUFFIX;
 
         $query->addInnerJoin(
             $filteredLocalesTable,
diff --git a/src/Extension/FluentVersionedExtension.php b/src/Extension/FluentVersionedExtension.php
index a8306aba..d985ba2c 100644
--- a/src/Extension/FluentVersionedExtension.php
+++ b/src/Extension/FluentVersionedExtension.php
@@ -93,7 +93,7 @@ class FluentVersionedExtension extends FluentExtension implements Resettable
      * This is different from the above cache which caches the result per object - each array (keyed by locale & table)
      * will have ALL object IDs for that locale & table.
      *
-     * static::$idsInLocaleCache[ $locale ][ $table(.self::SUFFIX_LIVE) ][ $objectId ] = $objectId
+     * static::$idsInLocaleCache[ $locale ][ $table(.FluentVersionedExtension::SUFFIX_LIVE) ][ $objectId ] = $objectId
      *
      * @var int[][][]
      */
@@ -116,7 +116,7 @@ public function augmentDatabase()
             // Must see versioned
             if ($extension instanceof Versioned) {
                 $seenVersioned = true;
-            } elseif ($extension instanceof self) {
+            } elseif ($extension instanceof FluentVersionedExtension) {
                 if (!$seenVersioned) {
                     throw new LogicException(
                         "FluentVersionedExtension must be added AFTER Versioned extension. Check "
@@ -132,8 +132,8 @@ public function augmentDatabase()
     protected function augmentDatabaseDontRequire($localisedTable)
     {
         DB::dont_require_table($localisedTable);
-        DB::dont_require_table($localisedTable . self::SUFFIX_LIVE);
-        DB::dont_require_table($localisedTable . self::SUFFIX_VERSIONS);
+        DB::dont_require_table($localisedTable . FluentVersionedExtension::SUFFIX_LIVE);
+        DB::dont_require_table($localisedTable . FluentVersionedExtension::SUFFIX_VERSIONS);
     }
 
     protected function augmentDatabaseRequireTable($localisedTable, $fields, $indexes)
@@ -141,13 +141,13 @@ protected function augmentDatabaseRequireTable($localisedTable, $fields, $indexe
         DB::require_table($localisedTable, $fields, $indexes, false);
 
         // _Live record
-        DB::require_table($localisedTable . self::SUFFIX_LIVE, $fields, $indexes, false);
+        DB::require_table($localisedTable . FluentVersionedExtension::SUFFIX_LIVE, $fields, $indexes, false);
 
         // Merge fields and indexes with Fluent defaults
         $versionsFields = array_merge($this->defaultVersionsFields, $fields);
         $versionsIndexes = array_merge($indexes, $this->defaultVersionsIndexes);
 
-        DB::require_table($localisedTable . self::SUFFIX_VERSIONS, $versionsFields, $versionsIndexes, false);
+        DB::require_table($localisedTable . FluentVersionedExtension::SUFFIX_VERSIONS, $versionsFields, $versionsIndexes, false);
     }
 
     /**
@@ -209,7 +209,7 @@ protected function rewriteVersionedTables(SQLSelect $query, array $tables, Local
         foreach ($tables as $tableName => $fields) {
             // Rename to _Versions suffixed versions
             $localisedTable = $this->getLocalisedTable($tableName);
-            $query->renameTable($localisedTable, $localisedTable . self::SUFFIX_VERSIONS);
+            $query->renameTable($localisedTable, $localisedTable . FluentVersionedExtension::SUFFIX_VERSIONS);
 
             // Add the chain of locale fallbacks
             $this->addLocaleFallbackChain($query, $tableName, $locale);
@@ -229,7 +229,7 @@ protected function addLocaleFallbackChain(SQLSelect $query, $tableName, Locale $
 
         foreach ($locale->getChain() as $joinLocale) {
             $joinAlias = $this->getLocalisedTable($tableName, $joinLocale->Locale);
-            $versionTable = $baseTable . self::SUFFIX_VERSIONS;
+            $versionTable = $baseTable . FluentVersionedExtension::SUFFIX_VERSIONS;
 
             $query->setJoinFilter(
                 $joinAlias,
@@ -250,7 +250,7 @@ protected function renameLocalisedTables(SQLSelect $query, array $tables)
     {
         foreach ($tables as $table => $fields) {
             $localisedTable = $this->getLocalisedTable($table);
-            $query->renameTable($localisedTable, $localisedTable . self::SUFFIX_LIVE);
+            $query->renameTable($localisedTable, $localisedTable . FluentVersionedExtension::SUFFIX_LIVE);
         }
     }
 
@@ -295,13 +295,13 @@ public function augmentWrite(&$manipulation)
         $includedTables = $this->getLocalisedTables();
         foreach ($includedTables as $table => $localisedFields) {
             // Localise both _Versions and _Live writes
-            foreach ([self::SUFFIX_LIVE, self::SUFFIX_VERSIONS] as $suffix) {
+            foreach ([FluentVersionedExtension::SUFFIX_LIVE, FluentVersionedExtension::SUFFIX_VERSIONS] as $suffix) {
                 $versionedTable = $table . $suffix;
                 $localisedTable = $this->getLocalisedTable($table) . $suffix;
 
                 // Add extra case for "Version" column when localising Versions
                 $localisedVersionFields = $localisedFields;
-                if ($suffix === self::SUFFIX_VERSIONS) {
+                if ($suffix === FluentVersionedExtension::SUFFIX_VERSIONS) {
                     $localisedVersionFields = array_merge(
                         $localisedVersionFields,
                         array_keys($this->defaultVersionsFields)
@@ -332,7 +332,7 @@ protected function getDeleteTableTarget($tableName, $locale = '')
         // Rewrite to _Live when deleting from live / unpublishing
         $table = parent::getDeleteTableTarget($tableName, $locale);
         if (Versioned::get_stage() === Versioned::LIVE) {
-            $table .= self::SUFFIX_LIVE;
+            $table .= FluentVersionedExtension::SUFFIX_LIVE;
         }
         return $table;
     }
@@ -482,7 +482,7 @@ protected function isLocalisedInStage($stage, $locale = null)
         $baseTable = $this->owner->baseTable();
         $table = $this->getLocalisedTable($baseTable);
         if ($stage === Versioned::LIVE) {
-            $table .= self::SUFFIX_LIVE;
+            $table .= FluentVersionedExtension::SUFFIX_LIVE;
         }
 
         // Check for a cached item in the full list of all objects. These are populated optimistically.
@@ -529,7 +529,7 @@ public static function reset()
      */
     public function onPrepopulateTreeDataCache($recordList = null, array $options = [])
     {
-        if (!Config::inst()->get(self::class, 'prepopulate_localecontent_cache')) {
+        if (!Config::inst()->get(FluentVersionedExtension::class, 'prepopulate_localecontent_cache')) {
             return;
         }
 
@@ -539,7 +539,7 @@ public function onPrepopulateTreeDataCache($recordList = null, array $options =
             return;
         }
 
-        self::prepoulateIdsInLocale(FluentState::singleton()->getLocale(), $this->owner->baseClass());
+        FluentVersionedExtension::prepoulateIdsInLocale(FluentState::singleton()->getLocale(), $this->owner->baseClass());
     }
 
     /**
@@ -558,7 +558,7 @@ public static function prepoulateIdsInLocale($locale, $dataObjectClass, $populat
         $table = $dataObject->getLocalisedTable($dataObject->baseTable());
 
         // If we already have items then we've been here before...
-        if (isset(self::$idsInLocaleCache[$locale][$table])) {
+        if (isset(FluentVersionedExtension::$idsInLocaleCache[$locale][$table])) {
             return;
         }
 
@@ -567,7 +567,7 @@ public static function prepoulateIdsInLocale($locale, $dataObjectClass, $populat
             $tables[] = $table;
         }
         if ($populateLive) {
-            $tables[] = $table . self::SUFFIX_LIVE;
+            $tables[] = $table . FluentVersionedExtension::SUFFIX_LIVE;
         }
 
         // Populate both the draft and live stages
@@ -581,8 +581,8 @@ public static function prepoulateIdsInLocale($locale, $dataObjectClass, $populat
             $ids = $result->column('RecordID');
 
             // We need to execute ourselves as the param is lost from the subSelect
-            self::$idsInLocaleCache[$locale][$table] = array_combine($ids, $ids);
-            self::$idsInLocaleCache[$locale][$table][static::CACHE_COMPLETE] = true;
+            FluentVersionedExtension::$idsInLocaleCache[$locale][$table] = array_combine($ids, $ids);
+            FluentVersionedExtension::$idsInLocaleCache[$locale][$table][static::CACHE_COMPLETE] = true;
         }
     }
 
@@ -598,18 +598,18 @@ public function updateLocalisationTabColumns(&$summaryColumns)
                 $recordLocale = $object->RecordLocale();
 
                 if ($recordLocale->getStagesDiffer()) {
-                    return _t(self::class . '.MODIFIED', 'Modified');
+                    return _t(FluentVersionedExtension::class . '.MODIFIED', 'Modified');
                 }
 
                 if ($recordLocale->IsPublished(true)) {
-                    return _t(self::class . '.PUBLISHED', 'Published');
+                    return _t(FluentVersionedExtension::class . '.PUBLISHED', 'Published');
                 }
 
                 if ($recordLocale->IsDraft()) {
-                    return _t(self::class . '.DRAFT', 'Draft');
+                    return _t(FluentVersionedExtension::class . '.DRAFT', 'Draft');
                 }
 
-                return _t(self::class . '.NOTLOCALISED', 'Not localised');
+                return _t(FluentVersionedExtension::class . '.NOTLOCALISED', 'Not localised');
             }
         ];
 
@@ -626,7 +626,7 @@ public function updateLocalisationTabColumns(&$summaryColumns)
                     return $sourceLocale->getLongTitle();
                 }
 
-                return _t(self::class . '.NOSOURCE', 'No source');
+                return _t(FluentVersionedExtension::class . '.NOSOURCE', 'No source');
             }
         ];
 
@@ -638,8 +638,8 @@ public function updateLocalisationTabColumns(&$summaryColumns)
                 }
 
                 return $object->RecordLocale()->IsPublished()
-                    ? _t(self::class . '.LIVEYES', 'Yes')
-                    : _t(self::class . '.LIVENO', 'No');
+                    ? _t(FluentVersionedExtension::class . '.LIVEYES', 'Yes')
+                    : _t(FluentVersionedExtension::class . '.LIVENO', 'No');
             }
         ];
     }
diff --git a/src/Extension/Traits/FluentObjectTrait.php b/src/Extension/Traits/FluentObjectTrait.php
index b73da892..d1103921 100644
--- a/src/Extension/Traits/FluentObjectTrait.php
+++ b/src/Extension/Traits/FluentObjectTrait.php
@@ -28,7 +28,7 @@ trait FluentObjectTrait
      * Add additional columns to localisation table
      *
      * @param $summaryColumns
-     * @see FluentObjectTrait::updateFluentCMSFields()
+     * @see self::updateFluentCMSFields()
      */
     abstract public function updateLocalisationTabColumns(&$summaryColumns);
 
diff --git a/src/Forms/CopyLocaleAction.php b/src/Forms/CopyLocaleAction.php
index 69103ea0..4a9bd727 100644
--- a/src/Forms/CopyLocaleAction.php
+++ b/src/Forms/CopyLocaleAction.php
@@ -166,7 +166,7 @@ public function getGroup($gridField, $record, $columnName)
     {
         $hasGroup = parent::getGroup($gridField, $record, $columnName);
         if ($hasGroup) {
-            return $this->isTo ? self::COPY_TO : self::COPY_FROM;
+            return $this->isTo ? CopyLocaleAction::COPY_TO : CopyLocaleAction::COPY_FROM;
         }
         return null;
     }
diff --git a/src/Forms/LocaleToggleColumn.php b/src/Forms/LocaleToggleColumn.php
index 6c4a88ef..4d950ed2 100644
--- a/src/Forms/LocaleToggleColumn.php
+++ b/src/Forms/LocaleToggleColumn.php
@@ -26,7 +26,7 @@ class LocaleToggleColumn implements GridField_SaveHandler, GridField_ColumnProvi
     public function augmentColumns($gridField, &$columns)
     {
         // Add "enabled in" column
-        if (in_array(self::COLUMN_NAME, $columns)) {
+        if (in_array(LocaleToggleColumn::COLUMN_NAME, $columns)) {
             return;
         }
 
@@ -37,10 +37,10 @@ public function augmentColumns($gridField, &$columns)
                 $columns,
                 $localeIndex + 1,
                 0,
-                [self::COLUMN_NAME]
+                [LocaleToggleColumn::COLUMN_NAME]
             );
         } else {
-            $columns[] = self::COLUMN_NAME;
+            $columns[] = LocaleToggleColumn::COLUMN_NAME;
         }
     }
 
@@ -49,7 +49,7 @@ public function augmentColumns($gridField, &$columns)
      */
     public function getColumnsHandled($gridField)
     {
-        return [self::COLUMN_NAME];
+        return [LocaleToggleColumn::COLUMN_NAME];
     }
 
     /**
@@ -60,7 +60,7 @@ public function getColumnsHandled($gridField)
      */
     public function getColumnContent($gridField, $locale, $columnName)
     {
-        if ($columnName !== self::COLUMN_NAME) {
+        if ($columnName !== LocaleToggleColumn::COLUMN_NAME) {
             return null;
         }
 
@@ -96,8 +96,8 @@ public function handleSave(GridField $gridField, DataObjectInterface $record)
         $value = $gridField->Value();
 
         // Keys for this value will be list of locales to enable
-        $enabledLocales = isset($value[self::COLUMN_NAME])
-            ? array_keys($value[self::COLUMN_NAME])
+        $enabledLocales = isset($value[LocaleToggleColumn::COLUMN_NAME])
+            ? array_keys($value[LocaleToggleColumn::COLUMN_NAME])
             : [];
 
         /** @var DataObject|FluentFilteredExtension $record */
@@ -112,7 +112,7 @@ protected function getFieldName(GridField $grid, Locale $locale)
         return sprintf(
             '%s[%s][%s]',
             $grid->getName(),
-            self::COLUMN_NAME,
+            LocaleToggleColumn::COLUMN_NAME,
             $locale->ID
         );
     }
diff --git a/src/Model/LocalDateTime.php b/src/Model/LocalDateTime.php
index 932ae1c2..746900af 100644
--- a/src/Model/LocalDateTime.php
+++ b/src/Model/LocalDateTime.php
@@ -40,7 +40,7 @@ public function getTimezone(): ?string
      * @param string|null $timezone
      * @return $this
      */
-    public function setTimezone(?string $timezone): self
+    public function setTimezone(?string $timezone): LocalDateTime
     {
         if ($timezone && !in_array($timezone, timezone_identifiers_list())) {
             throw new InvalidArgumentException("Invalid timezone {$timezone}");
@@ -90,7 +90,7 @@ public function setValue($value, $record = null, $markChanged = true)
      */
     public function getLocalValue(): string
     {
-        return $this->Format(self::ISO_DATETIME);
+        return $this->Format(LocalDateTime::ISO_DATETIME);
     }
 
     /** Assign a value that's already in the current locale
diff --git a/src/Model/Locale.php b/src/Model/Locale.php
index 0b967b2c..1bbd3a7a 100644
--- a/src/Model/Locale.php
+++ b/src/Model/Locale.php
@@ -253,7 +253,7 @@ public function getBadgeLabel()
     public function getHrefLang()
     {
         if ($this->UseDefaultCode) {
-            return self::X_DEFAULT;
+            return Locale::X_DEFAULT;
         }
         return strtolower(i18n::convert_rfc1766($this->Locale));
     }
@@ -307,7 +307,7 @@ public function getCMSFields()
                     )),
                 CheckboxField::create(
                     'UseDefaultCode',
-                    _t(__CLASS__ . '.USE_X_DEFAULT', 'Use {code} as SEO language code (treat as global)', ['code' => self::X_DEFAULT])
+                    _t(__CLASS__ . '.USE_X_DEFAULT', 'Use {code} as SEO language code (treat as global)', ['code' => Locale::X_DEFAULT])
                 )
                     ->setDescription(_t(
                         __CLASS__ . '.USE_X_DEFAULT_DESCRIPTION',
@@ -640,7 +640,7 @@ public function RecordLocale()
      */
     public function getLocaleEditPermission()
     {
-        $prefix = self::CMS_ACCESS_FLUENT_LOCALE;
+        $prefix = Locale::CMS_ACCESS_FLUENT_LOCALE;
         return "{$prefix}{$this->Locale}";
     }
 
@@ -650,7 +650,7 @@ public function providePermissions()
         $category = _t(__CLASS__ . '.PERMISSION', 'Localisation');
         $permissions = [
             // @todo - Actually implement this check on those actions
-            self::CMS_ACCESS_MULTI_LOCALE => [
+            Locale::CMS_ACCESS_MULTI_LOCALE => [
                 'name'     => _t(
                     __CLASS__ . '.MULTI_LOCALE',
                     'Access to multi-locale actions (E.g. save in all locales)'