diff options
| author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-11-19 15:30:49 +0100 |
|---|---|---|
| committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-11-19 15:30:49 +0100 |
| commit | 68003139e133835805b143b62c4407f19b495dab (patch) | |
| tree | 9a71a15d021330fb6d55cc338f125161ddfc61dd /docs/de/user/create_account.rst | |
| parent | bbd4ae7b56d9db744482a5630abad350f2d819af (diff) | |
| parent | cb1a6590c0e58c56d0612066501b3a586b103ed5 (diff) | |
| download | wallabag-68003139e133835805b143b62c4407f19b495dab.tar.gz wallabag-68003139e133835805b143b62c4407f19b495dab.tar.zst wallabag-68003139e133835805b143b62c4407f19b495dab.zip | |
Merge remote-tracking branch 'origin/master' into 2.2
# Conflicts:
# .editorconfig
# docs/de/index.rst
# docs/de/user/import.rst
# docs/en/index.rst
# docs/en/user/configuration.rst
# docs/en/user/import.rst
# docs/fr/index.rst
# docs/fr/user/import.rst
# src/Wallabag/CoreBundle/Command/InstallCommand.php
# src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
# src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
# web/bundles/wallabagcore/themes/baggy/css/style.min.css
# web/bundles/wallabagcore/themes/baggy/js/baggy.min.js
# web/bundles/wallabagcore/themes/material/css/style.min.css
# web/bundles/wallabagcore/themes/material/js/material.min.js
Diffstat (limited to 'docs/de/user/create_account.rst')
| -rw-r--r-- | docs/de/user/create_account.rst | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/docs/de/user/create_account.rst b/docs/de/user/create_account.rst index ce1b02a4..14a7d006 100644 --- a/docs/de/user/create_account.rst +++ b/docs/de/user/create_account.rst | |||
| @@ -1,6 +1,9 @@ | |||
| 1 | Account erstellen | 1 | Account erstellen |
| 2 | ================= | 2 | ================= |
| 3 | 3 | ||
| 4 | Registrierungsformular | ||
| 5 | ---------------------- | ||
| 6 | |||
| 4 | Klicke auf der Loginseite auf den ``Registrieren`` Button- | 7 | Klicke auf der Loginseite auf den ``Registrieren`` Button- |
| 5 | 8 | ||
| 6 | .. image:: ../../img/user/registration_form.png | 9 | .. image:: ../../img/user/registration_form.png |
| @@ -23,3 +26,16 @@ Dein Account ist nun aktiviert. | |||
| 23 | .. image:: ../../img/user/activated_account.png | 26 | .. image:: ../../img/user/activated_account.png |
| 24 | :alt: Willkommen! | 27 | :alt: Willkommen! |
| 25 | :align: center | 28 | :align: center |
| 29 | |||
| 30 | Anmeldung | ||
| 31 | --------- | ||
| 32 | |||
| 33 | Glückwunsch, dein Account ist nun aktiviert! | ||
| 34 | Um dich auf wallabag anzumelden, fülle das Formular auf der Login-Seite aus. | ||
| 35 | |||
| 36 | Wenn du auf einem persönlichen Computer bist und angemeldet bleiben möchtest, | ||
| 37 | kannst du ein Häkchen nach ``angemeldet bleiben`` setzen, wallabag wird sich ein Jahr an dich erinnern. | ||
| 38 | |||
| 39 | .. image:: ../../img/user/login_form.png | ||
| 40 | :alt: Login form | ||
| 41 | :align: center \ No newline at end of file | ||