diff --git a/src/IDF/templates/idf/faq.html b/src/IDF/templates/idf/faq.html index bcf6f93..db821da 100644 --- a/src/IDF/templates/idf/faq.html +++ b/src/IDF/templates/idf/faq.html @@ -5,7 +5,7 @@
  • {trans 'What are the keyboard shortcuts?'}
  • {trans 'How to mark an issue as duplicate?'}
  • {trans 'How can I display my head next to my comments?'}
    • -
  • {trans 'What is the API and how to use it?'}
    • +
  • {trans 'What is the API and how is it used?'}

    • {trans 'What are the keyboard shortcuts?'}

    @@ -48,7 +48,7 @@

    {blocktrans}You need to create an account on Gravatar, this takes about 5 minutes and is free.{/blocktrans}

    -

    {trans 'What is the API and how to use it?'}

    +

    {trans 'What is the API and how is it used?'}

    {blocktrans}The API (Application Programming Interface) is used to interact with InDefero with another program. For example, this can be used to create a desktop program to submit new tickets easily.{/blocktrans}

    {aurl 'url', 'IDF_Views::faqApi'}

    {blocktrans}Learn more about the API.{/blocktrans}

    diff --git a/src/IDF/templates/idf/register/confirmation.html b/src/IDF/templates/idf/register/confirmation.html index fa2cc36..cb4bf95 100644 --- a/src/IDF/templates/idf/register/confirmation.html +++ b/src/IDF/templates/idf/register/confirmation.html @@ -2,7 +2,7 @@ {block body} {if $form.errors}
    -

    {trans 'Oups, please check the form for errors.'}

    +

    {trans 'Oops, please check the form for errors.'}

    {if $form.get_top_errors} {$form.render_top_errors|unsafe} {/if} diff --git a/src/IDF/templates/idf/register/index.html b/src/IDF/templates/idf/register/index.html index 17bfb3b..4b862aa 100644 --- a/src/IDF/templates/idf/register/index.html +++ b/src/IDF/templates/idf/register/index.html @@ -2,7 +2,7 @@ {block body} {if $form.errors}
    -

    {trans 'Oups, please check the provided login and email address to register.'}

    +

    {trans 'Oops, please check the provided login and email address to register.'}

    {if $form.get_top_errors} {$form.render_top_errors|unsafe} {/if} diff --git a/src/IDF/templates/idf/register/inputkey.html b/src/IDF/templates/idf/register/inputkey.html index ed65976..e79e2c0 100644 --- a/src/IDF/templates/idf/register/inputkey.html +++ b/src/IDF/templates/idf/register/inputkey.html @@ -2,7 +2,7 @@ {block body} {if $form.errors}
    -

    {trans 'Oups, we found an error in the form.'}

    +

    {trans 'Oops, we found an error in the form.'}

    {if $form.get_top_errors} {$form.render_top_errors|unsafe} {/if} diff --git a/src/IDF/templates/idf/review/create.html b/src/IDF/templates/idf/review/create.html index 1a5a74e..d96caa5 100644 --- a/src/IDF/templates/idf/review/create.html +++ b/src/IDF/templates/idf/review/create.html @@ -57,7 +57,7 @@
    • A commit or revision of the current code in the repository from which you started your work.
    • A patch describing your changes with respect to the reference commit.
      • -
    • Ensure your patch does not contain any passwords or confidential information!
      • +
    • Check your patch does not provide any password or confidential information!
    {/blocktrans}
    {/block} diff --git a/src/IDF/templates/idf/source/git/help.html b/src/IDF/templates/idf/source/git/help.html index 72c3a55..e270111 100644 --- a/src/IDF/templates/idf/source/git/help.html +++ b/src/IDF/templates/idf/source/git/help.html @@ -11,7 +11,7 @@ code.{/blocktrans}

    git clone {$project.getSourceAccessUrl($user)}

    {aurl 'url', 'IDF_Views_User::myAccount'} -

    {blocktrans}You may need to provide your SSH key. The synchronization of your SSH key can take a couple of minutes. You can learn more about SSH key authentification.{/blocktrans}

    +

    {blocktrans}You may need to provide your SSH key. The synchronization of your SSH key can take a couple of minutes. You can learn more about SSH key authentication.{/blocktrans}

    {if $isOwner or $isMember}

    {trans 'First Commit'}

    diff --git a/src/IDF/templates/idf/user/changeemail.html b/src/IDF/templates/idf/user/changeemail.html index 6a29b3d..3ddb4c7 100644 --- a/src/IDF/templates/idf/user/changeemail.html +++ b/src/IDF/templates/idf/user/changeemail.html @@ -2,7 +2,7 @@ {block body} {if $form.errors}
    -

    {trans 'Oups, we found an error in the form.'}

    +

    {trans 'Oops, we found an error in the form.'}

    {if $form.get_top_errors} {$form.render_top_errors|unsafe} {/if} diff --git a/src/IDF/templates/idf/user/myaccount.html b/src/IDF/templates/idf/user/myaccount.html index f84dbec..4fceeae 100644 --- a/src/IDF/templates/idf/user/myaccount.html +++ b/src/IDF/templates/idf/user/myaccount.html @@ -2,7 +2,7 @@ {block body} {if $form.errors}
    -

    {trans 'Oups, please check the form for errors.'}

    +

    {trans 'Oops, please check the form for errors.'}

    {if $form.get_top_errors} {$form.render_top_errors|unsafe} {/if} diff --git a/src/IDF/templates/idf/user/passrecovery-ask.html b/src/IDF/templates/idf/user/passrecovery-ask.html index 5cd48eb..dfc3e58 100644 --- a/src/IDF/templates/idf/user/passrecovery-ask.html +++ b/src/IDF/templates/idf/user/passrecovery-ask.html @@ -2,7 +2,7 @@ {block body} {if $form.errors}
    -

    {trans 'Oups, please check the provided login or email address to recover your password.'}

    +

    {trans 'Oops, please check the provided login or email address to recover your password.'}

    {if $form.get_top_errors} {$form.render_top_errors|unsafe} {/if} diff --git a/src/IDF/templates/idf/user/passrecovery-inputkey.html b/src/IDF/templates/idf/user/passrecovery-inputkey.html index ef58d88..a55c6a5 100644 --- a/src/IDF/templates/idf/user/passrecovery-inputkey.html +++ b/src/IDF/templates/idf/user/passrecovery-inputkey.html @@ -2,7 +2,7 @@ {block body} {if $form.errors}
    -

    {trans 'Oups, we found an error in the form.'}

    +

    {trans 'Oops, we found an error in the form.'}

    {if $form.get_top_errors} {$form.render_top_errors|unsafe} {/if} @@ -30,7 +30,7 @@

    {trans 'Instructions'}

    {trans 'Use your email software to read your emails and open your verification email. Either click directly on the verification link or copy/paste the verification key in the box and submit the form.'}

    -

    {trans 'Just after providing the confirmation key, you will be able to reset your password and use again this website fully.'}

    +

    {trans 'Just after providing the confirmation key, you will be able to reset your password and use this website fully.'}

    {/block} {block javascript}