From ea902a96605bee6db1660b15df8ad4873fcce061 Mon Sep 17 00:00:00 2001
From: Jake Christensen <105668012+jchristensen-bw@users.noreply.github.com>
Date: Wed, 25 Sep 2024 10:20:44 -0600
Subject: [PATCH] updated summary/descriptions, resolve merge conflicts

---
 apps/browser/src/safari/safari/Info.plist       | 2 +-
 apps/cli/package.json                           | 2 +-
 apps/cli/stores/chocolatey/bitwarden-cli.nuspec | 2 +-
 apps/cli/stores/snap/snapcraft.yaml             | 2 +-
 apps/desktop/electron-builder.json              | 2 +-
 apps/desktop/package.json                       | 2 +-
 apps/desktop/src/package.json                   | 2 +-
 apps/desktop/stores/chocolatey/bitwarden.nuspec | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/browser/src/safari/safari/Info.plist b/apps/browser/src/safari/safari/Info.plist
index b79ed132ea9..7e8ed09947d 100644
--- a/apps/browser/src/safari/safari/Info.plist
+++ b/apps/browser/src/safari/safari/Info.plist
@@ -32,7 +32,7 @@
 		<key>NSHumanReadableCopyright</key>
 		<string>Copyright © 2015-2024 Bitwarden Inc. All rights reserved.</string>
 		<key>NSHumanReadableDescription</key>
-		<string>A secure and free password manager for all of your devices.</string>
+		<string>Securely create, save, and autofill logins and sensitive information.</string>
 		<key>SFSafariAppExtensionBundleIdentifiersToReplace</key>
 		<array>
 			<string>com.bitwarden.desktop.safari</string>
diff --git a/apps/cli/package.json b/apps/cli/package.json
index 8ab2afc4129..9fadce6b920 100644
--- a/apps/cli/package.json
+++ b/apps/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bitwarden/cli",
-  "description": "A secure and free password manager for all of your devices.",
+  "description": "Securely create, save, and autofill logins and sensitive information.",
   "version": "2024.9.1",
   "keywords": [
     "bitwarden",
diff --git a/apps/cli/stores/chocolatey/bitwarden-cli.nuspec b/apps/cli/stores/chocolatey/bitwarden-cli.nuspec
index e5ce03fa49d..62ddf048709 100644
--- a/apps/cli/stores/chocolatey/bitwarden-cli.nuspec
+++ b/apps/cli/stores/chocolatey/bitwarden-cli.nuspec
@@ -18,7 +18,7 @@
     <licenseUrl>https://github.com/bitwarden/clients/blob/master/LICENSE.txt</licenseUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <tags>bitwarden password manager cli</tags>
-    <summary>A secure and free password manager for all of your devices.</summary>
+    <summary>Securely create, save, and autofill logins and sensitive information.</summary>
     <description>
       For CLI documentation, please visit https://help.bitwarden.com/article/cli/
 
diff --git a/apps/cli/stores/snap/snapcraft.yaml b/apps/cli/stores/snap/snapcraft.yaml
index adb35a66b1a..7bcfa2022eb 100644
--- a/apps/cli/stores/snap/snapcraft.yaml
+++ b/apps/cli/stores/snap/snapcraft.yaml
@@ -1,6 +1,6 @@
 name: bw
 version: __version__
-summary: Bitwarden CLI - A secure and free password manager for all of your devices.
+summary: Bitwarden CLI - Securely create, save, and autofill logins and sensitive information.
 license: Proprietary
 description: |
   Bitwarden, Inc. is the parent company of 8bit Solutions LLC.
diff --git a/apps/desktop/electron-builder.json b/apps/desktop/electron-builder.json
index 09783f26f49..4c44ddcc78d 100644
--- a/apps/desktop/electron-builder.json
+++ b/apps/desktop/electron-builder.json
@@ -229,7 +229,7 @@
     "artifactName": "${productName}-${version}-${arch}.${ext}"
   },
   "snap": {
-    "summary": "Bitwarden is a secure and free password manager for all of your devices.",
+    "summary": "Securely create, save, and autofill logins and sensitive information.",
     "description": "**Installation**\nBitwarden requires access to the `password-manager-service`. Please enable it through permissions or by running `sudo snap connect bitwarden:password-manager-service` after installation. See https://btwrdn.com/install-snap for details.",
     "autoStart": true,
     "base": "core22",
diff --git a/apps/desktop/package.json b/apps/desktop/package.json
index c50e7ccbac4..272823ab6be 100644
--- a/apps/desktop/package.json
+++ b/apps/desktop/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bitwarden/desktop",
-  "description": "A secure and free password manager for all of your devices.",
+  "description": "Securely create, save, and autofill logins and sensitive information.",
   "version": "2024.9.2",
   "keywords": [
     "bitwarden",
diff --git a/apps/desktop/src/package.json b/apps/desktop/src/package.json
index 29b3f8ed7d1..c2359a6692c 100644
--- a/apps/desktop/src/package.json
+++ b/apps/desktop/src/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@bitwarden/desktop",
   "productName": "Bitwarden",
-  "description": "A secure and free password manager for all of your devices.",
+  "description": "Securely create, save, and autofill logins and sensitive information.",
   "version": "2024.9.2",
   "author": "Bitwarden Inc. <hello@bitwarden.com> (https://bitwarden.com)",
   "homepage": "https://bitwarden.com",
diff --git a/apps/desktop/stores/chocolatey/bitwarden.nuspec b/apps/desktop/stores/chocolatey/bitwarden.nuspec
index dc95703614d..71fafc2ea29 100644
--- a/apps/desktop/stores/chocolatey/bitwarden.nuspec
+++ b/apps/desktop/stores/chocolatey/bitwarden.nuspec
@@ -18,7 +18,7 @@
     <licenseUrl>https://github.com/bitwarden/clients/blob/master/LICENSE.txt</licenseUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <tags>bitwarden password manager</tags>
-    <summary>A secure and free password manager for all of your devices.</summary>
+    <summary>Securely create, save, and autofill logins and sensitive information.</summary>
     <description>
       Bitwarden, Inc. is the parent company of 8bit Solutions LLC.