diff --git a/Fifth Season/translations/el.json b/Fifth Season/translations/el.json
index 9184d8f723..94db9683de 100644
--- a/Fifth Season/translations/el.json	
+++ b/Fifth Season/translations/el.json	
@@ -2,12 +2,8 @@
    "character-u": "CHARACTER",
    "persona-u": "PERSONA",
    "powers-u": "POWERS",
-<<<<<<< HEAD
-=======
    "qualities-u": "QUALITIES",
->>>>>>> 745be1698e (New translations translation.json (Greek))
    "talents-u": "TALENTS",
-   "novice-u": "NOVICE",
    "journeyman-u": "JOURNEYMAN",
    "expert-u": "EXPERT",
    "master-u": "MASTER",
@@ -16,10 +12,7 @@
    "focuses-u": "FOCUSES",
    "magic-u": "MAGIC",
    "arcana-u": "ARCANA",
-<<<<<<< HEAD
-=======
    "psychic-u": "PSYCHIC",
->>>>>>> 745be1698e (New translations translation.json (Greek))
    "arcana/psychic-u": "ARCANA/PSYCHIC",
    "whisper-u": "WHISPER",
    "aim-u": "AIM",
@@ -63,14 +56,6 @@
    "power-points-u": "POWER POINTS",
    "kanna-u": "KANNA",
    "experience-points-u": "EXPERIENCE POINTS",
-<<<<<<< HEAD
-   "next": "Επόμενο",
-   "initiative-u": "INITIATIVE",
-   "adjust": "Adjust",
-   "fatigue-u": "FATIGUE",
-   "none": "Καμία",
-   "winded": "Winded",
-=======
    "next": "Next",
    "initiative-u": "INITIATIVE",
    "adjust": "Adjust",
@@ -78,20 +63,10 @@
    "none": "None",
    "winded": "Winded",
    "tired": "Tired",
->>>>>>> 745be1698e (New translations translation.json (Greek))
    "fatigued": "Fatigued",
    "exhausted": "Exhausted",
    "dying": "Dying",
    "blinded": "Blinded",
-<<<<<<< HEAD
-   "deafened": "Deafened",
-   "freefalling": "Free Falling",
-   "helpless": "Helpless",
-   "hindered": "Hindered",
-   "injured": "Injured",
-   "prone": "Prone",
-   "restrained": "Restrained",
-=======
    "confused": "Confused",
    "deafened": "Deafened",
    "defenseless": "Defenseless",
@@ -109,7 +84,6 @@
    "scarred": "Scarred",
    "slowed": "Slowed",
    "stunned": "Stunned",
->>>>>>> 745be1698e (New translations translation.json (Greek))
    "unconscious": "Unconscious",
    "wounded": "Wounded",
    "fear-u": "FEAR",
@@ -138,11 +112,7 @@
    "pulp": "Pulp",
    "cinematic": "Cinematic",
    "armor-u": "ARMOR",
-<<<<<<< HEAD
-   "base": "Βασικό",
-=======
    "base": "Base",
->>>>>>> 745be1698e (New translations translation.json (Greek))
    "shield": "Shield",
    "Penalty": "Penalty",
    "#-sign": "#",
@@ -154,18 +124,12 @@
    "damage-u": "DAMAGE",
    "power-name-u": "POWER NAME",
    "class-power-u": "CLASS POWER",
-<<<<<<< HEAD
-   "short-description-u": "SHORT DESCRIPTION",
-   "spell-name-u": "SPELL NAME",
-   "arcanum-name-u": "ARCANUM NAME",
-=======
    "quality-u": "QUALITY",
    "short-description-u": "SHORT DESCRIPTION",
    "spell-name-u": "SPELL NAME",
    "arcanum-name-u": "ARCANUM NAME",
    "psychic-discipline-u": "PSYCHIC DISCIPLINE",
    "discipline:-u": "DISCIPLINE:",
->>>>>>> 745be1698e (New translations translation.json (Greek))
    "equipment-name-u": "EQUIPMENT NAME",
    "quantity-u": "QUANTITY",
    "description-u": "DESCRIPTION",
@@ -181,10 +145,7 @@
    "goals-u": "GOALS",
    "honorifics-titles-and-memberships-u": "HONORIFICS, TITLES AND MEMBERSHIPS",
    "relationships-u": "RELATIONSHIPS",
-<<<<<<< HEAD
-=======
    "bonds-u": "BONDS",
->>>>>>> 745be1698e (New translations translation.json (Greek))
    "character-appearance-u": "CHARACTER APPEARANCE",
    "char-notes-u": "CHARACTER NOTES",
    "specialization1-u": "SPECIALIZATION 1",
@@ -200,15 +161,10 @@
    "mana-cost:-u": "MANA COST:",
    "cast-time:-u": "CAST TIME:",
    "tn:-u": "TN:",
-<<<<<<< HEAD
-   "test:-u": "TEST:",
-   "spellpower:-u": "SPELLPOWER:",
-=======
    "test-tn:-u": "TEST TN:",
    "test:-u": "TEST:",
    "spellpower:-u": "SPELLPOWER:",
    "psych-force:-u": "PSYCH FORCE:",
->>>>>>> 745be1698e (New translations translation.json (Greek))
    "focus-bonus:-u": "FOCUS BONUS:",
    "arcana": "Arcana",
    "psychic": "Psychic",
@@ -224,10 +180,7 @@
    "time:-u": "TIME:",
    "resistance:-u": "RESISTANCE:",
    "fatigue-tn:-u": "FATIGUE TN:",
-<<<<<<< HEAD
-=======
    "price-tn:-u": "PRICE TN:",
->>>>>>> 745be1698e (New translations translation.json (Greek))
    "ability:-u": "ABILITY:",
    "accuracy": "Accuracy",
    "dexterity": "Dexterity",
@@ -251,11 +204,8 @@
    "modern-age": "Modern AGE",
    "threefold": "Threefold",
    "world-of-lazarus": "World of Lazarus",
-<<<<<<< HEAD
-=======
    "fifth-season": "Fifth Season",
    "cthulhu-awakens": "Cthulhu Awakens",
->>>>>>> 745be1698e (New translations translation.json (Greek))
    "color-selection-u": "COLOR SELECTION",
    "black": "Black",
    "red": "Red",
@@ -281,13 +231,8 @@
    "hide": "Hide",
    "apply-armor-penalty-to-dexterity-rolls": "Apply Armor Penalty to Dexterity rolls",
    "add-tiebreaker-to-initiative-rolls": "Add Tiebreaker to Initiative rolls",
-<<<<<<< HEAD
-   "no": "Όχι",
-   "yes": "Ναι",
-=======
    "no": "No",
    "yes": "Yes",
->>>>>>> 745be1698e (New translations translation.json (Greek))
    "options-u": "OPTIONS",
    "add-aim-to-attack": "Add Aim to Attack",
    "prompt-for-aim": "Prompt for Aim",
@@ -299,22 +244,15 @@
    "prompt-for-stunt-reroll": "Prompt for Stunt Reroll",
    "always-reroll-stunt": "Always Reroll Stunt Die",
    "aim-value-a-value-must-be-entered-here": "Aim value (a number MUST be entered here)",
-<<<<<<< HEAD
-   "sections-u": "SECTIONS",
-=======
    "sections-u": "CHARACTER TAB SECTIONS",
    "replace-health-with-fortune": "Replace Health with Fortune",
->>>>>>> 745be1698e (New translations translation.json (Greek))
    "show-the-power-list": "Show the Power list in the Character tab",
    "show-the-class-list": "Show the Class Power list in the Character tab",
    "show-the-talent-list": "Show the Talent list in the Character tab",
    "show-the-spell/arcana-list": "Show the Spell/Arcana list in the Character tab",
    "show-the-extraordinary-powers-list": "Show the Extraordinary Powers list in the Character tab",
    "show-the-arcana/psychic-list": "Show the Arcana/Psychic list in the Character tab",
-<<<<<<< HEAD
-=======
    "show-the-psychic-list": "Show the Psychic list in the Character tab",
->>>>>>> 745be1698e (New translations translation.json (Greek))
    "show-the-mana/magic-points-section": "Show the Mana/Magic Points section",
    "show-the-power-points-section": "Show the Power Points section",
    "show-the-kanna-section": "Show the Kanna section",
@@ -383,10 +321,7 @@
    "arcana_focus": "Arcana Focus",
    "psychic_focus": "Psychic Focus",
    "fatigue_check_for": "Fatigue Check for",
-<<<<<<< HEAD
-=======
    "price_check_for": "Price Check for",
->>>>>>> 745be1698e (New translations translation.json (Greek))
    "each_fatiguing_spell": "Each Fatiguing spell this Encounter",
    "fear_label": "Fear",
    "armor_penalty": "Armor Penalty",
@@ -399,10 +334,7 @@
    "magic_arcana_focus": "Magic Arcana Focus",
    "spellpower_label": "Spellpower",
    "fatigue_tn_label": "Fatigue TN",
-<<<<<<< HEAD
-=======
    "price_tn_label": "Price TN",
->>>>>>> 745be1698e (New translations translation.json (Greek))
    "kanna_cost_label": "Kanna Cost",
    "power_cost_label": "Power Cost",
    "plus_one_tn": "+1 TN",
diff --git a/Fifth Season/translations/fi.json b/Fifth Season/translations/fi.json
index b2bfd32a6a..adaceeedbf 100644
--- a/Fifth Season/translations/fi.json	
+++ b/Fifth Season/translations/fi.json	
@@ -2,6 +2,7 @@
    "character-u": "CHARACTER",
    "persona-u": "PERSONA",
    "powers-u": "POWERS",
+   "qualities-u": "QUALITIES",
    "talents-u": "TALENTS",
    "novice-u": "NOVICE",
    "journeyman-u": "JOURNEYMAN",
@@ -12,6 +13,7 @@
    "focuses-u": "FOCUSES",
    "magic-u": "MAGIC",
    "arcana-u": "ARCANA",
+   "psychic-u": "PSYCHIC",
    "arcana/psychic-u": "ARCANA/PSYCHIC",
    "whisper-u": "WHISPER",
    "aim-u": "AIM",
@@ -61,17 +63,28 @@
    "fatigue-u": "FATIGUE",
    "none": "None",
    "winded": "Winded",
+   "tired": "Tired",
    "fatigued": "Fatigued",
    "exhausted": "Exhausted",
    "dying": "Dying",
    "blinded": "Blinded",
+   "confused": "Confused",
    "deafened": "Deafened",
+   "defenseless": "Defenseless",
+   "disadvantaged": "Disadvantaged",
+   "general-disadvantage": "General Disadvantage",
    "freefalling": "Free Falling",
+   "frightened": "Frightened",
    "helpless": "Helpless",
    "hindered": "Hindered",
+   "influenced": "Influenced",
    "injured": "Injured",
+   "maimed": "Maimed",
    "prone": "Prone",
    "restrained": "Restrained",
+   "scarred": "Scarred",
+   "slowed": "Slowed",
+   "stunned": "Stunned",
    "unconscious": "Unconscious",
    "wounded": "Wounded",
    "fear-u": "FEAR",
@@ -112,9 +125,12 @@
    "damage-u": "DAMAGE",
    "power-name-u": "POWER NAME",
    "class-power-u": "CLASS POWER",
+   "quality-u": "QUALITY",
    "short-description-u": "SHORT DESCRIPTION",
    "spell-name-u": "SPELL NAME",
    "arcanum-name-u": "ARCANUM NAME",
+   "psychic-discipline-u": "PSYCHIC DISCIPLINE",
+   "discipline:-u": "DISCIPLINE:",
    "equipment-name-u": "EQUIPMENT NAME",
    "quantity-u": "QUANTITY",
    "description-u": "DESCRIPTION",
@@ -130,6 +146,7 @@
    "goals-u": "GOALS",
    "honorifics-titles-and-memberships-u": "HONORIFICS, TITLES AND MEMBERSHIPS",
    "relationships-u": "RELATIONSHIPS",
+   "bonds-u": "BONDS",
    "character-appearance-u": "CHARACTER APPEARANCE",
    "char-notes-u": "CHARACTER NOTES",
    "specialization1-u": "SPECIALIZATION 1",
@@ -145,8 +162,10 @@
    "mana-cost:-u": "MANA COST:",
    "cast-time:-u": "CAST TIME:",
    "tn:-u": "TN:",
+   "test-tn:-u": "TEST TN:",
    "test:-u": "TEST:",
    "spellpower:-u": "SPELLPOWER:",
+   "psych-force:-u": "PSYCH FORCE:",
    "focus-bonus:-u": "FOCUS BONUS:",
    "arcana": "Arcana",
    "psychic": "Psychic",
@@ -162,6 +181,7 @@
    "time:-u": "TIME:",
    "resistance:-u": "RESISTANCE:",
    "fatigue-tn:-u": "FATIGUE TN:",
+   "price-tn:-u": "PRICE TN:",
    "ability:-u": "ABILITY:",
    "accuracy": "Accuracy",
    "dexterity": "Dexterity",
@@ -185,6 +205,8 @@
    "modern-age": "Modern AGE",
    "threefold": "Threefold",
    "world-of-lazarus": "World of Lazarus",
+   "fifth-season": "Fifth Season",
+   "cthulhu-awakens": "Cthulhu Awakens",
    "color-selection-u": "COLOR SELECTION",
    "black": "Black",
    "red": "Red",
@@ -224,12 +246,14 @@
    "always-reroll-stunt": "Always Reroll Stunt Die",
    "aim-value-a-value-must-be-entered-here": "Aim value (a number MUST be entered here)",
    "sections-u": "CHARACTER TAB SECTIONS",
+   "replace-health-with-fortune": "Replace Health with Fortune",
    "show-the-power-list": "Show the Power list in the Character tab",
    "show-the-class-list": "Show the Class Power list in the Character tab",
    "show-the-talent-list": "Show the Talent list in the Character tab",
    "show-the-spell/arcana-list": "Show the Spell/Arcana list in the Character tab",
    "show-the-extraordinary-powers-list": "Show the Extraordinary Powers list in the Character tab",
    "show-the-arcana/psychic-list": "Show the Arcana/Psychic list in the Character tab",
+   "show-the-psychic-list": "Show the Psychic list in the Character tab",
    "show-the-mana/magic-points-section": "Show the Mana/Magic Points section",
    "show-the-power-points-section": "Show the Power Points section",
    "show-the-kanna-section": "Show the Kanna section",
@@ -298,6 +322,7 @@
    "arcana_focus": "Arcana Focus",
    "psychic_focus": "Psychic Focus",
    "fatigue_check_for": "Fatigue Check for",
+   "price_check_for": "Price Check for",
    "each_fatiguing_spell": "Each Fatiguing spell this Encounter",
    "fear_label": "Fear",
    "armor_penalty": "Armor Penalty",
@@ -310,6 +335,7 @@
    "magic_arcana_focus": "Magic Arcana Focus",
    "spellpower_label": "Spellpower",
    "fatigue_tn_label": "Fatigue TN",
+   "price_tn_label": "Price TN",
    "kanna_cost_label": "Kanna Cost",
    "power_cost_label": "Power Cost",
    "plus_one_tn": "+1 TN",