From 555e478ec30b102979994e4d1746f82b0777bafd Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Tue, 27 Feb 2018 14:16:19 -0500
Subject: [PATCH] Uppercase Bitwarden
---
README.md | 8 +++----
SECURITY.md | 16 +++++++-------
build.ps1 | 2 +-
build.sh | 6 ++---
src/Api/appsettings.json | 2 +-
src/Billing/appsettings.json | 2 +-
.../Markdown/OrganizationUserAccepted.md | 2 +-
.../Markdown/OrganizationUserConfirmed.md | 2 +-
.../MailTemplates/Markdown/TwoFactorEmail.md | 2 +-
.../MailTemplates/Markdown/VerifyDelete.md | 2 +-
.../MailTemplates/Markdown/VerifyEmail.md | 2 +-
src/Core/MailTemplates/Markdown/Welcome.md | 6 ++---
.../Razor/OrganizationUserAccepted.cshtml | 2 +-
.../OrganizationUserAccepted.text.cshtml | 2 +-
.../Razor/OrganizationUserConfirmed.cshtml | 2 +-
.../OrganizationUserConfirmed.text.cshtml | 2 +-
.../MailTemplates/Razor/TwoFactorEmail.cshtml | 2 +-
.../Razor/TwoFactorEmail.text.cshtml | 2 +-
.../MailTemplates/Razor/VerifyDelete.cshtml | 4 ++--
.../Razor/VerifyDelete.text.cshtml | 2 +-
.../MailTemplates/Razor/VerifyEmail.cshtml | 4 ++--
.../Razor/VerifyEmail.text.cshtml | 2 +-
src/Core/MailTemplates/Razor/Welcome.cshtml | 22 +++++++++----------
.../MailTemplates/Razor/Welcome.text.cshtml | 6 ++---
.../MailTemplates/Razor/_MailLayout.cshtml | 4 ++--
.../Razor/_MailLayout.text.cshtml | 2 +-
src/Identity/appsettings.json | 2 +-
src/Jobs/appsettings.json | 2 +-
src/Scim/appsettings.json | 2 +-
util/Function/Download.cs | 2 +-
util/Function/NewHelpdeskTicket.cs | 4 ++--
util/Mail/wwwroot/index.html | 2 +-
util/Mail/wwwroot/templates/announcement.html | 4 ++--
util/Mail/wwwroot/templates/welcome.html | 20 ++++++++---------
util/Setup/CertBuilder.cs | 4 ++--
util/Setup/Program.cs | 4 ++--
36 files changed, 78 insertions(+), 78 deletions(-)
diff --git a/README.md b/README.md
index 2f7175568c..437c3e9010 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
<p align="center">
- <img src="https://i.imgur.com/lcoBQEZ.png" alt="bitwarden" />
+ <img src="https://i.imgur.com/lcoBQEZ.png" alt="Bitwarden" />
</p>
<p align="center">
<a href="https://ci.appveyor.com/project/bitwarden/core/branch/master" target="_blank">
@@ -15,7 +15,7 @@
-------------------
-The bitwarden Core project contains the APIs, database, and other infrastructure items needed for the "backend" of all bitwarden client applications.
+The Bitwarden Core project contains the APIs, database, and other infrastructure items needed for the "backend" of all bitwarden client applications.
The core infrastructure is written in C# using .NET Core with ASP.NET Core. The database is written in T-SQL/SQL Server. The codebase can be developed, built, run, and deployed cross-platform on Windows, macOS, and Linux distributions.
@@ -65,9 +65,9 @@ visit http://localhost:33657/.well-known/openid-configuration
</a>
</p>
-You can deploy bitwarden using Docker containers on Windows, macOS, and Linux distributions. Use the provided PowerShell and Bash scripts to get started quickly. Find all of the bitwarden images on [Docker Hub](https://hub.docker.com/u/bitwarden/).
+You can deploy Bitwarden using Docker containers on Windows, macOS, and Linux distributions. Use the provided PowerShell and Bash scripts to get started quickly. Find all of the bitwarden images on [Docker Hub](https://hub.docker.com/u/bitwarden/).
-Full documentation for deploying bitwarden with Docker can be found in our help center at: https://help.bitwarden.com/article/install-on-premise/
+Full documentation for deploying Bitwarden with Docker can be found in our help center at: https://help.bitwarden.com/article/install-on-premise/
### Requirements
diff --git a/SECURITY.md b/SECURITY.md
index 3564ea7b08..ef94f0b494 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -1,4 +1,4 @@
-bitwarden believes that working with security researchers across the globe is crucial to keeping our
+Bitwarden believes that working with security researchers across the globe is crucial to keeping our
users safe. If you believe you've found a security issue in our product or service, we encourage you to
notify us. We welcome working with you to resolve the issue promptly. Thanks in advance!
@@ -16,7 +16,7 @@ notify us. We welcome working with you to resolve the issue promptly. Thanks in
# In-scope
-- Security issues in any current release of bitwarden. This includes the web vault, browser extension,
+- Security issues in any current release of Bitwarden. This includes the web vault, browser extension,
and mobile apps (iOS and Android). Product downloads are available at https://bitwarden.com. Source
code is available at https://github.com/bitwarden.
@@ -24,14 +24,14 @@ notify us. We welcome working with you to resolve the issue promptly. Thanks in
The following bug classes are out-of scope:
-- Bugs that are already reported on any of bitwarden's issue trackers (https://github.com/bitwarden),
+- Bugs that are already reported on any of Bitwarden's issue trackers (https://github.com/bitwarden),
or that we already know of. Note that some of our issue tracking is private.
- Issues in an upstream software dependency (ex: Xamarin, ASP.NET) which are already reported to the
upstream maintainer.
- Attacks requiring physical access to a user's device.
- Self-XSS
-- Issues related to software or protocols not under bitwarden's control
-- Vulnerabilities in outdated versions of bitwarden
+- Issues related to software or protocols not under Bitwarden's control
+- Vulnerabilities in outdated versions of Bitwarden
- Missing security best practices that do not directly lead to a vulnerability
- Issues that do not have any impact on the general public
@@ -39,7 +39,7 @@ While researching, we'd like to ask you to refrain from:
- Denial of service
- Spamming
-- Social engineering (including phishing) of bitwarden staff or contractors
-- Any physical attempts against bitwarden property or data centers
+- Social engineering (including phishing) of Bitwarden staff or contractors
+- Any physical attempts against Bitwarden property or data centers
-Thank you for helping keep bitwarden and our users safe!
+Thank you for helping keep Bitwarden and our users safe!
diff --git a/build.ps1 b/build.ps1
index 11f6467424..0d3d3f37ab 100644
--- a/build.ps1
+++ b/build.ps1
@@ -1,7 +1,7 @@
$dir = Split-Path -Parent $MyInvocation.MyCommand.Path
echo $dir
-echo "`nBuilding bitwarden"
+echo "`nBuilding Bitwarden"
echo "=================="
& $dir\src\Api\build.ps1
diff --git a/build.sh b/build.sh
index f74e480877..d155916238 100644
--- a/build.sh
+++ b/build.sh
@@ -9,7 +9,7 @@ if [ $# -gt 1 -a "$1" == "push" ]
then
TAG=$2
- echo "Pushing bitwarden ($TAG)"
+ echo "Pushing Bitwarden ($TAG)"
echo "========================"
docker push bitwarden/api:$TAG
@@ -24,7 +24,7 @@ elif [ $# -gt 1 -a "$1" == "tag" ]
then
TAG=$2
- echo "Tagging bitwarden as '$TAG'"
+ echo "Tagging Bitwarden as '$TAG'"
docker tag bitwarden/api bitwarden/api:$TAG
docker tag bitwarden/identity bitwarden/identity:$TAG
@@ -35,7 +35,7 @@ then
docker tag bitwarden/mssql bitwarden/mssql:$TAG
docker tag bitwarden/setup bitwarden/setup:$TAG
else
- echo "Building bitwarden"
+ echo "Building Bitwarden"
echo "=================="
chmod u+x $DIR/src/Api/build.sh
diff --git a/src/Api/appsettings.json b/src/Api/appsettings.json
index f00014a9da..02fc9b24e2 100644
--- a/src/Api/appsettings.json
+++ b/src/Api/appsettings.json
@@ -1,7 +1,7 @@
{
"globalSettings": {
"selfHosted": false,
- "siteName": "bitwarden",
+ "siteName": "Bitwarden",
"projectName": "Api",
"stripeApiKey": "SECRET",
"baseServiceUri": {
diff --git a/src/Billing/appsettings.json b/src/Billing/appsettings.json
index b4e8f92f81..06c1ff718e 100644
--- a/src/Billing/appsettings.json
+++ b/src/Billing/appsettings.json
@@ -1,7 +1,7 @@
{
"globalSettings": {
"selfHosted": false,
- "siteName": "bitwarden",
+ "siteName": "Bitwarden",
"projectName": "Billing",
"stripeApiKey": "SECRET",
"baseServiceUri": {
diff --git a/src/Core/MailTemplates/Markdown/OrganizationUserAccepted.md b/src/Core/MailTemplates/Markdown/OrganizationUserAccepted.md
index 8c6dd1bde0..5810d57f13 100644
--- a/src/Core/MailTemplates/Markdown/OrganizationUserAccepted.md
+++ b/src/Core/MailTemplates/Markdown/OrganizationUserAccepted.md
@@ -1,5 +1,5 @@
This email is to notify you that {{userEmail}} has accepted your invitation to join {{organizationName}}.
-To confirm this user, log into the bitwarden web vault, manage your organization "People" and confirm the user.
+To confirm this user, log into the Bitwarden web vault, manage your organization "People" and confirm the user.
If you do not wish to confirm this user, you can also remove them from the organization on the same page.
diff --git a/src/Core/MailTemplates/Markdown/OrganizationUserConfirmed.md b/src/Core/MailTemplates/Markdown/OrganizationUserConfirmed.md
index 4ef73877ab..e8c17c399a 100644
--- a/src/Core/MailTemplates/Markdown/OrganizationUserConfirmed.md
+++ b/src/Core/MailTemplates/Markdown/OrganizationUserConfirmed.md
@@ -1,3 +1,3 @@
This email is to notify you that you have been confirmed as a user of {{organizationName}}.
-Any collections and logins being shared with you by this organization will now appear in your bitwarden vault.
+Any collections and logins being shared with you by this organization will now appear in your Bitwarden vault.
diff --git a/src/Core/MailTemplates/Markdown/TwoFactorEmail.md b/src/Core/MailTemplates/Markdown/TwoFactorEmail.md
index 5bd8d81e85..40ef52acbc 100644
--- a/src/Core/MailTemplates/Markdown/TwoFactorEmail.md
+++ b/src/Core/MailTemplates/Markdown/TwoFactorEmail.md
@@ -1,3 +1,3 @@
Your two-step verification code is: {{token}}
-Use this code to complete logging in with bitwarden.
+Use this code to complete logging in with Bitwarden.
diff --git a/src/Core/MailTemplates/Markdown/VerifyDelete.md b/src/Core/MailTemplates/Markdown/VerifyDelete.md
index b77c8a3145..2ad67e2f61 100644
--- a/src/Core/MailTemplates/Markdown/VerifyDelete.md
+++ b/src/Core/MailTemplates/Markdown/VerifyDelete.md
@@ -1,3 +1,3 @@
-Click the link below to delete your bitwarden account ({{email}}). If you did not request this email to delete your bitwarden account, you can safely ignore it.
+Click the link below to delete your Bitwarden account ({{email}}). If you did not request this email to delete your Bitwarden account, you can safely ignore it.
<{{url}}>
diff --git a/src/Core/MailTemplates/Markdown/VerifyEmail.md b/src/Core/MailTemplates/Markdown/VerifyEmail.md
index fa806b4c78..c05e189019 100644
--- a/src/Core/MailTemplates/Markdown/VerifyEmail.md
+++ b/src/Core/MailTemplates/Markdown/VerifyEmail.md
@@ -1,3 +1,3 @@
-Verify this email address for your bitwarden account by clicking the following link. If you did not request this email to verify a bitwarden account, you can safely ignore it.
+Verify this email address for your Bitwarden account by clicking the following link. If you did not request this email to verify a Bitwarden account, you can safely ignore it.
<{{url}}>
diff --git a/src/Core/MailTemplates/Markdown/Welcome.md b/src/Core/MailTemplates/Markdown/Welcome.md
index 08901e76a8..24377d9cb3 100644
--- a/src/Core/MailTemplates/Markdown/Welcome.md
+++ b/src/Core/MailTemplates/Markdown/Welcome.md
@@ -1,6 +1,6 @@
-Thank you for creating an account with bitwarden. You may now log in with your new account.
+Thank you for creating an account with Bitwarden. You may now log in with your new account.
-Did you know that bitwarden is free to sync with all of your devices? Download bitwarden today on:
+Did you know that Bitwarden is free to sync with all of your devices? Download Bitwarden today on:
Mobile
============
@@ -37,4 +37,4 @@ If you have any questions or problems you can email us from our website at:
<https://bitwarden.com/contact/?utm_source=welcome_email&utm_medium=email>
Thank you!
-The bitwarden Team
+The Bitwarden Team
diff --git a/src/Core/MailTemplates/Razor/OrganizationUserAccepted.cshtml b/src/Core/MailTemplates/Razor/OrganizationUserAccepted.cshtml
index 8a6558c8ae..fe0ec97c55 100644
--- a/src/Core/MailTemplates/Razor/OrganizationUserAccepted.cshtml
+++ b/src/Core/MailTemplates/Razor/OrganizationUserAccepted.cshtml
@@ -3,5 +3,5 @@
Layout = "_BasicMailLayout";
}
<p>This email is to notify you that @Model.UserEmail has accepted your invitation to join @Model.OrganizationName.</p>
-<p>To confirm this user, log into the bitwarden web vault, manage your organization "People, and confirm the user.</p>
+<p>To confirm this user, log into the Bitwarden web vault, manage your organization "People, and confirm the user.</p>
<p>If you do not wish to confirm this user, you can also remove them from the organization on the same page.</p>
diff --git a/src/Core/MailTemplates/Razor/OrganizationUserAccepted.text.cshtml b/src/Core/MailTemplates/Razor/OrganizationUserAccepted.text.cshtml
index 96bffd9102..a8953309bb 100644
--- a/src/Core/MailTemplates/Razor/OrganizationUserAccepted.text.cshtml
+++ b/src/Core/MailTemplates/Razor/OrganizationUserAccepted.text.cshtml
@@ -4,6 +4,6 @@
}
This email is to notify you that @Raw(Model.UserEmail) has accepted your invitation to join @Raw(Model.OrganizationName).
-To confirm this user, log into the bitwarden web vault, manage your organization "People" and confirm the user.
+To confirm this user, log into the Bitwarden web vault, manage your organization "People" and confirm the user.
If you do not wish to confirm this user, you can also remove them from the organization on the same page.
diff --git a/src/Core/MailTemplates/Razor/OrganizationUserConfirmed.cshtml b/src/Core/MailTemplates/Razor/OrganizationUserConfirmed.cshtml
index b44ae3d610..c07c910c01 100644
--- a/src/Core/MailTemplates/Razor/OrganizationUserConfirmed.cshtml
+++ b/src/Core/MailTemplates/Razor/OrganizationUserConfirmed.cshtml
@@ -3,4 +3,4 @@
Layout = "_BasicMailLayout";
}
<p>This email is to notify you that you have been confirmed as a user of @(Model.OrganizationName).</p>
-<p>Any collections and logins being shared with you by this organization will now appear in your bitwarden vault.</p>
+<p>Any collections and logins being shared with you by this organization will now appear in your Bitwarden vault.</p>
diff --git a/src/Core/MailTemplates/Razor/OrganizationUserConfirmed.text.cshtml b/src/Core/MailTemplates/Razor/OrganizationUserConfirmed.text.cshtml
index 8a1f093bd3..8d40563db3 100644
--- a/src/Core/MailTemplates/Razor/OrganizationUserConfirmed.text.cshtml
+++ b/src/Core/MailTemplates/Razor/OrganizationUserConfirmed.text.cshtml
@@ -4,4 +4,4 @@
}
This email is to notify you that you have been confirmed as a user of @Raw(Model.OrganizationName).
-Any collections and logins being shared with you by this organization will now appear in your bitwarden vault.
+Any collections and logins being shared with you by this organization will now appear in your Bitwarden vault.
diff --git a/src/Core/MailTemplates/Razor/TwoFactorEmail.cshtml b/src/Core/MailTemplates/Razor/TwoFactorEmail.cshtml
index bbd1d5454a..63ad08e1d6 100644
--- a/src/Core/MailTemplates/Razor/TwoFactorEmail.cshtml
+++ b/src/Core/MailTemplates/Razor/TwoFactorEmail.cshtml
@@ -6,5 +6,5 @@
Your two-step verification code is: @Model.Token
</p>
<p>
- Use this code to complete logging in with bitwarden.
+ Use this code to complete logging in with Bitwarden.
</p>
\ No newline at end of file
diff --git a/src/Core/MailTemplates/Razor/TwoFactorEmail.text.cshtml b/src/Core/MailTemplates/Razor/TwoFactorEmail.text.cshtml
index aee3525c31..87d6348225 100644
--- a/src/Core/MailTemplates/Razor/TwoFactorEmail.text.cshtml
+++ b/src/Core/MailTemplates/Razor/TwoFactorEmail.text.cshtml
@@ -4,4 +4,4 @@
}
Your two-step verification code is: @Raw(Model.Token)
-Use this code to complete logging in with bitwarden.
+Use this code to complete logging in with Bitwarden.
diff --git a/src/Core/MailTemplates/Razor/VerifyDelete.cshtml b/src/Core/MailTemplates/Razor/VerifyDelete.cshtml
index 9b3b1a7b64..df3ef320c0 100644
--- a/src/Core/MailTemplates/Razor/VerifyDelete.cshtml
+++ b/src/Core/MailTemplates/Razor/VerifyDelete.cshtml
@@ -3,7 +3,7 @@
Layout = "_BasicMailLayout";
}
<p>
- Click the link below to delete your bitwarden account (@Model.Email).
- If you did not request this email to delete your bitwarden account, you can safely ignore it.
+ Click the link below to delete your Bitwarden account (@Model.Email).
+ If you did not request this email to delete your Bitwarden account, you can safely ignore it.
</p>
<p><a href="@Raw(Model.Url)" target="_blank" clicktracking=off>@Model.Url</a></p>
diff --git a/src/Core/MailTemplates/Razor/VerifyDelete.text.cshtml b/src/Core/MailTemplates/Razor/VerifyDelete.text.cshtml
index ae8aa1f09c..0661516a19 100644
--- a/src/Core/MailTemplates/Razor/VerifyDelete.text.cshtml
+++ b/src/Core/MailTemplates/Razor/VerifyDelete.text.cshtml
@@ -2,6 +2,6 @@
@{
Layout = "_BasicMailLayout.text";
}
-Click the link below to delete your bitwarden account (@Raw(Model.Email)). If you did not request this email to delete your bitwarden account, you can safely ignore it.
+Click the link below to delete your Bitwarden account (@Raw(Model.Email)). If you did not request this email to delete your Bitwarden account, you can safely ignore it.
@Raw(Model.Url)
diff --git a/src/Core/MailTemplates/Razor/VerifyEmail.cshtml b/src/Core/MailTemplates/Razor/VerifyEmail.cshtml
index 691ea8c012..6d317ff4d3 100644
--- a/src/Core/MailTemplates/Razor/VerifyEmail.cshtml
+++ b/src/Core/MailTemplates/Razor/VerifyEmail.cshtml
@@ -3,7 +3,7 @@
Layout = "_BasicMailLayout";
}
<p>
- Verify this email address for your bitwarden account by clicking the following link. If you did not request this email to
- verify a bitwarden account, you can safely ignore it.
+ Verify this email address for your Bitwarden account by clicking the following link. If you did not request this email to
+ verify a Bitwarden account, you can safely ignore it.
</p>
<p><a href="@Raw(Model.Url)" target="_blank" clicktracking=off>@Model.Url</a></p>
diff --git a/src/Core/MailTemplates/Razor/VerifyEmail.text.cshtml b/src/Core/MailTemplates/Razor/VerifyEmail.text.cshtml
index 85e7b1c359..1d5784e74b 100644
--- a/src/Core/MailTemplates/Razor/VerifyEmail.text.cshtml
+++ b/src/Core/MailTemplates/Razor/VerifyEmail.text.cshtml
@@ -2,6 +2,6 @@
@{
Layout = "_BasicMailLayout.text";
}
-Verify this email address for your bitwarden account by clicking the following link. If you did not request this email to verify a bitwarden account, you can safely ignore it.
+Verify this email address for your Bitwarden account by clicking the following link. If you did not request this email to verify a Bitwarden account, you can safely ignore it.
@Raw(Model.Url)
diff --git a/src/Core/MailTemplates/Razor/Welcome.cshtml b/src/Core/MailTemplates/Razor/Welcome.cshtml
index 799cb122ed..ce187a1094 100644
--- a/src/Core/MailTemplates/Razor/Welcome.cshtml
+++ b/src/Core/MailTemplates/Razor/Welcome.cshtml
@@ -8,12 +8,12 @@
<table width="100%" cellpadding="0" cellspacing="0" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0;">
<tr style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0;">
<td class="content-block" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0; padding: 0 0 10px;" valign="top">
- Thank you for creating an account with bitwarden. You may now log in with your new account.
+ Thank you for creating an account with Bitwarden. You may now log in with your new account.
</td>
</tr>
<tr style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0;">
<td class="content-block" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0; padding: 0 0 10px;" valign="top">
- Did you know that bitwarden is free to sync with all of your devices? Download bitwarden today on:
+ Did you know that Bitwarden is free to sync with all of your devices? Download Bitwarden today on:
</td>
</tr>
<tr style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0;">
@@ -26,13 +26,13 @@
<table width="100%" cellpadding="0" cellspacing="0" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0;">
<tr style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0;">
<td valign="middle" class="aligncenter middle" width="50%" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0;" align="center">
- <a href="https://play.google.com/store/apps/details?id=com.x8bit.bitwarden" title="Get bitwarden on Google Play" target="_blank" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #3c8dbc; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0; text-decoration: underline;">
- <img src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png" height="63" width="163" alt="Get bitwarden on Google Play" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; border: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0; max-width: 100%;" />
+ <a href="https://play.google.com/store/apps/details?id=com.x8bit.bitwarden" title="Get Bitwarden on Google Play" target="_blank" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #3c8dbc; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0; text-decoration: underline;">
+ <img src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png" height="63" width="163" alt="Get Bitwarden on Google Play" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; border: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0; max-width: 100%;" />
</a>
</td>
<td valign="middle" class="aligncenter middle" width="50%" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0;" align="center">
- <a href="https://itunes.apple.com/us/app/bitwarden-free-password-manager/id1137397744?mt=8" target="_blank" title="Get bitwarden for iOS" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #3c8dbc; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0; text-decoration: underline;">
- <img src="https://bitwarden.com/images/app-store-badge.png" width="135" height="40" alt="Get bitwarden for iOS" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; border: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0; max-width: 100%;" />
+ <a href="https://itunes.apple.com/us/app/bitwarden-free-password-manager/id1137397744?mt=8" target="_blank" title="Get Bitwarden for iOS" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #3c8dbc; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0; text-decoration: underline;">
+ <img src="https://bitwarden.com/images/app-store-badge.png" width="135" height="40" alt="Get Bitwarden for iOS" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; border: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0; max-width: 100%;" />
</a>
</td>
</tr>
@@ -61,22 +61,22 @@
<table width="100%" cellpadding="0" cellspacing="0" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0;">
<tr style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0;">
<td valign="middle" class="aligncenter middle" width="25%" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0;" align="center">
- <a href="https://chrome.google.com/webstore/detail/bitwarden-free-password-m/nngceckbapebfimnlniiiahkandclblb?utm_source=welcome_email&utm_medium=email" title="Get bitwarden for Chrome" target="_blank" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #3c8dbc; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0; text-decoration: underline;">
+ <a href="https://chrome.google.com/webstore/detail/bitwarden-free-password-m/nngceckbapebfimnlniiiahkandclblb?utm_source=welcome_email&utm_medium=email" title="Get Bitwarden for Chrome" target="_blank" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #3c8dbc; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0; text-decoration: underline;">
<img width="53" height="54" alt="Chrome Extension" src="https://bitwarden.com/images/chrome.png" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; border: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0; max-width: 100%;" />
</a>
</td>
<td valign="middle" class="aligncenter middle" width="25%" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0;" align="center">
- <a href="https://addons.mozilla.org/firefox/addon/bitwarden-password-manager/" title="Get bitwarden for Firefox" target="_blank" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #3c8dbc; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0; text-decoration: underline;">
+ <a href="https://addons.mozilla.org/firefox/addon/bitwarden-password-manager/" title="Get Bitwarden for Firefox" target="_blank" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #3c8dbc; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0; text-decoration: underline;">
<img width="57" height="54" alt="Firefox Extension" src="https://bitwarden.com/images/firefox.png" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; border: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0; max-width: 100%;" />
</a>
</td>
<td valign="middle" class="aligncenter middle" width="25%" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0;" align="center">
- <a href="https://addons.opera.com/extensions/details/bitwarden-free-password-manager/?utm_source=welcome_email&utm_medium=email" title="Get bitwarden for Opera" target="_blank" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #3c8dbc; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0; text-decoration: underline;">
+ <a href="https://addons.opera.com/extensions/details/bitwarden-free-password-manager/?utm_source=welcome_email&utm_medium=email" title="Get Bitwarden for Opera" target="_blank" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #3c8dbc; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0; text-decoration: underline;">
<img width="53" height="54" alt="Opera Extension" src="https://bitwarden.com/images/opera.png" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; border: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0; max-width: 100%;" />
</a>
</td>
<td valign="middle" class="aligncenter middle" width="25%" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0;" align="center">
- <a href="https://www.microsoft.com/store/p/bitwarden-free-password-manager/9p6kxl0svnnl" title="Get bitwarden for Edge" target="_blank" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #3c8dbc; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0; text-decoration: underline;">
+ <a href="https://www.microsoft.com/store/p/bitwarden-free-password-manager/9p6kxl0svnnl" title="Get Bitwarden for Edge" target="_blank" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #3c8dbc; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0; text-decoration: underline;">
<img width="52" height="54" alt="Edge Extension" src="https://bitwarden.com/images/edge.png" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; border: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0; max-width: 100%;" />
</a>
</td>
@@ -107,7 +107,7 @@
<tr style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0;">
<td class="content-block last" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0; padding: 0;" valign="top">
Thank you!<br style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0;" />
- The bitwarden Team
+ The Bitwarden Team
</td>
</tr>
</table>
diff --git a/src/Core/MailTemplates/Razor/Welcome.text.cshtml b/src/Core/MailTemplates/Razor/Welcome.text.cshtml
index a608753195..f7a02243aa 100644
--- a/src/Core/MailTemplates/Razor/Welcome.text.cshtml
+++ b/src/Core/MailTemplates/Razor/Welcome.text.cshtml
@@ -2,9 +2,9 @@
@{
Layout = "_MailLayout.text";
}
-Thank you for creating an account with bitwarden. You may now log in with your new account.
+Thank you for creating an account with Bitwarden. You may now log in with your new account.
-Did you know that bitwarden is free to sync with all of your devices? Download bitwarden today on:
+Did you know that Bitwarden is free to sync with all of your devices? Download Bitwarden today on:
Mobile
============
@@ -39,4 +39,4 @@ You can also access your vault from any web-enabled device using our web vault a
If you have any questions or problems you can email us from our website at: https://bitwarden.com/contact/?utm_source=welcome_email&utm_medium=email
Thank you!
-The bitwarden Team
+The Bitwarden Team
diff --git a/src/Core/MailTemplates/Razor/_MailLayout.cshtml b/src/Core/MailTemplates/Razor/_MailLayout.cshtml
index b069ab5265..e01aa79bc7 100644
--- a/src/Core/MailTemplates/Razor/_MailLayout.cshtml
+++ b/src/Core/MailTemplates/Razor/_MailLayout.cshtml
@@ -3,7 +3,7 @@
<head>
<meta name="viewport" content="width=device-width" />
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
- <title>bitwarden</title>
+ <title>Bitwarden</title>
</head>
<body style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; height: 100%; line-height: 25px; width: 100% !important;" bgcolor="#f6f6f6">
@@ -119,7 +119,7 @@
<tr style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0;">
<td style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #999; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 12px; line-height: 20px; margin: 0; padding: 0 10px;" valign="top"><a href="https://twitter.com/bitwarden_app" target="_blank" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #999; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 12px; line-height: 20px; margin: 0; text-decoration: underline;"><img src="https://bitwarden.com/images/mail-twitter.png" alt="Twitter" width="30" height="30" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; border: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0; max-width: 100%;" /></a></td>
<td style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #999; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 12px; line-height: 20px; margin: 0; padding: 0 10px;" valign="top"><a href="https://www.facebook.com/bitwarden/" target="_blank" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #999; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 12px; line-height: 20px; margin: 0; text-decoration: underline;"><img src="https://bitwarden.com/images/mail-facebook.png" alt="Facebook" width="30" height="30" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; border: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0; max-width: 100%;" /></a></td>
- <td style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #999; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 12px; line-height: 20px; margin: 0; padding: 0 10px;" valign="top"><a href="https://plus.google.com/114869903467947368993" target="_blank" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #999; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 12px; line-height: 20px; margin: 0; text-decoration: underline;"><img src="https://bitwarden.com/images/mail-gplus.png" alt="Google+" width="30" height="30" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; border: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0; max-width: 100%;" /></a></td>
+ <td style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #999; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 12px; line-height: 20px; margin: 0; padding: 0 10px;" valign="top"><a href="https://plus.google.com/+bitwarden" target="_blank" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #999; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 12px; line-height: 20px; margin: 0; text-decoration: underline;"><img src="https://bitwarden.com/images/mail-gplus.png" alt="Google+" width="30" height="30" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; border: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0; max-width: 100%;" /></a></td>
<td style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #999; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 12px; line-height: 20px; margin: 0; padding: 0 10px;" valign="top"><a href="https://github.com/bitwarden" target="_blank" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #999; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 12px; line-height: 20px; margin: 0; text-decoration: underline;"><img src="https://bitwarden.com/images/mail-github.png" alt="GitHub" width="30" height="30" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; border: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0; max-width: 100%;" /></a></td>
</tr>
</table>
diff --git a/src/Core/MailTemplates/Razor/_MailLayout.text.cshtml b/src/Core/MailTemplates/Razor/_MailLayout.text.cshtml
index a976f01653..fd4be1dbfa 100644
--- a/src/Core/MailTemplates/Razor/_MailLayout.text.cshtml
+++ b/src/Core/MailTemplates/Razor/_MailLayout.text.cshtml
@@ -5,5 +5,5 @@
- Twitter: https://twitter.com/bitwarden_app
- Facebook: https://www.facebook.com/bitwarden/
-- Google+: https://plus.google.com/114869903467947368993
+- Google+: https://plus.google.com/+bitwarden
- GitHub: https://github.com/bitwarden
\ No newline at end of file
diff --git a/src/Identity/appsettings.json b/src/Identity/appsettings.json
index 5b468984b9..363daaeb6b 100644
--- a/src/Identity/appsettings.json
+++ b/src/Identity/appsettings.json
@@ -1,7 +1,7 @@
{
"globalSettings": {
"selfHosted": false,
- "siteName": "bitwarden",
+ "siteName": "Bitwarden",
"projectName": "Identity",
"stripeApiKey": "SECRET",
"baseServiceUri": {
diff --git a/src/Jobs/appsettings.json b/src/Jobs/appsettings.json
index a24d412e67..936e68dedd 100644
--- a/src/Jobs/appsettings.json
+++ b/src/Jobs/appsettings.json
@@ -1,7 +1,7 @@
{
"globalSettings": {
"selfHosted": false,
- "siteName": "bitwarden",
+ "siteName": "Bitwarden",
"projectName": "Jobs",
"stripeApiKey": "SECRET",
"baseServiceUri": {
diff --git a/src/Scim/appsettings.json b/src/Scim/appsettings.json
index b4e8f92f81..06c1ff718e 100644
--- a/src/Scim/appsettings.json
+++ b/src/Scim/appsettings.json
@@ -1,7 +1,7 @@
{
"globalSettings": {
"selfHosted": false,
- "siteName": "bitwarden",
+ "siteName": "Bitwarden",
"projectName": "Billing",
"stripeApiKey": "SECRET",
"baseServiceUri": {
diff --git a/util/Function/Download.cs b/util/Function/Download.cs
index d84b8c22d6..93da45c003 100644
--- a/util/Function/Download.cs
+++ b/util/Function/Download.cs
@@ -20,7 +20,7 @@ namespace Bit.Function
const string DesktopWindowsAppxFileName = "Bitwarden-{0}.appx";
const string DesktopWindowsAppx32FileName = "Bitwarden-{0}-ia32.appx";
const string DesktopWindowsStoreUrl = "https://www.microsoft.com/en-us/store/b/home";
- const string DesktopWindowsChocoUrl = "https://chocolatey.org/search?q=bitwarden";
+ const string DesktopWindowsChocoUrl = "https://chocolatey.org/packages/bitwarden";
const string DesktopMacOsDmgFileName = "Bitwarden-{0}.dmg";
const string DesktopMacOsPkgFileName = "Bitwarden-{0}.pkg";
diff --git a/util/Function/NewHelpdeskTicket.cs b/util/Function/NewHelpdeskTicket.cs
index 8934f24086..02a8b0d092 100644
--- a/util/Function/NewHelpdeskTicket.cs
+++ b/util/Function/NewHelpdeskTicket.cs
@@ -83,7 +83,7 @@ namespace Bit.Function
status = 2,
priority = 2,
source = 1,
- subject = "bitwarden.com Website Contact",
+ subject = "Bitwarden.com Website Contact",
description = FormatMessage(message)
});
@@ -103,7 +103,7 @@ namespace Bit.Function
var fromAddress = new MailAddress(email, name, Encoding.UTF8);
var mailMessage = new MailMessage(fromAddress, new MailAddress("bitwardencomsupport@bitwarden.freshdesk.com"))
{
- Subject = "bitwarden.com Website Contact",
+ Subject = "Bitwarden.com Website Contact",
Body = FormatMessage(message),
IsBodyHtml = true
};
diff --git a/util/Mail/wwwroot/index.html b/util/Mail/wwwroot/index.html
index 9402874c21..dd23797b32 100644
--- a/util/Mail/wwwroot/index.html
+++ b/util/Mail/wwwroot/index.html
@@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8" />
- <title>bitwarden Mail Templates</title>
+ <title>Bitwarden Mail Templates</title>
</head>
<body>
<ol>
diff --git a/util/Mail/wwwroot/templates/announcement.html b/util/Mail/wwwroot/templates/announcement.html
index 75c3c881ad..aa590a30da 100644
--- a/util/Mail/wwwroot/templates/announcement.html
+++ b/util/Mail/wwwroot/templates/announcement.html
@@ -49,7 +49,7 @@
<tr>
<td class="content-block last">
Thank you!<br />
- The bitwarden Team
+ The Bitwarden Team
</td>
</tr>
</table>
@@ -69,7 +69,7 @@
<tr>
<td><a href="https://twitter.com/bitwarden_app" target="_blank"><img src="https://bitwarden.com/images/mail-twitter.png" alt="Twitter" width="30" height="30" /></a></td>
<td><a href="https://www.facebook.com/bitwarden/" target="_blank"><img src="https://bitwarden.com/images/mail-facebook.png" alt="Facebook" width="30" height="30" /></a></td>
- <td><a href="https://plus.google.com/114869903467947368993" target="_blank"><img src="https://bitwarden.com/images/mail-gplus.png" alt="Google+" width="30" height="30" /></a></td>
+ <td><a href="https://plus.google.com/+bitwarden" target="_blank"><img src="https://bitwarden.com/images/mail-gplus.png" alt="Google+" width="30" height="30" /></a></td>
</tr>
</table>
</td>
diff --git a/util/Mail/wwwroot/templates/welcome.html b/util/Mail/wwwroot/templates/welcome.html
index d08d994e46..41bd676052 100644
--- a/util/Mail/wwwroot/templates/welcome.html
+++ b/util/Mail/wwwroot/templates/welcome.html
@@ -25,12 +25,12 @@
<table width="100%" cellpadding="0" cellspacing="0">
<tr>
<td class="content-block">
- Thank you for creating an account with bitwarden. You may now log in with your new account.
+ Thank you for creating an account with Bitwarden. You may now log in with your new account.
</td>
</tr>
<tr>
<td class="content-block">
- Did you know that bitwarden is free to sync with all of your devices? Download bitwarden today on:
+ Did you know that Bitwarden is free to sync with all of your devices? Download Bitwarden today on:
</td>
</tr>
<tr>
@@ -43,12 +43,12 @@
<table width="100%" cellpadding="0" cellspacing="0">
<tr>
<td valign="middle" class="aligncenter middle" width="50%">
- <a href="https://play.google.com/store/apps/details?id=com.x8bit.bitwarden" title="Get bitwarden on Google Play" target="_blank">
+ <a href="https://play.google.com/store/apps/details?id=com.x8bit.bitwarden" title="Get Bitwarden on Google Play" target="_blank">
<img src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png" height="63" width="163" alt="Get bitwarden on Google Play" />
</a>
</td>
<td valign="middle" class="aligncenter middle" width="50%">
- <a href="https://itunes.apple.com/us/app/bitwarden-free-password-manager/id1137397744?mt=8" target="_blank" title="Get bitwarden for iOS">
+ <a href="https://itunes.apple.com/us/app/bitwarden-free-password-manager/id1137397744?mt=8" target="_blank" title="Get Bitwarden for iOS">
<img src="https://bitwarden.com/images/app-store-badge.png" width="135" height="40" alt="Get bitwarden for iOS" />
</a>
</td>
@@ -78,22 +78,22 @@
<table width="100%" cellpadding="0" cellspacing="0">
<tr>
<td valign="middle" class="aligncenter middle" width="25%">
- <a href="https://chrome.google.com/webstore/detail/bitwarden-free-password-m/nngceckbapebfimnlniiiahkandclblb?utm_source=welcome_email&utm_medium=email" title="Get bitwarden for Chrome" target="_blank">
+ <a href="https://chrome.google.com/webstore/detail/bitwarden-free-password-m/nngceckbapebfimnlniiiahkandclblb?utm_source=welcome_email&utm_medium=email" title="Get Bitwarden for Chrome" target="_blank">
<img width="53" height="54" alt="Chrome Extension" src="https://bitwarden.com/images/chrome.png" />
</a>
</td>
<td valign="middle" class="aligncenter middle" width="25%">
- <a href="https://addons.mozilla.org/firefox/addon/bitwarden-password-manager/" title="Get bitwarden for Firefox" target="_blank">
+ <a href="https://addons.mozilla.org/firefox/addon/bitwarden-password-manager/" title="Get Bitwarden for Firefox" target="_blank">
<img width="57" height="54" alt="Firefox Extension" src="https://bitwarden.com/images/firefox.png" />
</a>
</td>
<td valign="middle" class="aligncenter middle" width="25%">
- <a href="https://addons.opera.com/extensions/details/bitwarden-free-password-manager/?utm_source=welcome_email&utm_medium=email" title="Get bitwarden for Opera" target="_blank">
+ <a href="https://addons.opera.com/extensions/details/bitwarden-free-password-manager/?utm_source=welcome_email&utm_medium=email" title="Get Bitwarden for Opera" target="_blank">
<img width="53" height="54" alt="Opera Extension" src="https://bitwarden.com/images/opera.png" />
</a>
</td>
<td valign="middle" class="aligncenter middle" width="25%">
- <a href="https://www.microsoft.com/store/p/bitwarden-free-password-manager/9p6kxl0svnnl" title="Get bitwarden for Edge" target="_blank">
+ <a href="https://www.microsoft.com/store/p/bitwarden-free-password-manager/9p6kxl0svnnl" title="Get Bitwarden for Edge" target="_blank">
<img width="52" height="54" alt="Edge Extension" src="https://bitwarden.com/images/edge.png" />
</a>
</td>
@@ -124,7 +124,7 @@
<tr>
<td class="content-block last">
Thank you!<br />
- The bitwarden Team
+ The Bitwarden Team
</td>
</tr>
</table>
@@ -143,7 +143,7 @@
<tr>
<td><a href="https://twitter.com/bitwarden_app" target="_blank"><img src="https://bitwarden.com/images/mail-twitter.png" alt="Twitter" width="30" height="30" /></a></td>
<td><a href="https://www.facebook.com/bitwarden/" target="_blank"><img src="https://bitwarden.com/images/mail-facebook.png" alt="Facebook" width="30" height="30" /></a></td>
- <td><a href="https://plus.google.com/114869903467947368993" target="_blank"><img src="https://bitwarden.com/images/mail-gplus.png" alt="Google+" width="30" height="30" /></a></td>
+ <td><a href="https://plus.google.com/+bitwarden" target="_blank"><img src="https://bitwarden.com/images/mail-gplus.png" alt="Google+" width="30" height="30" /></a></td>
<td><a href="https://github.com/bitwarden" target="_blank"><img src="https://bitwarden.com/images/mail-github.png" alt="GitHub" width="30" height="30" /></a></td>
</tr>
</table>
diff --git a/util/Setup/CertBuilder.cs b/util/Setup/CertBuilder.cs
index 47e38b8bce..a2c82bc36c 100644
--- a/util/Setup/CertBuilder.cs
+++ b/util/Setup/CertBuilder.cs
@@ -29,7 +29,7 @@ namespace Bit.Setup
Helpers.Exec("openssl req -x509 -newkey rsa:4096 -sha256 -nodes -days 365 " +
$"-keyout /bitwarden/ssl/self/{Domain}/private.key " +
$"-out /bitwarden/ssl/self/{Domain}/certificate.crt " +
- $"-subj \"/C=US/ST=New York/L=New York/O=8bit Solutions LLC/OU=bitwarden/CN={Domain}\"");
+ $"-subj \"/C=US/ST=New York/L=New York/O=8bit Solutions LLC/OU=Bitwarden/CN={Domain}\"");
}
if(LetsEncrypt)
@@ -41,7 +41,7 @@ namespace Bit.Setup
Console.WriteLine("Generating key for IdentityServer.");
Directory.CreateDirectory("/bitwarden/identity/");
Helpers.Exec("openssl req -x509 -newkey rsa:4096 -sha256 -nodes -keyout identity.key " +
- "-out identity.crt -subj \"/CN=bitwarden IdentityServer\" -days 10950");
+ "-out identity.crt -subj \"/CN=Bitwarden IdentityServer\" -days 10950");
Helpers.Exec("openssl pkcs12 -export -out /bitwarden/identity/identity.pfx -inkey identity.key " +
$"-in identity.crt -certfile identity.crt -passout pass:{IdentityCertPassword}");
diff --git a/util/Setup/Program.cs b/util/Setup/Program.cs
index 6db2f6831b..dc4cc495b8 100644
--- a/util/Setup/Program.cs
+++ b/util/Setup/Program.cs
@@ -212,7 +212,7 @@ namespace Bit.Setup
private static void PrintEnvironment()
{
var vaultUrl = Helpers.GetValueFronEnvFile("global", "globalSettings__baseServiceUri__vault");
- Console.WriteLine("\nbitwarden is up and running!");
+ Console.WriteLine("\nBitwarden is up and running!");
Console.WriteLine("===================================================");
Console.WriteLine("\nvisit {0}", vaultUrl);
Console.Write("to update, run ");
@@ -313,7 +313,7 @@ namespace Bit.Setup
}
catch
{
- Console.WriteLine("Unable to validate installation id. Problem contacting bitwarden server.");
+ Console.WriteLine("Unable to validate installation id. Problem contacting Bitwarden server.");
return false;
}
}