diff options
author | Stephen Finucane <stephen.finucane@intel.com> | 2016-03-25 21:29:41 +0000 |
---|---|---|
committer | Stephen Finucane <stephen.finucane@intel.com> | 2016-03-29 11:28:44 +0100 |
commit | 144558ef0b38a7f488afc723b049e48bf0c08da5 (patch) | |
tree | 3cb9384380524faeae41239d4de6dc42573ae904 | |
parent | d82ddfe0d9a10b9bf7a761ce9c3cc235f2dc35e9 (diff) | |
download | patchwork-144558ef0b38a7f488afc723b049e48bf0c08da5.tar patchwork-144558ef0b38a7f488afc723b049e48bf0c08da5.tar.gz |
templates: Use 'Patchwork' consistently
The templates referred to both 'patchwork' and 'Patchwork'. Use the
title case variant consistently.
Signed-off-by: Stephen Finucane <stephen.finucane@intel.com>
19 files changed, 38 insertions, 38 deletions
diff --git a/patchwork/templates/patchwork/help/about.html b/patchwork/templates/patchwork/help/about.html index 7befa6b..6d3408f 100644 --- a/patchwork/templates/patchwork/help/about.html +++ b/patchwork/templates/patchwork/help/about.html @@ -6,7 +6,7 @@ {% block body %} <p>Patchwork is free software, and is available from the -<a href="http://jk.ozlabs.org/projects/patchwork/">patchwork website</a>.</p> +<a href="http://jk.ozlabs.org/projects/patchwork/">Patchwork website</a>.</p> <p>Patchwork is built on the <a href="http://djangoproject.com/">django</a> web framework.</p> diff --git a/patchwork/templates/patchwork/help/pwclient.html b/patchwork/templates/patchwork/help/pwclient.html index e3fbc82..1d87ec9 100644 --- a/patchwork/templates/patchwork/help/pwclient.html +++ b/patchwork/templates/patchwork/help/pwclient.html @@ -5,8 +5,8 @@ {% block body %} -<p><code>pwclient</code> is the command-line client for patchwork. Currently, -it provides access to some read-only features of patchwork, such as downloading +<p><code>pwclient</code> is the command-line client for Patchwork. Currently, +it provides access to some read-only features of Patchwork, such as downloading and applying patches.</p> <p>To use pwclient, you will need:</p> @@ -17,7 +17,7 @@ and applying patches.</p> </ul> <p>You can create your own <code>.pwclientrc</code> file. Each -<a href="{% url 'project-list' %}">patchwork project</a> +<a href="{% url 'project-list' %}">Patchwork project</a> provides a sample linked from the 'project info' page.</p> {% endblock %} diff --git a/patchwork/templates/patchwork/mail-form.html b/patchwork/templates/patchwork/mail-form.html index d71b2fb..315b7a5 100644 --- a/patchwork/templates/patchwork/mail-form.html +++ b/patchwork/templates/patchwork/mail-form.html @@ -5,7 +5,7 @@ {% block body %} -<p>You can configure patchwork to send you mail on certain events, +<p>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.</p> diff --git a/patchwork/templates/patchwork/optin-request.html b/patchwork/templates/patchwork/optin-request.html index ba71614..a3dd4b8 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.</p> {% endif %} {% if form %} -<p>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.</p> +<p>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.</p> 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.</p> diff --git a/patchwork/templates/patchwork/optin-request.mail b/patchwork/templates/patchwork/optin-request.mail index fb4814b..bd40e67 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 9056191..aeb52b3 100644 --- a/patchwork/templates/patchwork/optin.html +++ b/patchwork/templates/patchwork/optin.html @@ -6,12 +6,12 @@ {% block body %} <p><strong>Opt-in complete</strong>. 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 <strong>{{email}}</strong>.</p> <p>If you later decide that you no longer want to receive automated mail from -patchwork, just visit <a href="{% url 'mail-settings' %}" +Patchwork, just visit <a href="{% url 'mail-settings' %}" >http://{{site.domain}}{% url 'mail-settings' %}</a>, or -visit the main patchwork page and navigate from there.</p> +visit the main Patchwork page and navigate from there.</p> {% if user.is_authenticated %} <p>Return to your <a href="{% url 'user-profile' %}">user profile</a>.</p> diff --git a/patchwork/templates/patchwork/optout-request.html b/patchwork/templates/patchwork/optout-request.html index c043dc7..1a5cec4 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.</p> {% endif %} {% if form %} -<p>This form allows you to opt-out of automated email from patchwork.</p> +<p>This form allows you to opt-out of automated email from Patchwork.</p> <p>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.</p> 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 8a3e46f..b1732fd 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 6a32503..7138854 100644 --- a/patchwork/templates/patchwork/optout.html +++ b/patchwork/templates/patchwork/optout.html @@ -6,15 +6,15 @@ {% block body %} <p><strong>Opt-out complete</strong>. You have successfully opted-out of -automated notifications from this patchwork system, from the address +automated notifications from this Patchwork system, from the address <strong>{{email}}</strong></p> -<p>Please note that you may still receive email from other patchwork setups at +<p>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.</p> -<p>If you later decide to receive mail from patchwork, just visit +<p>If you later decide to receive mail from Patchwork, just visit <a href="{% url 'mail-settings' %}" >http://{{site.domain}}{% url 'mail-settings' %}</a>, or -visit the main patchwork page and navigate from there.</p> +visit the main Patchwork page and navigate from there.</p> {% if user.is_authenticated %} <p>Return to your <a href="{% url 'user-profile' %}">user profile</a>.</p> diff --git a/patchwork/templates/patchwork/patch-change-notification.mail b/patchwork/templates/patchwork/patch-change-notification.mail index 0047fdb..7d04cff 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 1c2151d..9b6d5b3 100644 --- a/patchwork/templates/patchwork/profile.html +++ b/patchwork/templates/patchwork/profile.html @@ -38,11 +38,11 @@ Contributor to <div class="box"> <h2>Linked email addresses</h2> -<p>The following email addresses are associated with this patchwork account. -Adding alternative addresses allows patchwork to group contributions that +<p>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.</p> <p>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.</p> <p>Adding a new email address will send a confirmation email to that address.</p> diff --git a/patchwork/templates/patchwork/project.html b/patchwork/templates/patchwork/project.html index ffea25e..6f7e37d 100644 --- a/patchwork/templates/patchwork/project.html +++ b/patchwork/templates/patchwork/project.html @@ -50,10 +50,10 @@ </table> {% if enable_xmlrpc %} -<p>Sample <a href="{% url 'help' "pwclient/" %}">patchwork +<p>Sample <a href="{% url 'help' "pwclient/" %}">Patchwork client</a> configuration for this project: <a href="{% url 'pwclientrc' project.linkname %}" >.pwclientrc</a>.</p> {% endif %} - + {% endblock %} diff --git a/patchwork/templates/patchwork/register.mail b/patchwork/templates/patchwork/register.mail index 9079203..51f3adf 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 d40c305..56cc107 100644 --- a/patchwork/templates/patchwork/registration-confirm.html +++ b/patchwork/templates/patchwork/registration-confirm.html @@ -6,8 +6,8 @@ {% block body %} <p>Registraton confirmed!</p> -<p>Your patchwork registration is complete. Head over to your <a +<p>Your Patchwork registration is complete. Head over to your <a href="{% url 'user-profile' %}">profile</a> to start using -patchwork's extra features.</p> +Patchwork's extra features.</p> {% endblock %} diff --git a/patchwork/templates/patchwork/registration_form.html b/patchwork/templates/patchwork/registration_form.html index 3a314b8..4e610b3 100644 --- a/patchwork/templates/patchwork/registration_form.html +++ b/patchwork/templates/patchwork/registration_form.html @@ -13,7 +13,7 @@ registration.</p> </p> {% else %} -<p>By creating a patchwork account, you can:<p> +<p>By creating a Patchwork account, you can:<p> <ul> <li>create "bundles" of patches</li> <li>update the state of your own patches</li> @@ -62,7 +62,7 @@ Your name is used to identify you on the site </td> </tr> - + <tr> <td>{{ form.email.label_tag }}</td> <td> @@ -75,7 +75,7 @@ {% endif %} </td> </tr> - + <tr> <td></td> <td class="form-help"> @@ -95,7 +95,7 @@ {% endif %} </td> </tr> - + <tr> <td>{{ form.password.label_tag }}</td> <td> diff --git a/patchwork/templates/patchwork/todo-list.html b/patchwork/templates/patchwork/todo-list.html index 282c33c..444baa0 100644 --- a/patchwork/templates/patchwork/todo-list.html +++ b/patchwork/templates/patchwork/todo-list.html @@ -7,7 +7,7 @@ {% block body %} <h1>TODO</h1> -<p>A Patchwork Todo-list contains patches that are assigned to you, and +<p>A Patchwork todo-list contains patches that are assigned to you, and are in an "action required" state ({% for state in action_required_states %}{% if forloop.last and not forloop.first %} or {% endif %}{{ state }}{% if not forloop.last and not forloop.first %}, {%endif %}{% endfor %}), and are not archived. </p> diff --git a/patchwork/templates/patchwork/user-link-confirm.html b/patchwork/templates/patchwork/user-link-confirm.html index 051a13c..7c418ec 100644 --- a/patchwork/templates/patchwork/user-link-confirm.html +++ b/patchwork/templates/patchwork/user-link-confirm.html @@ -10,7 +10,7 @@ <p>{{ errors }}</p> {% else %} <p>You have sucessfully linked the email address {{ person.email }} to - your patchwork account</p> + your Patchwork account</p> {% endif %} <p>Back to <a href="{% url 'user-profile' %}">your diff --git a/patchwork/templates/patchwork/user-link.mail b/patchwork/templates/patchwork/user-link.mail index ac4d540..d0a3c97 100644 --- a/patchwork/templates/patchwork/user-link.mail +++ b/patchwork/templates/patchwork/user-link.mail @@ -4,7 +4,7 @@ This email is to confirm that you own the email address: {{ confirmation.email }} -So that you can add it to your patchwork profile. You can confirm this +So that you can add it to your Patchwork profile. You can confirm this email address by visiting the url: http://{{site.domain}}{% url 'confirm' key=confirmation.key %} diff --git a/templates/registration/password_reset_email.html b/templates/registration/password_reset_email.html index fa399a4..bdc2851 100644 --- a/templates/registration/password_reset_email.html +++ b/templates/registration/password_reset_email.html @@ -1,7 +1,7 @@ {% autoescape off %}Hi, You are receiving this email because you requested a password reset for -your user account on the patchwork patch-tracking system. +your user account on the Patchwork patch-tracking system. Please visit the following url and choose a new password: {% block reset_link %} |