Merge remote-tracking branch 'origin/main' into feature/zauber-rework

# Conflicts:
#	src/system.json

src/lang/en.json

@@ -0,0 +1,50 @@
+{
+  "TYPES": {
+    "Actor": {
+      "Character": "Hero",
+      "Creature": "Creature",
+      "Group": "Adventure Group",
+      "Merchant": "Merchant"
+    },
+    "Item": {
+      "ActiveEffect": "Active Effect",
+      "Equipment": "Equipment",
+      "Skill": "Skill",
+      "Advantage": "Dis-/advantage",
+      "SpecialAbility": "Special Ability",
+      "Spell": "Spell",
+      "Liturgy": "Liturgy",
+      "Species": "Species",
+      "Culture": "Culture",
+      "Profession": "Profession"
+    }
+  },
+  "COOLDOWN": {
+    "cancel": "cancel {t}"
+  },
+  "WEAPON": {
+    "attack": "Attack with {weapon}",
+    "parry": "Parry with {weapon}",
+    "damage": "Deal damage with {weapon}",
+    "initiative": "Roll initiative"
+  },
+  "COMBAT_DIALOG": {
+    "notReadyReason": {
+      "title": "Attack can't be executed due to:",
+      "noTarget": "No Target selected",
+      "noWeapon": "No Weapon selected",
+      "noSkill": "No Skill selected",
+      "noManeuver": "No Maneuver selected",
+      "impossible": "Difficulty exceeds Skill Value"
+    }
+  },
+  "COMBAT_DIALOG_TP": {
+    "windowTitle": "Roll Damage",
+    "regularFormula": "Damage formula:",
+    "bonusDamage": "Additional damage formula:",
+    "buttonText": "Roll Dice"
+  },
+  "ITEM_BROWSER": {
+    "progress": "{current}/{max}: imported from {compendium}"
+  }
+}

src/system.json

@@ -2,7 +2,7 @@
   "id": "DSA_4-1",
   "title": "Das Schwarze Auge 4.1",
   "description": "Noch ein Spielsystem für Das Schwarze Auge 4.1",
-  "version": "0.0.1",
+  "version": "0.6.1",
   "compatibility": {
     "minimum": 12,
     "verified": 13
@@ -179,6 +179,11 @@
       "lang": "de",
       "name": "Deutsch",
       "path": "lang/de.json"
+    },
+    {
+      "lang": "en",
+      "name": "English",
+      "path": "lang/en.json"
     }
   ],
   "documentTypes": {
@@ -359,5 +364,5 @@
   "primaryTokenAttribute": "lep.aktuell",
   "url": "https://git.macniel.online/macniel/foundry-dsa41-game",
   "manifest": "https://git.macniel.online/macniel/foundry-dsa41-game/raw/branch/main/src/system.json",
-  "download": "https://git.macniel.online/macniel/foundry-dsa41-game/releases/download/0.0.1/release.zip"
+  "download": "https://git.macniel.online/macniel/foundry-dsa41-game/releases/download/0.6.1/release.zip"
 }