Merge branch 'master' into master

2020-05-30 00:15:19 +02:00
parent ecd59462d0 45614ff397
commit c6c1c07bfb
36 changed files with 921 additions and 307 deletions
--- a/Editor/translation_en.json
+++ b/Editor/translation_en.json
@@ -276,6 +276,22 @@
 				"long"
 			],
 			"desc": "Temperature change steps on long button press"
+		},
+		"PowerPulsePower":{
+			"text": "POWPLS",
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
 }