Merge branch 'master' into ndom91/hunk-viewer

app/src/lib/components/AIPromptEdit/AIPromptEdit.svelte

@@ -36,7 +36,7 @@
 {#if prompts && $userPrompts}
 	<div class="prompt-item__title">
 		<h3 class="text-base-15 text-bold">
-			{promptUse === 'commits' ? 'Commit Message' : 'Branch Name'}
+			{promptUse === 'commits' ? 'Commit message' : 'Branch name'}
 		</h3>
 		<Button kind="solid" style="ghost" icon="plus-small" on:click={createNewPrompt}
 			>New prompt</Button

app/src/lib/components/AIPromptEdit/Content.svelte

@@ -158,7 +158,7 @@
 						icon="bin-small">Delete</Button
 					>
 					<Button kind="solid" style="ghost" icon="edit-text" on:click={() => (editing = true)}
-						>Edit Prompt</Button
+						>Edit prompt</Button
 					>
 				{/if}
 			</div>

app/src/lib/components/AIPromptSelect.svelte

@@ -50,7 +50,7 @@
 	labelId="name"
 	disabled={allPrompts.length === 1}
 	wide={true}
-	label={promptUse === 'commits' ? 'Commit Message' : 'Branch Name'}
+	label={promptUse === 'commits' ? 'Commit message' : 'Branch name'}
 >
 	<SelectItem slot="template" let:item let:selected {selected}>
 		{item.name}

app/src/lib/components/DetailsForm.svelte

@@ -33,7 +33,7 @@
 			<TextBox label="Path" readonly id="path" value={project?.path} />
 			<section class="description-wrapper">
 				<TextBox
-					label="Project Name"
+					label="Project name"
 					id="name"
 					placeholder="Project name can't be empty"
 					bind:value={title}

app/src/lib/components/PreferencesForm.svelte

@@ -118,7 +118,7 @@
 </script>
 
 <Section spacer>
-	<svelte:fragment slot="title">Commit Signing</svelte:fragment>
+	<svelte:fragment slot="title">Commit signing</svelte:fragment>
 	<svelte:fragment slot="description">
 		Use GPG or SSH to sign your commits so they can be verified as authentic.
 	</svelte:fragment>
@@ -143,7 +143,7 @@
 				itemId="value"
 				labelId="name"
 				on:select={updateSigningInfo}
-				label="Signing Format"
+				label="Signing format"
 			>
 				<SelectItem slot="template" let:item>
 					{item.name}
@@ -151,7 +151,7 @@
 			</Select>
 
 			<TextBox
-				label="Signing Key"
+				label="Signing key"
 				bind:value={signingKey}
 				required
 				on:change={updateSigningInfo}
@@ -159,7 +159,7 @@
 			/>
 
 			<TextBox
-				label="Signing Program (optional)"
+				label="Signing program (optional)"
 				bind:value={signingProgram}
 				on:change={updateSigningInfo}
 				placeholder="ex: /Applications/1Password.app/Contents/MacOS/op-ssh-sign"
@@ -186,9 +186,9 @@
 
 			<Button style="pop" kind="solid" wide icon="item-tick" on:click={checkSigning}>
 				{#if !checked}
-					Test Signing
+					Test signing
 				{:else}
-					Re-test Signing
+					Re-test signing
 				{/if}
 			</Button>
 			<SectionCardDisclaimer>

app/src/routes/settings/ai/+page.svelte

@@ -187,14 +187,14 @@
 					{/if}
 
 					{#if openAIKeyOption === KeyOption.BringYourOwn}
-						<TextBox label="API Key" bind:value={openAIKey} required placeholder="sk-..." />
+						<TextBox label="API key" bind:value={openAIKey} required placeholder="sk-..." />
 
 						<Select
 							items={openAIModelOptions}
 							bind:selectedItemId={openAIModelName}
 							itemId="value"
 							labelId="name"
-							label="Model Version"
+							label="Model version"
 						>
 							<SelectItem slot="template" let:item>
 								{item.name}
@@ -250,7 +250,7 @@
 
 					{#if anthropicKeyOption === KeyOption.BringYourOwn}
 						<TextBox
-							label="API Key"
+							label="API key"
 							bind:value={anthropicKey}
 							required
 							placeholder="sk-ant-api03-..."
@@ -261,7 +261,7 @@
 							bind:selectedItemId={anthropicModelName}
 							itemId="value"
 							labelId="name"
-							label="Model Version"
+							label="Model version"
 						>
 							<SelectItem slot="template" let:item>
 								{item.name}

crates/gitbutler-core/src/ops/reflog.rs

@@ -366,7 +366,7 @@ mod set_target_ref {
         let mut index = repo.index()?;
         index.add_path(&PathBuf::from("foo.txt"))?;
         let oid = index.write_tree()?;
-        let name = "Your Name";
+        let name = "Your name";
         let email = "your.email@example.com";
         let signature = git2::Signature::now(name, email)?;
         let commit_id = repo.commit(