Merge remote-tracking branch 'origin/dev' into feature/region-behaviours

langs/en-ca.json

@@ -67,8 +67,10 @@
 				"easy": "Easy",
 				"normal": "Normal",
 				"tough": "Tough",
-				"hard": "Hard"
+				"hard": "Hard",
+				"random": "Random Condition"
 			},
+			"difficulty": "Difficulty",
 			"drag": "Drag",
 			"edit": "Edit",
 			"edge": "Edge",
@@ -80,11 +82,23 @@
 			"guts": "Guts",
 			"location": "Location",
 			"move": "Move",
-			"path": {
-				"North": "North",
-				"East": "East",
-				"South": "South",
-				"West": "West"
+			"ordinals": {
+				"North": {
+					"full": "North",
+					"abbv": "N"
+				},
+				"East": {
+					"full": "East",
+					"abbv": "E"
+				},
+				"South": {
+					"full": "South",
+					"abbv": "S"
+				},
+				"West": {
+					"full": "West",
+					"abbv": "W"
+				}
 			},
 			"protection": "Protection",
 			"quantity": "Quantity",
@@ -121,6 +135,20 @@
 			"condensedRange": {
 				"name": "Condense Weapon Range Input",
 				"hint": "With this enabled, the weapon range will be displayed as \"X / Y\" when editing a weapon. While disabled it will be as displayed as two different rows, one for Short Range and one for Long Range"
+			},
+			"sandsOfFateInitial": {
+				"name": "Sands of Fate Initial",
+				"hint": "What value should The Hourglass reset to when a Cryptic Event occurs"
+			},
+			"onCrypticEvent": {
+				"name": "Cryptic Event Alert",
+				"hint": "What happens when a cryptic event occurs by clicking the \"Next Delve Tour\" button in the HUD",
+				"options": {
+					"notif": "Notification",
+					"pause": "Pause Game",
+					"both": "Notification and Pause Game",
+					"nothing": "Do Nothing"
+				}
 			}
 		},
 		"Apps": {
@@ -153,10 +181,17 @@
 			},
 			"warn": {
 				"cannot-go-negative": "\"{name}\" is unable to be a negative number."
+			},
+			"info": {
+				"cryptic-event-alert": "A Cryptic Event Has Occured!"
 			}
 		},
 		"tooltips": {
-			"shield-bonus": "Shield Bonus: {value}"
+			"shield-bonus": "Shield Bonus: {value}",
+			"set-fate-to": "Set Fate to {ordinal}",
+			"current-tour": "Current Delve Tour",
+			"next-tour": "Next Delve Tour",
+			"prev-tour": "Previous Delve Tour"
 		},
 		"region": {
 			"difficultyDelta": {