FIX Replace deprecated %s placeholders in translations with named placeholders

* Remove the use of sprintf and %s placeholders in the i18n tests
2017-02-05 08:41:31 +13:00 · 2017-02-05 08:41:31 +13:00 · e307f067ed
parent 73eb82f2b1
commit e307f067ed
68 changed files with 346 additions and 382 deletions
--- a/lang/af.yml
+++ b/lang/af.yml
@ -28,7 +28,7 @@ af:
    CSVEXPORT: 'Voer uit na CSV lêer'
    Find: Vind
    LinkExisting: 'Koppel bestaande'
-    NewRecord: 'Nuwe %s'
+    NewRecord: 'Nuwe {type}'
    NoItemsFound: 'Geen items gevind nie'
    PRINTEDAT: 'Gedruk te'
    PRINTEDBY: 'Gedruk deur'
@ -47,7 +47,7 @@ af:
    Create: Skep
    Delete: Verwyder
    DeletePermissionsFailure: 'Geen toestemming om te verwyder nie'
-    Deleted: 'Verwyderde %s %s'
+    Deleted: 'Verwyderde {type} {name}'
    Save: Stoor
  SilverStripe\Forms\MoneyField:
    FIELDLABELAMOUNT: Bedrag
@ -122,7 +122,7 @@ af:
    AssignedTo: 'toegeken aan "{title}"'
    FromGroup: 'geërf van groep "{title}"'
    FromRole: 'geërf van rol"{title}"'
-    FromRoleOnGroup: 'oorgeërf van rol "%s" op groep "%s"'
+    FromRoleOnGroup: 'oorgeërf van rol "{roletitle}" op groep "{grouptitle}"'
  SilverStripe\Security\PermissionRole:
    OnlyAdminCanApply: 'Slegs administrateur daarvoor aansoek doen'
    Title: Tietel
--- a/lang/ar.yml
+++ b/lang/ar.yml
@ -31,7 +31,7 @@ ar:
    FilterBy: 'ترشيح باستخدام'
    Find: ابحث
    LinkExisting: 'الرابط موجود'
-    NewRecord: 'جديد %s'
+    NewRecord: 'جديد {type}'
    NoItemsFound: 'لا يوجد عناصر'
    PRINTEDAT: 'تم الطباعة في'
    PRINTEDBY: 'تم الطباعة بواسطة'
@ -51,7 +51,7 @@ ar:
    Create: إنشاء
    Delete: حذف
    DeletePermissionsFailure: 'لا يوجد تصريحات بالحذف'
-    Deleted: '%s %s تم حذفه'
+    Deleted: '{type} {name} تم حذفه'
    Save: حفظ
  SilverStripe\Forms\GridField\GridFieldEditButton_ss:
    EDIT: تعديل
@ -132,9 +132,9 @@ ar:
    db_Password: 'الرقم السري'
    db_PasswordExpiry: 'تاريخ انتهاء صلاحية كلمة المرور'
  SilverStripe\Security\PasswordValidator:
-    LOWCHARSTRENGTH: 'يرجى زيادة قوة كلمة المرور بإضافة البعض من الأحرف التالية: %s'
+    LOWCHARSTRENGTH: 'يرجى زيادة قوة كلمة المرور بإضافة البعض من الأحرف التالية: {chars}'
    PREVPASSWORD: 'لقد استخدمت كلمة المرور هذه في الماضي، يرجى اختيار كلمة مرور جديدة'
-    TOOSHORT: 'إنّ كلمة السر قصيرة جدا، يجب أن تحتوي على %s أو أكثر من الحروف'
+    TOOSHORT: 'إنّ كلمة السر قصيرة جدا، يجب أن تحتوي على {minimum} أو أكثر من الحروف'
  SilverStripe\Security\Permission:
    AdminGroup: الإدارة
    CONTENT_CATEGORY: 'تصاريح المحتوى'
@ -145,7 +145,7 @@ ar:
    AssignedTo: 'تم تعيينها إلى "{عنوان}"'
    FromGroup: 'موروثة من المجموعة "{عنوان}"'
    FromRole: 'موروثة من دور "{عنوان}"'
-    FromRoleOnGroup: 'توريث من القاعدة "%s"  على المجموعة "%s"'
+    FromRoleOnGroup: 'توريث من القاعدة "{roletitle}"  على المجموعة "{grouptitle}"'
  SilverStripe\Security\PermissionRole:
    OnlyAdminCanApply: 'المدير فقط هو الذي يمكنه تطبيق'
    Title: عنوان
--- a/lang/ast.yml
+++ b/lang/ast.yml
@ -26,6 +26,6 @@ ast:
    db_LockedOutUntil: 'Bloquiáu fasta'
    db_PasswordExpiry: 'Data d''espiración de la contraseña'
  SilverStripe\Security\PermissionCheckboxSetField:
-    FromRoleOnGroup: 'heredáu del rol "%s" nel grupu "%s"'
+    FromRoleOnGroup: 'heredáu del rol "{roletitle}" nel grupu "{grouptitle}"'
  SilverStripe\Security\Security:
    ALREADYLOGGEDIN: 'Nun tienes accesu a esta páxina. Si tienes otra cuenta que pueda entrar nesta páxina, puedes volver conectate.'
--- a/lang/az.yml
+++ b/lang/az.yml
@ -71,7 +71,7 @@ az:
    FULLADMINRIGHTS: 'Tam administrativ hüquqlar'
    FULLADMINRIGHTS_HELP: 'Başqa təyin edilmiş bütün icazələr rədd olunur.'
  SilverStripe\Security\PermissionCheckboxSetField:
-    FromRoleOnGroup: '"%s" rolundan "%s" qrupunda törəyib'
+    FromRoleOnGroup: '"{roletitle}" rolundan "{grouptitle}" qrupunda törəyib'
  SilverStripe\Security\Security:
    ALREADYLOGGEDIN: 'Sizin bu səhifəyə icazəniz yoxdur. Əgər bu səhifəyə icazəsi olan başqa profiliniz varsa hesabınıza daxil olun'
    BUTTONSEND: 'Parolu sıfırlama linkini göndər'
--- a/lang/bg.yml
+++ b/lang/bg.yml
@ -71,7 +71,7 @@ bg:
    FilterBy: 'Филтриране по'
    Find: Търси
    LinkExisting: 'Свържи към съществуващ'
-    NewRecord: 'Нов %s'
+    NewRecord: 'Нов {type}'
    NoItemsFound: 'Няма намерени елементи'
    PRINTEDAT: 'Отпечатано на'
    PRINTEDBY: 'Отпечатано от'
@ -91,7 +91,7 @@ bg:
    Create: Създай
    Delete: Изтрий
    DeletePermissionsFailure: 'Изтриването не е разрешено'
-    Deleted: 'Изтрити %s %s'
+    Deleted: 'Изтрити {type} {name}'
    Save: Запис
  SilverStripe\Forms\GridField\GridFieldEditButton_ss:
    EDIT: 'Редактиране'
@ -280,7 +280,7 @@ bg:
    PLURALS:
      one: Потребител
      other: '{count} потребителя'
-    REMEMBERME: 'Запомни ме следващия път? (за %d ден/дни на това устройство)'
+    REMEMBERME: 'Запомни ме следващия път? (за {count} ден/дни на това устройство)'
    SINGULARNAME: Потребител
    SUBJECTPASSWORDCHANGED: 'Вашата парола беше променена'
    SUBJECTPASSWORDRESET: 'Връзка за анулиране на паролата'
@ -302,9 +302,9 @@ bg:
      other: '{count} потребителски пароли'
    SINGULARNAME: 'Потребителска парола'
  SilverStripe\Security\PasswordValidator:
-    LOWCHARSTRENGTH: 'Добавете някои от следните символи: %s, за да увеличите силата на паролата си'
+    LOWCHARSTRENGTH: 'Добавете някои от следните символи: {chars}, за да увеличите силата на паролата си'
    PREVPASSWORD: 'Вече сте използвали тази парола. Моля, изберете нова.'
-    TOOSHORT: 'Паролата е прекалено къса. Трябва да е от поне %s символа'
+    TOOSHORT: 'Паролата е прекалено къса. Трябва да е от поне {minimum} символа'
  SilverStripe\Security\Permission:
    AdminGroup: Администратор
    CMS_ACCESS_CATEGORY: 'Достъп до CMS'
@ -322,7 +322,7 @@ bg:
    AssignedTo: 'приписана на "{title}"'
    FromGroup: 'унаследена от група "{title}"'
    FromRole: 'унаследена от роля "{title}"'
-    FromRoleOnGroup: 'унаследено от роля "%s" на група "%s"'
+    FromRoleOnGroup: 'унаследено от роля "{roletitle}" на група "{grouptitle}"'
  SilverStripe\Security\PermissionRole:
    OnlyAdminCanApply: 'Може да се приложи само от администратор'
    PLURALNAME: 'Роли'
--- a/lang/cs.yml
+++ b/lang/cs.yml
@ -44,7 +44,7 @@ cs:
    FilterBy: 'Filtrovat podle'
    Find: Hledat
    LinkExisting: 'Odkaz existující'
-    NewRecord: 'Nový %s'
+    NewRecord: 'Nový {type}'
    NoItemsFound: 'Žádné položky'
    PRINTEDAT: 'Vytištěno v'
    PRINTEDBY: Vytištěno
@ -64,7 +64,7 @@ cs:
    Create: Vytvořit
    Delete: Smazat
    DeletePermissionsFailure: 'Žádná oprávnění mazat'
-    Deleted: 'Smazáno %s %s'
+    Deleted: 'Smazáno {type} {name}'
    Save: Uložit
  SilverStripe\Forms\GridField\GridFieldEditButton_ss:
    EDIT: Editovat
@ -145,7 +145,7 @@ cs:
    DefaultGroupTitleContentAuthors: 'Autoři obsahu'
    Description: Popis
    GroupReminder: 'Když vyberete nadřizenou skupinu, tato skupina bude mít všechny její role'
-    HierarchyPermsError: 'Nelze připojit nadřazenou skupinu "%s" s privilegovanými právy (vyžaduje ADMIN přístup)'
+    HierarchyPermsError: 'Nelze připojit nadřazenou skupinu "{group}" s privilegovanými právy (vyžaduje ADMIN přístup)'
    Locked: 'Zamčený?'
    NoRoles: 'Žádné role'
    PLURALNAME: Skupiny
@ -203,9 +203,9 @@ cs:
    PLURALNAME: 'Členská hesla'
    SINGULARNAME: 'Členské heslo'
  SilverStripe\Security\PasswordValidator:
-    LOWCHARSTRENGTH: 'Prosím, posilněte heslo přidáním některých z následujících znaků: %s'
+    LOWCHARSTRENGTH: 'Prosím, posilněte heslo přidáním některých z následujících znaků: {chars}'
    PREVPASSWORD: 'Již jste použil toto heslo v minulosti, vyberte nové heslo, prosím'
-    TOOSHORT: 'Heslo je příliš krátké, musí být %s nebo více znaků dlouhé'
+    TOOSHORT: 'Heslo je příliš krátké, musí být {minimum} nebo více znaků dlouhé'
  SilverStripe\Security\Permission:
    AdminGroup: Administrátor
    CONTENT_CATEGORY: 'Oprávnění obsahu'
@ -218,7 +218,7 @@ cs:
    AssignedTo: 'přiděleno k "{title}"'
    FromGroup: 'zdědeno ze skupiny "{title}"'
    FromRole: 'zdědeno z role "{title}"'
-    FromRoleOnGroup: 'děděno z role "%s" ve skupině "%s"'
+    FromRoleOnGroup: 'děděno z role "{roletitle}" ve skupině "{grouptitle}"'
  SilverStripe\Security\PermissionRole:
    OnlyAdminCanApply: 'Pouze administrátor může použít'
    PLURALNAME: Role
@ -226,7 +226,7 @@ cs:
    Title: Název
  SilverStripe\Security\PermissionRoleCode:
    PLURALNAME: 'Kódy role oprávnění'
-    PermsError: 'Nelze připojit kód "%s" s privilegovanými právy (vyžaduje ADMIN přístup)'
+    PermsError: 'Nelze připojit kód "{code}" s privilegovanými právy (vyžaduje ADMIN přístup)'
    SINGULARNAME: 'Kód role oprávnění'
  SilverStripe\Security\Security:
    ALREADYLOGGEDIN: 'K této stránce nemáte přístup. Pokud máte jiný účet, který k ní může přistupovat, můžete se přihlásit níže'
--- a/lang/de.yml
+++ b/lang/de.yml
@ -42,7 +42,7 @@ de:
    FilterBy: 'Filtern nach'
    Find: Suchen
    LinkExisting: 'Bestehenden Datensatz verknüpfen'
-    NewRecord: 'Neue(r) %s'
+    NewRecord: 'Neue(r) {type}'
    NoItemsFound: 'Keine Elemente gefunden'
    PRINTEDAT: 'Gedruckt am'
    PRINTEDBY: 'Gedruckt von'
@ -62,7 +62,7 @@ de:
    Create: Erstellen
    Delete: Löschen
    DeletePermissionsFailure: 'Keine Berechtigungen zum löschen'
-    Deleted: 'Gelöscht %s %s'
+    Deleted: 'Gelöscht {type} {name}'
    Save: Speichern
  SilverStripe\Forms\GridField\GridFieldEditButton_ss:
    EDIT: Bearbeiten
@ -136,7 +136,7 @@ de:
    DefaultGroupTitleContentAuthors: Inhaltsautoren
    Description: Beschreibung
    GroupReminder: 'Diese Gruppe übernimmt automatisch die Rollen der Elterngruppe'
-    HierarchyPermsError: 'Kann Berechtigungen der Eltern-Gruppe "%s" nicht hinzufügen (erfordert Administratorrechte)'
+    HierarchyPermsError: 'Kann Berechtigungen der Eltern-Gruppe "{group}" nicht hinzufügen (erfordert Administratorrechte)'
    Locked: 'Gesperrt?'
    NoRoles: 'Keine Rollen gefunden'
    PLURALNAME: Gruppen
@ -194,9 +194,9 @@ de:
    PLURALNAME: Benutzerpasswörter
    SINGULARNAME: Benutzerpasswort
  SilverStripe\Security\PasswordValidator:
-    LOWCHARSTRENGTH: 'Bitte erhöhen Sie die Sicherheit des Passworts, indem Sie auch einige der folgenden Zeichen verwenden: %s'
+    LOWCHARSTRENGTH: 'Bitte erhöhen Sie die Sicherheit des Passworts, indem Sie auch einige der folgenden Zeichen verwenden: {chars}'
    PREVPASSWORD: 'Sie haben dieses Passwort schon einmal verwendet. Bitte wählen Sie ein neues Passwort'
-    TOOSHORT: 'Das Passwort ist zu kurz, es muss mindestens %s Zeichen lang sein'
+    TOOSHORT: 'Das Passwort ist zu kurz, es muss mindestens {minimum} Zeichen lang sein'
  SilverStripe\Security\Permission:
    AdminGroup: Administrator
    CONTENT_CATEGORY: Inhaltsberechtigungen
@ -209,7 +209,7 @@ de:
    AssignedTo: 'Zugewiesen an "{title}"'
    FromGroup: 'abgeleited von Gruppe "{title}"'
    FromRole: 'abgeleited von Rolle "{title}"'
-    FromRoleOnGroup: 'geerbt von Rolle "%s" für die Gruppe "%s"'
+    FromRoleOnGroup: 'geerbt von Rolle "{roletitle}" für die Gruppe "{grouptitle}"'
  SilverStripe\Security\PermissionRole:
    OnlyAdminCanApply: 'Nur Adminstratoren können beitreten'
    PLURALNAME: Rollen
@ -217,7 +217,7 @@ de:
    Title: Titel
  SilverStripe\Security\PermissionRoleCode:
    PLURALNAME: Berechtigungsrollencodes
-    PermsError: 'Kann Berechtigungen dem Code "%s" nicht hinzufügen (erfordert Administratorrechte)'
+    PermsError: 'Kann Berechtigungen dem Code "{code}" nicht hinzufügen (erfordert Administratorrechte)'
    SINGULARNAME: Berechtigungsrollencode
  SilverStripe\Security\Security:
    ALREADYLOGGEDIN: 'Sie haben keinen Zugriff auf diese Seite. Wenn Sie ein anderes Konto besitzen, mit dem Sie auf diese Seite zugreifen können, melden Sie sich bitte unten an.'
--- a/lang/en.yml
+++ b/lang/en.yml
@ -72,7 +72,7 @@ en:
    FilterBy: 'Filter by '
    Find: Find
    LinkExisting: 'Link Existing'
-    NewRecord: 'New %s'
+    NewRecord: 'New {type}'
    NoItemsFound: 'No items found'
    PRINTEDAT: 'Printed at'
    PRINTEDBY: 'Printed by'
@ -92,7 +92,7 @@ en:
    Create: Create
    Delete: Delete
    DeletePermissionsFailure: 'No delete permissions'
-    Deleted: 'Deleted %s %s'
+    Deleted: 'Deleted {type} {name}'
    Save: Save
  SilverStripe\Forms\GridField\GridFieldEditButton_ss:
    EDIT: Edit
@ -176,7 +176,7 @@ en:
    Description: Description
    GROUPNAME: 'Group name'
    GroupReminder: 'If you choose a parent group, this group will take all it''s roles'
-    HierarchyPermsError: 'Can''t assign parent group "%s" with privileged permissions (requires ADMIN access)'
+    HierarchyPermsError: 'Can''t assign parent group "{group}" with privileged permissions (requires ADMIN access)'
    Locked: 'Locked?'
    MEMBERS: Members
    NEWGROUP: 'New Group'
@ -262,9 +262,9 @@ en:
      other: '{count} Member Passwords'
    SINGULARNAME: 'Member Password'
  SilverStripe\Security\PasswordValidator:
-    LOWCHARSTRENGTH: 'Please increase password strength by adding some of the following characters: %s'
+    LOWCHARSTRENGTH: 'Please increase password strength by adding some of the following characters: {chars}'
    PREVPASSWORD: 'You''ve already used that password in the past, please choose a new password'
-    TOOSHORT: 'Password is too short, it must be %s or more characters long'
+    TOOSHORT: 'Password is too short, it must be {minimum} or more characters long'
  SilverStripe\Security\Permission:
    AdminGroup: Administrator
    CMS_ACCESS_CATEGORY: 'CMS Access'
@ -282,7 +282,7 @@ en:
    AssignedTo: 'assigned to "{title}"'
    FromGroup: 'inherited from group "{title}"'
    FromRole: 'inherited from role "{title}"'
-    FromRoleOnGroup: 'inherited from role "%s" on group "%s"'
+    FromRoleOnGroup: 'inherited from role "{roletitle}" on group "{grouptitle}"'
  SilverStripe\Security\PermissionRole:
    OnlyAdminCanApply: 'Only admin can apply'
    PLURALNAME: Roles
@ -296,7 +296,7 @@ en:
    PLURALS:
      one: 'A Permission Role Code'
      other: '{count} Permission Role Codes'
-    PermsError: 'Can''t assign code "%s" with privileged permissions (requires ADMIN access)'
+    PermsError: 'Can''t assign code "{code}" with privileged permissions (requires ADMIN access)'
    SINGULARNAME: 'Permission Role Code'
  SilverStripe\Security\RememberLoginHash:
    PLURALNAME: 'Login Hashes'
--- a/lang/eo.yml
+++ b/lang/eo.yml
@ -72,7 +72,7 @@ eo:
    FilterBy: 'Filtri laŭ'
    Find: Serĉi
    LinkExisting: 'Ligi ekzistantajn'
-    NewRecord: 'Novaj %s'
+    NewRecord: 'Novaj {type}'
    NoItemsFound: 'Neniu elemento troviĝis'
    PRINTEDAT: 'Presita ĉe'
    PRINTEDBY: 'Presita de'
@ -92,7 +92,7 @@ eo:
    Create: Krei
    Delete: Forigi
    DeletePermissionsFailure: 'Mankas permeso forigi'
-    Deleted: 'Forigita %s %s'
+    Deleted: 'Forigita {type} {name}'
    Save: Konservi
  SilverStripe\Forms\GridField\GridFieldEditButton_ss:
    EDIT: Redakti
@ -231,7 +231,7 @@ eo:
    Description: Priskribo
    GROUPNAME: 'Nomo de grupo'
    GroupReminder: 'Se vi elektas patran grupon, ĉi tiu grupo prenos ĉiujn ĝiajn rolojn'
-    HierarchyPermsError: 'Ne povas agordi patran grupon "%s" kun privilegiaj permesoj (bezonas ADMIN-aliron)'
+    HierarchyPermsError: 'Ne povas agordi patran grupon "{group}" kun privilegiaj permesoj (bezonas ADMIN-aliron)'
    Locked: 'Ŝlosita?'
    MEMBERS: Membroj
    NEWGROUP: 'Nova Grupo'
@ -289,7 +289,7 @@ eo:
    PLURALS:
      one: 'Unu membro'
      other: '{count} membroj'
-    REMEMBERME: 'Memoru min je la sekva fojo? (por %d tagoj ĉe ĉi tiu aparato)'
+    REMEMBERME: 'Memoru min je la sekva fojo? (por {count} tagoj ĉe ĉi tiu aparato)'
    SINGULARNAME: Membro
    SUBJECTPASSWORDCHANGED: 'Via pasvorto estas ŝanĝita'
    SUBJECTPASSWORDRESET: 'Via pasvorto reagordis ligilon'
@ -311,9 +311,9 @@ eo:
      other: '{count} pasvortoj de membroj'
    SINGULARNAME: 'Membra pasvorto'
  SilverStripe\Security\PasswordValidator:
-    LOWCHARSTRENGTH: 'Bonvole plifortigu la pasvortan aldonante la jenajn signojn: %s'
+    LOWCHARSTRENGTH: 'Bonvole plifortigu la pasvortan aldonante la jenajn signojn: {chars}'
    PREVPASSWORD: 'Vi jam uzis tiun pasvorton pasintece, do bonvole elektu novan pasvorton'
-    TOOSHORT: 'Pasvorto estas tro mallonga; ĝi devas esti almenaŭ %s signojn longa'
+    TOOSHORT: 'Pasvorto estas tro mallonga; ĝi devas esti almenaŭ {minimum} signojn longa'
  SilverStripe\Security\Permission:
    AdminGroup: Administranto
    CMS_ACCESS_CATEGORY: CMS-aliro
@ -331,7 +331,7 @@ eo:
    AssignedTo: 'agordita al "{title}"'
    FromGroup: 'heredita el grupo "{title}"'
    FromRole: 'heredita el rolo "{title}"'
-    FromRoleOnGroup: 'heredita el rolo "%s" en grupo "%s"'
+    FromRoleOnGroup: 'heredita el rolo "{roletitle}" en grupo "{grouptitle}"'
  SilverStripe\Security\PermissionRole:
    OnlyAdminCanApply: 'Nur administranto povas apliki'
    PLURALNAME: Roloj
@ -345,7 +345,7 @@ eo:
    PLURALS:
      one: 'Unu permesrola kodo'
      other: '{count} permesrolaj kodoj'
-    PermsError: 'Ne povas agordi kodon "%s" kun privilegiaj permesoj (bezonas ADMIN-aliron)'
+    PermsError: 'Ne povas agordi kodon "{code}" kun privilegiaj permesoj (bezonas ADMIN-aliron)'
    SINGULARNAME: 'Permesrola kodo'
  SilverStripe\Security\RememberLoginHash:
    PLURALNAME: 'Ensalutaj haketaĵoj'
--- a/lang/es.yml
+++ b/lang/es.yml
@ -48,7 +48,7 @@ es:
    FilterBy: 'Filtrar por'
    Find: Buscar
    LinkExisting: 'Enlace Existente'
-    NewRecord: 'Nuevo %s'
+    NewRecord: 'Nuevo {type}'
    NoItemsFound: 'No se encontraron registros'
    PRINTEDAT: 'Impreso en'
    PRINTEDBY: 'Impreso por'
@ -68,7 +68,7 @@ es:
    Create: Crear
    Delete: Borrar
    DeletePermissionsFailure: 'Sin permiso para borrar'
-    Deleted: 'Borrado %s %s'
+    Deleted: 'Borrado {type} {name}'
    Save: Guardar
  SilverStripe\Forms\GridField\GridFieldEditButton_ss:
    EDIT: Editar
@ -243,7 +243,7 @@ es:
      other: '{count} Contraseñas de Miembros'
    SINGULARNAME: 'Contraseña del Miembro'
  SilverStripe\Security\PasswordValidator:
-    LOWCHARSTRENGTH: 'Necesitas aumentar la complejidad de tu contraseña agregando los siguientes caracteres: %s'
+    LOWCHARSTRENGTH: 'Necesitas aumentar la complejidad de tu contraseña agregando los siguientes caracteres: {chars}'
    PREVPASSWORD: 'Ya habías utilizado esa contraseña en el pasado, por favor usa uno nuevo'
    TOOSHORT: 'Tu contraseña es muy corta'
  SilverStripe\Security\Permission:
@ -261,7 +261,7 @@ es:
    AssignedTo: 'asignado a "{title}"'
    FromGroup: 'heredado desde el grupo "{title}"'
    FromRole: 'heredado desde la regla "{title}"'
-    FromRoleOnGroup: 'heredado desde la regla "%s" del grupo "%s"'
+    FromRoleOnGroup: 'heredado desde la regla "{roletitle}" del grupo "{grouptitle}"'
  SilverStripe\Security\PermissionRole:
    OnlyAdminCanApply: 'Sólo el administrador puede aplicar'
    PLURALNAME: Roles
--- a/lang/es_AR.yml
+++ b/lang/es_AR.yml
@ -74,7 +74,7 @@ es_AR:
    CONTENT_CATEGORY: 'Permisos de contenido'
    FULLADMINRIGHTS: 'Privilegios administrativos completos'
  SilverStripe\Security\PermissionCheckboxSetField:
-    FromRoleOnGroup: 'heredado desde el rol "%s" en el grupo "%s"'
+    FromRoleOnGroup: 'heredado desde el rol "{roletitle}" en el grupo "{grouptitle}"'
  SilverStripe\Security\Security:
    ALREADYLOGGEDIN: 'Ud no tiene acceso a esta página. Si tiene otra cuenta que puede acceder a esa página, entonces puede iniciar sesión nuevamente.'
    BUTTONSEND: 'Envíame el enlace para restablecer mi contraseña'
--- a/lang/es_MX.yml
+++ b/lang/es_MX.yml
@ -24,7 +24,7 @@ es_MX:
    FilterBy: 'Filtrar por'
    Find: Buscar
    LinkExisting: 'Enlazar existente'
-    NewRecord: 'Nuevo %s'
+    NewRecord: 'Nuevo {type}'
    NoItemsFound: 'No hay ítems encontrados'
    PRINTEDAT: 'Impreso en'
    PRINTEDBY: 'Imprimir por'
@ -109,7 +109,7 @@ es_MX:
    FULLADMINRIGHTS: 'Privilegios administrativos completos'
    FULLADMINRIGHTS_HELP: 'Implica y anula todos los demás permisos asignados.'
  SilverStripe\Security\PermissionCheckboxSetField:
-    FromRoleOnGroup: 'heredado del rol "%s" en el grupo "%s"'
+    FromRoleOnGroup: 'heredado del rol "{roletitle}" en el grupo "{grouptitle}"'
  SilverStripe\Security\Security:
    ALREADYLOGGEDIN: 'Usted no tiene acceso a esta página. Si tiene otra cuenta que pueda tener acceso a ésta página, puede abrir una sesión abajo.'
    BUTTONSEND: 'Envíame enlace para restablecer contraseña'
--- a/lang/et_EE.yml
+++ b/lang/et_EE.yml
@ -34,7 +34,7 @@ et_EE:
    FilterBy: Filtreerimisalus
    Find: Otsi
    LinkExisting: 'Lingi olemasolev'
-    NewRecord: 'Uus %s'
+    NewRecord: 'Uus {type}'
    NoItemsFound: 'Üksusi ei leitud'
    PRINTEDAT: 'Printimiskoht:'
    PRINTEDBY: Printis
@ -52,7 +52,7 @@ et_EE:
    Create: Loo
    Delete: Kustuta
    DeletePermissionsFailure: 'Kustutamisõigused puuduvad'
-    Deleted: '%s %s on kustutatud'
+    Deleted: '{type} {name} on kustutatud'
    Save: Salvesta
  SilverStripe\Forms\GridField\GridFieldEditButton_ss:
    EDIT: Redigeeri
@ -136,7 +136,7 @@ et_EE:
    AssignedTo: 'määratud grupile "{title}"'
    FromGroup: 'päritud grupilt "{title}"'
    FromRole: 'päritud rollilt "{title}"'
-    FromRoleOnGroup: 'päritud rollist "%s" grupis "%s"'
+    FromRoleOnGroup: 'päritud rollist "{roletitle}" grupis "{grouptitle}"'
  SilverStripe\Security\PermissionRole:
    OnlyAdminCanApply: 'Ainult administraator saab rakendada'
    Title: Pealkiri
--- a/lang/fa_IR.yml
+++ b/lang/fa_IR.yml
@ -42,7 +42,7 @@ fa_IR:
    FilterBy: 'پالایش براساس'
    Find: بگرد
    LinkExisting: 'لینک موجود'
-    NewRecord: '%s جدید'
+    NewRecord: '{type} جدید'
    NoItemsFound: 'هیچ آیتمی یافت نشد'
    PRINTEDAT: 'پرینت‌شده در'
    PRINTEDBY: 'پرینت‌شده توسط'
@ -62,7 +62,7 @@ fa_IR:
    Create: ایجاد
    Delete: حذف
    DeletePermissionsFailure: 'دسترسی‌های حذف وجود ندارد'
-    Deleted: 'حذف شده %s %s'
+    Deleted: 'حذف شده {type} {name}'
    Save: ذخیره
  SilverStripe\Forms\GridField\GridFieldEditButton_ss:
    EDIT: ویرایش
@ -120,7 +120,7 @@ fa_IR:
    DefaultGroupTitleContentAuthors: 'نویسندگان مطالب'
    Description: توضحیات
    GroupReminder: 'اگر یک گروه مادر را برگزینید،‌ این گروه تمامی وظایف آن را می‌پذیرد'
-    HierarchyPermsError: 'با دسترسی‌های داده‌شده نمی‌توان گروه مادر "%s" را تخصیص داد (نیازمند دسترسی مدید ارشد)'
+    HierarchyPermsError: 'با دسترسی‌های داده‌شده نمی‌توان گروه مادر "{group}" را تخصیص داد (نیازمند دسترسی مدید ارشد)'
    Locked: قفل‌شده؟
    NoRoles: 'هیچ وظیفه‌ای پیدا نشد'
    PLURALNAME: گروه‌ها
@ -174,7 +174,7 @@ fa_IR:
    PLURALNAME: 'گذرواژه‌های کاربر'
    SINGULARNAME: 'گذرواژه کاربر'
  SilverStripe\Security\PasswordValidator:
-    TOOSHORT: 'گذرواژه بسیار کوتاه است، باید %s کاراکتر یا بیشتر باشد'
+    TOOSHORT: 'گذرواژه بسیار کوتاه است، باید {minimum} کاراکتر یا بیشتر باشد'
  SilverStripe\Security\Permission:
    AdminGroup: 'مدیر کل'
    CONTENT_CATEGORY: 'دسترسی محتوا'
--- a/lang/fi.yml
+++ b/lang/fi.yml
@ -72,7 +72,7 @@ fi:
    FilterBy: 'Suodata &raquo;'
    Find: Etsi
    LinkExisting: 'Linkitä olemassaoleva'
-    NewRecord: 'Uusi %s'
+    NewRecord: 'Uusi {type}'
    NoItemsFound: 'Ei kohteita'
    PRINTEDAT: Tulostettu
    PRINTEDBY: Tulostaja
@ -92,7 +92,7 @@ fi:
    Create: Luo
    Delete: Poista
    DeletePermissionsFailure: 'Ei oikeuksia poistamiseen'
-    Deleted: 'Poistettiin %s %s'
+    Deleted: 'Poistettiin {type} {name}'
    Save: Tallenna
  SilverStripe\Forms\GridField\GridFieldEditButton_ss:
    EDIT: Muokkaa
@ -231,7 +231,7 @@ fi:
    Description: Kuvaus
    GROUPNAME: 'Ryhmän nimi'
    GroupReminder: 'Valitessasi isäntäryhmän roolit periytyvät tähän ryhmään'
-    HierarchyPermsError: 'Isäntäryhmään ei voitu asettaa "%s" annettuja oikeuksia (vaaditaan JÄRJESTELMÄNVALVOJAN oikeudet)'
+    HierarchyPermsError: 'Isäntäryhmään ei voitu asettaa "{group}" annettuja oikeuksia (vaaditaan JÄRJESTELMÄNVALVOJAN oikeudet)'
    Locked: 'Lukittu?'
    MEMBERS: Jäsenet
    NEWGROUP: 'Uusi ryhmä'
@ -289,7 +289,7 @@ fi:
    PLURALS:
      one: Käyttäjä
      other: '{count} Käyttäjää'
-    REMEMBERME: 'Muista minut? (%d päivän ajan tällä koneella)'
+    REMEMBERME: 'Muista minut? ({days} päivän ajan tällä koneella)'
    SINGULARNAME: Käyttäjä
    SUBJECTPASSWORDCHANGED: 'Salasanasi on vaihdettu'
    SUBJECTPASSWORDRESET: 'Salasanasi palautuslinkki'
@ -311,9 +311,9 @@ fi:
      other: '{count} Käyttäjän salasanaa'
    SINGULARNAME: 'Käyttäjän salasana'
  SilverStripe\Security\PasswordValidator:
-    LOWCHARSTRENGTH: 'Ole hyvä ja tee monimutkaisempi salasana lisäämällä joitakin seuraavista merkeistä: %s'
+    LOWCHARSTRENGTH: 'Ole hyvä ja tee monimutkaisempi salasana lisäämällä joitakin seuraavista merkeistä: {chars}'
    PREVPASSWORD: 'Olet jo käyttänyt tätä salasanaa aikaisemmin, ole hyvä ja valitse uusi'
-    TOOSHORT: 'Salasanan on oltava vähintään %s merkkiä'
+    TOOSHORT: 'Salasanan on oltava vähintään {minimum} merkkiä'
  SilverStripe\Security\Permission:
    AdminGroup: Järjestelmänvalvoja
    CMS_ACCESS_CATEGORY: CMS-pääsy
@ -330,7 +330,7 @@ fi:
    AssignedTo: 'valittiin "{title}"'
    FromGroup: 'periytyivät ryhmästä "{title}"'
    FromRole: 'periytyivät roolista "{title}"'
-    FromRoleOnGroup: 'periytynyt roolista "%s" ryhmässä "%s"'
+    FromRoleOnGroup: 'periytynyt roolista "{roletitle}" ryhmässä "{grouptitle}"'
  SilverStripe\Security\PermissionRole:
    OnlyAdminCanApply: 'Vain järjestelmänvalvojalla on oikeudet asettaa'
    PLURALNAME: Roolit
@ -344,7 +344,7 @@ fi:
    PLURALS:
      one: 'Käyttöoikeuden roolin koodi'
      other: '{count} Käyttöoikeuksien roolien koodit'
-    PermsError: 'Ei voida asettaa koodia "%s" annetuilla oikeuksilla (vaaditaan JÄRJESTELMÄNVALVOJAN oikeudet)'
+    PermsError: 'Ei voida asettaa koodia "{code}" annetuilla oikeuksilla (vaaditaan JÄRJESTELMÄNVALVOJAN oikeudet)'
    SINGULARNAME: 'Käyttöoikeuden roolin koodi'
  SilverStripe\Security\RememberLoginHash:
    PLURALNAME: Kirjautumistarkisteet
--- a/lang/fr.yml
+++ b/lang/fr.yml
@ -58,7 +58,7 @@ fr:
    FilterBy: 'Filtrer par'
    Find: Trouver
    LinkExisting: 'Lien existant'
-    NewRecord: 'Nouveau %s'
+    NewRecord: 'Nouveau {type}'
    NoItemsFound: 'Aucun élément n’a été trouvé.'
    PRINTEDAT: 'Imprimé le'
    PRINTEDBY: 'Imprimé par'
@ -78,7 +78,7 @@ fr:
    Create: Créer
    Delete: Supprimer
    DeletePermissionsFailure: 'Vous n’avez pas les autorisations pour supprimer'
-    Deleted: '%s %s supprimés'
+    Deleted: '{type} {name} supprimés'
    Save: Enregistrer
  SilverStripe\Forms\GridField\GridFieldEditButton_ss:
    EDIT: Editer
@ -230,9 +230,9 @@ fr:
    PLURALNAME: 'Mots de passe du membre'
    SINGULARNAME: 'Mot de passe du membre'
  SilverStripe\Security\PasswordValidator:
-    LOWCHARSTRENGTH: 'Veuillez augmenter la force de votre mot de passe en ajoutant certains caractères suivants : %s'
+    LOWCHARSTRENGTH: 'Veuillez augmenter la force de votre mot de passe en ajoutant certains caractères suivants : {chars}'
    PREVPASSWORD: 'Vous avez déjà utilisé ce mot de passe par le passé, veuillez en choisir un autre'
-    TOOSHORT: 'Le mot de passe est trop court, il doit contenir au moins %s caractères'
+    TOOSHORT: 'Le mot de passe est trop court, il doit contenir au moins {minimum} caractères'
  SilverStripe\Security\Permission:
    AdminGroup: Administrateur
    CONTENT_CATEGORY: 'Permissions du contenu'
@ -243,9 +243,9 @@ fr:
    UserPermissionsIntro: "Assigner des groupes à cet utilisateur modifiera les autorisations dont il dispose. Consultez la section «\_Groupes\_» pour plus de détails sur les autorisations associées à chaque groupe."
  SilverStripe\Security\PermissionCheckboxSetField:
    AssignedTo: 'assignée au groupe « {title} »'
-    FromGroup: "hérité du groupe «\_{title}\_»"
-    FromRole: "héritée du rôle «\_{title}\_»"
-    FromRoleOnGroup: "hérité du rôle «\_%s\_» du groupe «\_%s\_»"
+    FromGroup: 'hérité du groupe « {title} »'
+    FromRole: 'héritée du rôle « {title} »'
+    FromRoleOnGroup: 'hérité du rôle « {roletitle} » du groupe « {grouptitle} »'
  SilverStripe\Security\PermissionRole:
    OnlyAdminCanApply: 'Limité aux administrateurs'
    PLURALNAME: Rôles
--- a/lang/gl_ES.yml
+++ b/lang/gl_ES.yml
@ -18,7 +18,7 @@ gl_ES:
    Filter: Filtro
    Find: Atopar
    LinkExisting: 'Ligazón existente'
-    NewRecord: 'Novo %s'
+    NewRecord: 'Novo {type}'
    NoItemsFound: 'Ningún elemento atopado'
    PRINTEDAT: 'Impreso ás'
    PRINTEDBY: 'Impreso por'
@ -89,7 +89,7 @@ gl_ES:
    FULLADMINRIGHTS: 'Todos os dereitos administrativos'
    FULLADMINRIGHTS_HELP: 'Implica e anula todos os outros permisos asinados.'
  SilverStripe\Security\PermissionCheckboxSetField:
-    FromRoleOnGroup: 'herdado do role "%s" sobre o grupo "%s"'
+    FromRoleOnGroup: 'herdado do role "{roletitle}" sobre o grupo "{grouptitle}"'
  SilverStripe\Security\Security:
    ALREADYLOGGEDIN: 'Non tes acceso a esta páxina. Se tes outra conta que pode acceder a páxina, podes iniciar sesión a continuación.'
    BUTTONSEND: 'Enviarme a ligazón de restablecemento do contrasinal'
--- a/lang/hr.yml
+++ b/lang/hr.yml
@ -35,7 +35,7 @@ hr:
    Create: Kreiraj
    Delete: Obriši
    DeletePermissionsFailure: 'Nema dozvole brisanja'
-    Deleted: 'Obrisano %s %s'
+    Deleted: 'Obrisano {type} {name}'
    Save: Spremi
  SilverStripe\Forms\GridField\GridFieldEditButton_ss:
    EDIT: Uredi
--- a/lang/id.yml
+++ b/lang/id.yml
@ -39,7 +39,7 @@ id:
    FilterBy: 'Saring menurut '
    Find: Cari
    LinkExisting: 'Tautan yang Ada'
-    NewRecord: '%s baru'
+    NewRecord: '{type} baru'
    NoItemsFound: 'Tidak ada data'
    PRINTEDAT: 'Dicetak pada'
    PRINTEDBY: 'Dicetak oleh'
@ -59,7 +59,7 @@ id:
    Create: Buat
    Delete: Hapus
    DeletePermissionsFailure: 'Tidak ada ijin menghapus'
-    Deleted: '%s %s dihapus'
+    Deleted: '{type} {name} dihapus'
    Save: Simpan
  SilverStripe\Forms\GridField\GridFieldEditButton_ss:
    EDIT: Edit
@ -109,7 +109,7 @@ id:
    DefaultGroupTitleContentAuthors: 'Penulis Konten'
    Description: Deskripsi
    GroupReminder: 'Jika Anda memilih kelompok induk, kelompok ini akan mengambil perannya'
-    HierarchyPermsError: 'Tidak dapat menghubungkan kelompok induk "%s" dengan perijinan khusus (memerlukan akses PENGELOLA)'
+    HierarchyPermsError: 'Tidak dapat menghubungkan kelompok induk "{group}" dengan perijinan khusus (memerlukan akses PENGELOLA)'
    Locked: 'Terkunci?'
    NoRoles: 'Tidak ada peran'
    Parent: 'Kelompok Induk'
@ -155,9 +155,9 @@ id:
    db_Password: 'Kata kunci'
    db_PasswordExpiry: 'Tanggal Kadaluarsa'
  SilverStripe\Security\PasswordValidator:
-    LOWCHARSTRENGTH: 'Mohon tingkatkan kekuatan kata kunci dengan menambah beberapa karakter berikut ini: %s'
+    LOWCHARSTRENGTH: 'Mohon tingkatkan kekuatan kata kunci dengan menambah beberapa karakter berikut ini: {chars}'
    PREVPASSWORD: 'Anda sudah pernah menggunakan kata kunci tersebut, mohon pilih kata kunci yang baru'
-    TOOSHORT: 'Kata kunci terlalu singkat, setidaknya harus terdiri dari %s karakter atau lebih'
+    TOOSHORT: 'Kata kunci terlalu singkat, setidaknya harus terdiri dari {minimum} karakter atau lebih'
  SilverStripe\Security\Permission:
    AdminGroup: Pengelola
    CONTENT_CATEGORY: 'Perijinan konten'
@ -168,12 +168,12 @@ id:
    AssignedTo: 'dihubungkan ke "{title}"'
    FromGroup: 'diwarisi dari kelompok "{title}"'
    FromRole: 'diwarisi dari peran "{title}"'
-    FromRoleOnGroup: 'diwarisi dari peran "%s" pada kelompok "%s"'
+    FromRoleOnGroup: 'diwarisi dari peran "{roletitle}" pada kelompok "{grouptitle}"'
  SilverStripe\Security\PermissionRole:
    OnlyAdminCanApply: 'Hanya untuk pengelola'
    Title: Judul
  SilverStripe\Security\PermissionRoleCode:
-    PermsError: 'Tidak dapat menghubungkan kode "%s" dengan perijinan khusus (memerlukan akses PENGELOLA)'
+    PermsError: 'Tidak dapat menghubungkan kode "{code}" dengan perijinan khusus (memerlukan akses PENGELOLA)'
  SilverStripe\Security\Security:
    ALREADYLOGGEDIN: 'Anda tidak punya akses ke laman ini. Jika Anda punya akun lain dengan akses ke laman ini, silakan masuk kembali.'
    BUTTONSEND: 'Kirimkan tautan penggantian kata kunci'
--- a/lang/id_ID.yml
+++ b/lang/id_ID.yml
@ -39,7 +39,7 @@ id_ID:
    FilterBy: 'Saring menurut '
    Find: Cari
    LinkExisting: 'Tautan yang Ada'
-    NewRecord: '%s baru'
+    NewRecord: '{type} baru'
    NoItemsFound: 'Tidak ada data'
    PRINTEDAT: 'Dicetak pada'
    PRINTEDBY: 'Dicetak oleh'
@ -59,7 +59,7 @@ id_ID:
    Create: Buat
    Delete: Hapus
    DeletePermissionsFailure: 'Tidak ada ijin menghapus'
-    Deleted: '%s %s dihapus'
+    Deleted: '{type} {name} dihapus'
    Save: Simpan
  SilverStripe\Forms\GridField\GridFieldEditButton_ss:
    EDIT: Edit
@ -109,7 +109,7 @@ id_ID:
    DefaultGroupTitleContentAuthors: 'Penulis Konten'
    Description: Deskripsi
    GroupReminder: 'Jika Anda memilih kelompok induk, kelompok ini akan mengambil perannya'
-    HierarchyPermsError: 'Tidak dapat menghubungkan kelompok induk "%s" dengan perijinan khusus (memerlukan akses PENGELOLA)'
+    HierarchyPermsError: 'Tidak dapat menghubungkan kelompok induk "{group}" dengan perijinan khusus (memerlukan akses PENGELOLA)'
    Locked: 'Terkunci?'
    NoRoles: 'Tidak ada peran'
    Parent: 'Kelompok Induk'
@ -155,9 +155,9 @@ id_ID:
    db_Password: 'Kata kunci'
    db_PasswordExpiry: 'Tanggal Kadaluarsa'
  SilverStripe\Security\PasswordValidator:
-    LOWCHARSTRENGTH: 'Mohon tingkatkan kekuatan kata kunci dengan menambah beberapa karakter berikut ini: %s'
+    LOWCHARSTRENGTH: 'Mohon tingkatkan kekuatan kata kunci dengan menambah beberapa karakter berikut ini: {chars}'
    PREVPASSWORD: 'Anda sudah pernah menggunakan kata kunci tersebut, mohon pilih kata kunci yang baru'
-    TOOSHORT: 'Kata kunci terlalu singkat, setidaknya harus terdiri dari %s karakter atau lebih'
+    TOOSHORT: 'Kata kunci terlalu singkat, setidaknya harus terdiri dari {minimum} karakter atau lebih'
  SilverStripe\Security\Permission:
    AdminGroup: Pengelola
    FULLADMINRIGHTS: 'Hak pengelolaan penuh'
@ -167,12 +167,12 @@ id_ID:
    AssignedTo: 'dihubungkan ke "{title}"'
    FromGroup: 'diwarisi dari kelompok "{title}"'
    FromRole: 'diwarisi dari peran "{title}"'
-    FromRoleOnGroup: 'diwarisi dari peran "%s" pada kelompok "%s"'
+    FromRoleOnGroup: 'diwarisi dari peran "{roletitle}" pada kelompok "{grouptitle}"'
  SilverStripe\Security\PermissionRole:
    OnlyAdminCanApply: 'Hanya untuk pengelola'
    Title: Judul
  SilverStripe\Security\PermissionRoleCode:
-    PermsError: 'Tidak dapat menghubungkan kode "%s" dengan perijinan khusus (memerlukan akses PENGELOLA)'
+    PermsError: 'Tidak dapat menghubungkan kode "{code}" dengan perijinan khusus (memerlukan akses PENGELOLA)'
  SilverStripe\Security\Security:
    ALREADYLOGGEDIN: 'Anda tidak punya akses ke laman ini. Jika Anda punya akun lain dengan akses ke laman ini, silakan masuk kembali.'
    BUTTONSEND: 'Kirimkan tautan penggantian kata kunci'
--- a/lang/it.yml
+++ b/lang/it.yml
@ -72,7 +72,7 @@ it:
    FilterBy: 'Filtra per'
    Find: Trova
    LinkExisting: 'Collega esistente'
-    NewRecord: 'Nuovo %s'
+    NewRecord: 'Nuovo {type}'
    NoItemsFound: 'Nessun elemento trovato'
    PRINTEDAT: 'Stampato alle'
    PRINTEDBY: 'Stampato da'
@ -92,7 +92,7 @@ it:
    Create: Crea
    Delete: Elimina
    DeletePermissionsFailure: 'Non hai i permessi per eliminare'
-    Deleted: 'Eliminato %s %s'
+    Deleted: 'Eliminato {type} {name}'
    Save: Salva
  SilverStripe\Forms\GridField\GridFieldEditButton_ss:
    EDIT: Modifica
@ -231,7 +231,7 @@ it:
    Description: Descrizione
    GROUPNAME: 'Nome del gruppo'
    GroupReminder: 'Se scegli un gruppo genitore, questo gruppo erediterà tutti i suoi ruoli'
-    HierarchyPermsError: 'Non posso assegnare permessi privilegiati al gruppo genitore "%s" (richiede accesso ADMIN)'
+    HierarchyPermsError: 'Non posso assegnare permessi privilegiati al gruppo genitore "{group}" (richiede accesso ADMIN)'
    Locked: 'Bloccato?'
    MEMBERS: Membri
    NEWGROUP: 'Nuovo Gruppo'
@ -289,7 +289,7 @@ it:
    PLURALS:
      one: 'Un Utente'
      other: '{count} Utenti'
-    REMEMBERME: 'Ricordati di me la prossima volta? (per %d giorni su questo dispositivo)'
+    REMEMBERME: 'Ricordati di me la prossima volta? (per {count} giorni su questo dispositivo)'
    SINGULARNAME: Utente
    SUBJECTPASSWORDCHANGED: 'La tua password è stata cambiata'
    SUBJECTPASSWORDRESET: 'Link per azzerare la tua password'
@ -311,9 +311,9 @@ it:
      other: '{count} password utente'
    SINGULARNAME: 'Password utente'
  SilverStripe\Security\PasswordValidator:
-    LOWCHARSTRENGTH: 'Perfavore aumenta la sicurezza della password aggiungendo alcuni dei seguenti caratteri: %s'
+    LOWCHARSTRENGTH: 'Perfavore aumenta la sicurezza della password aggiungendo alcuni dei seguenti caratteri: {chars}'
    PREVPASSWORD: 'Hai già usato questa password in passato, per favore scegline una nuova'
-    TOOSHORT: 'La password è troppo corta, deve essere lunga %s o più caratteri'
+    TOOSHORT: 'La password è troppo corta, deve essere lunga {minimum} o più caratteri'
  SilverStripe\Security\Permission:
    AdminGroup: Amministratore
    CMS_ACCESS_CATEGORY: 'Accesso al CMS'
@ -331,7 +331,7 @@ it:
    AssignedTo: 'assegnato a "{title}"'
    FromGroup: 'ereditato dal gruppo "{title}"'
    FromRole: 'ereditato dal ruolo "{title}"'
-    FromRoleOnGroup: 'ereditato dal ruolo "%s" nel gruppo "%s"'
+    FromRoleOnGroup: 'ereditato dal ruolo "{roletitle}" nel gruppo "{grouptitle}"'
  SilverStripe\Security\PermissionRole:
    OnlyAdminCanApply: 'Solo l''amministratore può applicare'
    PLURALNAME: Ruoli
@ -345,7 +345,7 @@ it:
    PLURALS:
      one: 'Un codice di ruolo'
      other: '{count} codici di ruolo'
-    PermsError: 'Non posso assegnare permessi privilegiati al codice "%s" (richiede accesso ADMIN)'
+    PermsError: 'Non posso assegnare permessi privilegiati al codice "{code}" (richiede accesso ADMIN)'
    SINGULARNAME: 'Codice di ruolo'
  SilverStripe\Security\RememberLoginHash:
    PLURALNAME: 'Hash di Login'
--- a/lang/ja.yml
+++ b/lang/ja.yml
@ -30,8 +30,8 @@ ja:
    Filter: フィルタ
    FilterBy: によってフィルター
    Find: 探す
-    LinkExisting: 既存のリンク
-    NewRecord: 新しい%s
+    LinkExisting: '既存のリンク'
+    NewRecord: '新しい{type}'
    NoItemsFound: '項目が見つかりませんでした'
    PRINTEDAT: で印刷
    PRINTEDBY: によって印刷
@ -51,7 +51,7 @@ ja:
    Create: 作成
    Delete: 削除
    DeletePermissionsFailure: 削除権限がありません
-    Deleted: '削除済み %s %s'
+    Deleted: '削除済み {type} {name}'
    Save: 保存
  SilverStripe\Forms\GridField\GridFieldEditButton_ss:
    EDIT: 編集
@ -131,7 +131,7 @@ ja:
    db_Password: パスワード
    db_PasswordExpiry: パスワードの有効期限
  SilverStripe\Security\PasswordValidator:
-    LOWCHARSTRENGTH: '次の文字のいくつかを追加してパスワードを強化してください: %s'
+    LOWCHARSTRENGTH: '次の文字のいくつかを追加してパスワードを強化してください: {chars}'
    PREVPASSWORD: 'このパスワードは過去に使用されています、新しいパスワードを選択してください'
    TOOSHORT: パスワードが短すぎます、%文字以上でなければなりません
  SilverStripe\Security\Permission:
@ -144,7 +144,7 @@ ja:
    AssignedTo: '"{title}" に割り当てられた'
    FromGroup: 'グループ"{title}"から継承'
    FromRole: '役割"{title}"から継承'
-    FromRoleOnGroup: 'グループ "%s" のロール "%s"から継承'
+    FromRoleOnGroup: 'グループ "{roletitle}" のロール "{grouptitle}"から継承'
  SilverStripe\Security\PermissionRole:
    OnlyAdminCanApply: '管理者のみ適用可能'
    Title: タイトル
--- a/lang/lt.yml
+++ b/lang/lt.yml
@ -39,7 +39,7 @@ lt:
    FilterBy: 'Filtruoti pagal '
    Find: Rasti
    LinkExisting: 'Pasirinkti esamą'
-    NewRecord: 'Naujas %s'
+    NewRecord: 'Naujas {type}'
    NoItemsFound: 'Įrašų nerasta'
    PRINTEDAT: Atspausdinta
    PRINTEDBY: Atspausdino
@ -59,7 +59,7 @@ lt:
    Create: Sukurti
    Delete: Ištrinti
    DeletePermissionsFailure: 'Nėra leidimų trynimui'
-    Deleted: 'Ištrinta %s %s'
+    Deleted: 'Ištrinta {type} {name}'
    Save: Išsaugoti
  SilverStripe\Forms\GridField\GridFieldEditButton_ss:
    EDIT: Redaguoti
@ -109,7 +109,7 @@ lt:
    DefaultGroupTitleContentAuthors: 'Turinio autoriai'
    Description: Aprašymas
    GroupReminder: 'Jeigu pasirinksite tėvinę grupę, ši grupė perims visas jos roles'
-    HierarchyPermsError: 'Nepavyko priskirti tėvinės grupės "%s" su priskirtais leidimais (būtina ADMIN prieeiga)'
+    HierarchyPermsError: 'Nepavyko priskirti tėvinės grupės "{group}" su priskirtais leidimais (būtina ADMIN prieeiga)'
    Locked: 'Užrakinta?'
    NoRoles: 'Rolių nerasta'
    Parent: 'Priklauso grupei'
@ -155,9 +155,9 @@ lt:
    db_Password: Slaptažodis
    db_PasswordExpiry: 'Slaptažodžio pabaigos data'
  SilverStripe\Security\PasswordValidator:
-    LOWCHARSTRENGTH: 'Padarykite slaptažodį sudėtingesnį, panaudodami bent kelis simbolius iš šio sąrašo: %s'
+    LOWCHARSTRENGTH: 'Padarykite slaptažodį sudėtingesnį, panaudodami bent kelis simbolius iš šio sąrašo: {chars}'
    PREVPASSWORD: 'Jūs jau naudojote šį slaptažodį anksčiau, prašome sukurti naują'
-    TOOSHORT: 'Slaptažodis yra per trumpas, jis turi būti sudarytas iš %s arba didesnio skaičiaus simbolių'
+    TOOSHORT: 'Slaptažodis yra per trumpas, jis turi būti sudarytas iš {minimum} arba didesnio skaičiaus simbolių'
  SilverStripe\Security\Permission:
    AdminGroup: Administratorius
    CONTENT_CATEGORY: 'Turinio teisės'
@ -168,12 +168,12 @@ lt:
    AssignedTo: 'priskirta "{title}"'
    FromGroup: 'paveldėta iš grupės "{title}"'
    FromRole: 'paveldėta iš rolės "{title}"'
-    FromRoleOnGroup: 'paveldėta iš rolės "%s" grupėje "%s"'
+    FromRoleOnGroup: 'paveldėta iš rolės "{roletitle}" grupėje "{grouptitle}"'
  SilverStripe\Security\PermissionRole:
    OnlyAdminCanApply: 'Gali priskirti tik administratorius'
    Title: Pavadinimas
  SilverStripe\Security\PermissionRoleCode:
-    PermsError: 'Nepavyko priskirto kodo "%s" su priskirtais leidimais (būtina ADMIN prieiga)'
+    PermsError: 'Nepavyko priskirto kodo "{code}" su priskirtais leidimais (būtina ADMIN prieiga)'
  SilverStripe\Security\Security:
    ALREADYLOGGEDIN: 'Jūs neturite prieigos prie šio puslapio. Jeigu norite prisijungti kaip kitas vartotojas, spauskite čia.'
    BUTTONSEND: 'Atsiųsti slaptažodžio atstatymo nuorodą'
--- a/lang/lv.yml
+++ b/lang/lv.yml
@ -76,7 +76,7 @@ lv:
    FULLADMINRIGHTS: 'Pilnas administratora tiesības'
    FULLADMINRIGHTS_HELP: 'Ietver un pārraksta visas pārējās piesaistītās atļaujas'
  SilverStripe\Security\PermissionCheckboxSetField:
-    FromRoleOnGroup: 'mantots no lomas "%s" grupā "%s"'
+    FromRoleOnGroup: 'mantots no lomas "{roletitle}" grupā "{grouptitle}"'
  SilverStripe\Security\Security:
    ALREADYLOGGEDIN: 'Jums nav piekļuves tiesību šai lapai. Ja jums ir izveidots cits konts ar kuru ir iespējams piekļūt šai lapai, tad jūs varat atkārtoti pieslēgties. '
    BUTTONSEND: 'Nosūtīt man paroles atiestatīšanas saiti'
--- a/lang/mi.yml
+++ b/lang/mi.yml
@ -33,7 +33,7 @@ mi:
    FilterBy: 'Tātari mā'
    Find: Rapu
    LinkExisting: 'Hono Tīari'
-    NewRecord: '%s hōu'
+    NewRecord: '{type} hōu'
    NoItemsFound: 'Kāore i kitea he tūemi'
    PRINTEDAT: 'I tāngia i'
    PRINTEDBY: 'I tāngia e'
@ -53,7 +53,7 @@ mi:
    Create: Hanga
    Delete: Muku
    DeletePermissionsFailure: 'Kāore he whakaaetanga muku'
-    Deleted: 'Kua mukua %s %s'
+    Deleted: 'Kua mukua {type} {name}'
    Save: Tiaki
  SilverStripe\Forms\GridField\GridFieldEditButton_ss:
    EDIT: Whakatika
@ -133,9 +133,9 @@ mi:
    db_Password: Kupuhipa
    db_PasswordExpiry: 'Rā Mōnehu Kupuhipa'
  SilverStripe\Security\PasswordValidator:
-    LOWCHARSTRENGTH: 'Whakakahatia tō kupuhipa mā te tāpiri i ētahi o ēnei pūāhua: %s'
+    LOWCHARSTRENGTH: 'Whakakahatia tō kupuhipa mā te tāpiri i ētahi o ēnei pūāhua: {chars}'
    PREVPASSWORD: 'Kua whakamahi kētia tēnā kupuhipa i mua, kōwhiria he kupuhipa hou'
-    TOOSHORT: 'He poto rawa te kupuhipa, me %s pūāhua neke atu te roa'
+    TOOSHORT: 'He poto rawa te kupuhipa, me {minimum} pūāhua neke atu te roa'
  SilverStripe\Security\Permission:
    AdminGroup: Kaiwhakahaere
    CONTENT_CATEGORY: 'Whakaaetanga ihirangi'
@ -146,7 +146,7 @@ mi:
    AssignedTo: 'kua tautapatia ki  "{title}"'
    FromGroup: 'I tukuna iho i te rōpū "{title}"'
    FromRole: 'I tukuna iho i te tūnga "{title}"'
-    FromRoleOnGroup: 'i tukuna iho i "%s" i te rōpū "%s"'
+    FromRoleOnGroup: 'i tukuna iho i "{roletitle}" i te rōpū "{grouptitle}"'
  SilverStripe\Security\PermissionRole:
    OnlyAdminCanApply: 'Ka taea anake te tono e ngā kaiwhakahaere'
    Title: Taitara
--- a/lang/nb.yml
+++ b/lang/nb.yml
@ -33,7 +33,7 @@ nb:
    FilterBy: 'Filtrer på '
    Find: Finn
    LinkExisting: 'Knytt til eksisterende'
-    NewRecord: 'Ny %s'
+    NewRecord: 'Ny {type}'
    NoItemsFound: 'Ingen elementer ble funnet'
    PRINTEDAT: 'Skrevet ut ved'
    PRINTEDBY: 'Skrevet ut av'
@ -53,7 +53,7 @@ nb:
    Create: Opprett
    Delete: Slett
    DeletePermissionsFailure: 'Ikke tillatt å slette'
-    Deleted: 'Slettet %s %s'
+    Deleted: 'Slettet {type} {name}'
    Save: Lagre
  SilverStripe\Forms\GridField\GridFieldEditButton_ss:
    EDIT: Rediger
@ -89,7 +89,7 @@ nb:
    DefaultGroupTitleContentAuthors: Innholdsforfattere
    Description: Beskrivelse
    GroupReminder: 'Hvis du velger en overordnet gruppe, vil denne gruppen arve alle rollene'
-    HierarchyPermsError: 'Kan ikke angi overordnet gruppe "%s" med administratorrettigheter (krever ADMIN-tilgang)'
+    HierarchyPermsError: 'Kan ikke angi overordnet gruppe "{group}" med administratorrettigheter (krever ADMIN-tilgang)'
    Locked: 'Låst?'
    NoRoles: 'Ingen roller funnet'
    Parent: 'Overordnet gruppe'
@ -134,9 +134,9 @@ nb:
    db_Password: Passord
    db_PasswordExpiry: 'Utløpsdato for passord'
  SilverStripe\Security\PasswordValidator:
-    LOWCHARSTRENGTH: 'Vennligst øk passordstyrken ved å legge til noen av følgende tegn: %s'
+    LOWCHARSTRENGTH: 'Vennligst øk passordstyrken ved å legge til noen av følgende tegn: {chars}'
    PREVPASSWORD: 'Du har brukt passordet tidligere, vennligst velg et nytt passord'
-    TOOSHORT: 'Passordet er for kort, det må være %s eller flere tegn langt'
+    TOOSHORT: 'Passordet er for kort, det må være {minimum} eller flere tegn langt'
  SilverStripe\Security\Permission:
    AdminGroup: Administratorer
    CONTENT_CATEGORY: Innholdstillatelser
@ -147,12 +147,12 @@ nb:
    AssignedTo: 'tilordnet "{title}"'
    FromGroup: 'Arvet fra gruppe "{title}"'
    FromRole: 'arvet fra rolle "{title}"'
-    FromRoleOnGroup: 'arvet fra rollen "%s" i gruppen "%s"'
+    FromRoleOnGroup: 'arvet fra rollen "{roletitle}" i gruppen "{grouptitle}"'
  SilverStripe\Security\PermissionRole:
    OnlyAdminCanApply: 'Bare administratorer kan søke'
    Title: Tittel
  SilverStripe\Security\PermissionRoleCode:
-    PermsError: 'Kan ikke angi kode "%s" med administratorrettigheter (krever ADMIN-tilgang)'
+    PermsError: 'Kan ikke angi kode "{code}" med administratorrettigheter (krever ADMIN-tilgang)'
  SilverStripe\Security\Security:
    ALREADYLOGGEDIN: 'Du har ikke adgang til denne siden. Hvis du har en annen konto som har adgang til denne siden, kan du logge inn med den under.'
    BUTTONSEND: 'Send meg en lenke for å nullstille passordet'
--- a/lang/nl.yml
+++ b/lang/nl.yml
@ -43,7 +43,7 @@ nl:
    FilterBy: Filteren
    Find: Zoeken
    LinkExisting: 'Koppel een bestaand item'
-    NewRecord: 'Nieuw %s'
+    NewRecord: 'Nieuw {type}'
    NoItemsFound: 'Geen items gevonden.'
    PRINTEDAT: 'Geprint op'
    PRINTEDBY: 'Geprint door'
@ -63,7 +63,7 @@ nl:
    Create: Aanmaken
    Delete: Verwijderen
    DeletePermissionsFailure: 'Onvoldoende rechten om te verwijderen'
-    Deleted: '%s %s verwijderd'
+    Deleted: '{type} {name} verwijderd'
    Save: Opslaan
  SilverStripe\Forms\GridField\GridFieldEditButton_ss:
    EDIT: Bewerken
@ -115,7 +115,7 @@ nl:
    DefaultGroupTitleContentAuthors: 'Inhoud Auteurs'
    Description: 'Omschrijving '
    GroupReminder: 'Als u de bovenliggende groep selecteert, neemt deze groep alle rollen over'
-    HierarchyPermsError: 'U moet (ADMIN) rechten hebben om de bovenliggende groep "%s" toe te kennen'
+    HierarchyPermsError: 'U moet (ADMIN) rechten hebben om de bovenliggende groep "{group}" toe te kennen'
    Locked: 'Gesloten?'
    NoRoles: 'Geen rollen gevonden'
    Parent: 'Bovenliggende groep'
@ -161,9 +161,9 @@ nl:
    db_Password: Wachtwoord
    db_PasswordExpiry: 'Wachtwoord vervaldatum'
  SilverStripe\Security\PasswordValidator:
-    LOWCHARSTRENGTH: 'Maak a.u.b. uw wachtwoord sterker door enkele van de volgende karakters te gebruiken: %s'
+    LOWCHARSTRENGTH: 'Maak a.u.b. uw wachtwoord sterker door enkele van de volgende karakters te gebruiken: {chars}'
    PREVPASSWORD: 'U heeft dit wachtwoord in het verleden al gebruikt, kies a.u.b. een nieuw wachtwoord.'
-    TOOSHORT: 'Het wachtwoord is te kort, het moet minimaal %s karakters hebben'
+    TOOSHORT: 'Het wachtwoord is te kort, het moet minimaal {minimum} karakters hebben'
  SilverStripe\Security\Permission:
    AdminGroup: Beheerder
    CONTENT_CATEGORY: Inhoudsrechten
@ -174,14 +174,14 @@ nl:
    AssignedTo: 'toegewezen aan "{title}"'
    FromGroup: 'geërfd van de groep "{title}"'
    FromRole: 'geërfd van de rol "{title}"'
-    FromRoleOnGroup: 'geërfd van rol "%s" in groep "%s"'
+    FromRoleOnGroup: 'geërfd van rol "{roletitle}" in groep "{grouptitle}"'
  SilverStripe\Security\PermissionRole:
    OnlyAdminCanApply: 'Alleen admin kan doorvoeren'
    PLURALNAME: Rollen
    SINGULARNAME: Rol
    Title: Titel
  SilverStripe\Security\PermissionRoleCode:
-    PermsError: 'U moet (ADMIN) rechten hebben om de code "%s" toe te kennen'
+    PermsError: 'U moet (ADMIN) rechten hebben om de code "{code}" toe te kennen'
  SilverStripe\Security\Security:
    ALREADYLOGGEDIN: 'U hebt geen toegang tot deze pagina.  Als u een andere account met de nodige rechten hebt, kan u hieronder opnieuw inloggen.'
    BUTTONSEND: 'Nieuw wachtwoord aanmaken'
--- a/lang/pl.yml
+++ b/lang/pl.yml
@ -33,7 +33,7 @@ pl:
    FilterBy: 'Filtruj wg'
    Find: Wyszukaj
    LinkExisting: 'Linkuj istniejący'
-    NewRecord: 'Nowy %s'
+    NewRecord: 'Nowy {type}'
    NoItemsFound: 'Nie znaleziono elementów'
    PRINTEDAT: 'Wydrukowane na'
    PRINTEDBY: 'Wydrukowane przez'
@ -53,7 +53,7 @@ pl:
    Create: Stwórz
    Delete: Usuń
    DeletePermissionsFailure: 'Brak uprawnień do usuwania'
-    Deleted: 'Usunięto %s %s'
+    Deleted: 'Usunięto {type} {name}'
    Save: Zapisz
  SilverStripe\Forms\GridField\GridFieldEditButton_ss:
    EDIT: Edytuj
@ -89,7 +89,7 @@ pl:
    DefaultGroupTitleContentAuthors: 'Autor treści'
    Description: Opis
    GroupReminder: 'Jeśli wybierzesz nadrzędną grupę, obecna grupa otrzyma wszystkie jej role'
-    HierarchyPermsError: 'Nie można przyporządkować uprzywilejowanej grupy "%s" (wymagane uprawnienie ADMIN)'
+    HierarchyPermsError: 'Nie można przyporządkować uprzywilejowanej grupy "{group}" (wymagane uprawnienie ADMIN)'
    Locked: 'Zablokowana?'
    NoRoles: 'Nie znaleziono ról'
    Parent: 'Grupa nadrzędna'
@ -136,7 +136,7 @@ pl:
  SilverStripe\Security\PasswordValidator:
    LOWCHARSTRENGTH: 'Proszę zwiększyć siłę hasła, dodając niektóre z następujących znaków: % s'
    PREVPASSWORD: 'Użyłeś już tego hasła wcześniej, proszę wybrać nowe'
-    TOOSHORT: 'Hasło jest za krótkie, proszę podać %s znaków lub więcej'
+    TOOSHORT: 'Hasło jest za krótkie, proszę podać {minimum} znaków lub więcej'
  SilverStripe\Security\Permission:
    AdminGroup: Administrator
    CONTENT_CATEGORY: 'Uprawnienie edycji treści'
@ -147,12 +147,12 @@ pl:
    AssignedTo: 'przypisany do "{title}"'
    FromGroup: 'odziedziczone z grupy "{title}"'
    FromRole: 'odziedziczone z roli "{title}"'
-    FromRoleOnGroup: 'odziedziczone z roli "%s" w grupie "%s"'
+    FromRoleOnGroup: 'odziedziczone z roli "{roletitle}" w grupie "{grouptitle}"'
  SilverStripe\Security\PermissionRole:
    OnlyAdminCanApply: 'Tylko administrator może to zastosować'
    Title: Tytuł
  SilverStripe\Security\PermissionRoleCode:
-    PermsError: 'Nie można przyporządkować uprzywilejowanego uprawnienia "%s" (wymagane uprawnienie ADMIN)'
+    PermsError: 'Nie można przyporządkować uprzywilejowanego uprawnienia "{code}" (wymagane uprawnienie ADMIN)'
  SilverStripe\Security\Security:
    ALREADYLOGGEDIN: 'Nie masz dostępu do tej strony. Jeśli posiadasz inne konto, które umożliwi Ci dostęp do tej strony, możesz się zalogować poniżej'
    BUTTONSEND: 'Wyślij mi link do zresetowania hasła'
--- a/lang/pt.yml
+++ b/lang/pt.yml
@ -16,7 +16,7 @@ pt:
    Filter: Filtrar
    Find: Procurar
    LinkExisting: 'Link existente'
-    NewRecord: 'Novo %s'
+    NewRecord: 'Novo {type}'
    NoItemsFound: 'Não foram encontrados elementos'
    PRINTEDAT: 'Impresso em'
    PRINTEDBY: 'Impresso por'
@ -84,7 +84,7 @@ pt:
    CONTENT_CATEGORY: 'Permissões de conteúdo'
    FULLADMINRIGHTS: 'Direitos de Administrador'
  SilverStripe\Security\PermissionCheckboxSetField:
-    FromRoleOnGroup: 'herdada da regra "%s" no grupo "%s"'
+    FromRoleOnGroup: 'herdada da regra "{roletitle}" no grupo "{grouptitle}"'
  SilverStripe\Security\PermissionRole:
    Title: Título
  SilverStripe\Security\Security:
--- a/lang/ru.yml
+++ b/lang/ru.yml
@ -72,7 +72,7 @@ ru:
    FilterBy: 'Фильтр по'
    Find: Найти
    LinkExisting: Связать
-    NewRecord: 'Новый(-ая) %s'
+    NewRecord: 'Новый(-ая) {type}'
    NoItemsFound: 'Элементов не найдено'
    PRINTEDAT: 'Когда распечатано:'
    PRINTEDBY: 'Кем распечатано:'
@ -92,7 +92,7 @@ ru:
    Create: Создать
    Delete: Удалить
    DeletePermissionsFailure: 'Нет прав на удаление'
-    Deleted: 'Удалено %s %s'
+    Deleted: 'Удалено {type} {name}'
    Save: 'Сохранить'
  SilverStripe\Forms\GridField\GridFieldEditButton_ss:
    EDIT: 'Редактировать'
@ -245,7 +245,7 @@ ru:
    Description: Описание
    GROUPNAME: 'Имя группы'
    GroupReminder: 'При назначении группы верхнего уровня все роли будут переняты из нее'
-    HierarchyPermsError: 'У Вас недостаточно прав для назначения родительской группы "%s" (необходимы права администратора)'
+    HierarchyPermsError: 'У Вас недостаточно прав для назначения родительской группы "{group}" (необходимы права администратора)'
    Locked: 'Блокировано?'
    MEMBERS: 'Члены группы'
    NEWGROUP: 'Новая группа'
@ -309,7 +309,7 @@ ru:
      few: '{count} участника'
      many: '{count} участников'
      other: '{count} участников'
-    REMEMBERME: 'Запомнить меня? (на %d дней на этом устройстве)'
+    REMEMBERME: 'Запомнить меня? (на {count} дней на этом устройстве)'
    SINGULARNAME: Пользователь
    SUBJECTPASSWORDCHANGED: 'Ваш пароль изменен'
    SUBJECTPASSWORDRESET: 'Ссылка для переустановки пароля'
@ -333,9 +333,9 @@ ru:
      other: '{count} паролей'
    SINGULARNAME: Пароль
  SilverStripe\Security\PasswordValidator:
-    LOWCHARSTRENGTH: 'Пожалуйста, увеличьте сложность пароля, добавив один из следующих символов: %s'
+    LOWCHARSTRENGTH: 'Пожалуйста, увеличьте сложность пароля, добавив один из следующих символов: {chars}'
    PREVPASSWORD: 'Вы уже использовали этот пароль прежде. Пожалуйста, выберите новый пароль.'
-    TOOSHORT: 'Слишком короткий пароль, минимальная длина - %s символов'
+    TOOSHORT: 'Слишком короткий пароль, минимальная длина - {minimum} символов'
  SilverStripe\Security\Permission:
    AdminGroup: Администратор
    CMS_ACCESS_CATEGORY: 'Доступ к CMS'
@ -355,7 +355,7 @@ ru:
    AssignedTo: 'присвоено "{title}"'
    FromGroup: 'перенято от группы "{title}"'
    FromRole: 'перенято из роли "{title}"'
-    FromRoleOnGroup: 'перенято из роли "%s" для группы "%s"'
+    FromRoleOnGroup: 'перенято из роли "{roletitle}" для группы "{grouptitle}"'
  SilverStripe\Security\PermissionRole:
    OnlyAdminCanApply: 'Может применяться только администратором'
    PLURALNAME: 'Роли'
@ -373,7 +373,7 @@ ru:
      few: '{count} кода роли доступа'
      many: '{count} кодов роли доступа'
      other: '{count} кодов роли доступа'
-    PermsError: 'У Вас недостаточно прав для назначения родительской группы "%s" (необходимы права администратора)'
+    PermsError: 'У Вас недостаточно прав для назначения родительской группы "{code}" (необходимы права администратора)'
    SINGULARNAME: 'Код роли доступа'
  SilverStripe\Security\RememberLoginHash:
    PLURALNAME: 'Хэши авторизации'
--- a/lang/sk.yml
+++ b/lang/sk.yml
@ -45,7 +45,7 @@ sk:
    FilterBy: 'Filtrovať podľa'
    Find: Vyhľadať
    LinkExisting: 'Prepojenie existujúcich'
-    NewRecord: 'Nový %s'
+    NewRecord: 'Nový {type}'
    NoItemsFound: 'Žiadne položky'
    PRINTEDAT: 'Vytlačené v'
    PRINTEDBY: Vytlačené
@ -65,7 +65,7 @@ sk:
    Create: Vytvoriť
    Delete: Zmazať
    DeletePermissionsFailure: 'Žiadne oprávnenia zmazať'
-    Deleted: 'Zmazané %s %s'
+    Deleted: 'Zmazané {type} {name}'
    Save: Uložiť
  SilverStripe\Forms\GridField\GridFieldEditButton_ss:
    EDIT: Editovať
@ -148,7 +148,7 @@ sk:
    DefaultGroupTitleContentAuthors: 'Autori obsahu'
    Description: Popis
    GroupReminder: 'Ak vyberiete nadriadenú skupinu, bude táto skupina mať všetky úlohy'
-    HierarchyPermsError: 'Nie je možné pripojiť nadriadenú skupinu "%s" s privilegovanými právami (vyžaduje ADMIN prístup)'
+    HierarchyPermsError: 'Nie je možné pripojiť nadriadenú skupinu "{group}" s privilegovanými právami (vyžaduje ADMIN prístup)'
    Locked: 'Zamknuté?'
    NoRoles: 'Nenašli sa úlohy'
    PLURALNAME: Skupiny
@ -206,9 +206,9 @@ sk:
    PLURALNAME: 'Heslá člena'
    SINGULARNAME: 'Heslo člena'
  SilverStripe\Security\PasswordValidator:
-    LOWCHARSTRENGTH: 'Prosím posilnite heslo pridaním z týchto niektorých znakov: %s'
+    LOWCHARSTRENGTH: 'Prosím posilnite heslo pridaním z týchto niektorých znakov: {chars}'
    PREVPASSWORD: 'Už ste použili toto heslo v minulosti, vyberte nové hoslo, prosím'
-    TOOSHORT: 'Heslo je príliš krátke, musí byť %s alebo viacej znakov dlhé'
+    TOOSHORT: 'Heslo je príliš krátke, musí byť {minimum} alebo viacej znakov dlhé'
  SilverStripe\Security\Permission:
    AdminGroup: Administrátor
    CONTENT_CATEGORY: 'Práva k obsahu'
@ -221,7 +221,7 @@ sk:
    AssignedTo: 'pripojené k "{title}"'
    FromGroup: 'zdedené zo skupiny "{title}"'
    FromRole: 'zdedené z úlohy "{title}"'
-    FromRoleOnGroup: 'zdedené z úlohy "%s" v skupine "%s"'
+    FromRoleOnGroup: 'zdedené z úlohy "{roletitle}" v skupine "{grouptitle}"'
  SilverStripe\Security\PermissionRole:
    OnlyAdminCanApply: 'Iba administrátor môže použiť'
    PLURALNAME: Roly
@ -229,7 +229,7 @@ sk:
    Title: Názov
  SilverStripe\Security\PermissionRoleCode:
    PLURALNAME: 'Kódy oprávnenia role'
-    PermsError: 'Nie je možné pripojiť kód "%s" s privilegovanými právami (vyžaduje ADMIN prístup)'
+    PermsError: 'Nie je možné pripojiť kód "{code}" s privilegovanými právami (vyžaduje ADMIN prístup)'
    SINGULARNAME: 'Kód oprávnenia role'
  SilverStripe\Security\Security:
    ALREADYLOGGEDIN: 'K tejto stránke nemáte prístup. Ak máte iný účet, ktorý k nej má prístup, môžete sa prihlásiť.'
--- a/lang/sl.yml
+++ b/lang/sl.yml
@ -32,7 +32,7 @@ sl:
    FilterBy: 'Filtriraj po'
    Find: Poišči
    LinkExisting: 'Poveži na'
-    NewRecord: 'Novih %s'
+    NewRecord: 'Novih {type}'
    NoItemsFound: 'Ni rezultatov'
    PRINTEDAT: 'Tiskano pri'
    PRINTEDBY: Natisnil
@ -51,7 +51,7 @@ sl:
    Create: Ustvari
    Delete: Izbriši
    DeletePermissionsFailure: 'Ni dovoljenja za brisanje'
-    Deleted: 'Izbrisanih %s %s'
+    Deleted: 'Izbrisanih {type} {name}'
    Save: Shrani
  SilverStripe\Forms\GridField\GridFieldEditButton_ss:
    EDIT: Uredi
@ -133,7 +133,7 @@ sl:
    FULLADMINRIGHTS_HELP: 'Lahko izniči oziroma upravlja z vsemi drugimi dovoljenji.'
  SilverStripe\Security\PermissionCheckboxSetField:
    FromGroup: 'Privzeto iz skupine "{title}"'
-    FromRoleOnGroup: 'podedovano iz vloge "%s" na skupino "%s"'
+    FromRoleOnGroup: 'podedovano iz vloge "{roletitle}" na skupino "{grouptitle}"'
  SilverStripe\Security\PermissionRole:
    Title: Naslov
  SilverStripe\Security\Security:
--- a/lang/sl_SI.yml
+++ b/lang/sl_SI.yml
@ -22,7 +22,7 @@ sl_SI:
    Filter: Filter
    FilterBy: 'Filtriraj po'
    Find: Najdi
-    NewRecord: 'Nov %s'
+    NewRecord: 'Nov {type}'
    Print: Natisni
    ResetFilter: Resetiraj
  SilverStripe\Forms\GridField\GridFieldDeleteAction:
@ -34,7 +34,7 @@ sl_SI:
    Create: Ustvari
    Delete: Izbriši
    DeletePermissionsFailure: 'Nimate pravic za brisanje'
-    Deleted: 'Izbrisano %s %s'
+    Deleted: 'Izbrisano {type} {name}'
    Save: Shrani
  SilverStripe\Forms\GridField\GridFieldEditButton_ss:
    EDIT: Uredi
--- a/lang/sr.yml
+++ b/lang/sr.yml
@ -33,7 +33,7 @@ sr:
    FilterBy: 'Филтрирај по'
    Find: Пронађи
    LinkExisting: 'Постојање линка'
-    NewRecord: 'Нови %s'
+    NewRecord: 'Нови {type}'
    NoItemsFound: 'Ниједна ставка није пронађена'
    PRINTEDAT: Одштампано
    PRINTEDBY: Одштампао
@ -53,7 +53,7 @@ sr:
    Create: Креирај
    Delete: Избриши
    DeletePermissionsFailure: 'Немате право брисања'
-    Deleted: 'Избрисано %s %s'
+    Deleted: 'Избрисано {type} {name}'
    Save: Сачувај
  SilverStripe\Forms\GridField\GridFieldEditButton_ss:
    EDIT: Измени
@ -89,7 +89,7 @@ sr:
    DefaultGroupTitleContentAuthors: 'Аутори садржаја'
    Description: Опис
    GroupReminder: 'Ако изаберете родитељску групу, ова група ће преузети све њене улоге'
-    HierarchyPermsError: 'Није могуће доделити родитељску групу "%s" са привилегованим дозволама (захтева Администраторски приступ)'
+    HierarchyPermsError: 'Није могуће доделити родитељску групу "{group}" са привилегованим дозволама (захтева Администраторски приступ)'
    Locked: 'Закључано?'
    NoRoles: 'Улоге нису пронађене'
    Parent: 'Родитељска група'
@ -134,9 +134,9 @@ sr:
    db_Password: Лозинка
    db_PasswordExpiry: 'Датум истека лозинке'
  SilverStripe\Security\PasswordValidator:
-    LOWCHARSTRENGTH: 'Појачајте лозинку додавањем неких од следећих знакова: %s'
+    LOWCHARSTRENGTH: 'Појачајте лозинку додавањем неких од следећих знакова: {chars}'
    PREVPASSWORD: 'Већ сте користили наведену лозинку у прошлости. Стога, изаберите другу лозинку'
-    TOOSHORT: 'Лозинка је прекратка. Лозинка мора садржати бар %s знакова'
+    TOOSHORT: 'Лозинка је прекратка. Лозинка мора садржати бар {minimum} знакова'
  SilverStripe\Security\Permission:
    AdminGroup: Администратор
    CONTENT_CATEGORY: 'Дозволе за садржај'
@ -147,12 +147,12 @@ sr:
    AssignedTo: 'додељено "{title}"'
    FromGroup: 'наслеђено од групе "{title}"'
    FromRole: 'наслеђено од улоге "{title}"'
-    FromRoleOnGroup: 'наслеђено из улоге "%s" за групу "%s"'
+    FromRoleOnGroup: 'наслеђено из улоге "{roletitle}" за групу "{grouptitle}"'
  SilverStripe\Security\PermissionRole:
    OnlyAdminCanApply: 'Може примењивати само администратор'
    Title: Наслов
  SilverStripe\Security\PermissionRoleCode:
-    PermsError: 'Није могуће доделити кôд  "%s" са привилегованим дозволама (захтева Администраторски приступ)'
+    PermsError: 'Није могуће доделити кôд  "{code}" са привилегованим дозволама (захтева Администраторски приступ)'
  SilverStripe\Security\Security:
    ALREADYLOGGEDIN: 'Немате дозволу за приступ овој страни. Уколико имате други налог којим можете да приступите овој страни, пријавите се.'
    BUTTONSEND: 'Пошаљи ми линк за ресетовање лозинке'
--- a/lang/sr@latin.yml
+++ b/lang/sr@latin.yml
@ -33,7 +33,7 @@ sr@latin:
    FilterBy: 'Filtriraj po'
    Find: Pronađi
    LinkExisting: 'Postojanje linka'
-    NewRecord: 'Novi %s'
+    NewRecord: 'Novi {type}'
    NoItemsFound: 'Nijedna stavka nije pronađena'
    PRINTEDAT: Odštampano
    PRINTEDBY: Odštampao
@ -53,7 +53,7 @@ sr@latin:
    Create: Kreiraj
    Delete: Izbriši
    DeletePermissionsFailure: 'Nemate pravo brisanja'
-    Deleted: 'Izbrisano %s %s'
+    Deleted: 'Izbrisano {type} {name}'
    Save: Sačuvaj
  SilverStripe\Forms\GridField\GridFieldEditButton_ss:
    EDIT: Izmeni
@ -89,7 +89,7 @@ sr@latin:
    DefaultGroupTitleContentAuthors: 'Autori sadržaja'
    Description: Opis
    GroupReminder: 'Ako izaberete roditeljsku grupu, ova grupa će preuzeti sve njene uloge'
-    HierarchyPermsError: 'Nije moguće dodeliti roditeljsku grupu "%s" sa privilegovanim dozvolama (zahteva Administratorski pristup)'
+    HierarchyPermsError: 'Nije moguće dodeliti roditeljsku grupu "{group}" sa privilegovanim dozvolama (zahteva Administratorski pristup)'
    Locked: 'Zaključano?'
    NoRoles: 'Uloge nisu pronađene'
    Parent: 'Roditeljska grupa'
@ -134,9 +134,9 @@ sr@latin:
    db_Password: Lozinka
    db_PasswordExpiry: 'Datum isteka lozinke'
  SilverStripe\Security\PasswordValidator:
-    LOWCHARSTRENGTH: 'Pojačajte lozinku dodavanjem nekih od sledećih znakova: %s'
+    LOWCHARSTRENGTH: 'Pojačajte lozinku dodavanjem nekih od sledećih znakova: {chars}'
    PREVPASSWORD: 'Već ste koristili navedenu lozinku u prošlosti. Stoga, izaberite drugu lozinku'
-    TOOSHORT: 'Lozinka je prekratka. Lozinka mora sadržati bar %s znakova'
+    TOOSHORT: 'Lozinka je prekratka. Lozinka mora sadržati bar {minimum} znakova'
  SilverStripe\Security\Permission:
    AdminGroup: Administrator
    FULLADMINRIGHTS: 'Puna administrativna prava'
@ -146,12 +146,12 @@ sr@latin:
    AssignedTo: 'dodeljeno "{title}"'
    FromGroup: 'nasleđeno od grupe "{title}"'
    FromRole: 'nasleđeno od uloge "{title}"'
-    FromRoleOnGroup: 'nasleđeno iz uloge "%s" za grupu "%s"'
+    FromRoleOnGroup: 'nasleđeno iz uloge "{roletitle}" za grupu "{grouptitle}"'
  SilverStripe\Security\PermissionRole:
    OnlyAdminCanApply: 'Može primenjivati samo administrator'
    Title: Naslov
  SilverStripe\Security\PermissionRoleCode:
-    PermsError: 'Nije moguće dodeliti kôd  "%s" sa privilegovanim dozvolama (zahteva Administratorski pristup)'
+    PermsError: 'Nije moguće dodeliti kôd  "{code}" sa privilegovanim dozvolama (zahteva Administratorski pristup)'
  SilverStripe\Security\Security:
    ALREADYLOGGEDIN: 'Nemate dozvolu za pristup ovoj strani. Ukoliko imate drugi nalog kojim možete da pristupite ovoj strani, prijavite se.'
    BUTTONSEND: 'Pošalji mi link za resetovanje lozinke'
--- a/lang/sr_RS.yml
+++ b/lang/sr_RS.yml
@ -33,7 +33,7 @@ sr_RS:
    FilterBy: 'Филтрирај по'
    Find: Пронађи
    LinkExisting: 'Постојање линка'
-    NewRecord: 'Нови %s'
+    NewRecord: 'Нови {type}'
    NoItemsFound: 'Ниједна ставка није пронађена'
    PRINTEDAT: Одштампано
    PRINTEDBY: Одштампао
@ -53,7 +53,7 @@ sr_RS:
    Create: Креирај
    Delete: Избриши
    DeletePermissionsFailure: 'Немате право брисања'
-    Deleted: 'Избрисано %s %s'
+    Deleted: 'Избрисано {type} {name}'
    Save: Сачувај
  SilverStripe\Forms\GridField\GridFieldEditButton_ss:
    EDIT: Измени
@ -89,7 +89,7 @@ sr_RS:
    DefaultGroupTitleContentAuthors: 'Аутори садржаја'
    Description: Опис
    GroupReminder: 'Ако изаберете родитељску групу, ова група ће преузети све њене улоге'
-    HierarchyPermsError: 'Није могуће доделити родитељску групу "%s" са привилегованим дозволама (захтева Администраторски приступ)'
+    HierarchyPermsError: 'Није могуће доделити родитељску групу "{group}" са привилегованим дозволама (захтева Администраторски приступ)'
    Locked: 'Закључано?'
    NoRoles: 'Улоге нису пронађене'
    Parent: 'Родитељска група'
@ -134,9 +134,9 @@ sr_RS:
    db_Password: Лозинка
    db_PasswordExpiry: 'Датум истека лозинке'
  SilverStripe\Security\PasswordValidator:
-    LOWCHARSTRENGTH: 'Појачајте лозинку додавањем неких од следећих знакова: %s'
+    LOWCHARSTRENGTH: 'Појачајте лозинку додавањем неких од следећих знакова: {chars}'
    PREVPASSWORD: 'Већ сте користили наведену лозинку у прошлости. Стога, изаберите другу лозинку'
-    TOOSHORT: 'Лозинка је прекратка. Лозинка мора садржати бар %s знакова'
+    TOOSHORT: 'Лозинка је прекратка. Лозинка мора садржати бар {minimum} знакова'
  SilverStripe\Security\Permission:
    AdminGroup: Администратор
    FULLADMINRIGHTS: 'Пуна административна права'
@ -146,12 +146,12 @@ sr_RS:
    AssignedTo: 'додељено "{title}"'
    FromGroup: 'наслеђено од групе "{title}"'
    FromRole: 'наслеђено од улоге "{title}"'
-    FromRoleOnGroup: 'наслеђено из улоге "%s" за групу "%s"'
+    FromRoleOnGroup: 'наслеђено из улоге "{roletitle}" за групу "{grouptitle}"'
  SilverStripe\Security\PermissionRole:
    OnlyAdminCanApply: 'Може примењивати само администратор'
    Title: Наслов
  SilverStripe\Security\PermissionRoleCode:
-    PermsError: 'Није могуће доделити кôд  "%s" са привилегованим дозволама (захтева Администраторски приступ)'
+    PermsError: 'Није могуће доделити кôд  "{code}" са привилегованим дозволама (захтева Администраторски приступ)'
  SilverStripe\Security\Security:
    ALREADYLOGGEDIN: 'Немате дозволу за приступ овој страни. Уколико имате други налог којим можете да приступите овој страни, пријавите се.'
    BUTTONSEND: 'Пошаљи ми линк за ресетовање лозинке'
--- a/lang/sr_RS@latin.yml
+++ b/lang/sr_RS@latin.yml
@ -33,7 +33,7 @@ sr_RS@latin:
    FilterBy: 'Filtriraj po'
    Find: Pronađi
    LinkExisting: 'Postojanje linka'
-    NewRecord: 'Novi %s'
+    NewRecord: 'Novi {type}'
    NoItemsFound: 'Nijedna stavka nije pronađena'
    PRINTEDAT: Odštampano
    PRINTEDBY: Odštampao
@ -53,7 +53,7 @@ sr_RS@latin:
    Create: Kreiraj
    Delete: Izbriši
    DeletePermissionsFailure: 'Nemate pravo brisanja'
-    Deleted: 'Izbrisano %s %s'
+    Deleted: 'Izbrisano {type} {name}'
    Save: Sačuvaj
  SilverStripe\Forms\GridField\GridFieldEditButton_ss:
    EDIT: Izmeni
@ -89,7 +89,7 @@ sr_RS@latin:
    DefaultGroupTitleContentAuthors: 'Autori sadržaja'
    Description: Opis
    GroupReminder: 'Ako izaberete roditeljsku grupu, ova grupa će preuzeti sve njene uloge'
-    HierarchyPermsError: 'Nije moguće dodeliti roditeljsku grupu "%s" sa privilegovanim dozvolama (zahteva Administratorski pristup)'
+    HierarchyPermsError: 'Nije moguće dodeliti roditeljsku grupu "{group}" sa privilegovanim dozvolama (zahteva Administratorski pristup)'
    Locked: 'Zaključano?'
    NoRoles: 'Uloge nisu pronađene'
    Parent: 'Roditeljska grupa'
@ -134,9 +134,9 @@ sr_RS@latin:
    db_Password: Lozinka
    db_PasswordExpiry: 'Datum isteka lozinke'
  SilverStripe\Security\PasswordValidator:
-    LOWCHARSTRENGTH: 'Pojačajte lozinku dodavanjem nekih od sledećih znakova: %s'
+    LOWCHARSTRENGTH: 'Pojačajte lozinku dodavanjem nekih od sledećih znakova: {chars}'
    PREVPASSWORD: 'Već ste koristili navedenu lozinku u prošlosti. Stoga, izaberite drugu lozinku'
-    TOOSHORT: 'Lozinka je prekratka. Lozinka mora sadržati bar %s znakova'
+    TOOSHORT: 'Lozinka je prekratka. Lozinka mora sadržati bar {minimum} znakova'
  SilverStripe\Security\Permission:
    AdminGroup: Administrator
    CONTENT_CATEGORY: 'Dozvolje za sadržaj'
@ -147,12 +147,12 @@ sr_RS@latin:
    AssignedTo: 'dodeljeno "{title}"'
    FromGroup: 'nasleđeno od grupe "{title}"'
    FromRole: 'nasleđeno od uloge "{title}"'
-    FromRoleOnGroup: 'nasleđeno iz uloge "%s" za grupu "%s"'
+    FromRoleOnGroup: 'nasleđeno iz uloge "{roletitle}" za grupu "{grouptitle}"'
  SilverStripe\Security\PermissionRole:
    OnlyAdminCanApply: 'Može primenjivati samo administrator'
    Title: Naslov
  SilverStripe\Security\PermissionRoleCode:
-    PermsError: 'Nije moguće dodeliti kôd  "%s" sa privilegovanim dozvolama (zahteva Administratorski pristup)'
+    PermsError: 'Nije moguće dodeliti kôd  "{code}" sa privilegovanim dozvolama (zahteva Administratorski pristup)'
  SilverStripe\Security\Security:
    ALREADYLOGGEDIN: 'Nemate dozvolu za pristup ovoj strani. Ukoliko imate drugi nalog kojim možete da pristupite ovoj strani, prijavite se.'
    BUTTONSEND: 'Pošalji mi link za resetovanje lozinke'
--- a/lang/sv.yml
+++ b/lang/sv.yml
@ -41,7 +41,7 @@ sv:
    FilterBy: 'Filtrera på'
    Find: Hitta
    LinkExisting: 'Länk finns'
-    NewRecord: 'Ny %s'
+    NewRecord: 'Ny {type}'
    NoItemsFound: 'Inget hittades'
    PRINTEDAT: Utskrivet
    PRINTEDBY: 'Utskrivet av'
@ -61,7 +61,7 @@ sv:
    Create: Skapa
    Delete: Radera
    DeletePermissionsFailure: 'Rättighet för att radera saknas'
-    Deleted: 'Raderade %s %s'
+    Deleted: 'Raderade {type} {name}'
    Save: Spara
  SilverStripe\Forms\GridField\GridFieldEditButton_ss:
    EDIT: Redigera
@ -111,7 +111,7 @@ sv:
    DefaultGroupTitleContentAuthors: Författare
    Description: Beskrivning
    GroupReminder: 'Om du väljer en förälder till gruppen så kommer gruppen ärva alla förälderns roller'
-    HierarchyPermsError: 'Den överordnade gruppen "%s" kan inte ges priviligerad tillgång (adminrättigheter krävs)'
+    HierarchyPermsError: 'Den överordnade gruppen "{group}" kan inte ges priviligerad tillgång (adminrättigheter krävs)'
    Locked: 'Låst?'
    NoRoles: 'Inga roller fun'
    Parent: 'Överordnad grupp'
@ -157,9 +157,9 @@ sv:
    db_Password: Lösenord
    db_PasswordExpiry: 'Lösenordet upphör att gälla'
  SilverStripe\Security\PasswordValidator:
-    LOWCHARSTRENGTH: 'Var god och stärk ditt lösenord genom att lägga till något av följande tecken: %s'
+    LOWCHARSTRENGTH: 'Var god och stärk ditt lösenord genom att lägga till något av följande tecken: {chars}'
    PREVPASSWORD: 'Du har redan använt samma lösenord tidigare, var god och välj ett nytt lösenord'
-    TOOSHORT: 'Lösenordet är för kort, det måste innehålla %s eller fler tecken.'
+    TOOSHORT: 'Lösenordet är för kort, det måste innehålla {minimum} eller fler tecken.'
  SilverStripe\Security\Permission:
    AdminGroup: Administratör
    CONTENT_CATEGORY: Innehållsåtkomst
@ -170,12 +170,12 @@ sv:
    AssignedTo: 'tilldelad till "{title}"'
    FromGroup: 'ärvde från grupp "{title}"'
    FromRole: 'ärvde från roll "{title}"'
-    FromRoleOnGroup: 'ärvt från roll "%s" i grupp "%s"'
+    FromRoleOnGroup: 'ärvt från roll "{roletitle}" i grupp "{grouptitle}"'
  SilverStripe\Security\PermissionRole:
    OnlyAdminCanApply: 'Endast administratörer kan tillämpa denna roll'
    Title: Rollnamn
  SilverStripe\Security\PermissionRoleCode:
-    PermsError: 'Koden "%s" kan inte ges privilegierad tillgång (adminrättigheter krävs)'
+    PermsError: 'Koden "{code}" kan inte ges privilegierad tillgång (adminrättigheter krävs)'
  SilverStripe\Security\Security:
    ALREADYLOGGEDIN: 'Du har inte tillträde till den här sidan. Om du har ett annat konto som har rätt behörighet kan du logga in igen nedan.'
    BUTTONSEND: 'Skicka återställningslänk'
--- a/lang/th.yml
+++ b/lang/th.yml
@ -24,7 +24,7 @@ th:
    FilterBy: กรองข้อมูลจาก
    Find: ค้นหา
    LinkExisting: ลิงก์ที่มีอยู่
-    NewRecord: 'ใหม่ %s'
+    NewRecord: 'ใหม่ {type}'
    NoItemsFound: ไม่พบรายการที่ต้องการ
    PRINTEDAT: ถูกสั่งพิมพ์ที่
    PRINTEDBY: พิมพ์โดย
@ -40,7 +40,7 @@ th:
    CancelBtn: ยกเลิก
    Create: สร้าง
    Delete: ลบ
-    Deleted: 'ลบ %s %s แล้ว'
+    Deleted: 'ลบ {type} {name} แล้ว'
    Save: บันทึก
  SilverStripe\Forms\MoneyField:
    FIELDLABELAMOUNT: จำนวน
@ -102,7 +102,7 @@ th:
    OnlyAdminCanApply: เฉพาะผู้ดูแลเท่านั้นที่สามารถนำไปใช้ได้
    Title: หัวเรื่อง
  SilverStripe\Security\Security:
-    ALREADYLOGGEDIN: 'คุณไม่จำเป็นต้องเข้ามาที่หน้าเว็บนี้. หากคุณมีบัญชีอื่นๆที่สามารถเข้าถึงหน้าเว็บนี้ได้อยู่แล้ว คุณสามารถ <a href="%s">เข้าสู่ระบบอีกครั้ง</a>'
+    ALREADYLOGGEDIN: 'คุณไม่จำเป็นต้องเข้ามาที่หน้าเว็บนี้. หากคุณมีบัญชีอื่นๆที่สามารถเข้าถึงหน้าเว็บนี้ได้อยู่แล้ว คุณสามารถ เข้าสู่ระบบอีกครั้ง'
    BUTTONSEND: ส่งลิงค์รีเซ็ตรหัสผ่านให้กับฉัน
    CHANGEPASSWORDBELOW: คุณสามารถเปลี่ยนรหัสผ่านของคุณได้จากด้านล่าง
    ENTERNEWPASSWORD: กรุณากรอกรหัสผ่านใหม่ของคุณ
--- a/lang/uk.yml
+++ b/lang/uk.yml
@ -69,7 +69,7 @@ uk:
  SilverStripe\Security\Permission:
    CONTENT_CATEGORY: 'Дозволи вмісту'
  SilverStripe\Security\PermissionCheckboxSetField:
-    FromRoleOnGroup: 'Успадкований з ролі "%s" на групу "%s"'
+    FromRoleOnGroup: 'Успадкований з ролі "{roletitle}" на групу "{grouptitle}"'
  SilverStripe\Security\PermissionRole:
    Title: Назва
  SilverStripe\Security\Security:
--- a/lang/zh.yml
+++ b/lang/zh.yml
@ -38,7 +38,7 @@ zh:
    FilterBy: 过滤条件
    Find: 查找
    LinkExisting: 链接已存在
-    NewRecord: '新 %s'
+    NewRecord: '新 {type}'
    NoItemsFound: 没有找到任何项目
    PRINTEDAT: 印刷地
    PRINTEDBY: 印刷人
@ -58,7 +58,7 @@ zh:
    Create: 创建
    Delete: '删除'
    DeletePermissionsFailure: '没有删除权限'
-    Deleted: '已删除的 %s %s'
+    Deleted: '已删除的 {type} {name}'
    Save: 保存
  SilverStripe\Forms\GridField\GridFieldEditButton_ss:
    EDIT: 编辑
@ -108,7 +108,7 @@ zh:
    DefaultGroupTitleContentAuthors: '内容作者'
    Description: 描述
    GroupReminder: '如果您选择了某父组，该组别将会承担起所有功能角色'
-    HierarchyPermsError: '无法为父组 "%s" 分配特权权限（要求具备 ADMIN 访问）'
+    HierarchyPermsError: '无法为父组 "{group}" 分配特权权限（要求具备 ADMIN 访问）'
    Locked: 锁定？
    NoRoles: 没有找到角色
    Parent: 父组
@ -154,9 +154,9 @@ zh:
    db_Password: '密码'
    db_PasswordExpiry: '密码失效日期'
  SilverStripe\Security\PasswordValidator:
-    LOWCHARSTRENGTH: '请添加下列部分字符以提升密码强度：%s'
+    LOWCHARSTRENGTH: '请添加下列部分字符以提升密码强度：{chars}'
    PREVPASSWORD: '您已经使用过这个密码，请选用新的密码'
-    TOOSHORT: '密码长度过短，必须为 %s 个字符或更长'
+    TOOSHORT: '密码长度过短，必须为 {minimum} 个字符或更长'
  SilverStripe\Security\Permission:
    AdminGroup: 管理员
    CONTENT_CATEGORY: '内容权限'
@ -167,12 +167,12 @@ zh:
    AssignedTo: '已分配至 "{title}"'
    FromGroup: '从小组 "{title}"继承'
    FromRole: '从角色 "{title}"继承'
-    FromRoleOnGroup: '从 "%s" 小组的 "%s" 角色继承'
+    FromRoleOnGroup: '从 "{roletitle}" 小组的 "{grouptitle}" 角色继承'
  SilverStripe\Security\PermissionRole:
    OnlyAdminCanApply: 只有管理员可以应用
    Title: '标题'
  SilverStripe\Security\PermissionRoleCode:
-    PermsError: '无法为代码 "%s"分配特权权限（要求具备 ADMIN 访问）'
+    PermsError: '无法为代码 "{code}"分配特权权限（要求具备 ADMIN 访问）'
  SilverStripe\Security\Security:
    ALREADYLOGGEDIN: '您无法进入这个页面。如果您有另一个帐号可以进入这个页面，您可以在下面再次登录。'
    BUTTONSEND: '将密码重设链接发送给我'
--- a/src/Forms/GridField/GridFieldDetailForm_ItemRequest.php
+++ b/src/Forms/GridField/GridFieldDetailForm_ItemRequest.php
@ -490,10 +490,13 @@ class GridFieldDetailForm_ItemRequest extends RequestHandler
        }
        $this->record->delete();

-        $message = sprintf(
-            _t('SilverStripe\\Forms\\GridField\\GridFieldDetailForm.Deleted', 'Deleted %s %s'),
-            $this->record->i18n_singular_name(),
-            htmlspecialchars($title, ENT_QUOTES)
+        $message = _t(
+            'SilverStripe\\Forms\\GridField\\GridFieldDetailForm.Deleted',
+            'Deleted {type} {name}',
+            [
+                'type' => $this->record->i18n_singular_name(),
+                'name' => htmlspecialchars($title, ENT_QUOTES)
+            ]
        );

        $toplevelController = $this->getToplevelController();
@ -592,7 +595,7 @@ class GridFieldDetailForm_ItemRequest extends RequestHandler
            )));
        } else {
            $items->push(new ArrayData(array(
-                'Title' => sprintf(_t('SilverStripe\\Forms\\GridField\\GridField.NewRecord', 'New %s'), $this->record->i18n_singular_name()),
+                'Title' => _t('SilverStripe\\Forms\\GridField\\GridField.NewRecord', 'New {type}', ['type' => $this->record->i18n_singular_name()]),
                'Link' => false
            )));
        }
--- a/src/Security/Group.php
+++ b/src/Security/Group.php
@ -488,13 +488,13 @@ class Group extends DataObject
                ->column('Code');
            $privilegedCodes = Permission::config()->get('privileged_permissions');
            if (array_intersect($inheritedCodes, $privilegedCodes)) {
-                $result->addError(sprintf(
+                $result->addError(
                    _t(
                        'SilverStripe\\Security\\Group.HierarchyPermsError',
-                        'Can\'t assign parent group "%s" with privileged permissions (requires ADMIN access)'
-                    ),
-                    $this->Parent()->Title
-                ));
+                        'Can\'t assign parent group "{group}" with privileged permissions (requires ADMIN access)',
+                        ['group' => $this->Parent()->Title]
+                    )
+                );
            }
        }

@ -650,7 +650,7 @@ class Group extends DataObject
        if (!$allGroups->count()) {
            $authorGroup = new Group();
            $authorGroup->Code = 'content-authors';
-            $authorGroup->Title = _t('SilverStripe\\Security\\Group.DefaultGroupTitleContentAuthors', 'Content Authors');
+            $authorGroup->Title = _t(__CLASS__ . '.DefaultGroupTitleContentAuthors', 'Content Authors');
            $authorGroup->Sort = 1;
            $authorGroup->write();
            Permission::grant($authorGroup->ID, 'CMS_ACCESS_CMSMain');
@ -664,7 +664,7 @@ class Group extends DataObject
        if (!$adminGroups->count()) {
            $adminGroup = new Group();
            $adminGroup->Code = 'administrators';
-            $adminGroup->Title = _t('SilverStripe\\Security\\Group.DefaultGroupTitleAdministrators', 'Administrators');
+            $adminGroup->Title = _t(__CLASS__ . '.DefaultGroupTitleAdministrators', 'Administrators');
            $adminGroup->Sort = 0;
            $adminGroup->write();
            Permission::grant($adminGroup->ID, 'ADMIN');
--- a/src/Security/MemberAuthenticator/MemberLoginForm.php
+++ b/src/Security/MemberAuthenticator/MemberLoginForm.php
@ -224,6 +224,6 @@ class MemberLoginForm extends BaseLoginForm
     */
    public function getAuthenticatorName()
    {
-        return _t('SilverStripe\\Security\\MemberLoginForm.AUTHENTICATORNAME', "E-mail &amp; Password");
+        return _t(self::class . '.AUTHENTICATORNAME', "E-mail &amp; Password");
    }
 }
--- a/src/Security/PasswordValidator.php
+++ b/src/Security/PasswordValidator.php
@ -88,12 +88,10 @@ class PasswordValidator
        if ($this->minLength) {
            if (strlen($password) < $this->minLength) {
                $valid->addError(
-                    sprintf(
-                        _t(
-                            'SilverStripe\\Security\\PasswordValidator.TOOSHORT',
-                            'Password is too short, it must be %s or more characters long'
-                        ),
-                        $this->minLength
+                    _t(
+                        'SilverStripe\\Security\\PasswordValidator.TOOSHORT',
+                        'Password is too short, it must be {minimum} or more characters long',
+                        ['minimum' => $this->minLength]
                    ),
                    'bad',
                    'TOO_SHORT'
@ -118,12 +116,10 @@ class PasswordValidator

            if ($score < $this->minScore) {
                $valid->addError(
-                    sprintf(
-                        _t(
-                            'SilverStripe\\Security\\PasswordValidator.LOWCHARSTRENGTH',
-                            'Please increase password strength by adding some of the following characters: %s'
-                        ),
-                        implode(', ', $missedTests)
+                    _t(
+                        'SilverStripe\\Security\\PasswordValidator.LOWCHARSTRENGTH',
+                        'Please increase password strength by adding some of the following characters: {chars}',
+                        ['chars' => implode(', ', $missedTests)]
                    ),
                    'bad',
                    'LOW_CHARACTER_STRENGTH'
--- a/src/Security/PermissionCheckboxSetField.php
+++ b/src/Security/PermissionCheckboxSetField.php
@ -156,9 +156,12 @@ class PermissionCheckboxSetField extends FormField
                                    }
                                    $inheritedCodes[$code->Code][] = _t(
                                        'SilverStripe\\Security\\PermissionCheckboxSetField.FromRoleOnGroup',
-                                        'inherited from role "%s" on group "%s"',
+                                        'inherited from role "{roletitle}" on group "{grouptitle}"',
                                        'A permission inherited from a role on a certain group',
-                                        array('roletitle' => $role->dbObject('Title')->forTemplate(), 'grouptitle' => $parent->dbObject('Title')->forTemplate())
+                                        array(
+                                            'roletitle' => $role->dbObject('Title')->forTemplate(),
+                                            'grouptitle' => $parent->dbObject('Title')->forTemplate()
+                                        )
                                    );
                                }
                            }
--- a/src/Security/PermissionRoleCode.php
+++ b/src/Security/PermissionRoleCode.php
@ -3,6 +3,7 @@
 namespace SilverStripe\Security;

 use SilverStripe\ORM\DataObject;
+use SilverStripe\Security\PermissionRole;

 /**
 * A PermissionRoleCode represents a single permission code assigned to a {@link PermissionRole}.
@ -18,7 +19,7 @@ class PermissionRoleCode extends DataObject
    );

    private static $has_one = array(
-        "Role" => "SilverStripe\\Security\\PermissionRole",
+        "Role" => PermissionRole::class,
    );

    private static $table_name = "PermissionRoleCode";
@ -33,13 +34,13 @@ class PermissionRoleCode extends DataObject
            && in_array($this->Code, $privilegedCodes)
            && !Permission::check('ADMIN')
        ) {
-            $result->addError(sprintf(
+            $result->addError(
                _t(
-                    'SilverStripe\\Security\\PermissionRoleCode.PermsError',
-                    'Can\'t assign code "%s" with privileged permissions (requires ADMIN access)'
-                ),
-                $this->Code
-            ));
+                    __CLASS__ . '.PermsError',
+                    'Can\'t assign code "{code}" with privileged permissions (requires ADMIN access)',
+                    ['code' => $this->Code]
+                )
+            );
        }

        return $result;
--- a/src/Security/Security.php
+++ b/src/Security/Security.php
@ -356,16 +356,15 @@ class Security extends Controller implements TemplateGlobalProvider
                $messageSet = $configMessageSet;
            } else {
                $messageSet = array(
-                    'default'         => _t(
-                        'SilverStripe\\Security\\Security.NOTEPAGESECURED',
+                    'default' => _t(
+                        __CLASS__ . '.NOTEPAGESECURED',
                        "That page is secured. Enter your credentials below and we will send "
-                        . "you right along."
+                            . "you right along."
                    ),
                    'alreadyLoggedIn' => _t(
-                        'SilverStripe\\Security\\Security.ALREADYLOGGEDIN',
+                        __CLASS__ . '.ALREADYLOGGEDIN',
                        "You don't have access to this page.  If you have another account that "
-                        . "can access that page, you can log in again below.",
-                        "%s will be replaced with a link to log in."
+                            . "can access that page, you can log in again below."
                    )
                );
            }
@ -460,7 +459,7 @@ class Security extends Controller implements TemplateGlobalProvider
            },
            $this->getApplicableAuthenticators()
        );
-    }
+        }


    /**
@ -679,7 +678,7 @@ class Security extends Controller implements TemplateGlobalProvider
            $handlers,
            function (Authenticator &$auth, $name) use ($link) {
                $auth = $auth->getLoginHandler(Controller::join_links($link, $name));
-            }
+        }
        );

        return $this->delegateToMultipleHandlers(
@ -687,8 +686,8 @@ class Security extends Controller implements TemplateGlobalProvider
            _t(__CLASS__.'.LOGIN', 'Log in'),
            $this->getTemplatesFor('login'),
            [$this, 'aggregateTabbedForms']
-        );
-    }
+            );
+        }

    /**
     * Log the currently logged in user out
@ -892,7 +891,7 @@ class Security extends Controller implements TemplateGlobalProvider
        // Return the customised controller - may be used to render a Form (e.g. login form)
        if (is_array($result)) {
            $result = $this->renderWrappedController($title, $result, $templates);
-        }
+    }

        return $result;
    }
@ -989,8 +988,8 @@ class Security extends Controller implements TemplateGlobalProvider
            _t('SilverStripe\\Security\\Security.CHANGEPASSWORDHEADER', 'Change your password'),
            $this->getTemplatesFor('changepassword'),
            [$this, 'aggregateAuthenticatorResponses']
-        );
-    }
+                );
+            }

    /**
     * Create a link to the password reset form.
@ -1053,7 +1052,7 @@ class Security extends Controller implements TemplateGlobalProvider

        $service = DefaultAdminService::singleton();
        return $service->findOrCreateDefaultAdmin();
-    }
+        }

    /**
     * Flush the default admin credentials
@ -1186,7 +1185,7 @@ class Security extends Controller implements TemplateGlobalProvider

        return [
            'password'  => $encryptor->encrypt($password, $salt, $member),
-            'salt'      => $salt,
+            'salt' => $salt,
            'algorithm' => $algorithm,
            'encryptor' => $encryptor
        ];
@ -1338,8 +1337,8 @@ class Security extends Controller implements TemplateGlobalProvider
    public static function get_template_global_variables()
    {
        return [
-            "LoginURL"        => "login_url",
-            "LogoutURL"       => "logout_url",
+            "LoginURL" => "login_url",
+            "LogoutURL" => "logout_url",
            "LostPasswordURL" => "lost_password_url",
            "CurrentMember"   => "getCurrentUser",
            "currentUser"     => "getCurrentUser"
--- a/src/i18n/i18n.php
+++ b/src/i18n/i18n.php
@ -22,13 +22,12 @@ use InvalidArgumentException;
 * <code>
 * _t('MyNamespace.MYENTITY', 'My default natural language value');
 * _t('MyNamespace.MYENTITY', 'My default natural language value', 'My explanatory context');
- * sprintf(_t('MyNamespace.MYENTITY', 'Counting %s things'), 42);
+ * _t('MyNamespace.MYENTITY', 'Counting {number} things', ['number' => 42]);
 * </code>
 *
 * Templates:
 * <code>
 * <%t MyNamespace.MYENTITY 'My default natural language value' %>
- * <%t MyNamespace.MYENTITY 'Counting %s things' s=$ThingsCount %>
 * <%t MyNamespace.MYENTITY 'Counting {count} things' count=$ThingsCount %>
 * </code>
 *
--- a/tests/php/i18n/YamlReaderTest.php
+++ b/tests/php/i18n/YamlReaderTest.php
@ -17,16 +17,16 @@ class YamlReaderTest extends SapphireTest
        $output = $reader->read('en', $path);
        $expected = [
            'NONAMESPACE' => 'Include Entity without Namespace',
-            'SPRINTFNONAMESPACE' => 'My replacement no namespace: %s',
-            'SPRINTFINCLUDENONAMESPACE' => 'My include replacement no namespace: %s',
+            'REPLACEMENTNONAMESPACE' => 'My replacement no namespace: {replacement}',
+            'REPLACEMENTINCLUDENONAMESPACE' => 'My include replacement no namespace: {replacement}',
            'LAYOUTTEMPLATENONAMESPACE' => 'Layout Template no namespace',
            'i18nTestModule.ENTITY' => 'Entity with "Double Quotes"',
            'i18nTestModule.ADDITION' => 'Addition',
            'i18nTestModule.MAINTEMPLATE' => 'Main Template',
            'i18nTestModule.WITHNAMESPACE' => 'Include Entity with Namespace',
            'i18nTestModule.LAYOUTTEMPLATE' => 'Layout Template',
-            'i18nTestModule.SPRINTFNAMESPACE' => 'My replacement: %s',
-            'i18nTestModuleInclude.ss.SPRINTFINCLUDENAMESPACE' => 'My include replacement: %s',
+            'i18nTestModule.REPLACEMENTNAMESPACE' => 'My replacement: {replacement}',
+            'i18nTestModuleInclude_ss.REPLACEMENTINCLUDENAMESPACE' => 'My include replacement: {replacement}',
            'i18nTestModule.PLURALS' => [
                'one' => 'A test',
                'other' => '{count} tests',
--- a/tests/php/i18n/i18nTest.php
+++ b/tests/php/i18n/i18nTest.php
@ -157,14 +157,14 @@ class i18nTest extends SapphireTest
            'array',
            [
                'i18nTestModule.MAINTEMPLATE' => 'Main Template',
-                'i18nTestModule.ss.SPRINTFNONAMESPACE' => 'My replacement no namespace: %s',
+                'REPLACEMENTNONAMESPACE' => 'My replacement no namespace: {replacement}',
                'i18nTestModule.LAYOUTTEMPLATE' => 'Layout Template',
-                'i18nTestModule.ss.LAYOUTTEMPLATENONAMESPACE' => 'Layout Template no namespace',
-                'i18nTestModule.SPRINTFNAMESPACE' => 'My replacement: %s',
+                'LAYOUTTEMPLATENONAMESPACE' => 'Layout Template no namespace',
+                'i18nTestModule.REPLACEMENTNAMESPACE' => 'My replacement: {replacement}',
                'i18nTestModule.WITHNAMESPACE' => 'Include Entity with Namespace',
-                'i18nTestModuleInclude.ss.NONAMESPACE' => 'Include Entity without Namespace',
-                'i18nTestModuleInclude.ss.SPRINTFINCLUDENAMESPACE' => 'My include replacement: %s',
-                'i18nTestModuleInclude.ss.SPRINTFINCLUDENONAMESPACE' => 'My include replacement no namespace: %s'
+                'NONAMESPACE' => 'Include Entity without Namespace',
+                'i18nTestModuleInclude_ss.REPLACEMENTINCLUDENAMESPACE' => 'My include replacement: {replacement}',
+                'REPLACEMENTINCLUDENONAMESPACE' => 'My include replacement no namespace: {replacement}'
            ],
            'en_US'
        );
@ -186,14 +186,14 @@ class i18nTest extends SapphireTest
            'array',
            [
                'i18nTestModule.MAINTEMPLATE' => 'TRANS Main Template',
-                'i18nTestModule.ss.SPRINTFNONAMESPACE' => 'TRANS My replacement no namespace: %s',
+                'REPLACEMENTNONAMESPACE' => 'TRANS My replacement no namespace: {replacement}',
                'i18nTestModule.LAYOUTTEMPLATE' => 'TRANS Layout Template',
-                'i18nTestModule.ss.LAYOUTTEMPLATENONAMESPACE' => 'TRANS Layout Template no namespace',
-                'i18nTestModule.SPRINTFNAMESPACE' => 'TRANS My replacement: %s',
+                'LAYOUTTEMPLATENONAMESPACE' => 'TRANS Layout Template no namespace',
+                'i18nTestModule.REPLACEMENTNAMESPACE' => 'TRANS My replacement: {replacement}',
                'i18nTestModule.WITHNAMESPACE' => 'TRANS Include Entity with Namespace',
-                'i18nTestModuleInclude.ss.NONAMESPACE' => 'TRANS Include Entity without Namespace',
-                'i18nTestModuleInclude.ss.SPRINTFINCLUDENAMESPACE' => 'TRANS My include replacement: %s',
-                'i18nTestModuleInclude.ss.SPRINTFINCLUDENONAMESPACE' => 'TRANS My include replacement no namespace: %s',
+                'NONAMESPACE' => 'TRANS Include Entity without Namespace',
+                'i18nTestModuleInclude_ss.REPLACEMENTINCLUDENAMESPACE' => 'TRANS My include replacement: {replacement}',
+                'REPLACEMENTINCLUDENONAMESPACE' => 'TRANS My include replacement no namespace: {replacement}',
                'i18nTestModule.PLURALS' => 'An item|{count} items',
            ],
            'de_DE'
@ -250,16 +250,13 @@ class i18nTest extends SapphireTest
            'array',
            [
                'i18nTestModule.NEWMETHODSIG' => 'TRANS New _t method signature test',
-                'i18nTestModule.INJECTIONS' => 'TRANS Hello {name} {greeting}. But it is late, {goodbye}',
-                'i18nTestModule.INJECTIONSLEGACY' => 'TRANS Hello %s %s. But it is late, %s',
+                'i18nTestModule.INJECTIONS' => 'TRANS Hello {name} {greeting}. But it is late, {goodbye}'
            ],
            'en_US'
        );

        $entity = "i18nTestModule.INJECTIONS";
        $default = "Hello {name} {greeting}. But it is late, {goodbye}";
-        $entityLegacy = 'i18nTestModule.INJECTIONSLEGACY';
-        $defaultLegacy = 'TRANS Hello %s %s. But it is late, %s';

        // Test missing entity key
        $translated = i18n::_t(
@ -298,19 +295,6 @@ class i18nTest extends SapphireTest
            "Full test of translation, using default, context and injection array"
        );

-        // @deprecated 5.0 Passing in % placeholders (detected in default value)
-        // Note: Missing-placeholder substitution no longer functions
-        $translated = i18n::_t(
-            $entityLegacy, // has %s placeholders
-            $defaultLegacy,
-            ["name"=>"Cat", "greeting2"=>"meow", "goodbye"=>"meow"]
-        );
-        $this->assertContains(
-            "TRANS Hello Cat meow. But it is late, meow",
-            $translated,
-            "Testing sprintf placeholders with named injections"
-        );
-
        // Passing in non-associative arrays for placeholders is now an error
        $this->setExpectedException(InvalidArgumentException::class, 'Injection must be an associative array');
        i18n::_t(
--- a/tests/php/i18n/i18nTest/_fakewebroot/i18nothermodule/templates/i18nOtherModule.ss
+++ b/tests/php/i18n/i18nTest/_fakewebroot/i18nothermodule/templates/i18nOtherModule.ss
@ -1 +1 @@
-<% _t('i18nOtherModule.MAINTEMPLATE',"Main Template Other Module")%>
+<%t i18nOtherModule.MAINTEMPLATE "Main Template Other Module" %>
--- a/tests/php/i18n/i18nTest/_fakewebroot/i18ntestmodule/code/i18nTestModule.php
+++ b/tests/php/i18n/i18nTest/_fakewebroot/i18ntestmodule/code/i18nTestModule.php
@ -5,8 +5,7 @@ use SilverStripe\Dev\TestOnly;

 class i18nTestModule extends DataObject implements TestOnly
 {
-
-    static $db = array(
+    private static $db = array(
        'MyField' => 'Varchar',
    );

--- a/tests/php/i18n/i18nTest/_fakewebroot/i18ntestmodule/lang/de.yml
+++ b/tests/php/i18n/i18nTest/_fakewebroot/i18ntestmodule/lang/de.yml
@ -1,7 +1,7 @@
 de:
  NONAMESPACE: Include Entity without Namespace (de)
-  SPRINTFNONAMESPACE: "My replacement no namespace: %s (de)"
-  SPRINTFINCLUDENONAMESPACE: "My include replacement no namespace: %s (de)"
+  REPLACEMENTNONAMESPACE: "My replacement no namespace: {replacement} (de)"
+  REPLACEMENTINCLUDENONAMESPACE: "My include replacement no namespace: {replacement} (de)"
  LAYOUTTEMPLATENONAMESPACE: Layout Template no namespace (de)
  i18nTestModule:
    # Comment for entity
@ -10,7 +10,7 @@ de:
    MAINTEMPLATE: Main Template (de)
    WITHNAMESPACE: Include Entity with Namespace (de)
    LAYOUTTEMPLATE: Layout Template (de)
-    SPRINTFNAMESPACE: "My replacement: %s (de)"
+    REPLACEMENTNAMESPACE: "My replacement: {replacement} (de)"
    PRIORITYNOTICE: Low Module Priority (de)
-  i18nTestModuleInclude.ss:
-    SPRINTFINCLUDENAMESPACE: "My include replacement: %s (de)"
+  i18nTestModuleInclude_ss:
+    REPLACEMENTINCLUDENAMESPACE: "My include replacement: {replacement} (de)"
--- a/tests/php/i18n/i18nTest/_fakewebroot/i18ntestmodule/lang/en.yml
+++ b/tests/php/i18n/i18nTest/_fakewebroot/i18ntestmodule/lang/en.yml
@ -1,7 +1,7 @@
 en:
  NONAMESPACE: Include Entity without Namespace
-  SPRINTFNONAMESPACE: 'My replacement no namespace: %s'
-  SPRINTFINCLUDENONAMESPACE: 'My include replacement no namespace: %s'
+  REPLACEMENTNONAMESPACE: 'My replacement no namespace: {replacement}'
+  REPLACEMENTINCLUDENONAMESPACE: 'My include replacement no namespace: {replacement}'
  LAYOUTTEMPLATENONAMESPACE: Layout Template no namespace
  i18nTestModule:
    # Comment for entity
@ -10,12 +10,12 @@ en:
    MAINTEMPLATE: Main Template
    WITHNAMESPACE: Include Entity with Namespace
    LAYOUTTEMPLATE: Layout Template
-    SPRINTFNAMESPACE: 'My replacement: %s'
+    REPLACEMENTNAMESPACE: 'My replacement: {replacement}'
    PLURALS:
      one: 'A test'
      other: '{count} tests'
-  i18nTestModuleInclude.ss:
-    SPRINTFINCLUDENAMESPACE: "My include replacement: %s"
+  i18nTestModuleInclude_ss:
+    REPLACEMENTINCLUDENAMESPACE: "My include replacement: {replacement}"
  Month:
    PLURALS:
      one: 'A month'
--- a/tests/php/i18n/i18nTest/_fakewebroot/i18ntestmodule/lang/en_GB.yml
+++ b/tests/php/i18n/i18nTest/_fakewebroot/i18ntestmodule/lang/en_GB.yml
@ -1,7 +1,7 @@
 en:
  NONAMESPACE: Include Entity without Namespace
-  SPRINTFNONAMESPACE: "My replacement no namespace: %s"
-  SPRINTFINCLUDENONAMESPACE: "My include replacement no namespace: %s"
+  REPLACEMENTNONAMESPACE: "My replacement no namespace: {replacement}"
+  REPLACEMENTINCLUDENONAMESPACE: "My include replacement no namespace: {replacement}"
  LAYOUTTEMPLATENONAMESPACE: Layout Template no namespace
  i18nTestModule:
    # Comment for entity
@ -10,6 +10,6 @@ en:
    MAINTEMPLATE: Main Template
    WITHNAMESPACE: Include Entity with Namespace
    LAYOUTTEMPLATE: Layout Template
-    SPRINTFNAMESPACE: "My replacement: %s"
-  i18nTestModuleInclude.ss:
-    SPRINTFINCLUDENAMESPACE: "My include replacement: %s"
+    REPLACEMENTNAMESPACE: "My replacement: {replacement}"
+  i18nTestModuleInclude_ss:
+    REPLACEMENTINCLUDENAMESPACE: "My include replacement: {replacement}"
--- a/tests/php/i18n/i18nTest/_fakewebroot/i18ntestmodule/lang/es_AR.yml
+++ b/tests/php/i18n/i18nTest/_fakewebroot/i18ntestmodule/lang/es_AR.yml
@ -1,7 +1,7 @@
 en:
  NONAMESPACE: Include Entity without Namespace
-  SPRINTFNONAMESPACE: My replacement no namespace: %s
-  SPRINTFINCLUDENONAMESPACE: My include replacement no namespace: %s
+  REPLACEMENTNONAMESPACE: 'My replacement no namespace: {replacement}'
+  REPLACEMENTINCLUDENONAMESPACE: 'My include replacement no namespace: {replacement}'
  LAYOUTTEMPLATENONAMESPACE: Layout Template no namespace
  i18nTestModule:
    # Comment for entity
@ -10,6 +10,6 @@ en:
    MAINTEMPLATE: Main Template
    WITHNAMESPACE: Include Entity with Namespace
    LAYOUTTEMPLATE: Layout Template
-    SPRINTFNAMESPACE: My replacement: %s
-  i18nTestModuleInclude.ss:
-    SPRINTFINCLUDENAMESPACE: My include replacement: %s
+    REPLACEMENTNAMESPACE: 'My replacement: {replacement}'
+  i18nTestModuleInclude_ss:
+    REPLACEMENTINCLUDENAMESPACE: 'My include replacement: {replacement}'
--- a/tests/php/i18n/i18nTest/_fakewebroot/i18ntestmodule/lang/es_ES.yml
+++ b/tests/php/i18n/i18nTest/_fakewebroot/i18ntestmodule/lang/es_ES.yml
@ -1,7 +1,7 @@
 en:
  NONAMESPACE: Include Entity without Namespace
-  SPRINTFNONAMESPACE: My replacement no namespace: %s
-  SPRINTFINCLUDENONAMESPACE: My include replacement no namespace: %s
+  REPLACEMENTNONAMESPACE: 'My replacement no namespace: {replacement}'
+  REPLACEMENTINCLUDENONAMESPACE: 'My include replacement no namespace: {replacement}'
  LAYOUTTEMPLATENONAMESPACE: Layout Template no namespace
  i18nTestModule:
    # Comment for entity
@ -10,6 +10,6 @@ en:
    MAINTEMPLATE: Main Template
    WITHNAMESPACE: Include Entity with Namespace
    LAYOUTTEMPLATE: Layout Template
-    SPRINTFNAMESPACE: My replacement: %s
-  i18nTestModuleInclude.ss:
-    SPRINTFINCLUDENAMESPACE: My include replacement: %s
+    REPLACEMENTNAMESPACE: 'My replacement: {replacement}'
+  i18nTestModuleInclude_ss:
+    REPLACEMENTINCLUDENAMESPACE: 'My include replacement: {replacement}'
--- a/tests/php/i18n/i18nTest/_fakewebroot/i18ntestmodule/templates/Includes/i18nTestModuleInclude.ss
+++ b/tests/php/i18n/i18nTest/_fakewebroot/i18ntestmodule/templates/Includes/i18nTestModuleInclude.ss
@ -1,4 +1,4 @@
-<% _t("i18nTestModule.WITHNAMESPACE", 'Include Entity with Namespace') %>
-<% _t("NONAMESPACE", 'Include Entity without Namespace') %>
-<% sprintf(_t('i18nTestModuleInclude.ss.SPRINTFINCLUDENAMESPACE','My include replacement: %s'),$TestProperty) %>
-<% sprintf(_t('SPRINTFINCLUDENONAMESPACE','My include replacement no namespace: %s'),$TestProperty) %>
+<%t i18nTestModule.WITHNAMESPACE 'Include Entity with Namespace' %>
+<%t NONAMESPACE 'Include Entity without Namespace' %>
+<%t i18nTestModuleInclude_ss.REPLACEMENTINCLUDENAMESPACE 'My include replacement: {replacement}' replacement=$TestProperty %>
+<%t REPLACEMENTINCLUDENONAMESPACE 'My include replacement no namespace: {replacement}' replacement=$TestProperty %>
--- a/tests/php/i18n/i18nTest/_fakewebroot/i18ntestmodule/templates/Layout/i18nTestModule.ss
+++ b/tests/php/i18n/i18nTest/_fakewebroot/i18ntestmodule/templates/Layout/i18nTestModule.ss
@ -1,7 +1,7 @@
-<% _t('i18nTestModule.LAYOUTTEMPLATE',"Layout Template") %>
-<% _t('LAYOUTTEMPLATENONAMESPACE',"Layout Template no namespace") %>
-<% sprintf(_t('i18nTestModule.SPRINTFNAMESPACE','My replacement: %s'),$TestProperty) %>
-<% sprintf(_t('SPRINTFNONAMESPACE','My replacement no namespace: %s'),$TestProperty) %>
+<%t i18nTestModule.LAYOUTTEMPLATE "Layout Template" %>
+<%t LAYOUTTEMPLATENONAMESPACE "Layout Template no namespace" %>
+<%t i18nTestModule.REPLACEMENTNAMESPACE 'My replacement: {replacement}' replacement=$TestProperty %>
+<%t REPLACEMENTNONAMESPACE 'My replacement no namespace: {replacement}' replacement=$TestProperty %>
 <% include i18nTestModuleInclude %>

 <%t i18nTestModule.NEWMETHODSIG "New _t method signature test" %>
--- a/tests/php/i18n/i18nTest/_fakewebroot/i18ntestmodule/templates/i18nTestModule.ss
+++ b/tests/php/i18n/i18nTest/_fakewebroot/i18ntestmodule/templates/i18nTestModule.ss
@ -1,7 +1,7 @@
-<% _t('i18nTestModule.MAINTEMPLATE',"Main Template") %>
+<%t i18nTestModule.MAINTEMPLATE "Main Template" %>
 $Layout
 lonely _t() call that should be ignored
-<% _t('i18nTestModule.NEWENTITY',"Not stored in master file yet") %>
+<%t i18nTestModule.NEWENTITY "Not stored in master file yet" %>
 Single: <%t i18nTestModule.PLURALS 'An item|{count} items' count=1 %>
 Multiple: <%t i18nTestModule.PLURALS 'An item|{count} items' count=4 %>
 None: <%t i18nTestModule.PLURALS 'An item|{count} items' count=0 %>
--- a/tests/php/i18n/i18nTest/_fakewebroot/themes/testtheme1/lang/de.yml
+++ b/tests/php/i18n/i18nTest/_fakewebroot/themes/testtheme1/lang/de.yml
@ -1,11 +1,11 @@
 de:
  i18nTestTheme1:
    LAYOUTTEMPLATE: Theme1 Layout Template (de)
-    SPRINTFNAMESPACE: Theme1 My replacement: %s (de)
+    REPLACEMENTNAMESPACE: 'Theme1 My replacement: {replacement} (de)'
  i18nTestTheme1Include:
    WITHNAMESPACE: Theme1 Include Entity with Namespace (de)
-    SPRINTFINCLUDENAMESPACE: Theme1 My include replacement: %s (de)
+    REPLACEMENTINCLUDENAMESPACE: 'Theme1 My include replacement: {replacement} (de)'
  NONAMESPACE: Theme1 Include Entity without Namespace (de)
-  SPRINTFINCLUDENONAMESPACE: Theme1 My include replacement no namespace: %s (de)
+  REPLACEMENTINCLUDENONAMESPACE: 'Theme1 My include replacement no namespace: {replacement} (de)'
  LAYOUTTEMPLATENONAMESPACE: Theme1 Layout Template no namespace (de)
-  SPRINTFNONAMESPACE: Theme1 My replacement no namespace: %s (de)
+  REPLACEMENTNONAMESPACE: 'Theme1 My replacement no namespace: {replacement} (de)'
--- a/tests/php/i18n/i18nTest/_fakewebroot/themes/testtheme1/lang/en.yml
+++ b/tests/php/i18n/i18nTest/_fakewebroot/themes/testtheme1/lang/en.yml
@ -1,11 +1,11 @@
 en:
  i18nTestTheme1:
    LAYOUTTEMPLATE: Theme1 Layout Template
-    SPRINTFNAMESPACE: Theme1 My replacement: %s
+    REPLACEMENTNAMESPACE: 'Theme1 My replacement: {replacement}'
  i18nTestTheme1Include:
    WITHNAMESPACE: Theme1 Include Entity with Namespace
-    SPRINTFINCLUDENAMESPACE: Theme1 My include replacement: %s
+    REPLACEMENTINCLUDENAMESPACE: 'Theme1 My include replacement: {replacement}'
  NONAMESPACE: Theme1 Include Entity without Namespace
-  SPRINTFINCLUDENONAMESPACE: Theme1 My include replacement no namespace: %s
+  REPLACEMENTINCLUDENONAMESPACE: 'Theme1 My include replacement no namespace: {replacement}'
  LAYOUTTEMPLATENONAMESPACE: Theme1 Layout Template no namespace
-  SPRINTFNONAMESPACE: Theme1 My replacement no namespace: %s
+  REPLACEMENTNONAMESPACE: 'Theme1 My replacement no namespace: {replacement}'
--- a/tests/php/i18n/i18nTest/_fakewebroot/themes/testtheme1/templates/Includes/i18nTestTheme1Include.ss
+++ b/tests/php/i18n/i18nTest/_fakewebroot/themes/testtheme1/templates/Includes/i18nTestTheme1Include.ss
@ -1,4 +1,4 @@
-<% _t("i18nTestTheme1Include.WITHNAMESPACE", 'Theme1 Include Entity with Namespace') %>
-<% _t("NONAMESPACE", 'Theme1 Include Entity without Namespace') %>
-<% sprintf(_t('i18nTestTheme1Include.SPRINTFINCLUDENAMESPACE','Theme1 My include replacement: %s'),$TestProperty) %>
-<% sprintf(_t('SPRINTFINCLUDENONAMESPACE','Theme1 My include replacement no namespace: %s'),$TestProperty) %>
+<%t i18nTestTheme1Include.WITHNAMESPACE 'Theme1 Include Entity with Namespace' %>
+<%t NONAMESPACE 'Theme1 Include Entity without Namespace' %>
+<%t i18nTestTheme1Include.REPLACEMENTINCLUDENAMESPACE 'Theme1 My include replacement: {replacement}' replacement=$TestProperty %>
+<%t REPLACEMENTINCLUDENONAMESPACE 'Theme1 My include replacement no namespace: {replacement}' replacement=$TestProperty %>
--- a/tests/php/i18n/i18nTest/_fakewebroot/themes/testtheme1/templates/Layout/i18nTestTheme1.ss
+++ b/tests/php/i18n/i18nTest/_fakewebroot/themes/testtheme1/templates/Layout/i18nTestTheme1.ss
@ -1,5 +1,5 @@
-<% _t('i18nTestTheme1.LAYOUTTEMPLATE',"Theme1 Layout Template") %>
-<% _t('LAYOUTTEMPLATENONAMESPACE',"Theme1 Layout Template no namespace") %>
-<% sprintf(_t('i18nTestTheme1.SPRINTFNAMESPACE','Theme1 My replacement: %s'),$TestProperty) %>
-<% sprintf(_t('SPRINTFNONAMESPACE','Theme1 My replacement no namespace: %s'),$TestProperty) %>
+<%t i18nTestTheme1.LAYOUTTEMPLATE "Theme1 Layout Template" %>
+<%t LAYOUTTEMPLATENONAMESPACE "Theme1 Layout Template no namespace" %>
+<%t i18nTestTheme1.REPLACEMENTNAMESPACE 'Theme1 My replacement: {replacement}' replacement=$TestProperty %>
+<%t REPLACEMENTNONAMESPACE 'Theme1 My replacement no namespace: {replacement}' replacement=$TestProperty %>
 <% include i18nTestTheme1Include %>
--- a/tests/php/i18n/i18nTest/_fakewebroot/themes/testtheme1/templates/i18nTestTheme1Main.ss
+++ b/tests/php/i18n/i18nTest/_fakewebroot/themes/testtheme1/templates/i18nTestTheme1Main.ss
@ -1,3 +1,3 @@
-<% _t('i18nTestTheme1.MAINTEMPLATE',"Theme1 Main Template") %>
+<%t i18nTestTheme1.MAINTEMPLATE "Theme1 Main Template" %>
 $Layout
 lonely _t() call that should be ignored
--- a/tests/php/i18n/i18nTest/_fakewebroot/themes/testtheme2/templates/i18nTestTheme2.ss
+++ b/tests/php/i18n/i18nTest/_fakewebroot/themes/testtheme2/templates/i18nTestTheme2.ss
@ -1,3 +1,3 @@
-<% _t('i18nTestTheme2.MAINTEMPLATE',"Theme2 Main Template") %>
+<%t i18nTestTheme2.MAINTEMPLATE "Theme2 Main Template" %>
 $Layout
 lonely _t() call that should be ignored
--- a/tests/php/i18n/i18nTextCollectorTest.php
+++ b/tests/php/i18n/i18nTextCollectorTest.php
@ -127,7 +127,7 @@ SS;
        $mymodule = ModuleLoader::inst()->getManifest()->getModule('i18ntestmodule');

        $html = <<<SS
-<% _t('Test.SINGLEQUOTE','Single Quote'); %>
+<%t Test.SINGLEQUOTE 'Single Quote' %>
 SS;
        $this->assertEquals(
            [ 'Test.SINGLEQUOTE' => 'Single Quote' ],
@ -135,7 +135,7 @@ SS;
        );

        $html = <<<SS
-<% _t(  "Test.DOUBLEQUOTE", "Double Quote and Spaces"   ); %>
+<%t   Test.DOUBLEQUOTE "Double Quote and Spaces"    %>
 SS;
        $this->assertEquals(
            [ 'Test.DOUBLEQUOTE' => "Double Quote and Spaces" ],
@ -143,7 +143,7 @@ SS;
        );

        $html = <<<SS
-<% _t("Test.NOSEMICOLON","No Semicolon") %>
+<%t Test.NOSEMICOLON "No Semicolon" %>
 SS;
        $this->assertEquals(
            [ 'Test.NOSEMICOLON' => "No Semicolon" ],
@ -158,22 +158,7 @@ SS;
        $mymodule = ModuleLoader::inst()->getManifest()->getModule('i18ntestmodule');

        $html = <<<SS
-<% _t(
-	'NEWLINES',
-	'New Lines'
-) %>
-SS;
-        $this->assertEquals(
-            [ 'Test.NEWLINES' => "New Lines" ],
-            $c->collectFromTemplate($html, 'Test', $mymodule)
-        );
-
-        $html = <<<SS
-<% _t(
-	'Test.PRIOANDCOMMENT',
-	' Prio and Value with "Double Quotes"',
-	'Comment with "Double Quotes"'
-) %>
+<%t Test.PRIOANDCOMMENT ' Prio and Value with "Double Quotes"' is 'Comment with "Double Quotes"' %>
 SS;
        $this->assertEquals(
            [ 'Test.PRIOANDCOMMENT' => [
@ -184,12 +169,7 @@ SS;
        );

        $html = <<<SS
-<% _t(
-	'Test.PRIOANDCOMMENT',
-	" Prio and Value with 'Single Quotes'",
-
-	"Comment with 'Single Quotes'"
-) %>
+<%t Test.PRIOANDCOMMENT " Prio and Value with 'Single Quotes'" is "Comment with 'Single Quotes'" %>
 SS;
        $this->assertEquals(
            [ 'Test.PRIOANDCOMMENT' => [
@ -201,7 +181,7 @@ SS;

        // Test empty
        $html = <<<SS
-<% _t('Test.PRIOANDCOMMENT') %>
+<%t Test.PRIOANDCOMMENT %>
 SS;
        $this->assertEquals(
            [],
@ -483,27 +463,27 @@ PHP;
            'Layout Template no namespace',
            $matches['i18nTestModule.ss.LAYOUTTEMPLATENONAMESPACE']
        );
-        $this->assertArrayHasKey('i18nTestModule.ss.SPRINTFNONAMESPACE', $matches);
+        $this->assertArrayHasKey('i18nTestModule.ss.REPLACEMENTNONAMESPACE', $matches);
        $this->assertEquals(
-            'My replacement no namespace: %s',
-            $matches['i18nTestModule.ss.SPRINTFNONAMESPACE']
+            'My replacement no namespace: {replacement}',
+            $matches['i18nTestModule.ss.REPLACEMENTNONAMESPACE']
        );
        $this->assertArrayHasKey('i18nTestModule.LAYOUTTEMPLATE', $matches);
        $this->assertEquals(
            'Layout Template',
            $matches['i18nTestModule.LAYOUTTEMPLATE']
        );
-        $this->assertArrayHasKey('i18nTestModule.SPRINTFNAMESPACE', $matches);
+        $this->assertArrayHasKey('i18nTestModule.REPLACEMENTNAMESPACE', $matches);
        $this->assertEquals(
-            'My replacement: %s',
-            $matches['i18nTestModule.SPRINTFNAMESPACE']
+            'My replacement: {replacement}',
+            $matches['i18nTestModule.REPLACEMENTNAMESPACE']
        );

        // Includes should not automatically inject translations into parent templates
        $this->assertArrayNotHasKey('i18nTestModule.WITHNAMESPACE', $matches);
-        $this->assertArrayNotHasKey('i18nTestModuleInclude.ss.NONAMESPACE', $matches);
-        $this->assertArrayNotHasKey('i18nTestModuleInclude.ss.SPRINTFINCLUDENAMESPACE', $matches);
-        $this->assertArrayNotHasKey('i18nTestModuleInclude.ss.SPRINTFINCLUDENONAMESPACE', $matches);
+        $this->assertArrayNotHasKey('i18nTestModuleInclude_ss.NONAMESPACE', $matches);
+        $this->assertArrayNotHasKey('i18nTestModuleInclude_ss.REPLACEMENTINCLUDENAMESPACE', $matches);
+        $this->assertArrayNotHasKey('i18nTestModuleInclude_ss.REPLACEMENTINCLUDENONAMESPACE', $matches);
    }

    public function testCollectMergesWithExisting()