From b8e00b28079be8da952e1506b06e450c183a75c3 Mon Sep 17 00:00:00 2001
From: WBHarry <williambjrklund@gmail.com>
Date: Sat, 25 Apr 2026 17:39:20 +0200
Subject: [PATCH 1/4] Translation fixes

---
 templates/settings/variant-rules.hbs               | 2 +-
 templates/ui/combatTracker/combatTrackerHeader.hbs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/settings/variant-rules.hbs b/templates/settings/variant-rules.hbs
index cdaef024..9c9650dd 100644
--- a/templates/settings/variant-rules.hbs
+++ b/templates/settings/variant-rules.hbs
@@ -32,7 +32,7 @@
     <footer class="form-footer">
         <button data-action="reset">
             <i class="fa-solid fa-arrow-rotate-left"></i>
-            <span>{{localize "SETTINGS.UI.ACTIONS.ResetReset"}}</span>
+            <span>{{localize "SETTINGS.UI.ACTIONS.Reset"}}</span>
         </button>
         <button data-action="save" >
             <i class="fa-solid fa-floppy-disk"></i>
diff --git a/templates/ui/combatTracker/combatTrackerHeader.hbs b/templates/ui/combatTracker/combatTrackerHeader.hbs
index 8ac960c6..803286ab 100644
--- a/templates/ui/combatTracker/combatTrackerHeader.hbs
+++ b/templates/ui/combatTracker/combatTrackerHeader.hbs
@@ -66,7 +66,7 @@
 
         {{#if (and combats.length user.isGM)}}
             <div class="encounter-battlepoints" data-tooltip="#battlepoints#" data-combat-id="{{combat.id}}">
-                {{battlepoints.current}}/{{battlepoints.max}} BP{{#if battlepoints.hasModifierBP}}*{{/if}}
+                {{battlepoints.current}}/{{battlepoints.max}} {{localize "DAGGERHEART.GENERAL.Battlepoints.short"}}{{#if battlepoints.hasModifierBP}}*{{/if}}
             </div>
         {{/if}}
 

From 4d17a7d9bf5fbb03a52f875a712300846759addf Mon Sep 17 00:00:00 2001
From: WBHarry <williambjrklund@gmail.com>
Date: Sat, 25 Apr 2026 17:45:50 +0200
Subject: [PATCH 2/4] Fixed that new weapons couldn't be created on the
 Character Sheet

---
 module/applications/sheets/api/application-mixin.mjs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/module/applications/sheets/api/application-mixin.mjs b/module/applications/sheets/api/application-mixin.mjs
index 5faa5d5c..e941931a 100644
--- a/module/applications/sheets/api/application-mixin.mjs
+++ b/module/applications/sheets/api/application-mixin.mjs
@@ -725,7 +725,7 @@ export default function DHApplicationMixin(Base) {
                       : null
                   : this.document;
 
-            let systemData = {};
+            let systemData = null;
             if (featureOnCharacter) {
                 systemData = {
                     originItemType: this.document.type,
@@ -738,10 +738,11 @@ export default function DHApplicationMixin(Base) {
 
             const data = {
                 name: cls.defaultName({ type, parent }),
-                type,
-                system: systemData
+                type
             };
 
+            if (systemData) data.system = systemData;
+
             if (inVault) data['system.inVault'] = true;
             if (disabled) data.disabled = true;
             if (type === 'domainCard' && parent?.system.domains?.length) {

From d0afee59d8a953c683c92f7e4ac51c1257722ffa Mon Sep 17 00:00:00 2001
From: WBHarry <williambjrklund@gmail.com>
Date: Sat, 25 Apr 2026 18:51:49 +0200
Subject: [PATCH 3/4] Corrected secondaryWeapon translation

---
 module/config/itemBrowserConfig.mjs | 4 ++--
 module/data/item/weapon.mjs         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/module/config/itemBrowserConfig.mjs b/module/config/itemBrowserConfig.mjs
index 5c0a219b..04b387cb 100644
--- a/module/config/itemBrowserConfig.mjs
+++ b/module/config/itemBrowserConfig.mjs
@@ -177,8 +177,8 @@ export const typeConfig = {
                 key: 'system.secondary',
                 label: 'DAGGERHEART.UI.ItemBrowser.subtype',
                 choices: [
-                    { value: false, label: 'DAGGERHEART.ITEMS.Weapon.primaryWeapon' },
-                    { value: true, label: 'DAGGERHEART.ITEMS.Weapon.secondaryWeapon' }
+                    { value: false, label: 'DAGGERHEART.ITEMS.Weapon.primaryWeapon.full' },
+                    { value: true, label: 'DAGGERHEART.ITEMS.Weapon.secondaryWeapon.full' }
                 ]
             },
             {
diff --git a/module/data/item/weapon.mjs b/module/data/item/weapon.mjs
index 75e6dc8e..db67e71c 100644
--- a/module/data/item/weapon.mjs
+++ b/module/data/item/weapon.mjs
@@ -28,7 +28,7 @@ export default class DHWeapon extends AttachableItem {
             equipped: new fields.BooleanField({ initial: false }),
 
             //SETTINGS
-            secondary: new fields.BooleanField({ initial: false, label: 'DAGGERHEART.ITEMS.Weapon.secondaryWeapon' }),
+            secondary: new fields.BooleanField({ initial: false, label: 'DAGGERHEART.ITEMS.Weapon.secondaryWeapon.full' }),
             burden: new fields.StringField({
                 required: true,
                 choices: CONFIG.DH.GENERAL.burden,

From c82bcbeb01a64ee1af11ed07c336a75d9ad82309 Mon Sep 17 00:00:00 2001
From: WBHarry <williambjrklund@gmail.com>
Date: Sat, 25 Apr 2026 22:50:59 +0200
Subject: [PATCH 4/4] Linted

---
 module/data/item/weapon.mjs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/module/data/item/weapon.mjs b/module/data/item/weapon.mjs
index db67e71c..84e4de7f 100644
--- a/module/data/item/weapon.mjs
+++ b/module/data/item/weapon.mjs
@@ -28,7 +28,10 @@ export default class DHWeapon extends AttachableItem {
             equipped: new fields.BooleanField({ initial: false }),
 
             //SETTINGS
-            secondary: new fields.BooleanField({ initial: false, label: 'DAGGERHEART.ITEMS.Weapon.secondaryWeapon.full' }),
+            secondary: new fields.BooleanField({
+                initial: false,
+                label: 'DAGGERHEART.ITEMS.Weapon.secondaryWeapon.full'
+            }),
             burden: new fields.StringField({
                 required: true,
                 choices: CONFIG.DH.GENERAL.burden,