From a7579915f7f4a0accbfd2f246b2ff8c9f1234ef1 Mon Sep 17 00:00:00 2001
From: Kiril Videlov <kiril@videlov.com>
Date: Sat, 27 Jul 2024 19:26:45 +0200
Subject: [PATCH] rename Trunk to Target in the UI

As it is more descriptive what it is. Added a tooltip for a good measure
---
 apps/desktop/src/lib/components/ProjectSetupTarget.svelte  | 2 +-
 apps/desktop/src/lib/navigation/BaseBranchCard.svelte      | 7 +++++--
 apps/desktop/src/lib/settings/PreferencesForm.svelte       | 4 ++--
 apps/desktop/src/routes/settings/experimental/+page.svelte | 4 ++--
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/apps/desktop/src/lib/components/ProjectSetupTarget.svelte b/apps/desktop/src/lib/components/ProjectSetupTarget.svelte
index 0c6d207ff..406a7afd6 100644
--- a/apps/desktop/src/lib/components/ProjectSetupTarget.svelte
+++ b/apps/desktop/src/lib/components/ProjectSetupTarget.svelte
@@ -81,7 +81,7 @@
 <div class="project-setup">
 	<div class="project-setup__info">
 		<ProjectNameLabel {projectName} />
-		<h3 class="text-base-body-14 text-bold">Target trunk branch</h3>
+		<h3 class="text-base-body-14 text-bold">Target branch</h3>
 	</div>
 
 	<div class="project-setup__fields">
diff --git a/apps/desktop/src/lib/navigation/BaseBranchCard.svelte b/apps/desktop/src/lib/navigation/BaseBranchCard.svelte
index 0392c52d1..5d7563992 100644
--- a/apps/desktop/src/lib/navigation/BaseBranchCard.svelte
+++ b/apps/desktop/src/lib/navigation/BaseBranchCard.svelte
@@ -21,7 +21,7 @@
 </script>
 
 <button
-	use:tooltip={isNavCollapsed ? 'Trunk' : ''}
+	use:tooltip={isNavCollapsed ? 'Target' : ''}
 	on:mousedown={async () => await goto(`/${project.id}/base`)}
 	class="base-branch-card"
 	class:selected
@@ -39,7 +39,10 @@
 	{#if !isNavCollapsed}
 		<div class="content">
 			<div class="button-head">
-				<span class="text-base-14 text-semibold trunk-label">Trunk</span>
+				<span
+					use:tooltip={'The branch that your Workspace virtual branches are based on and will be merged into.'}
+					class="text-base-14 text-semibold trunk-label">Target</span
+				>
 				{#if ($base?.behind || 0) > 0}
 					<Badge count={$base?.behind || 0} help="Unmerged upstream commits" />
 				{/if}
diff --git a/apps/desktop/src/lib/settings/PreferencesForm.svelte b/apps/desktop/src/lib/settings/PreferencesForm.svelte
index ce63cafef..4749ad47d 100644
--- a/apps/desktop/src/lib/settings/PreferencesForm.svelte
+++ b/apps/desktop/src/lib/settings/PreferencesForm.svelte
@@ -228,8 +228,8 @@
 	<SectionCard orientation="row" labelFor="allowForcePush">
 		<svelte:fragment slot="title">Allow force pushing</svelte:fragment>
 		<svelte:fragment slot="caption">
-			Force pushing allows GitButler to override branches even if they were pushed to remote. We
-			will never force push to the trunk.
+			Force pushing allows GitButler to override branches even if they were pushed to remote.
+			GitButler will never force push to the target branch.
 		</svelte:fragment>
 		<svelte:fragment slot="actions">
 			<Toggle
diff --git a/apps/desktop/src/routes/settings/experimental/+page.svelte b/apps/desktop/src/routes/settings/experimental/+page.svelte
index baa9d439c..821d3c9e9 100644
--- a/apps/desktop/src/routes/settings/experimental/+page.svelte
+++ b/apps/desktop/src/routes/settings/experimental/+page.svelte
@@ -15,8 +15,8 @@
 	<SectionCard labelFor="baseBranchSwitching" orientation="row">
 		<svelte:fragment slot="title">Switching the target branch</svelte:fragment>
 		<svelte:fragment slot="caption">
-			This allows changing of the target branch (trunk) after the initial project setup from within
-			the project settings. Not fully tested yet, use with caution.
+			This allows changing of the target branch after the initial project setup from within the
+			project settings. Not fully tested yet, use with caution.
 		</svelte:fragment>
 		<svelte:fragment slot="actions">
 			<Toggle