Merge branch 'h-da-screenis' into 'h-da-main'

chapter "first steps" and "important settings" in english modified with h-da screenis and text

See merge request !4

content/first-steps/_index.en.md

@@ -65,7 +65,7 @@ Key protection is highly recommended for worry-free end-to-end encryption. There
 
 ![secure backup of securitykey step1](/images/03_Make_Key_Backup_1_en.png)
 
-Alternatively you can choose "Security & Privacy" right next to your username.
+Alternatively you can choose "Security & Privacy" by clicking the "arrow-down" symbol right next to your username.
 
 ![secure backup of securitykey step1](/images/10_Setup-Keystore_en.png)
 
@@ -73,12 +73,49 @@ In the next window you can setup your key backup:
 
 ![secure backup of securitykey step2](/images/03_Make_Key_Backup_2_en.png)
 
-Please choose "Generate a Security Key" and "Continue".
-In the next windows you will see your security key. This should be kept save and retrievable as an emergency key.
+If you choose "Generate a Security Key" and "Continue", then your security key will appear in the next window. This should be kept save and retrievable as an emergency key. 
 
 ![Securitykey backup](/images/03_Make_Key_Backup_3_en.png)
 
-   
+With each logout from elements and re-login or new login to elements on a new device, you will be asked for your security key. Without this key you don't have access to your old encrypted chats.
+
+**Alternatively** you can choose a strong security phrase (but please not the h-da password!). Furthermore, the security key is generated in addition to the security phrase and should also be kept safe and retrievable as an emergency key. This security phrase will always has to be entered if keys are to be synchronized with the key backup.
+
+![request to put in a passphrase for security key](/images/12_Setup-Key_en.png)
+
+![Give a passphrase for security key](/images/12_Enter-Key_en.png)
+
+You will be asked to confirm your passphrase for your security key:
+![confirmation of passphrase for security key](/images/12_Enter-Key2_en.png)
+
+The next window shows your security key, which you should keep safe and retrievable together with your strong passphrase.
+
+![security key for saving](/images/03_Make_Key_Backup_3_en.png) 
+
+Last but not least you may be asked to confirm your identity with your elements-login-password.
+
+![Bestätigung der Identität](/images/03_account_validation_de.png) 
+*(sorry for no english screenshot)*
+
+If you logout from elements and login again or login to elements with another device, then you will be asked for your security key or your passphrase.
+
+![Restore-Session with Key](/images/01_Restore-Session_withKey_or_phrase_en.png) 
+
+If you put in a passphrase, you will be asked like this:
+
+![Restore-Session with passphrase](/images/01_Restore-Session_withPhrase2_en.png) 
+
+If you put in a generated security key, you will be asked like this:
+
+![Restore-Session with Key](/images/01_Restore-Session_withKey2_en.png) 
+
+If you entered correctly, your restore session is successfully verified:
+
+![Restore-Session verified](/images/01_Restore-Session_verified_en.png)
+
+Now you can use your elements chat client inclusive encryption.
+
+  
 With each login to elements you will see the following window:
 
 ![help to improve](/images/01_Help_to_improve_en.png)

content/first-steps/_index.md

@@ -80,11 +80,11 @@ erscheint im nachfolgenden Fenster Ihr Sicherungsschlüssel, den Sie sich unbedi
 
 ![Anzeige des Sicherheitsschlüssel zum abschreiben oder wegspeichern](/images/03_Make_Key_Backup_3_de.png) 
 
-Wenn Sie sich aus Elements abmelden oder auf einem weiteren Gerät einrichten, werden Sie nach Ihrem Sicherungsschlüssel gefragt. Wenn Sie den dann nicht zur Hand haben, haben Sie keinen Zugriff mehr auf Ihre alten verschlüsselten Chats.
+Wenn Sie sich aus Elements abmelden und erneut anmelden oder Elements auf einem weiteren Gerät einrichten, werden Sie nach Ihrem Sicherungsschlüssel gefragt. Wenn Sie den dann nicht zur Hand haben, haben Sie keinen Zugriff mehr auf Ihre alten verschlüsselten Chats.
 
 **Alternativ** zum "Sicherheitsschlüssel generieren" können Sie sich auch selbst eine starke Sicherheitsphrase (bitte nicht das Hochschulpasswort!) erstellen. Weiterhin wird der Sicherungsschlüssel zusätzlich zur Sicherheitsphrase erstellt und sollte als Notfallschlüssel sicher und wiederauffindbar verwahrt werden. Die Sicherheitsphrase wird immer einzugeben sein, wenn Schlüssel mit der Schlüsselsicherung synchronisiert werden sollen.
 
-![Aufforderung den Sicherheitsschlüssel zu generieren oder eine Sicherheitsphrase einzugeben](/images/11_Setup-Key_de.png)
+![Aufforderung den Sicherheitsschlüssel zu generieren oder eine Sicherheitsphrase einzugeben](/images/12_Setup-Key_de.png)
 ![Aufforderung eine Passwort für die Schlüsselsicherung einzugeben](/images/12_Enter-Key_de.png)
 
 Dann werden Sie zur Bestätigung Ihrer Passphrase aufgefordert:
@@ -100,11 +100,11 @@ Zum Abschluß der Schlüsselsicherung werden Sie zur Bestätigung Ihrer Identit
 
 Wenn Sie sich nach erfolgter Schlüsselsicherung von Elements abmelden und später erneut anmelden wollen, oder auf einem anderen Gerät zusätzlich anmelden wollen, erscheint das folgende Fenster, wo Sie abhängig von Ihrer obigen Wahl entweder Ihren Sicherungsschlüssel oder Ihre Passphrase eingeben können:
 
-![Restore-Session with Key](/images/01_Restore-Session_withKey_de.png) 
+![Restore-Session with Key](/images/01_Restore-Session_withKey_or_phrase_de.png) 
 
 Wurde eine Sicherheitsphrase hinterlegt, werden Sie wie folgt gefragt:
 
-![Restore-Session with Key](/images/01_Restore-Session_withPhrase2_de.png) 
+![Restore-Session with passphrase](/images/01_Restore-Session_withPhrase2_de.png) 
 
 Wurde nur ein generierter Sicherungsschlüssel (ohne Sicherheitsphrase) hinterlegt, werden Sie wie folgt gefragt:
 

content/settings/_index.en.md

@@ -25,14 +25,37 @@ Key protection is highly recommended for worry-free end-to-end encryption. There
 
 ![secure backup of securitykey step1](/images/03_Make_Key_Backup_1_en.png)
 
-The next window will look like this:
+Alternatively you can choose "Security & Privacy" by clicking the "arrow-down" symbol right next to your username.
+
+![secure backup of securitykey step1](/images/10_Setup-Keystore_en.png)
+
+In the next window you can setup your key backup:
+
 ![secure backup of securitykey step2](/images/03_Make_Key_Backup_2_en.png)
 
-Please choose "Generate a Security Key" and "Continue".
-In the next windows you will see your security key. This should be kept save and retrievable as an emergency key.
+If you choose "Generate a Security Key" and "Continue", then your security key will appear in the next window. This should be kept save and retrievable as an emergency key. 
 
 ![Securitykey backup](/images/03_Make_Key_Backup_3_en.png)
 
+With each logout from elements and re-login or new login to elements on a new device, you will be asked for your security key. Without this key you don't have access to your old encrypted chats.
+
+**Alternatively** you can choose a strong security phrase (but please not the h-da password!). Furthermore, the security key is generated in addition to the security phrase and should also be kept safe and retrievable as an emergency key. This security phrase will always has to be entered if keys are to be synchronized with the key backup.
+
+![request to put in a passphrase for security key](/images/12_Setup-Key_en.png)
+
+![Give a passphrase for security key](/images/12_Enter-Key_en.png)
+
+You will be asked to confirm your passphrase for your security key:
+![confirmation of passphrase for security key](/images/12_Enter-Key2_en.png)
+
+The next window shows your security key, which you should keep safe and retrievable together with your strong passphrase.
+
+![security key for saving](/images/03_Make_Key_Backup_3_en.png) 
+
+Last but not least you may be asked to confirm your identity with your elements-login-password.
+
+![Bestätigung der Identität](/images/03_account_validation_de.png) 
+*(sorry for no english screenshot)*
 
 ## Other important settings
 
@@ -75,13 +98,4 @@ In the **Security & Privacy** tab you will find all your devices that have been
 
 * The public names of your devices which can be assigned here (by clicking on them with the mouse) can also be viewed by your conversation partner:inside.  This helps if they want to compare the cryptographic keys of your devices (e.g. laptop + cell phone) and can easily identify the device names.
 
-* The many cryptographic keys are stored on the respective device. If this is e.g. a tab in a browser, there is a risk that this tab will be closed unintentionally. Then all encrypted contents are no longer readable. To prevent this from happening, a key protection is offered on the home server of the Darmstadt University of Applied Sciences, on which (protected by a passphrase) all cryptographic keys are stored encrypted. It is strongly recommended to use this key backup!
-
-![Screenshot of the menu item for key protection](/images/10_Setup-Keystore_en.png)
-
-If not set up after initial registration: The **Key Backup** is a valuable achievement, as it enables the keys of all end-to-end encrypted calls to be centrally secured on the Darmstadt University of Applied Sciences server with a password. This allows convenient use of multiple devices or matrix clients. To do so, click on "Start using key backup" and choose a strong security phrase (but not the University password). This security phrase will always have to be entered if keys are to be synchronized with the key backup.
-
-![Prompt to generate the security key or enter a security phrase](/images/11_Setup-Key_en.png)
-![Prompt to enter a password for the key backup](/images/12_Enter-Key_en.png)
-Alternatively, instead of the security phrase, you can also have a security key generated that serves the same purpose as the security phrase. Furthermore, the security key is generated in addition to the security phrase and should be kept safe and retrievable as an emergency key (e.g. save it as .txt file or print it out) 
-![Display of the security key to write or save away](/images/13_Present-Key_en.png) 
+* The many cryptographic keys are stored on the respective device. If this is e.g. a tab in a browser, there is a risk that this tab will be closed unintentionally. Then all encrypted contents are no longer readable. To prevent this from happening, a key protection is offered on the home server of the Darmstadt University of Applied Sciences, on which (protected by a passphrase) all cryptographic keys are stored encrypted. It is strongly recommended to use this key backup!
\ No newline at end of file