Skip to content

Commit

Permalink
Merge branch 'main' into feat/spf-qualifiers
Browse files Browse the repository at this point in the history
  • Loading branch information
underdarknl authored Jan 7, 2025
2 parents c697074 + 64b4c8b commit aa160a8
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ <h1>{% translate "OpenKAT setup" %}</h1>
{% include "partials/stepper.html" %}

<h2>{% translate "Account setup" %}</h2>
<h3>{% translate "Accounts" %}</h3>
<h4>{% translate "Organization setup with separate accounts:" %}</h4>
<p>
{% blocktranslate trimmed %}
Expand All @@ -36,7 +35,7 @@ <h4>{% translate "Single account setup:" %}</h4>
{% if organization %}
<div class="button-container">
<a href="{% url "step_choose_user_type" organization.code %}"
class="button">{% translate "Create separate accounts" %}</a>
class="button ghost">{% translate "Create separate accounts" %}</a>
<a href="{% url "step_introduction" organization.code %}"
class="button ">{% translate "Continue with this account, onboard me!" %}</a>
</div>
Expand Down
6 changes: 1 addition & 5 deletions rocky/rocky/locale/django.pot
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-12-18 09:24+0000\n"
"POT-Creation-Date: 2025-01-03 20:02+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down Expand Up @@ -1637,10 +1637,6 @@ msgstr ""
msgid "Account setup"
msgstr ""

#: onboarding/templates/account/step_2c_account_setup_intro.html
msgid "Accounts"
msgstr ""

#: onboarding/templates/account/step_2c_account_setup_intro.html
msgid "Organization setup with separate accounts:"
msgstr ""
Expand Down

0 comments on commit aa160a8

Please sign in to comment.