From: Stephen Finucane Date: Fri, 25 Mar 2016 21:29:41 +0000 (+0000) Subject: templates: Use 'Patchwork' consistently X-Git-Tag: v2.0.0-rc1~382 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=144558ef0b38a7f488afc723b049e48bf0c08da5;p=thirdparty%2Fpatchwork.git templates: Use 'Patchwork' consistently The templates referred to both 'patchwork' and 'Patchwork'. Use the title case variant consistently. Signed-off-by: Stephen Finucane --- diff --git a/patchwork/templates/patchwork/help/about.html b/patchwork/templates/patchwork/help/about.html index 7befa6bf..6d3408f2 100644 --- a/patchwork/templates/patchwork/help/about.html +++ b/patchwork/templates/patchwork/help/about.html @@ -6,7 +6,7 @@ {% block body %}

Patchwork is free software, and is available from the -patchwork website.

+Patchwork website.

Patchwork is built on the django web framework.

diff --git a/patchwork/templates/patchwork/help/pwclient.html b/patchwork/templates/patchwork/help/pwclient.html index e3fbc82e..1d87ec9b 100644 --- a/patchwork/templates/patchwork/help/pwclient.html +++ b/patchwork/templates/patchwork/help/pwclient.html @@ -5,8 +5,8 @@ {% block body %} -

pwclient is the command-line client for patchwork. Currently, -it provides access to some read-only features of patchwork, such as downloading +

pwclient is the command-line client for Patchwork. Currently, +it provides access to some read-only features of Patchwork, such as downloading and applying patches.

To use pwclient, you will need:

@@ -17,7 +17,7 @@ and applying patches.

You can create your own .pwclientrc file. Each -patchwork project +Patchwork project provides a sample linked from the 'project info' page.

{% endblock %} diff --git a/patchwork/templates/patchwork/mail-form.html b/patchwork/templates/patchwork/mail-form.html index d71b2fb2..315b7a5d 100644 --- a/patchwork/templates/patchwork/mail-form.html +++ b/patchwork/templates/patchwork/mail-form.html @@ -5,7 +5,7 @@ {% block body %} -

You can configure patchwork to send you mail on certain events, +

You can configure Patchwork to send you mail on certain events, or block automated mail altogether. Enter your email address to view or change your email settings.

diff --git a/patchwork/templates/patchwork/optin-request.html b/patchwork/templates/patchwork/optin-request.html index ba716148..a3dd4b89 100644 --- a/patchwork/templates/patchwork/optin-request.html +++ b/patchwork/templates/patchwork/optin-request.html @@ -15,9 +15,9 @@ that link to confirm your opt-in.

{% endif %} {% if form %} -

This form allows you to opt-in to automated email from patchwork. Use -this if you have previously opted-out of patchwork mail, but now want to -received notifications from patchwork.

+

This form allows you to opt-in to automated email from Patchwork. Use +this if you have previously opted-out of Patchwork mail, but now want to +received notifications from Patchwork.

When you submit it, an email will be sent to your address with a link to click to finalise the opt-in. Patchwork does this to prevent someone opting you in without your consent.

diff --git a/patchwork/templates/patchwork/optin-request.mail b/patchwork/templates/patchwork/optin-request.mail index fb4814bf..bd40e677 100644 --- a/patchwork/templates/patchwork/optin-request.mail +++ b/patchwork/templates/patchwork/optin-request.mail @@ -1,7 +1,7 @@ Hi, This email is to confirm that you would like to opt-in to automated -email from the patchwork system at {{site.domain}}. +email from the Patchwork system at {{site.domain}}. To complete the opt-in process, visit: diff --git a/patchwork/templates/patchwork/optin.html b/patchwork/templates/patchwork/optin.html index 90561910..aeb52b33 100644 --- a/patchwork/templates/patchwork/optin.html +++ b/patchwork/templates/patchwork/optin.html @@ -6,12 +6,12 @@ {% block body %}

Opt-in complete. You have sucessfully opted back in to -automated email from this patchwork system, using the address +automated email from this Patchwork system, using the address {{email}}.

If you later decide that you no longer want to receive automated mail from -patchwork, just visit http://{{site.domain}}{% url 'mail-settings' %}, or -visit the main patchwork page and navigate from there.

+visit the main Patchwork page and navigate from there.

{% if user.is_authenticated %}

Return to your user profile.

diff --git a/patchwork/templates/patchwork/optout-request.html b/patchwork/templates/patchwork/optout-request.html index c043dc77..1a5cec4c 100644 --- a/patchwork/templates/patchwork/optout-request.html +++ b/patchwork/templates/patchwork/optout-request.html @@ -15,9 +15,9 @@ that link to confirm your opt-out.

{% endif %} {% if form %} -

This form allows you to opt-out of automated email from patchwork.

+

This form allows you to opt-out of automated email from Patchwork.

If you opt-out of email, Patchwork may still email you if you do certain -actions yourself (such as create a new patchwork account), but will not send +actions yourself (such as create a new Patchwork account), but will not send you unsolicited email.

When you submit it, one email will be sent to your address with a link to click to finalise the opt-out. Patchwork does this to prevent someone opting you out diff --git a/patchwork/templates/patchwork/optout-request.mail b/patchwork/templates/patchwork/optout-request.mail index 8a3e46fd..b1732fd0 100644 --- a/patchwork/templates/patchwork/optout-request.mail +++ b/patchwork/templates/patchwork/optout-request.mail @@ -1,7 +1,7 @@ Hi, This email is to confirm that you would like to opt-out from all email -from the patchwork system at {{site.domain}}. +from the Patchwork system at {{site.domain}}. To complete the opt-out process, visit: diff --git a/patchwork/templates/patchwork/optout.html b/patchwork/templates/patchwork/optout.html index 6a325039..71388549 100644 --- a/patchwork/templates/patchwork/optout.html +++ b/patchwork/templates/patchwork/optout.html @@ -6,15 +6,15 @@ {% block body %}

Opt-out complete. You have successfully opted-out of -automated notifications from this patchwork system, from the address +automated notifications from this Patchwork system, from the address {{email}}

-

Please note that you may still receive email from other patchwork setups at +

Please note that you may still receive email from other Patchwork setups at different sites, as they are run independently. You may need to opt-out of those separately.

-

If you later decide to receive mail from patchwork, just visit +

If you later decide to receive mail from Patchwork, just visit http://{{site.domain}}{% url 'mail-settings' %}, or -visit the main patchwork page and navigate from there.

+visit the main Patchwork page and navigate from there.

{% if user.is_authenticated %}

Return to your user profile.

diff --git a/patchwork/templates/patchwork/patch-change-notification.mail b/patchwork/templates/patchwork/patch-change-notification.mail index 0047fdbe..7d04cffd 100644 --- a/patchwork/templates/patchwork/patch-change-notification.mail +++ b/patchwork/templates/patchwork/patch-change-notification.mail @@ -1,6 +1,6 @@ Hello, -The following patch{{notifications|length|pluralize:"es"}} (submitted by you) {{notifications|length|pluralize:"has,have"}} been updated in patchwork: +The following patch{{notifications|length|pluralize:"es"}} (submitted by you) {{notifications|length|pluralize:"has,have"}} been updated in Patchwork: {% for notification in notifications %} * {{notification.patch.project.linkname}}: {{notification.patch.name|safe}} - http://{{site.domain}}{{notification.patch.get_absolute_url}} @@ -14,7 +14,7 @@ Happy patchworking. -- -This is an automated mail sent by the patchwork system at +This is an automated mail sent by the Patchwork system at {{site.domain}}. To stop receiving these notifications, edit your mail settings at: http://{{site.domain}}{% url 'mail-settings' %} diff --git a/patchwork/templates/patchwork/profile.html b/patchwork/templates/patchwork/profile.html index 1c2151d1..9b6d5b3a 100644 --- a/patchwork/templates/patchwork/profile.html +++ b/patchwork/templates/patchwork/profile.html @@ -38,11 +38,11 @@ Contributor to

Linked email addresses

-

The following email addresses are associated with this patchwork account. -Adding alternative addresses allows patchwork to group contributions that +

The following email addresses are associated with this Patchwork account. +Adding alternative addresses allows Patchwork to group contributions that you have made under different addresses.

The "notify?" column allows you to opt-in or -out of automated -patchwork notification emails. Setting it to "no" will disable automated +Patchwork notification emails. Setting it to "no" will disable automated notifications for that address.

Adding a new email address will send a confirmation email to that address.

diff --git a/patchwork/templates/patchwork/project.html b/patchwork/templates/patchwork/project.html index ffea25ef..6f7e37df 100644 --- a/patchwork/templates/patchwork/project.html +++ b/patchwork/templates/patchwork/project.html @@ -50,10 +50,10 @@ {% if enable_xmlrpc %} -

Sample patchwork +

Sample Patchwork client configuration for this project: .pwclientrc.

{% endif %} - + {% endblock %} diff --git a/patchwork/templates/patchwork/register.mail b/patchwork/templates/patchwork/register.mail index 90792035..51f3adfa 100644 --- a/patchwork/templates/patchwork/register.mail +++ b/patchwork/templates/patchwork/register.mail @@ -1,11 +1,11 @@ Hi, -This email is to confirm your account on the patchwork patch-tracking +This email is to confirm your account on the Patchwork patch-tracking system. You can activate your account by visiting the url: http://{{site.domain}}{% url 'registration_activateactivation_key'=request.key %} -If you didn't request a user account on patchwork, then you can ignore +If you didn't request a user account on Patchwork, then you can ignore this mail. Happy patchworking. diff --git a/patchwork/templates/patchwork/registration-confirm.html b/patchwork/templates/patchwork/registration-confirm.html index d40c3050..56cc107f 100644 --- a/patchwork/templates/patchwork/registration-confirm.html +++ b/patchwork/templates/patchwork/registration-confirm.html @@ -6,8 +6,8 @@ {% block body %}

Registraton confirmed!

-

Your patchwork registration is complete. Head over to your Your Patchwork registration is complete. Head over to your profile to start using -patchwork's extra features.

+Patchwork's extra features.

{% endblock %} diff --git a/patchwork/templates/patchwork/registration_form.html b/patchwork/templates/patchwork/registration_form.html index 3a314b8a..4e610b32 100644 --- a/patchwork/templates/patchwork/registration_form.html +++ b/patchwork/templates/patchwork/registration_form.html @@ -13,7 +13,7 @@ registration.

{% else %} -

By creating a patchwork account, you can:

+

By creating a Patchwork account, you can: