diff --git a/README.md b/README.md index 19ef4e0bfe781..7f7a05ba0fd39 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ See the [FAQ](#is-gitlens-free-to-use 'Jump to FAQ') for more details. [Features](#discover-powerful-features 'Jump to Discover Powerful Features') | [Labs](#gitkraken-labs 'Jump to GitKraken Labs') -| [Pro](#ready-for-gitlens-pro 'Jump to Ready for GitLens Pro?') +| [Pro](#ready-for-gitlens-pro 'Jump to Ready for GitKraken Pro?') | [FAQ](#faq 'Jump to FAQ') | [Support and Community](#support-and-community 'Jump to Support and Community') | [Contributing](#contributing 'Jump to Contributing') @@ -257,11 +257,11 @@ Use the Explain panel on the **Commit Details** view to leverage AI to help you Use the `Generate Commit Message` command from the Source Control view's context menu to automatically generate a commit message for your staged changes by leveraging AI. -# Ready for GitLens Pro? +# Ready for GitKraken Pro? -When you're ready to unlock the full potential of GitLens and enjoy all the benefits on your privately hosted repos, consider upgrading to GitLens Pro. With GitLens Pro, you'll gain access to ✨ features on privately hosted repos and ☁️ features based on the Pro plan. +When you're ready to unlock the full potential of GitLens and enjoy all the benefits on your privately hosted repos, consider upgrading to GitKraken Pro. With GitKraken Pro, you'll gain access to ✨ features on privately hosted repos and ☁️ features based on the Pro plan. -To learn more about the pricing and the additional ✨ and ☁️ features offered with GitLens Pro, visit the [GitLens Pricing page](https://www.gitkraken.com/gitlens/pricing). Upgrade to GitLens Pro today and take your Git workflow to the next level! +To learn more about the pricing and the additional ✨ and ☁️ features offered with GitKraken Pro, visit the [GitLens Pricing page](https://www.gitkraken.com/gitlens/pricing). Upgrade to GitKraken Pro today and take your Git workflow to the next level! # FAQ @@ -274,7 +274,7 @@ Yes. All features are free to use on all repos, **except** for features, While GitLens offers a remarkable set of free features, a subset of features tailored for professional developers and teams, marked with a ✨, require a trial or paid plan for use on privately hosted repos — use on local or publicly hosted repos is free for everyone. Additionally some features marked with a ☁️, rely on GitKraken Dev Services which requires an account and access is based on your plan, e.g. Free, Pro, etc. -Preview ✨ features instantly for free for 3 days without an account, or start a free Pro trial to get an additional 7 days and gain access to ☁️ features to experience the full power of GitLens. +Preview ✨ features instantly for free for 3 days without an account, or start a free GitKraken trial to get an additional 7 days and gain access to ☁️ features to experience the full power of GitLens. ## Are ✨ and ☁️ features free to use? @@ -300,7 +300,7 @@ Join the GitLens community on [GitHub Discussions](https://github.com/gitkraken/ For any issues or inquiries related to GitLens, you can reach out to the GitKraken support team via the [official support page](https://support.gitkraken.com/). They will be happy to assist you with any problems you may encounter. -With GitLens Pro, you gain access to priority email support from our customer success team, ensuring higher priority and faster response times. Custom onboarding and training are also available to help you and your team quickly get up and running with a GitLens Pro plan. +With GitKraken Pro, you gain access to priority email support from our customer success team, ensuring higher priority and faster response times. Custom onboarding and training are also available to help you and your team quickly get up and running with a GitKraken Pro plan. # Contributing diff --git a/package.json b/package.json index 7974d885027a1..d601064add3ee 100644 --- a/package.json +++ b/package.json @@ -14448,7 +14448,7 @@ }, { "view": "gitlens.views.workspaces", - "contents": "[Start Free Pro Trial](command:gitlens.plus.loginOrSignUp)\n\nStart a free 7-day Pro trial to use GitKraken Workspaces, or [sign in](command:gitlens.plus.loginOrSignUp).\n☁️ Requires an account and access is based on your plan, e.g. Free, Pro, etc", + "contents": "[Start Free GitKraken Trial](command:gitlens.plus.loginOrSignUp)\n\nStart a free 7-day GitKraken trial to use GitKraken Workspaces, or [sign in](command:gitlens.plus.loginOrSignUp).\n☁️ Requires an account and access is based on your plan, e.g. Free, Pro, etc", "when": "!gitlens:plus" }, { @@ -14468,17 +14468,17 @@ }, { "view": "gitlens.views.worktrees", - "contents": "[Preview Pro](command:gitlens.plus.startPreviewTrial)\n\nPreview Pro for 3 days, or [sign in](command:gitlens.plus.loginOrSignUp) to start a full 7-day Pro trial.\n✨ A trial or paid plan is required to use this on privately hosted repos.", + "contents": "[Preview Pro](command:gitlens.plus.startPreviewTrial)\n\nPreview Pro for 3 days, or [sign in](command:gitlens.plus.loginOrSignUp) to start a full 7-day GitKraken trial.\n✨ A trial or paid plan is required to use this on privately hosted repos.", "when": "gitlens:plus:required && gitlens:plus:state == 0" }, { "view": "gitlens.views.worktrees", - "contents": "Your 3-day Pro preview has ended, start a free Pro trial to get an additional 7 days, or [sign in](command:gitlens.plus.loginOrSignUp).\n\n[Start Free Pro Trial](command:gitlens.plus.loginOrSignUp)\n✨ A trial or paid plan is required to use this on privately hosted repos.", + "contents": "Your 3-day Pro preview has ended, start a free GitKraken trial to get an additional 7 days, or [sign in](command:gitlens.plus.loginOrSignUp).\n\n[Start Free GitKraken Trial](command:gitlens.plus.loginOrSignUp)\n✨ A trial or paid plan is required to use this on privately hosted repos.", "when": "gitlens:plus:required && gitlens:plus:state == 2" }, { "view": "gitlens.views.worktrees", - "contents": "Your Pro trial has ended, please upgrade to continue to use this on privately hosted repos.\n\n[Upgrade to Pro](command:gitlens.plus.purchase)\n✨ A paid plan is required to use this on privately hosted repos.", + "contents": "Your GitKraken trial has ended, please upgrade to continue to use this on privately hosted repos.\n\n[Upgrade to Pro](command:gitlens.plus.purchase)\n✨ A paid plan is required to use this on privately hosted repos.", "when": "gitlens:plus:required && gitlens:plus:state == 4" } ], @@ -14732,8 +14732,8 @@ }, { "id": "gitlens.welcome.preview", - "title": "Previewing GitLens Pro", - "description": "During your preview, you have access to ✨ features on privately hosted repos. [Learn more](https://www.gitkraken.com/gitlens/pro-features)\n\n[Start Free Pro Trial](command:gitlens.plus.loginOrSignUp)\n\nStart a free Pro trial to get an additional 7 days.", + "title": "Previewing GitKraken Pro", + "description": "During your preview, you have access to ✨ features on privately hosted repos. [Learn more](https://www.gitkraken.com/gitlens/pro-features)\n\n[Start Free GitKraken Trial](command:gitlens.plus.loginOrSignUp)\n\nStart a free GitKraken trial to get an additional 7 days.", "media": { "markdown": "walkthroughs/welcome/preview.md" }, @@ -14741,7 +14741,7 @@ }, { "id": "gitlens.welcome.trial", - "title": "Trialing GitLens Pro", + "title": "Trialing GitKraken Pro", "description": "During your trial, you have access to ✨ features on privately hosted repos and ☁️ features based on the Pro plan. [Learn more](https://www.gitkraken.com/gitlens/pro-features)\n\n[Upgrade to Pro](command:gitlens.plus.purchase)", "media": { "markdown": "walkthroughs/welcome/trial.md" diff --git a/src/git/remotes/richRemoteProvider.ts b/src/git/remotes/richRemoteProvider.ts index 9c552f3ae284c..ed3464d56d163 100644 --- a/src/git/remotes/richRemoteProvider.ts +++ b/src/git/remotes/richRemoteProvider.ts @@ -578,7 +578,7 @@ export async function ensurePaidPlan(providerName: string, container: Container) void container.subscription.startPreviewTrial(); break; } else if (subscription.account == null) { - const signIn = { title: 'Start Free Pro Trial' }; + const signIn = { title: 'Start Free GitKraken Trial' }; const cancel = { title: 'Cancel', isCloseAffordance: true }; const result = await window.showWarningMessage( `${title}\n\nDo you want to continue to use ✨ features on privately hosted repos, free for an additional 7 days?`, diff --git a/src/plus/subscription/subscriptionService.ts b/src/plus/subscription/subscriptionService.ts index 0f9359d2f5def..759bf4d53cbeb 100644 --- a/src/plus/subscription/subscriptionService.ts +++ b/src/plus/subscription/subscriptionService.ts @@ -419,10 +419,10 @@ export class SubscriptionService implements Disposable { void this.showAccountView(); if (!silent && plan.effective.id === SubscriptionPlanId.Free) { - const confirm: MessageItem = { title: 'Start Free Pro Trial', isCloseAffordance: true }; + const confirm: MessageItem = { title: 'Start Free GitKraken Trial', isCloseAffordance: true }; const cancel: MessageItem = { title: 'Cancel' }; const result = await window.showInformationMessage( - 'Your 3-day Pro preview has ended, start a free Pro trial to get an additional 7 days.\n\n✨ A trial or paid plan is required to use Pro features on privately hosted repos.', + 'Your 3-day Pro preview has ended, start a free GitKraken trial to get an additional 7 days.\n\n✨ A trial or paid plan is required to use Pro features on privately hosted repos.', { modal: true }, confirm, cancel, @@ -475,7 +475,7 @@ export class SubscriptionService implements Disposable { `You can now preview Pro features for ${pluralize( 'day', days, - )}. After which, you can start a free Pro trial for an additional 7 days.`, + )}. After which, you can start a free GitKraken trial for an additional 7 days.`, confirm, learn, ); diff --git a/src/plus/workspaces/workspacesService.ts b/src/plus/workspaces/workspacesService.ts index 0f209981699ec..df9b9041c9fe4 100644 --- a/src/plus/workspaces/workspacesService.ts +++ b/src/plus/workspaces/workspacesService.ts @@ -163,7 +163,7 @@ export class WorkspacesService implements Disposable { cloudWorkspaces: cloudWorkspaces, cloudWorkspaceInfo: filteredSharedWorkspaceCount > 0 - ? `${filteredSharedWorkspaceCount} shared workspaces hidden - upgrade to GitLens Pro to access.` + ? `${filteredSharedWorkspaceCount} shared workspaces hidden - upgrade to GitKraken Pro to access.` : undefined, }; } diff --git a/src/quickpicks/items/directive.ts b/src/quickpicks/items/directive.ts index c3b942649d05b..ebdbacdd503e9 100644 --- a/src/quickpicks/items/directive.ts +++ b/src/quickpicks/items/directive.ts @@ -47,7 +47,7 @@ export function createDirectiveQuickPickItem( detail = 'Preview Pro for 3-days to use this on privately hosted repos'; break; case Directive.ExtendTrial: - label = 'Start Free Pro Trial'; + label = 'Start Free GitKraken Trial'; detail = 'Continue to use this on privately hosted repos, free for an additional 7 days'; break; case Directive.RequiresVerification: diff --git a/src/subscription.ts b/src/subscription.ts index c2719718b4974..3cb3732804b3f 100644 --- a/src/subscription.ts +++ b/src/subscription.ts @@ -131,16 +131,16 @@ export function getSubscriptionPlan( export function getSubscriptionPlanName(id: SubscriptionPlanId) { switch (id) { case SubscriptionPlanId.FreePlus: - return 'GitLens Free'; + return 'GitKraken Free'; case SubscriptionPlanId.Pro: - return 'GitLens Pro'; + return 'GitKraken Pro'; case SubscriptionPlanId.Teams: - return 'GitLens Teams'; + return 'GitKraken Teams'; case SubscriptionPlanId.Enterprise: - return 'GitLens Enterprise'; + return 'GitKraken Enterprise'; case SubscriptionPlanId.Free: default: - return 'GitLens'; + return 'GitKraken'; } } @@ -153,14 +153,14 @@ export function getSubscriptionStatePlanName(state: SubscriptionState | undefine case SubscriptionState.FreePlusInTrial: return `${getSubscriptionPlanName(id ?? SubscriptionPlanId.Pro)} (Trial)`; case SubscriptionState.VerificationRequired: - return `GitLens (Unverified)`; + return `GitKraken (Unverified)`; case SubscriptionState.Paid: return getSubscriptionPlanName(id ?? SubscriptionPlanId.Pro); case SubscriptionState.Free: case SubscriptionState.FreePreviewTrialExpired: case null: default: - return 'GitLens'; + return 'GitKraken'; } } diff --git a/src/webviews/apps/plus/account/components/account-content.ts b/src/webviews/apps/plus/account/components/account-content.ts index 8ed47c64c4f89..5ca90b1929504 100644 --- a/src/webviews/apps/plus/account/components/account-content.ts +++ b/src/webviews/apps/plus/account/components/account-content.ts @@ -97,10 +97,10 @@ export class AccountContent extends LitElement { case SubscriptionState.Free: case SubscriptionState.FreePreviewTrialExpired: case SubscriptionState.FreePlusTrialExpired: - return 'GitLens Free'; + return 'GitKraken Free'; case SubscriptionState.FreeInPreviewTrial: case SubscriptionState.FreePlusInTrial: - return 'GitLens Pro (Trial)'; + return 'GitKraken Pro (Trial)'; case SubscriptionState.VerificationRequired: return `${this.plan} (Unverified)`; default: @@ -171,14 +171,14 @@ export class AccountContent extends LitElement { Sign Up -

Signing up starts a free 7-day Pro trial.

+

Signing up starts a free 7-day GitKraken trial.

`; case SubscriptionState.FreePlusTrialExpired: return html`

- Your Pro trial has ended, please upgrade to continue to use ✨ features on privately hosted - repos. + Your GitKraken trial has ended, please upgrade to continue to use ✨ features on privately + hosted repos.

Upgrade to Pro @@ -192,8 +192,8 @@ export class AccountContent extends LitElement { case SubscriptionState.FreePlusInTrial: return html`

- Your have ${this.daysRemaining} remaining in your Pro trial. Once your trial ends, you'll need a - paid plan to continue using ✨ features. + Your have ${this.daysRemaining} remaining in your GitKraken trial. Once your trial ends, you'll + need a paid plan to continue using ✨ features.

Upgrade to Pro diff --git a/src/webviews/apps/plus/shared/components/feature-gate-plus-state.ts b/src/webviews/apps/plus/shared/components/feature-gate-plus-state.ts index 11c2db015b5aa..c29c371361184 100644 --- a/src/webviews/apps/plus/shared/components/feature-gate-plus-state.ts +++ b/src/webviews/apps/plus/shared/components/feature-gate-plus-state.ts @@ -76,7 +76,7 @@ export class FeatureGatePlusState extends LitElement { >

Preview Pro for 3 days, or - sign in to start a full 7-day Pro trial. + sign in to start a full 7-day GitKraken trial.

✨ A trial or paid plan is required to use this on privately hosted repos.

`; @@ -84,18 +84,21 @@ export class FeatureGatePlusState extends LitElement { case SubscriptionState.FreePreviewTrialExpired: return html`

- Your 3-day Pro preview has ended, start a free Pro trial to get an additional 7 days, or + Your 3-day Pro preview has ended, start a free GitKraken trial to get an additional 7 days, or sign in.

Start Free Pro TrialStart Free GitKraken Trial

✨ A trial or paid plan is required to use this on privately hosted repos.

`; case SubscriptionState.FreePlusTrialExpired: return html` -

Your Pro trial has ended, please upgrade to continue to use this on privately hosted repos.

+

+ Your GitKraken trial has ended, please upgrade to continue to use this on privately hosted + repos. +

Upgrade to Pro diff --git a/src/webviews/apps/welcome/welcome.html b/src/webviews/apps/welcome/welcome.html index 85fc68bda28de..8349e0713a255 100644 --- a/src/webviews/apps/welcome/welcome.html +++ b/src/webviews/apps/welcome/welcome.html @@ -392,7 +392,7 @@

Try Pro ✨

Unlock the full power of GitLens ✨ and ☁️ features

Start a Pro trialStart a GitKraken trial  or sign in