Merge remote-tracking branch 'refs/remotes/origin/master'

public/locales/ca/lang.json

@@ -405,6 +405,7 @@
     "mullet8": "Mullet8",
     "mullet10": "Mullet10",
     "estoile": "Estoile",
+    "comet": "Comet",
     "compassRose": "Compass Rose",
     "billet": "Billet",
     "delf": "Delf",
@@ -427,6 +428,10 @@
     "ribbon2": "Ribbon2",
     "ribbon3": "Ribbon3",
     "ribbon4": "Ribbon4",
+    "ribbon5": "Ribbon5",
+    "ribbon6": "Ribbon6",
+    "ribbon7": "Ribbon7",
+    "ribbon8": "Ribbon8",
     "crossHummetty": "Cross Hummetty",
     "crossVoided": "Cross Voided",
     "crossPattee": "Cross Pattee",
@@ -483,6 +488,7 @@
     "martenCourant": "Marten Courant",
     "boarRampant": "Boar Rampant",
     "stagPassant": "Stag Passant",
+    "stagLodgedRegardant": "Stag Lodged Reguardant",
     "hindStatant": "Hind Statant",
     "horseRampant": "Horse Rampant",
     "horseSalient": "Horse Salient",
@@ -508,6 +514,7 @@
     "squirrel": "Squirrel",
     "frog": "Frog",
     "snake": "Snake",
+    "ouroboros": "Ouroboros",
     "crocodile": "Crocodile",
     "lizard": "Lizard",
     "scorpion": "Scorpion",
@@ -556,6 +563,7 @@
     "lymphad": "Lymphad",
     "caravel": "Caravel",
     "drakkar": "Drakkar",
+    "raft": "Raft",
     "armillarySphere": "Armillary Sphere",
     "shipWheel": "Ship Wheel",
     "dragonPassant": "Dragon Passant",
@@ -570,6 +578,7 @@
     "serpent": "Serpent",
     "basilisk": "Basilisk",
     "sagittarius": "Sagittarius",
+    "centaur": "Centaur",
     "tree": "Tree",
     "oak": "Oak",
     "pineTree": "Pine Tree",
@@ -580,18 +589,28 @@
     "sextifoil": "Sextifoil",
     "mapleLeaf": "Maple Leaf",
     "rose": "Rose",
+    "thistle": "Thistle",
     "apple": "Apple",
     "pear": "Pear",
     "grapeBunch": "Grape Bunch",
+    "grapeBunch2": "Grape Bunch2",
     "wheatStalk": "Wheat Stalk",
+    "earOfWheat": "Ear Of Wheat",
     "pineCone": "Pine Cone",
     "garb": "Garb",
     "sickle": "Sickle",
     "scythe": "Scythe",
+    "scythe2": "Scythe2",
     "rake": "Rake",
     "plough": "Plough",
+    "ploughshare": "Ploughshare",
     "sword": "Sword",
     "falchion": "Falchion",
+    "flamberge": "Flamberge",
+    "flangedMace": "Flanged Mace",
+    "mace": "Mace",
+    "maces": "Maces",
+    "grenade": "Grenade",
     "rapier": "Rapier",
     "sabre": "Sabre",
     "sabresCrossed": "Sabres Crossed",
@@ -600,36 +619,55 @@
     "axe": "Axe",
     "lochaberAxe": "Lochaber Axe",
     "spear": "Spear",
+    "lanceHead": "Lance Head",
+    "lanceWithBanner": "Lance With Banner",
     "mallet": "Mallet",
     "bowWithArrow": "Bow With Arrow",
+    "bowWithThreeArrows": "Bow With Three Arrows",
     "bow": "Bow",
     "arrow": "Arrow",
     "arrowsSheaf": "Arrows Sheaf",
     "arbalest": "Arbalest",
+    "arbalest2": "Arbalest2",
+    "armEmbowedHoldingSabre": "Arm Embowed Holding Sabre",
+    "armEmbowedVambraced": "Arm Embowed Vambraced",
+    "armEmbowedVambracedHoldingSword": "Arm Embowed Vambraced Holding Sword",
     "helmet": "Helmet",
     "helmetCorinthian": "Corinthian Helmet",
     "helmetGreat": "Great Helm",
+    "helmetZischagge": "Zischagge Helmet",
     "gauntlet": "Gauntlet",
     "shield": "Shield",
     "cannon": "Cannon",
     "hand": "Hand",
     "head": "Head",
     "headWreathed": "Head Wreathed",
     "foot": "Foot",
+    "skeleton": "Skeleton",
     "skull": "Skull",
+    "skull2": "Skull2",
+    "bone": "Bone",
+    "crossedBones": "Crossed Bones",
     "cavalier": "Cavalier",
     "archer": "Archer",
+    "cossack": "Cossack",
     "monk": "Monk",
     "angel": "Angel",
     "tower": "Tower",
     "castle": "Castle",
+    "castle2": "Castle2",
+    "palace": "Palace",
     "bridge": "Bridge",
+    "bridge2": "Bridge2",
+    "portcullis": "Portcullis",
     "column": "Column",
+    "pillar": "Pillar",
     "lighthouse": "Lighthouse",
     "windmill": "Windmill",
     "crown": "Crown",
     "crown2": "Crown2",
     "laurelWreath": "Laurel Wreath",
+    "laurelWreath2": "Laurel Wreath2",
     "mitre": "Mitre",
     "orb": "Orb",
     "chalice": "Chalice",
@@ -659,18 +697,28 @@
     "log": "Log",
     "chain": "Chain",
     "anvil": "Anvil",
+    "hook": "Hook",
     "ladder": "Ladder",
+    "ladder2": "Ladder2",
     "trowel": "Trowel",
     "banner": "Banner",
     "bookClosed": "Book Closed",
+    "bookClosed2": "Book Closed2",
     "bookOpen": "Book Open",
     "scrollClosed": "Scroll Closed",
     "feather": "Feather",
     "drawingCompass": "Drawing Compass",
+    "shears": "Shears",
+    "gear": "Gear",
+    "millstone": "Millstone",
+    "saw": "Saw",
     "scissors": "Scissors",
+    "scissors2": "Scissors2",
+    "pincers": "Pincers",
     "hourglass": "Hourglass",
     "scale": "Scale",
     "scaleImbalanced": "Scale Imbalanced",
+    "scalesHanging": "Scales Hanging",
     "fan": "Fan",
     "snowflake": "Snowflake",
     "spiral": "Spiral",

public/locales/de/lang.json

@@ -405,6 +405,7 @@
     "mullet8": "Stern 8",
     "mullet10": "Stern 10",
     "estoile": "Estoile",
+    "comet": "Comet",
     "compassRose": "Kompassrose",
     "billet": "Holzscheit",
     "delf": "Delf",
@@ -427,6 +428,10 @@
     "ribbon2": "Ribbon2",
     "ribbon3": "Ribbon3",
     "ribbon4": "Ribbon4",
+    "ribbon5": "Ribbon5",
+    "ribbon6": "Ribbon6",
+    "ribbon7": "Ribbon7",
+    "ribbon8": "Ribbon8",
     "crossHummetty": "Gemeines Kreuz",
     "crossVoided": "Balkenkreuz",
     "crossPattee": "Tatzenkreuz",
@@ -483,6 +488,7 @@
     "martenCourant": "Marten Courant",
     "boarRampant": "Eber aufrecht",
     "stagPassant": "Stag Passant",
+    "stagLodgedRegardant": "Stag Lodged Reguardant",
     "hindStatant": "Hind Statant",
     "horseRampant": "Pferd aufrecht",
     "horseSalient": "Pferd springend",
@@ -508,6 +514,7 @@
     "squirrel": "Squirrel",
     "frog": "Frog",
     "snake": "Schlange",
+    "ouroboros": "Ouroboros",
     "crocodile": "Crocodile",
     "lizard": "Lizard",
     "scorpion": "Scorpion",
@@ -556,6 +563,7 @@
     "lymphad": "Lymphad",
     "caravel": "Caravel",
     "drakkar": "Drakkar",
+    "raft": "Raft",
     "armillarySphere": "Armillarsphäre",
     "shipWheel": "Ship Wheel",
     "dragonPassant": "Drache schreitend",
@@ -570,6 +578,7 @@
     "serpent": "Seeschlange",
     "basilisk": "Basilisk",
     "sagittarius": "Sagittarius",
+    "centaur": "Centaur",
     "tree": "Baum",
     "oak": "Eiche",
     "pineTree": "Pine Tree",
@@ -580,18 +589,28 @@
     "sextifoil": "Sextifoil",
     "mapleLeaf": "Maple Leaf",
     "rose": "Rose",
+    "thistle": "Thistle",
     "apple": "Apfel",
     "pear": "Pear",
     "grapeBunch": "Grape Bunch",
+    "grapeBunch2": "Grape Bunch2",
     "wheatStalk": "Wheat Stalk",
+    "earOfWheat": "Ear Of Wheat",
     "pineCone": "Pine Cone",
     "garb": "Korn",
     "sickle": "Sickle",
     "scythe": "Scythe",
+    "scythe2": "Scythe2",
     "rake": "Rechen",
     "plough": "Pflug",
+    "ploughshare": "Ploughshare",
     "sword": "Schwert",
     "falchion": "Krummschwert",
+    "flamberge": "Flamberge",
+    "flangedMace": "Flanged Mace",
+    "mace": "Mace",
+    "maces": "Maces",
+    "grenade": "Grenade",
     "rapier": "Rapier",
     "sabre": "Säbel",
     "sabresCrossed": "Gekreuzte Säbel",
@@ -600,36 +619,55 @@
     "axe": "Axt",
     "lochaberAxe": "Lochaber-Axt",
     "spear": "Spear",
+    "lanceHead": "Lance Head",
+    "lanceWithBanner": "Lance With Banner",
     "mallet": "Holzhammer",
     "bowWithArrow": "Pfeil und Bogen",
+    "bowWithThreeArrows": "Bow With Three Arrows",
     "bow": "Bogen",
     "arrow": "Pfeil",
     "arrowsSheaf": "Pfeilbündel",
     "arbalest": "Arbalest",
+    "arbalest2": "Arbalest2",
+    "armEmbowedHoldingSabre": "Arm Embowed Holding Sabre",
+    "armEmbowedVambraced": "Arm Embowed Vambraced",
+    "armEmbowedVambracedHoldingSword": "Arm Embowed Vambraced Holding Sword",
     "helmet": "Helm",
     "helmetCorinthian": "Corinthian Helmet",
     "helmetGreat": "Great Helm",
+    "helmetZischagge": "Zischagge Helmet",
     "gauntlet": "Gauntlet",
     "shield": "Shield",
     "cannon": "Kanone",
     "hand": "Hand",
     "head": "Kopf",
     "headWreathed": "Kopf mit Kranz",
     "foot": "Fuß",
+    "skeleton": "Skeleton",
     "skull": "Skull",
+    "skull2": "Skull2",
+    "bone": "Bone",
+    "crossedBones": "Crossed Bones",
     "cavalier": "Ritter",
     "archer": "Archer",
+    "cossack": "Cossack",
     "monk": "Mönch",
     "angel": "Engel",
     "tower": "Turm",
     "castle": "Burg",
+    "castle2": "Castle2",
+    "palace": "Palace",
     "bridge": "Bridge",
+    "bridge2": "Bridge2",
+    "portcullis": "Portcullis",
     "column": "Column",
+    "pillar": "Pillar",
     "lighthouse": "Lighthouse",
     "windmill": "Windmill",
     "crown": "Krone",
     "crown2": "Krone 2",
     "laurelWreath": "Laurel Wreath",
+    "laurelWreath2": "Laurel Wreath2",
     "mitre": "Mitre",
     "orb": "Reichsapfel",
     "chalice": "Kelch",
@@ -659,18 +697,28 @@
     "log": "Stamm",
     "chain": "Kette",
     "anvil": "Amboss",
+    "hook": "Hook",
     "ladder": "Ladder",
+    "ladder2": "Ladder2",
     "trowel": "Trowel",
     "banner": "Banner",
     "bookClosed": "Book Closed",
+    "bookClosed2": "Book Closed2",
     "bookOpen": "Book Open",
     "scrollClosed": "Scroll Closed",
     "feather": "Feather",
     "drawingCompass": "Drawing Compass",
+    "shears": "Shears",
+    "gear": "Gear",
+    "millstone": "Millstone",
+    "saw": "Saw",
     "scissors": "Scissors",
+    "scissors2": "Scissors2",
+    "pincers": "Pincers",
     "hourglass": "Hourglass",
     "scale": "Scale",
     "scaleImbalanced": "Scale Imbalanced",
+    "scalesHanging": "Scales Hanging",
     "fan": "Fan",
     "snowflake": "Snowflake",
     "spiral": "Spiral",