Sync with upstream

.github/disabled_classes.build

@@ -118,7 +118,6 @@
 		"RichTextEffect",
 		"SceneReplicationConfig",
 		"ScriptExtension",
-		"ShaderInclude",
 		"Shape2D",
 		"Shape3D",
 		"SkeletonModification2D",
@@ -151,4 +150,4 @@
 		"X509Certificate"
 	],
 	"type": "build_profile"
-}
+}

assets/icons/ShortcutPanel.svg.import

@@ -0,0 +1,43 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://bqmx4oyj8c5mm"
+path="res://.godot/imported/ShortcutPanel.svg-954786637bc59adfc322367d34feba33.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/icons/ShortcutPanel.svg"
+dest_files=["res://.godot/imported/ShortcutPanel.svg-954786637bc59adfc322367d34feba33.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/uastc_level=0
+compress/rdo_quality_loss=0.0
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/channel_remap/red=0
+process/channel_remap/green=1
+process/channel_remap/blue=2
+process/channel_remap/alpha=3
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
+svg/scale=1.0
+editor/scale_with_editor_scale=false
+editor/convert_colors_with_editor_theme=false

godot_only/scripts/tests.gd

@@ -15,10 +15,8 @@ func _run() -> void:
 		for report_line in report:
 			print_rich(report_line)
 
-func add_to_report(test_category: String, test: String, result: String,
-expected: String) -> void:
-	report.append('%s: [b]"%s"[/b] returned [b]"%s"[/b], expected [b]"%s"[/b]' %\
-			[test_category, test, result, expected])
+func add_to_report(test_category: String, test: String, result: String, expected: String) -> void:
+	report.append('%s: [b]"%s"[/b] returned [b]"%s"[/b], expected [b]"%s"[/b]' % [test_category, test, result, expected])
 
 
 # This test is dependent on specifics of the Formatter and AttributePathdata classes.

godot_only/scripts/update_translations.gd

@@ -2,7 +2,7 @@
 @tool
 extends EditorScript
 
-const COMMENTS_DICT = {
+const COMMENTS_DICT: Dictionary[String, String] = {
 	"Viewport": "The viewport is the area where the graphic is displayed. In similar applications, it's often called the canvas.",
 	"CDATA color": "CDATA shouldn't be translated. It's a type of XML section.",
 	"Editor formatter": "Refers to the formatter used for VectorTouch's code editor.",
@@ -16,6 +16,7 @@ const COMMENTS_DICT = {
 	"Dark": "Refers to a theme preset.",
 	"Light": "Refers to a theme preset.",
 	"Black (OLED)": "Refers to a theme preset.",
+	"translation-credits": "Translators (comma-separated): Name or alias, optionally followed by an email in angle brackets <email@example.com>.\nUsed for credits. Adding yourself is optional. New entries go at the end. Don't remove or rearrange existing entries.",
 }
 
 const TRANSLATIONS_DIR = "translations"
@@ -104,19 +105,21 @@ func update_translations() -> void:
 	fa.store_string(HEADER)
 	for msg in messages:
 		if COMMENTS_DICT.has(msg.msgid):
-			fa.store_string("#. %s\n" % COMMENTS_DICT[msg.msgid])
+			var comment_lines := COMMENTS_DICT[msg.msgid].split("\n")
+			var comment := ""
+			for line in comment_lines:
+				comment += "#. %s\n" % line
+			fa.store_string(comment)
 			used_comments.append(msg.msgid)
 		fa.store_string(msg.to_string())
 	fa = null
-	print("Created %s with %d strings" % [TRANSLATIONS_DIR.path_join("/VectorTouch.pot"),
-			(messages.size() + 1)])
+	print("Created %s with %d strings" % [TRANSLATIONS_DIR.path_join("/GodSVG.pot"), (messages.size() + 1)])
 
 	for file in DirAccess.get_files_at(folder_location):
 		if not (file.get_extension() == "po" or file == "VectorTouch.pot"):
 			continue
 
-		var args := PackedStringArray(["--update", "--quiet", "--verbose", "--backup=off",
-				folder_location.path_join(file), pot_location])
+		var args := PackedStringArray(["--update", "--quiet", "--verbose", "--backup=off", folder_location.path_join(file), pot_location])
 		var output: Array = []
 		var result := OS.execute("msgmerge", args, output, true)
 		if not result == -1: