fix: add missing translation keys for edit subtask instructions

- Add editInstructions and editPlaceholder keys to chat.json subtasks section
- Add error_editing_subtask key to common.json errors.message section
- Fix translation key references in ChatRow.tsx to use correct paths
- Rebased on main to pick up latest changes

src/i18n/locales/en/common.json

@@ -100,7 +100,8 @@
 			"cannot_delete_invalid_timestamp": "Cannot delete message: invalid timestamp",
 			"message_not_found": "Message with timestamp {{messageTs}} not found",
 			"error_deleting_message": "Error deleting message: {{error}}",
-			"error_editing_message": "Error editing message: {{error}}"
+			"error_editing_message": "Error editing message: {{error}}",
+			"error_editing_subtask": "Error editing subtask: {{error}}"
 		},
 		"gemini": {
 			"generate_stream": "Gemini generate context stream error: {{error}}",

webview-ui/src/components/chat/ChatRow.tsx

@@ -867,7 +867,7 @@ export const ChatRowContent = ({
 											e.stopPropagation()
 											handleEditSubtaskClick()
 										}}
-										title={t("chat:editSubtaskInstructions")}
+										title={t("chat:subtasks.editInstructions")}
 										style={{
 											padding: "2px 4px",
 											borderRadius: "3px",
@@ -892,19 +892,19 @@ export const ChatRowContent = ({
 												fontFamily: "var(--vscode-editor-font-family)",
 												fontSize: "var(--vscode-editor-font-size)",
 											}}
-											placeholder={t("chat:editSubtaskInstructions.placeholder")}
+											placeholder={t("chat:subtasks.editPlaceholder")}
 											autoFocus
 										/>
 										<div className="flex gap-2 justify-end">
 											<button
 												onClick={handleCancelEditSubtask}
 												className="px-3 py-1 rounded bg-vscode-button-secondaryBackground text-vscode-button-secondaryForeground hover:bg-vscode-button-secondaryHoverBackground">
-												{t("chat:cancel")}
+												{t("chat:cancel.title")}
 											</button>
 											<button
 												onClick={handleSaveEditSubtask}
 												className="px-3 py-1 rounded bg-vscode-button-background text-vscode-button-foreground hover:bg-vscode-button-hoverBackground">
-												{t("chat:save")}
+												{t("chat:save.title")}
 											</button>
 										</div>
 									</div>

webview-ui/src/i18n/locales/en/chat.json

@@ -278,7 +278,9 @@
 		"completionContent": "Subtask Completed",
 		"resultContent": "Subtask Results",
 		"defaultResult": "Please continue to the next task.",
-		"completionInstructions": "Subtask completed! You can review the results and suggest any corrections or next steps. If everything looks good, confirm to return the result to the parent task."
+		"completionInstructions": "Subtask completed! You can review the results and suggest any corrections or next steps. If everything looks good, confirm to return the result to the parent task.",
+		"editInstructions": "Edit subtask instructions",
+		"editPlaceholder": "Edit subtask instructions..."
 	},
 	"questions": {
 		"hasQuestion": "Roo has a question"