diff --git a/content/accessibility/_index.en.md b/content/accessibility/_index.en.md
index e9d9f3923ad5b9ca7a445959b9f90d6b531a15c7..316080a0dc91d1d1bafd20738201f5185a2c93cb 100644
--- a/content/accessibility/_index.en.md
+++ b/content/accessibility/_index.en.md
@@ -15,13 +15,13 @@ As a public body within the meaning of the Barrier-free Web Sites Act (BfWebG),
No BITV test for the web application Element has been performed yet.
## Non-accessible content
-* The login page has too low contrast.
-* The chat application has too low contrast, can only be operated in its basic features using a screen reader.
+* The contrast on the login page is too low.
+* The contrast on the chat application is too low, only basic features work when using a screen reader.
* The chat application is not always operable with the keyboard.
## Alternatives
-Accessible alternatives are for example the command line clients [matrix-commands](https://matrix.org/docs/projects/client/matrix-commander), [weechat-matrix](https://matrix.org/docs/projects/client/weechat-matrix) or [gomuks](https://matrix.org/docs/projects/client/gomuks).
+Accessible alternatives are the command line clients [matrix-commands](https://matrix.org/docs/projects/client/matrix-commander), [weechat-matrix](https://matrix.org/docs/projects/client/weechat-matrix) or [gomuks](https://matrix.org/docs/projects/client/gomuks).
## Contact
-Should you notice any shortcomings in terms of barrier-free design, please contact sd.h-da.de.
+If you notice any shortcomings in terms of barrier-free design, please contact sd.h-da.de.
diff --git a/content/clients/_index.en.md b/content/clients/_index.en.md
index 0484e2e0f179335b8507e82b00cc5afbee8fe044..48e89a9a84de253ebc74748dea528e3fbdfc0275 100644
--- a/content/clients/_index.en.md
+++ b/content/clients/_index.en.md
@@ -8,7 +8,7 @@ weight: 15
# Installation of a client / program
-The recommended client for using Matrix is called Element and can be used on different systems and devices:
+The recommended client for using Matrix is called Element and works on different systems and devices:
1. **Element Web:** [The h_da browser web application](#web-app)
1. **Element Desktop:** [Downloads for Linux/Windows/Mac](#desktop-app)
1. **Element mobile:** [Android/iOS](#mobile-app)
@@ -21,20 +21,20 @@ Web-App: {{% button href="https://chat.fbi.h-da.de" icon="fas fa-globe" %}}chat.
The easiest way is to open the Element Web application directly in a modern browser (e.g. [Mozilla Firefox](https://www.mozilla.org/de/firefox/)).
-Further information can be found in the submenu ["Element Web (Browser)"]({{< ref "clients/browser" >}} "Element Web (Browser)").
+Further information is available in the submenu ["Element Web (Browser)"]({{< ref "clients/browser" >}} "Element Web (Browser)").
## Element Desktop {#desktop-app}
Downloads for: {{% button href="https://packages.riot.im/desktop/install/win32/x64/Element%20Setup.exe" icon="fas fa-download" %}}Windows{{% /button %}} {{% button href="https://packages.riot.im/desktop/install/macos/Element.dmg" icon="fas fa-download" %}}macOS{{% /button %}} {{% button href="/clients/install_linux" icon="fas fa-download" %}}Linux{{% /button %}}
-More recommendable than using a browser tab is the installation of the program Element on your own computer. Here you can keep the overview independently of the browser (however, you should also take care of the updates of the program).
+Instead of using a browser tab the installation of the program Element on your own computer is recommended. Here you can keep the overview independently of the browser (however, also take care of the updates of the program).
-More information can be found in the submenu ["Element Desktop"]({{< ref "desktop.md" >}} "Element Desktop").
+More information is available in the submenu ["Element Desktop"]({{< ref "desktop.md" >}} "Element Desktop").
## Element Mobile {#mobile-app}
Downloads for: {{% button href="https://play.google.com/store/apps/details?id=im.vector.app" icon="fas fa-download" %}}Android (Google Play){{% /button %}} {{% button href="https://apps.apple.com/app/vector/id1083446067" icon="fas fa-download" %}}iOS (iPhone/iPad){{% /button %}} {{% button href="https://f-droid.org/packages/im.vector.app/" icon="fas fa-download" %}}Android (F-Driod){{% /button %}}
-To have access to Matrix on the road, there is the possibility to install a mobile element client on the smartphone.
+To access Matrix on the road, a mobile Element client on the smartphone is also available when necessary.
-Further information can be found in the submenu ["Element Mobile"]({{< ref "mobile.md" >}} "Element Mobile").
+Further information is available in the submenu ["Element Mobile"]({{< ref "mobile.md" >}} "Element Mobile").
diff --git a/content/clients/browser.en.md b/content/clients/browser.en.md
index 52e45738d758a46a702d6fb0b93ec2b3a51b9d98..5408856fca928f3c829ab2491fbc9a6c5cbe6e48 100644
--- a/content/clients/browser.en.md
+++ b/content/clients/browser.en.md
@@ -11,7 +11,7 @@ Start here: [https://chat.fbi.h-da.de](https://chat.fbi.h-da.de)
-No registration is necessary, the service can be used immediately by clicking on "Sign in" on the homepage [**https://chat.fbi.h-da.de**](https://chat.fbi.h-da.de).
+No registration is necessary, the service works immediately by clicking on "Sign in" on the homepage [**https://chat.fbi.h-da.de**](https://chat.fbi.h-da.de).
@@ -25,12 +25,12 @@ An alternative login, e.g. using the e-mail address, is *NOT* possible during th
After the first login there is also no e-mail / confirmation mail.
-Analogous to e-mail addresses, this results in matrix addresses with the following structure:
+Analogous to e-mail addresses, this results in Matrix addresses with the following structure:
@University-Login:matrix.fbi.h-da.de
{{% notice warning %}}
-If you want to start immediately with the common available [Matrix Client](https://app.element.io/#/login) instead of the above mentioned website (Element Web-App installed at Darmstadt University of Applied Sciences), it is important to change the home server from the usually default matrix.org to matrix.fbi.h-da.de (shown in the following three screenshots)
+If you want to start immediately with the common available [Matrix Client](https://app.element.io/#/login) instead of the above mentioned website (Element Web-App installed at Darmstadt University of Applied Sciences), it is important to change the home server from the default matrix.org to matrix.fbi.h-da.de (shown in the following three screenshots)
{{% /notice %}}
@@ -39,19 +39,19 @@ If you want to start immediately with the common available [Matrix Client](https
-2. Entry of the matrix home server address of the Darmstadt University of Applied Sciences
+2. Enter the matrix home server address of the Darmstadt University of Applied Sciences
-3. After clicking "Continue" you fill in your credentials analogur the description for the element chat client in chapter "First Steps".
+3. Click "Continue" to fill in theyour credentials fitting the description for the Element chat client in chapter "First Steps".
## Browser settings
### Browser selection
-Recommended are the browsers [Firefox](https://www.mozilla.org/de/firefox/new/), [Chromium](https://www.chromium.org/getting-involved/download-chromium), newer versions of MS Edge (based on Chromium). Older or unsuitable browsers may only show a white page.
+Recommend browsers are [Firefox](https://www.mozilla.org/de/firefox/new/), [Chromium](https://www.chromium.org/getting-involved/download-chromium), and newer versions of MS Edge (based on Chromium). Older or unsuitable browsers may only show a white page.
### NoScript
-Many people use script blockers to protect themselves from Tracking and malware in the browser, for example with the addon [NoScript](https://addons.mozilla.org/de/firefox/addon/noscript/). Here you have to make the following settings (for the integration manager, e.g. Jitsi/Etherpad)
+Many people use script blockers to protect themselves from tracking and malware in the browser, i.e. with [NoScript](https://addons.mozilla.org/de/firefox/addon/noscript/). Change the following settings (for the integration manager, e.g. Jitsi/Etherpad)
@@ -59,7 +59,7 @@ Source: TU Dresden
### Cookies
-Do you also allow cookies from
+Also, allow cookies from
- h-da.de
- vector.im (for the integration manager)
diff --git a/content/clients/desktop.en.md b/content/clients/desktop.en.md
index 643b4cd0cb270b35a742b3c38a48d9c9ab642ec6..6ae516ef1e9dbd13c9f899e68e6a41cffc40aa22 100644
--- a/content/clients/desktop.en.md
+++ b/content/clients/desktop.en.md
@@ -18,14 +18,14 @@ This is done by clicking on **Edit**. Then you will not accidentally end up on t
-Now you can manually specify the home server: https://matrix.fbi.h-da.de
+Manually specify the following home server: https://matrix.fbi.h-da.de
-Afterwards the one-time login with h-da login and h-da password must be carried out:
+Afterwards, carry out the one-time login with h-da login and password:
-By activating the slider under "All Settings > Settings" > **Automatic start after system login**, the element client starts after every reboot and you no longer miss any notifications.
+Activate the slider under "All Settings > Settings" > **Automatic start after system login**, to let the Element client start after every reboot and no longer miss any notifications.
diff --git a/content/clients/install_linux.en.md b/content/clients/install_linux.en.md
index d406a09785f1ef6ed2600e7745ee73d0d4b0cb62..9ac3c8557606347c1afe86d6db401a468a57a468 100644
--- a/content/clients/install_linux.en.md
+++ b/content/clients/install_linux.en.md
@@ -6,7 +6,7 @@ chapter: true
weight: 60
---
# Install Element Desktop on Linux
-We recommend using the package manager of your System to install Element Desktop. The following commands will install element desktop. You can enter them on the command line.
+We recommend using the systems package manager to install Element Desktop. The following commands will install Element Desktop. Enter them on the command line.
### Debian/Ubuntu
```sh
diff --git a/content/clients/mobile.en.md b/content/clients/mobile.en.md
index 04434ce756c63b8fc4a1b93595278bf5aee03eac..cf6c323b4b73dee4fbf50a2b03dff53999378df0 100644
--- a/content/clients/mobile.en.md
+++ b/content/clients/mobile.en.md
@@ -10,7 +10,7 @@ weight: 30
Downloads for: {{% button href="https://play.google.com/store/apps/details?id=im.vector.app" icon="fas fa-download" %}}Android (Google Play){{% /button %}} {{% button href="https://apps.apple.com/app/vector/id1083446067" icon="fas fa-download" %}}iOS (iPhone/iPad){{% /button %}} {{% button href="https://f-droid.org/packages/im.vector.app/" icon="fas fa-download" %}}Android (F-Driod){{% /button %}}
-The following series of images shows screenshots of the setup of Android or iOS Element:
+The following series of images shows screenshots of the Element setup for Android or iOS:
diff --git a/content/clients/more_clients.en.md b/content/clients/more_clients.en.md
index 3f4cc3b939dccb8e217ae14bf67aececa620535b..ed4136d6716144c4350c6f110c8013298d144953 100644
--- a/content/clients/more_clients.en.md
+++ b/content/clients/more_clients.en.md
@@ -7,7 +7,7 @@ chapter: true
# More clients
-For users who like to experiment, there are numerous other clients in addition to Element, with which the Matrix communication protocol can be used:
+Users who like to experiment, there are numerous other clients for the Matrix communication protocol available in addition to Element:
- https://matrix.org/docs/projects/clients-matrix
- https://matrix.org/docs/projects/try-matrix-now
diff --git a/content/communities/_index.en.md b/content/communities/_index.en.md
index fe3d4dfeae2e6ed3dbd645ec70c783520db9e3c3..6d7c16e8195856e1f820ed8b58a6bec72166e3f2 100644
--- a/content/communities/_index.en.md
+++ b/content/communities/_index.en.md
@@ -12,23 +12,23 @@ weight: 50
All matrix users of the client element (and a few other clients) can use communities to filter different rooms, which may be lost or scattered in the room list on the left.
-Communities can only be created for yourself or for others (if you invite them into a community) and create a superordinate structure for rooms. For example, for a semester group/study group or for a chair team etc.
+Communities are only created for yourself or for others (when invited into a community) and create a superordinate structure for rooms. For example, a semester group/study group or for a chair team etc.
-Existing rooms can be assigned to a community in the community settings (under #).
+An existing room is assigned to a community in the community settings (under #).
A community created with the + button can be drag'n'dropped from the community avatar (little picture) onto the sidebar.
-A small HTML page can be used to describe the community.
+A small HTML page is used to describe the community.
-Unfortunately it is currently not possible to add more administrators through the matrix client: [https://github.com/vector-im/element-web/issues/5240](https://github.com/vector-im/element-web/issues/5240)
+Unfortunately, it is not possible to add more administrators through the Matrix client at the moment: [https://github.com/vector-im/element-web/issues/5240](https://github.com/vector-im/element-web/issues/5240)
-Removing rooms from communities is done by clicking on the hash # in the upper right corner, then clicking on the room to be removed and then clicking on "Remove from community".
+Removing rooms from communities is done by clicking on the hash # in the upper right corner. Click on the room to remove and then click on "Remove from community".
-A community can be deleted when the administrator leaves it.
+A community is deleted when the administrator leaves it.
### other administrators
-Currently no more administrators can be added to a community via Element. Issue on Github](https://github.com/vector-im/riot-web/issues/5240) If you need more administrators in a community, they can be added by the Matrix Admin Team. Please send a support request to sd.h-da.de.
+Currently, no more administrators can be added to a community via Element. Issue on Github](https://github.com/vector-im/riot-web/issues/5240) When more administrators in a community are needed, they are added by the Matrix Admin Team. Please send a support request to sd.h-da.de.
diff --git a/content/development/_index.en.md b/content/development/_index.en.md
index 9010faade40b84f4e013cb724cb866b85d3e86ff..da1fa29e0670e78715e87377fd7942d6711d2d4f 100644
--- a/content/development/_index.en.md
+++ b/content/development/_index.en.md
@@ -8,15 +8,15 @@ weight: 200
# Further development of Matrix
-Currently the h_da does not pay for the use of the source code. The Matrix-Admin-Team is in contact with the developers and occasionally contributes small things to the further development.
+Currently, h_da does not pay for the use of the source code. The Matrix-Admin-Team is in contact with the developers and occasionally contributes small changes to further development.
-Matrix is an open standard, the details of interoperable communication using the matrix set of HTTP-APIs are freely published. Matrix is also open source, which means that the source code of the reference servers, clients and services has been released to the public under the Apache v2 license to encourage everyone to run their own servers and clients.
+Matrix is an open standard, the details of interoperable communication using the Matrix set of HTTP-APIs are freely published. Matrix is also open source, which means that the source code of the reference servers, clients and services is released to the public under the Apache v2 license to encourage everyone to run their own servers and clients.
-Since it is free software, improvement requests can be converted into direct programming jobs.
+Since it is free software, improvement requests are converted into direct programming jobs.
-Currently still in development, and can be promoted/accelerated by orders/donations, are among others
+Among others, the following items are still under development and can be promoted/accelerated by orders/donations:
* chat export
* Threading (more clearly arranged discussions)
diff --git a/content/encryption/_index.en.md b/content/encryption/_index.en.md
index 7292a08ec590b2e253f70512484c3d4a9966008e..47879bf1a63ea0721a92929a7bc231b39fff74a4 100644
--- a/content/encryption/_index.en.md
+++ b/content/encryption/_index.en.md
@@ -8,41 +8,41 @@ weight: 60
# Use of end-to-end encryption
-1:1 calls are now encrypted end-to-end by default. Therefore, a configured key backup as well as a verification of all self used client devices is recommended ([Important settings]({{< ref "settings" >}}))
+By default, 1:1 calls are end-to-end encrypted now. Therefore, a configured key backup as well as a verification of all self-used client devices is recommended ([Important settings]({{< ref "settings" >}}))
-The decision whether a created room should be encrypted in this way must be well thought out and cannot be undone. If the room is large or public, checking all keys of all interlocutors could take a lot of time. But this manual check can be done later on occasion and end-to-end encrypted conversations can be started directly with blind trust for the time being.
+The decision whether a created room should be encrypted in this way must be well thought out and cannot be undone. If the room is large or public, checking all keys of all participants can take a lot of time. This manual check is done later on occasion and end-to-end encrypted conversations are started directly with blind trust for the time being.
-If you want end-to-end encryption (E2EE) to interlocutor:inside in an unencrypted room, you can achieve this by clicking on the settings of the desired room. (or in the room via "Room info" > "Room settings" in the upper right corner):
+If end-to-end encryption (E2EE) to interlocutor:inside in an unencrypted room is needed, click on the settings of the desired room (or in the room via "Room info" > "Room settings" in the upper right corner):
-To do this, move the Encrypted slider on the Security & Privacy tab:
+To do this, activate the Encrypted slider on the Security & Privacy tab:
-This can be confirmed with OK. From now on the messages can only be read by those involved in the conversation. If you have not set up a key protection in the settings before, you should do this now (see [Important settings]({{< ref "settings" >}})) to be able to read earlier and in absence received messages.
+Confirm with OK. From now on only those involved in the conversation are able to read the messages. When no key protection has been set up in the settings before, do it now (see [Important settings]({{< ref "settings" >}})) to read earlier messages and those received in absence.
-Now the encrypted exchange can begin. If you want to verify the correctness of the keys and to document this trustworthiness digitally, you first have to unfold the sidebar by clicking on the person symbol in the upper right corner:
+The encrypted exchange can begin now. To verify the correctness of the keys and to document this trustworthiness digitally, first unfold the sidebar by clicking on the person symbol in the upper right corner:
-The contact person can now be clicked on in the opening bar of the participants in the conversation:
+Click the contact person in the opening bar of the participants in the conversation:
-The bar now shows the conversation person in detail. Here a key verification can be initiated by clicking on "Verify". By clicking on "Start Verification" the other side is notified and after confirmation (see next picture) the "Verification by Emojis" can start.
+The bar shows the conversation person in detail now. Here a key verification is initiated by clicking on "Verify". The other side is notified by clicking on "Start Verification". After confirmation (see next picture) the "Verification by Emojis" starts.
-This verification should be done with the contact person by comparison (e.g. verbally via telephone, in the same room or other medium). Since this is not always easy, the trust can also be expressed first of all (otherwise you will be asked again and again to carry out the verification) and carried out on occasion (e.g. at the next meeting).
+This verification should be done with the contact person by comparison (e.g. verbally via telephone, in the same room or other medium). Since this is not always easy, the trust can also be expressed first (otherwise the verification is asked again and again) and carried out on occasion (e.g. at the next meeting).
-A detailed description of the topic can be found in this [video by Prof. Plikat](https://invidious.ggc-project.de/VOxfa6dqXSk) and [in this Matrix blog article](https://blog.riot.im/e2e-encryption-by-default-cross-signing-is-here).
+A detailed description of the topic is shown in this [video by Prof. Plikat](https://invidious.ggc-project.de/VOxfa6dqXSk) and [in this Matrix blog article](https://blog.riot.im/e2e-encryption-by-default-cross-signing-is-here).
-The adjustment itself is done via emoji images or QR codes, which can look different depending on the device and icon pack. Also the translation of all interface elements into German is not 100% available.
+The adjustment itself is done via emoji images or QR codes, which look different depending on the device and icon pack. Also, the translation of all interface elements into German is not 100% available.
@@ -50,7 +50,7 @@ This is done analogously in rooms with several participants, each one individual
-In the respective room rows the following symbols indicate the status of the encryption and the corresponding verification:
+ The following symbols indicate the status of the encryption and the corresponding verification in the respective room rows:
diff --git a/content/faq/_index.en.md b/content/faq/_index.en.md
index 3470bbfc707f94fdc2ddb5f209187b46d7afd696..40798b9f7cb158bf5ac99de3d80bb56d4b5fc6a5 100644
--- a/content/faq/_index.en.md
+++ b/content/faq/_index.en.md
@@ -8,81 +8,81 @@ weight: 200
This is a collection of frequently asked questions and their answers. Some of the answers are not yet written.
* [What is the difference between passphrase and recovery key?](#securityphrase-vs-securitykey)
-* [Why is there no status bar at the bottom of the screen when hovering over hyperlinks in the Desktop-Client element? How can you trust them then?](#no-statusline)
+* [Why is there no status bar at the bottom of the screen when hovering over hyperlinks in the Desktop-Client element? How can they be trusted then?](#no-statusline)
* [How to tell people a room address with Element Desktop Client?](#desktop-share-room)
-* [How do you tell people a room address with Element Web-Client?](#web-share-room)
-* [Can I write LaTeX?](#latex)
+* [How to tell people a room address with Element Web-Client?](#web-share-room)
+* [Is it possible to write LaTeX?](#latex)
* [Are there something like Threads (like in Mattermost/Slack) in Matrix?](#threads)
-* [How do I change the passphrase for my key backup?](##change-securityphrase)
-* [How do I reset the key backup if I have lost my passphrase AND my (saved and printed) recovery key?](#reset-securityphrase)
+* [Is it possible to change the passphrase for my key backup?](##change-securityphrase)
+* [Is it possible to reset the key backup if the passphrase is lost along with the (saved and printed) recovery key?](#reset-securityphrase)
* [Why is there no room "Hochschule Darmstadt"? Who is allowed to create it?](#no-tud-room)
-* [How can I, as the administrator, delete many messages at once?](#delete-multiple-messages)
-* [Sometimes I see a room marked in bold and click on it, but I don't have the time to edit the content and any consequences for me immediately. How can I mark the room as "unread" again?](#mark-room-as-unread)
-* [What should I do if video or audio in a video conference does not work on a MacOS?](#apple-no-video)
-* [How many people can be invited at ones into a room? Can I invite people by their E-Mail address?](#how-many-invites-can-i-do)
-* [Can I modify access permissions for all rooms in my community, that only members of the community can enter?](#roompermissions-in-communities)
-* [Can I manage multiple Matrix-Account on my Element Desktop Client?](#multiple-accounts-element)
+* [How can administrators delete many messages at once?](#delete-multiple-messages)
+* [Sometimes a room is marked in bold and when clicked on, there is no time to edit the content and any consequences immediately. Is it possible to mark a room as "unread" again?](#mark-room-as-unread)
+* [How to solve video or audio not working in a video conference on a MacOS?](#apple-no-video)
+* [How many people can be invited at once into a room? Can E-Mail addresses used to invite people?](#how-many-invites-can-i-do)
+* [Is modification of access permissions possible for all rooms in a community, that only members of that community can enter?](#roompermissions-in-communities)
+* [Can Element Desktop Client manage multiple Matrix-Accounts?](#multiple-accounts-element)
***
#### What is the difference between passphrase and recovery key? {#securityphrase-vs-securitykey}
-The password that can access the key backup is called the recovery key and is very long, starts with a capital E and should be saved or printed after setup. Since this password is hard to remember in everyday life (e.g. when you are on the road, want to have a look at Matrix, but only have access to other computers) you can think of a (easy to remember) passphrase from which the recovery key can be calculated (in the browser/client) before trying to "open" the key backup.
+The password that can access the key backup is called the recovery key and is very long, starts with a capital E and should be saved or printed after setup. Since this password is hard to remember in everyday life (e.g. when on the road, looking at Matrix, but having only access to untrusted computers) think of a passphrase (easy to remember) from which the recovery key is calculated (in the browser/client) before trying to "open" the key backup.
***
-#### Why is there no status bar at the bottom of the screen when hovering over hyperlinks in the Desktop-Client element? How can you trust them then? {#no-statusline}
-In fact, the status bar is a popular test of the seriousness of hyperlinks you are trying to click on. In the Desktop Client element this is not possible, similar to the mobile clients. Here you can only right-click on the link and check the presented target page for seriousness.
+#### Why is there no status bar at the bottom of the screen when hovering over hyperlinks in the Desktop-Client element? How can they be trusted then? {#no-statusline}
+In fact, the status bar is a popular test of the seriousness of hyperlinks to click on. In the Desktop Client Element this is not possible, similar to the mobile clients. Here, right-click on the link and check the presented target page for seriousness.
***
#### How to tell people a room address with Element Desktop Client? {#desktop-share-room}
-With the matrix.to link, which you can see under the i for the room properties and another click on "Share room".
+With the matrix.to link, under the i for the room properties and another click on "Share room".
***
-#### How do you tell people a room address with Element Web-Client? {#web-share-room}
-With the matrix.to link, which you can see under the i for the room properties and a further click on "Part room" and an exchange of the front matrix.to with matrix.fbi.h-da.de
+#### How to tell people a room address with Element Web-Client? {#web-share-room}
+With the matrix.to link, under the i for the room properties, a further click on "Part room", and changing of the front matrix.to with matrix.fbi.h-da.de
***
-#### Can I write LaTeX? {#latex}
+#### Is it possible to write LaTeX? {#latex}
Yes, but it is an experimental feature right now. It will be available for everybody in a few weeks: https://github.com/vector-im/element-web/issues/1945
***
#### Are there something like Threads (like in Mattermost/Slack) in Matrix? {#threads}
-No, threads like in Mattermost or Slack are currently not existing in Matrix. The developers of Element are aware of this topic and planed it for future release. To get more information, follow their roadmap: https://github.com/vector-im/roadmap/projects/1
+No, threads like in Mattermost or Slack are not existing in Matrix currently. The developers of Element are aware of this topic and planned it for a future release. To get more information, follow their roadmap: https://github.com/vector-im/roadmap/projects/1
***
-#### How do I change the passphrase for my key backup? {##change-securityphrase}
+#### Is it possible to change the passphrase for my key backup? {##change-securityphrase}
?
***
-#### How do I reset the key backup if I have lost my passphrase AND my (saved and printed) recovery key? {#reset-securityphrase}
+#### Is it possible to reset the key backup if the passphrase is lost along with the (saved and printed) recovery key {#reset-securityphrase}
?
***
#### Why is there no room "Hochschule Darmstadt"? Who is allowed to create it? {#no-tud-room}
-All persons creating a room are administrative persons and are responsible for the room. Matrix is not yet designed for the exchange of thousands of members at the university. Should a central room be needed one day, its establishment and maintenance would certainly be the responsibility of the presidium.
+All persons that create a room are administrative persons and are responsible for the room. Matrix is not designed for the exchange of thousands of members at the university yet. When a central room is needed one day, its establishment and maintenance would certainly be the responsibility of the presidium.
***
-#### How can I, as the administrator, delete many messages at once? {#delete-multiple-messages}
+#### How can administrators delete many messages at once? {#delete-multiple-messages}
?
***
-#### Sometimes I see a room marked in bold and click on it, but I don't have the time to edit the content and any consequences for me immediately. How can I mark the room as "unread" again? {#mark-room-as-unread}
+#### Sometimes a room is marked in bold and when clicked on, there is no time to edit the content and any consequences immediately. Is it possible to mark a room as "unread" again? {#mark-room-as-unread}
Unfortunately this is not possible in Element. As a workaround, you can mark the room as a favorite and notice yourself that your own favorites should be looked at again.
***
-#### What should I do if video or audio in a video conference does not work on a MacOS? {#apple-no-video}
+#### How to solve video or audio not working in a video conference on a MacOS? {#apple-no-video}
Often Element does not have the rights to access the webcam and microphone. These can be assigned in the system settings under Security and Privacy.
***
-#### How many people can be invited at ones into a room? Can I invite people by their E-Mail address? {#how-many-invites-can-i-do}
-Mass invite by E-Mail is currently not supported in Element. If you want to mass invite, please send an request via the servicedesk, so we can assist. You can invite 100 people by their ZIH username yourself.
+#### How many people can be invited at once into a room? Can E-Mail addresses used to invite people? {#how-many-invites-can-i-do}
+Mass invitation by E-Mail is not supported in Element currently. When mass invitations are needed, please send an request via the servicedesk for assistance. Invitations for up to 100 people by their ZIH username are allowed.
***
-#### Can I modify access permissions for all rooms in my community, that only members of the community can enter? {#roompermissions-in-communities}
+#### Is modification of access permissions possible for all rooms in a community, that only members of that community can enter? {#roompermissions-in-communities}
No, this is not possible. Rooms can be part of multiple communities. Therefore the access permission will be set on room based level.
***
-#### Can I manage multiple Matrix-Account on my Element Desktop Client? {#multiple-accounts-element}
-With the Element Desktop client, you can only manage one Matrix-Account right now. But it is possible to start several Element-windows with different Matrix-Accounts, also within your Autostart-settings of your computer. Therefore, you need to change (or create additional) execution commands to open a specific profile:
+#### Can Element Desktop Client manage multiple Matrix-Accounts? {#multiple-accounts-element}
+The Element Desktop client can manage only one Matrix-Account right now. But it is possible to start several Element-windows with different Matrix-Accounts, also within the computers Autostart-settings. Therefore, execution commands need to change (or additional ones created) to open a specific profile:
```
element-desktop --profile PROFILE_NAME
```
-So you can place several Element-Starters in your Autorstart, with different profile names, e.g. --profile TUD or --profile Private. Unfortunately, both opened windows will appear with the same Icon in the Indicator-Applet. But therefore, a solution will upcome soon, for sure...
+Several Element-Starters with different profile names are placed in your Autostart, e.g. --profile TUD or --profile Private. Unfortunately, both opened windows will appear with the same Icon in the Indicator-Applet. A solution for this will be developed soon...
-Furthermore, there are other Matrix-Clients, that can handle more Matrix-Accounts per se, e.g. [weechat](https://matrix.org/docs/projects/client/weechat-matrix), [Spectral](https://matrix.org/docs/projects/client/spectral), [Quaternion](https://matrix.org/docs/projects/client/quaternion), or [Mirage](https://matrix.org/docs/projects/client/mirage).
+Furthermore, there are other Matrix-Clients, that are able to handle more Matrix-Accounts per se, e.g. [weechat](https://matrix.org/docs/projects/client/weechat-matrix), [Spectral](https://matrix.org/docs/projects/client/spectral), [Quaternion](https://matrix.org/docs/projects/client/quaternion), or [Mirage](https://matrix.org/docs/projects/client/mirage).
diff --git a/content/first-steps/_index.en.md b/content/first-steps/_index.en.md
index 5698688d26807179bce48c813ca747df194c82b6..d35f1ec186d2d4207d1a2f43cb3571e2aeba3b6c 100644
--- a/content/first-steps/_index.en.md
+++ b/content/first-steps/_index.en.md
@@ -8,28 +8,27 @@ weight: 2
# First steps - How to use Matrix?
-Members and members of the Darmstadt University of Applied Sciences (of course also students) can use their **University Login** to communicate with members of the Darmstadt University of Applied Sciences and other universities and other Matrix users (e.g. academic partners) via chat and audio/video telephony in compliance with the relevant legal and regulatory provisions on data protection and IT security.
-communicate.
+Members and members of the Darmstadt University of Applied Sciences (students as well, of course) use their **University Login** to communicate with members of the Darmstadt University of Applied Sciences, other universities, and other Matrix users (e.g. academic partners) via chat and audio/video telephony in compliance with the relevant legal and regulatory provisions on data protection and IT security.
{{% notice tip %}}
-We recommend using the Element desktop client, because this avoids most problems users have with Matrix, e.g. end to end encryption.
+The use of the Element desktop client is recommended, because this avoids most problems users have with Matrix, e.g. end-to-end encryption.
{{% /notice %}}
Downloads for: {{% button href="https://packages.riot.im/desktop/install/win32/x64/Element%20Setup.exe" icon="fas fa-download" %}}Windows{{% /button %}} {{% button href="https://packages.riot.im/desktop/install/macos/Element.dmg" icon="fas fa-download" %}}macOS{{% /button %}} {{% button href="/clients/install_linux" icon="fas fa-download" %}}Linux{{% /button %}}
-After a desktop installation, make sure to use the existing account with the h-da login and not to create a new account on another server. Here the example of Element:
+After a desktop installation, make sure to use the existing account with the h-da login and do not create a new account on another server. This example uses Element:
-This is done by clicking on **Edit**. Then you will not accidentally end up on the wrong server...
+Click on **Edit**. This way, the proper server is used.
-Now you can manually specify the home server: **matrix.fbi.h-da.de**
+Now specify the home server manually: **matrix.fbi.h-da.de**
-The drop-down menu "Sign in with" should be left at "User name". Afterwards the login with your h-da login and h-da password.
+The drop-down menu "Sign in with" should be left at "User name". Afterwards, login with the h-da login and password.
**Username: university login** (only the h-da-login, no e-mail address!)
@@ -47,88 +46,88 @@ Analogous to e-mail addresses, this results in matrix addresses with the followi
## Convenient use of end-to-end encryption (E2EE)
-Matrix not only encrypts transports to and from the home server (in the data center of Darmstadt University of Applied Sciences) but also allows the use of end-to-end encryption (E2EE). For this, cryptographic keys have to be exchanged between all devices that want to write end-to-end encrypted. This technical necessity sounds and is complicated, but in the meantime it has become very convenient for the users. The many cryptographic keys created by the client are stored on the respective device. If this is a tab in a browser, for example, 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 with a security phrase (or security key that can be calculated from it) all cryptographic keys are stored encrypted.
+Matrix not only encrypts transports to and from the home server (in the data center of Darmstadt University of Applied Sciences) but also allows the use of end-to-end encryption (E2EE). For this, cryptographic keys have to be exchanged between all devices that want to send end-to-end encrypted messages. This technical necessity sounds and is complicated, but has become very convenient for the users. The many cryptographic keys created by the client are stored on the respective device. If, for example, this is a tab in a browser, there is a risk that this tab will be closed unintentionally: 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. All cryptographic keys that are protected with a security phrase (or security key that is calculated from it) are stored in encrypted form on the server.
{{% notice info %}}
It is highly recommended to use this key backup (with a secure security phrase which is NOT your University password) and read on at [Other important settings]({{< relref "settings/_index.en.md" >}})!
{{% /notice %}}
- If you login for the fist time or login again without having made any backup of your securitykey yet, then the following window will be shown:
+ If loggiing in for the first time or again without having made any backup of the security key yet, then the following window will be shown:
-You have to "skip" this, because you did not have any security key yet:
+"Skip" this, because there is no security key yet:
-Key protection is highly recommended for worry-free end-to-end encryption. Therefore you have to choose "Settings/Security & Privacy". Please look for "Encryption" and choose "set up" secure backup.
+Key protection is highly recommended for worry-free end-to-end encryption. Therefore choose "Settings/Security & Privacy". Please look for "Encryption" and choose "set up" secure backup.
-Alternatively you can choose "Security & Privacy" by clicking the downward pointing triangle symbol right next to your username.
+Alternatively, choose "Security & Privacy" by clicking the downward pointing triangle symbol right next to the username.
-In the next window you can setup your key backup:
+Setup the key backup in the next window:
-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.
+Choose "Generate a Security Key" and "Continue", to let the security key appear in the next window. This should be kept save and retrievable as an emergency key.
-With each logout from element and re-login or new login to element 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.
+With each logout from element and re-login or new login to element on a new device, the security key is prompted. Without this key, there is no access to 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.
+**Alternatively** Choose a strong security phrase (but 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 have to be entered if keys are to be synchronized with the key backup.
-You will be asked to confirm your passphrase for your security key:
+Confirm the passphrase for the security key:
-The next window shows your security key, which you should keep safe and retrievable together with your strong passphrase.
+The next window shows the security key, which should be kept safe and retrievable together with a strong passphrase.
-Last but not least you may be asked to confirm your identity with your element-login-password.
+Last but not least, the users identity may need to be confirmed with the element-login-password.
*(sorry for no english screenshot)*
-If you logout from element and login again or login to element with another device, then you will be asked for your security key or your passphrase.
+After logout from Element and logging in again or a login to Element with another device, then the security key or passphrase must be entered.
-If you put in a passphrase, you will be asked like this:
+When entering a passphrase, the prompt looks like this:
-If you put in a generated security key, you will be asked like this:
+If entering in a generated security key, the prompt looks like this:
-If you entered correctly, your restore session is successfully verified:
+Upon correct input, the restore session is successfully verified:
-Now you can use your element chat client inclusive encryption.
+Now the Element chat client is used with encryption.
-With each login to element you will see the following window:
+With each login to Element the following window appears:
-This question you can answer as you like.
+This question can be answered at will.
## Webclient
For using the Webclient, see the manuel under [clients -> browser]({{< relref "clients/browser.en.md" >}})
-A registration of accounts (as known from other matrix servers) is not possible here at the Darmstadt University of Applied Sciences, because only persons with University login can use the service. The Darmstadt University of Applied Sciences is not a communication service provider.
+A registration of accounts (as known from other Matrix servers) is not possible at the Darmstadt University of Applied Sciences, because only persons with University login can use the service. The Darmstadt University of Applied Sciences is not a communication service provider.
-For scientific cooperations with colleagues without a University account there is the possibility to [apply for a university guest account](https://sd.h-da.de), which also entitles to use Matrix.
+For scientific cooperations with colleagues without a University account there is the possibility to [apply for a university guest account](https://sd.h-da.de), which also entitles to the use of Matrix.
However, the federation with the Matrix servers of other scientific or civil society institutions will soon be possible (analogous to the existing e-mail federation). Example servers with which communication is already possible are:
@@ -177,13 +176,13 @@ However, the federation with the Matrix servers of other scientific or civil soc
* [Uni Stuttgart](https://chat.stuvus.de/) incl. [Docu](https://wiki.stuvus.uni-stuttgart.de/display/ITKB/Matrix+Messenger)
-Explizit für Studierende:
+Students can use these servers:
* [StudiChat](https://chat.studichat.de/#/welcome) (für alle)
* [Fachschaften](https://matrix.fachschaften.org/) (für Fachschaften)
-Weitere europäische Hochschulen:
+More European Universities:
* [ETH Zürich](https://element.phys.ethz.ch/) incl. [Docu](https://readme.phys.ethz.ch/chat/)
diff --git a/content/integrations/_index.en.md b/content/integrations/_index.en.md
index 1bb9479573e9e6c1f1e4176b42b12b4b0b65cb51..e84261a7191efe5e9ba4bdfaa369af9a1884266a 100644
--- a/content/integrations/_index.en.md
+++ b/content/integrations/_index.en.md
@@ -8,15 +8,15 @@ weight: 80
# Use integrations, bridges, bots (e.g. Jitsi)
-Integrations/Widgets can be managed via the room information in the upper right corner.
+Integrations/Widgets are managed via the room information in the upper right corner.
-Here, for example, an etherpad, a jitsi video conference, an RSS bot, etc. can be integrated, i.e. services that are located and run on other servers. Therefore, when using integrations, the JavaScript activity of vector.im (for the integration manager) and other servers (e.g. in the Firefox addon NoScript) must be allowed. Since the widgets are often too small to use the services in their full functionality, widgets can often be opened large in new browser tabs.
+Here, for example, an etherpad, a jitsi video conference, an RSS bot, etc. is integrated, i.e. services that are located and run on other servers. Therefore, when using integrations, the JavaScript activity of vector.im (for the integration manager) and other servers (e.g. in the Firefox addon NoScript) must be allowed. Since the widgets are often too small to use the services in their full functionality, widgets often open large in new browser tabs.
## Etherpad
-The Etherpad widget can be used for collaborative writing or attaching important information to a room.
+The Etherpad widget is used for collaborative writing or attaching important information to a room.
{{% notice warning %}}
For this purpose, a name must be assigned which must have less than 16 characters!
diff --git a/content/messaging/_index.en.md b/content/messaging/_index.en.md
index cbe11a364310dc719292e6a504a64f9afaca752b..6724de18816945ead8073962447a266fbb9cc6b3 100644
--- a/content/messaging/_index.en.md
+++ b/content/messaging/_index.en.md
@@ -11,22 +11,22 @@ To write to individual persons and thus create a 1:1 chat, click on the "+" righ
-Now click in the search field and start typing the name (surname and last name), h-da login or the email address of the person you want to find. While typing a list of search results will appear.
+To find a person, click the search field and start typing the name (surname and last name), h-da login, or the email address. A list of search results will appear while typing.
-People who already has an account in Matrix can also be found by their matrix name (@h-da-login:matrix.fbi.h-da.de).
+People who already have an account in Matrix can also be found by their matrix name (@h-da-login:matrix.fbi.h-da.de).
-Please wait 5 seconds after each last entered character until the search results are displayed. Persons who have not yet logged in into Matrix may only be found via their h-da login or their e-mail address. The link button "Show More" will display further search results. Please also note on which server your searched person is displayed.
+Please wait 5 seconds after each entered character until the search results are displayed. Persons who have not yet logged in into Matrix may only be found via their h-da login or their e-mail address. The link button "Show More" will display further search results. Please also note on which server the searched person is displayed.
{{% notice note %}}
-Pasting the content of your clipboard to find people works only for inserting e-mail addresses, NOT for h-da logins or names!
-To find people, please enter the characters by hand, character by character and wait 5 seconds until the hits are displayed. *Workaround:* type a single character and paste the content of your clipboard and delete the unnecessary character.
+Pasting the content of the clipboard to find people works only for inserting e-mail addresses, NOT for h-da logins or names!
+To find people, please enter the characters by hand, one by one and wait 5 seconds until the results are displayed. *Workaround:* type a single character, paste the clipboard content, and delete the unnecessary character.
{{% /notice %}}
[TU Dresden screeni]: <> ()
For *mass invitation of persons* (up to 100 at once, then repeatable) *e-mail addresses* or the *matrix names* (@h-da-login:matrix.fbi.h-da.de) are necessary. Collect them e.g. in a text editor line by line, copy them as bulk into clipboard and then paste them into the search field in Matrix Element (copy & paste).
-If you cannot find a person, ask the person for his h-da login or share your matrix name (@h-da-login:matrix.fbi.h-da.de), so that the addressed person can contact you within Matrix.
+If the person cannot be found, ask the person for their h-da login or share the matrix name (@h-da-login:matrix.fbi.h-da.de), so that the addressed person can establish the contact within Matrix.
Please note, that an invitation e-mail is not sent by Matrix!
@@ -34,13 +34,13 @@ Also note, that Matrix accounts of h-da function logins may not be checked. Due
Now back to the theme "direct messages":
-After put in the name of your person of contact in the search field, a list of search results will appear. Click on the person you want to contact and then "Go"
+After putting in the name of the contact person in the search field, a list of search results will appear. Click on the person to contact and then "Go"
[TU Dresden screeni]: <> ()
-The conversation opens and can begin after the invited person has accepted your invitation [end-to-end encrypted]({{< relref "encryption" >}}) (meanwhile standard). The connection to the server at the Darmstadt University of Applied Sciences is of course also transport-encrypted. If you explicitly do not want end-to-end encryption for a special reason, an unencrypted room and invite the conversation partners to it.
+The conversation opens and can begin after the invited person has accepted the invitation [end-to-end encrypted]({{< relref "encryption" >}}) (meanwhile standard). The connection to the server at the Darmstadt University of Applied Sciences is also transport-encrypted, of course. If for a special reason, end-to-end encryption is not desired, create an unencrypted room and invite the conversation partners to it.
Further: [formatting messages]({{< relref "formatting.en.md" >}})
-A room with yourself is also possible and can be used as clipboard / notebook and for tests, e.g. whether formatting and hyperlinks look correct.
+A room with just a single user is also possible and can be used as clipboard / notebook and for tests, e.g. whether formatting and hyperlinks look correct.
diff --git a/content/messaging/formatting.en.md b/content/messaging/formatting.en.md
index bfff3be86624792437b5da2110c989653915115d..8539b2676940c0060bb1c8fd768501e2c47ce8aa 100644
--- a/content/messaging/formatting.en.md
+++ b/content/messaging/formatting.en.md
@@ -8,13 +8,13 @@ weight: 30
## Write and read messages
-Messages can be sent with the **Enter key**. For a line break press Shift + Enter.
+Messages are sent with the **Enter key**. Press Shift + Enter for a line break.
-**files** (also images) can be sent up to a size of 10MB. For this purpose the paper clip must be selected. The sidebar with the document symbol shows the files within a room. Larger files can be shared via the [cloudstore of h_da](https://cloud.h-da.de) and a share link.
+**files** (also images) up to a size of 10MB are possible to send. Select the paper clip for this purpose. The sidebar with the document symbol shows the files within a room. Larger files are shared via the [cloudstore of h_da](https://cloud.h-da.de) and a share link.
-Using text formatted in the markup language [**MarkDown**](https://de.wikipedia.org/wiki/Markdown), messages can also be formatted in Matrix Element. Here are some examples:
+Matrix Element allows message text formatted in the markup language [**MarkDown**](https://de.wikipedia.org/wiki/Markdown). Here are some examples:
| result | to type |
|:------------------------------------------------------------------------------- |:-------------------------------------------------------------------------------------:|
@@ -28,20 +28,20 @@ Using text formatted in the markup language [**MarkDown**](https://de.wikipedia.
| list entries | ```* list entry```<br/>```* list entry```<br/>```* list entry```<br/> |
| numbered lists | ```1. numbered list```<br/>```2. numbered list```<br/>```3. numbered list```<br/> |
-The current [MarkDown specification can be found here](https://spec.commonmark.org/current/).
+The current [MarkDown specification is here](https://spec.commonmark.org/current/).
-The input of LaTeX formulas is supported as well.
+LaTeX formula input is supported as well.
-**Hashtags** can be used to make terms easier to find in the search.
+**Hashtags** are used to make terms easier to find in the search.
-**Smileys** can be reached with a starting colon ":"
+**Smileys** are used with a starting colon ":"
-If there are more unread messages in a room than the screen can display, clicking on the icon to the right of the central content with a triangle pointing up and a dot pointing up will make you jump to the oldest unread message.
+If there are more unread messages in a room than the screen can display, clicking on the icon to the right of the central content with a triangle pointing up and a dot pointing up will jump to the oldest unread message.
-Similarly, you can jump to the latest timestamp of a conversation by clicking on the triangle at the bottom of a circle on the right edge of the central content page.
+Similarly, to jump to the latest timestamp of a conversation click on the triangle at the bottom of a circle on the right edge of the central content page.
diff --git a/content/notifications/_index.en.md b/content/notifications/_index.en.md
index ae3a866b95baf2dda9b0828a2869a131cc245df3..9d64872b2c7a60d7a35a6b30bc6e0d8a74385a2e 100644
--- a/content/notifications/_index.en.md
+++ b/content/notifications/_index.en.md
@@ -7,15 +7,15 @@ weight: 38
---
## Fine-tune notifications
-You have to be able to do your work and not be disturbed by Matrix. In times of digital distraction, we all need to learn how notifications should be adapted step by step in a meaningful way.
+People must be able to do their work and not be disturbed by Matrix. In times of digital distraction, we all need to learn how notifications should be adapted step by step in a meaningful way.
*Scenario 1:*
-If you are writing a proposal for a research project and the deadline is approaching, you may want to be notified when your colleagues want to start a discussion with you. Notifications in this room are intended to draw attention and will be set accordingly...
+When writing a proposal for a research project and the deadline is approaching, colleagues send notifications when a discussion starts. Notifications in this room are intended to draw attention and will be set accordingly...
*Scenario 2:*
-If you are in a room whose main purpose is to inform yourself about new scientific papers and other interesting things from time to time, you may want to turn off the notifications and remind yourself to enter the room from time to time, or you may want to be notified aloud only when your name is mentioned in the discussion.
+When in a room whose main purpose is to inform about new scientific papers and other interesting things from time to time, turn off the notifications. Remember to enter the room from time to time, or get notified aloud only when your name is mentioned in the discussion.
### Global settings
@@ -29,7 +29,7 @@ See [recommendations for first steps after first login]({{< ref "settings" >}})
### Roomwise settings
-When the mouse is moved over individual rooms in the room list, 3 grey dots appear on the right-hand edge for each room. After clicking on them, you can set up the notifications for each room individually.
+When the mouse is moved over individual rooms in the room list, 3 grey dots appear on the right-hand edge for each room. After clicking on them, set up the notifications for each room individually.
diff --git a/content/rooms/_index.en.md b/content/rooms/_index.en.md
index 47dec2c1099e7bd81ea0a25d4f895653e7f9be0e..c2631f91ec2ee510cfe55fb689409a7e0e9480a3 100644
--- a/content/rooms/_index.en.md
+++ b/content/rooms/_index.en.md
@@ -7,9 +7,9 @@ weight: 35
---
# Rooms
-Conversations are organized in matrix in rooms. 1:1 conversations are also rooms, but for now with only two people. In this
-Category is about
+Conversations in Matrix are organized in rooms. 1:1 conversations are also rooms, but with only two people for now. This
+Category is about how to
1. [create rooms]({{< relref "rooms/create" >}})
2. [find rooms]({{< relref "rooms/find" >}})
3. [delete rooms]({{< relref "rooms/delete" >}})
-4. [share rooms]({{< relref "rooms/sharing" >}})
\ No newline at end of file
+4. [share rooms]({{< relref "rooms/sharing" >}})
diff --git a/content/rooms/create.en.md b/content/rooms/create.en.md
index a996628a2ce8a00dc30a3a75acf1a8beae29f143..8e509e9eca1266079023779ab9385522f98752d0 100644
--- a/content/rooms/create.en.md
+++ b/content/rooms/create.en.md
@@ -10,7 +10,7 @@ weight: 10
New rooms are created using the + in the left bar in the category Rooms.
-Then the room name must be assigned. You can also optionally assign a theme (which can be adapted more often later). Optionally, the room can be made publicly accessible (this is not the default setting). With an additional click on "Show more settings" it can be prevented that Matrix users from outside the Darmstadt University of Applied Sciences home server (Homeserver) can enter the room. By default, all new rooms (just like all new 1:1 calls) have [end-to-end encryption]({{< relref "encryption" >}}) set up. If this is not desired (e.g. because verification of the participants becomes very impractical in very large rooms) you can use the slider BEFORE creating the room to not activate end-to-end encryption. Similar if you want to create public rooms (this rooms can be entered by everyone). BEFORE creating public rooms, you should deactivate the end-to-end encryption.
+Then the room name must be assigned. You can also optionally assign a theme (which can be adapted more often later). Optionally, the room can be made publicly accessible (this is not the default setting). With an additional click on "Show more settings" it can be prevented that Matrix users from outside the Darmstadt University of Applied Sciences home server (Homeserver) can enter the room. By default, all new rooms (just like all new 1:1 calls) have [end-to-end encryption]({{< relref "encryption" >}}) set up. If this is not desired (e.g. because verification of the participants becomes very impractical in very large rooms) you can use the slider BEFORE creating the room to not activate end-to-end encryption. Similarly, if you want to create public rooms (these rooms can be entered by everyone). BEFORE creating public rooms, you should deactivate the end-to-end encryption.
{{% notice note %}}
The end-to-end encryption of large or public spaces is critical in terms of the difficult verification for many people. See [Use end-to-end encryption]({{< relref "encryption" >}}).
@@ -22,7 +22,7 @@ A once activated end-to-end encryption could not be rolled back!
-The room is now created and gets any colored icon color. By clicking on the 'i' in the upper right corner and then the gear wheel "room settings" you can access exactly those room settings:
+The room is created now and gets any colored icon color assigned. By clicking on the 'i' in the upper right corner followed by the gear wheel "room settings" you can access exactly those room settings:
@@ -42,12 +42,12 @@ In the **Security & Privacy** tab, room administrators have to make important de
1. "Only people who have been invited": These are closed rooms. Access at the moment only by explicit invitation by moderator:inside or administrator:inside
2. "Everyone who knows the room link (except guests)": This is a public room, but you can only read it if you enter it (and thus become visible to all room members). Here you can see exactly who is in the room and when, and if necessary you can kick and ban people who should not be in the room...
-3. "Everyone who knows the room link (including guests)": This is a public room, and everyone can read it. All over the world. And room members will never know who read it and when. So this is like a website where everyone can take notes. This setting often goes along with the option that "everyone" can read the chat history.
+3. "Everyone who knows the room link (including guests)": This is a public room, and everyone can read it, all over the world. Room members will never know who read it and when. This is like a website where everyone can take notes. This setting often goes along with the option that "everyone" can read the chat history.
-A "call waiting" to closed rooms is not yet possible. The closest workaround is to send a direct message to the room administrator, who will then invite you.
+A "call waiting" to closed rooms is not yet possible. The closest workaround is to send a direct message to the room administrator who will invite you then.
{{% notice warning %}}
-As the room administrator, you have **responsibility** for the content shared in the room (e.g. false messages, hate mail, etc.). Include other people in this responsibility by assigning roles in the right bar (after clicking on the person icon) via the "Permission Level" drop-down menu, e.g. Administrator:inside or Moderator:inside.
+As the room administrator, you have **responsibility** for the content shared in the room (e.g. false messages, hate mail, etc). Include other people in this responsibility by assigning roles in the right bar (after clicking on the person icon) via the "Permission Level" drop-down menu, e.g. Administrator:inside or Moderator:inside.
{{% /notice %}}
diff --git a/content/rooms/delete.en.md b/content/rooms/delete.en.md
index 35ef08d8e1f77faaa2afdbad37937e7255d0ce40..a09cf25cf7562256f6f4876119dfb70a8a025562 100644
--- a/content/rooms/delete.en.md
+++ b/content/rooms/delete.en.md
@@ -8,12 +8,12 @@ weight: 30
## Delete rooms and leave rooms
-When leaving rooms, they no longer appear in the room list (left column). If the last person in the room leaves the room, the room is still in the archive for 7 days, but is then permanently deleted.
+When leaving rooms, they no longer appear in the room list (left column). If the last person in the room leaves, the room is archived for 7 days. After that, is it deleted permanently.
-As administrator of the room, you should "kick" all members of the room first (remove them from the room). Then you should leave the room as the last person and thus you initiate the later deletion by the server.
+As room administrator, you should "kick" (remove) all members of the room first. Then you should leave the room as the last person to initiate the later deletion by the server.
-An export of the room history e.g. into a .txt or .html file is not yet possible: https://github.com/vector-im/element-web/issues/2630
+An export of the room history (e.g. into a .txt or .html file) is not yet possible: https://github.com/vector-im/element-web/issues/2630
diff --git a/content/rooms/find.en.md b/content/rooms/find.en.md
index e3b41fa2b03c380e2e14bef3ede2c10c6c9aa17b..abb7c4e508deb76942c5677d05223676dfafbdda 100644
--- a/content/rooms/find.en.md
+++ b/content/rooms/find.en.md
@@ -7,10 +7,10 @@ weight: 20
---
## Find rooms
-The room directory, in which the publicly accessible rooms are presented, can be reached via the button "Discover / Explore" in the upper left corner under the own display name. Here you can immediately search for a room on the h_da-Matrix.
+The room directory, in which the publicly accessible rooms are presented, is reached via the button "Discover / Explore" in the upper left corner under its own display name. Here you can immediately search for a room on the h_da-Matrix.
{{% notice note %}}
The global federation is currently in test operation. It is possible that the Federation will be restricted again at a later date.
-{{% /notice %}}
\ No newline at end of file
+{{% /notice %}}
diff --git a/content/rooms/sharing.en.md b/content/rooms/sharing.en.md
index 34478ac4cf64bb51f9503189a45a74fa2936b8ba..30fd49d5941590d5e3507fbafe64af36378cf036 100644
--- a/content/rooms/sharing.en.md
+++ b/content/rooms/sharing.en.md
@@ -7,13 +7,13 @@ weight: 40
---
# Share rooms and make them public
{{% notice warning %}}
-The share icon in the upper right corner of each room also provides a link, a QR code and various social networks. The link, however, leads to https://matrix.to/ from where you can access the room via an Element web app from https://element.io. In order to share a room within Darmstadt University of Applied Sciences please use the methode explained in this artice.
+The share icon in the upper right corner of each room also provides a link, a QR code and various social networks. The link, however, leads to https://matrix.to/ from where you can access the room via an Element web app from https://element.io. To share a room within Darmstadt University of Applied Sciences please use the method explained in this artice.
{{% /notice %}}
Every room has a so-called room-address, which can be found in the room settings under the sub-menu Advanced. A room address looks like this:
!aen6iekahv8Pi0zohf:matrix.fbi.h-da.de
-Because this cryptic address can not be read easily by humans, custom room addresses can be assigned. This is only necessary for rooms, which you want to make public and reference in other places.
+Because this cryptic address can not be read easily by humans, custom room addresses can be assigned. This is only necessary for rooms which you want to make public and reference in other places.
Room addresses can either be globally published addresses (findable by users in other servers - useful for topics beyond the Darmstadt University of Applied Sciences) or local addresses, which is only valid within the matrix home server at the Darmstadt University of Applied Sciences.
@@ -48,7 +48,7 @@ into the chat line. If you are a member of that room, you can confirm the auto-c
**Suggestion Nr. 2 for sharing a room address:**
-The share icon at the top right of each room also offers a matrix.to-link, as well as a QR code and various social networks. The matrix.to-link leads to a page where you can select how the link should be opened. For example, the installed client Element Desktop can be used, or it can be selected via which home server the room is to be entered.
+The share icon at the top right of each room also offers a matrix.to-link, as well as a QR code and various social networks. The matrix.to-link leads to a page where you can select how the link should be opened. For example, the installed client Element Desktop can be used, or it can be selected by which home server the room is to be entered.
@@ -62,4 +62,4 @@ Furthermore, you also can create a hyperlink to the room, which you have to cons
https://matrix.fbi.h-da.de/#/room/#roomaddress:matrix.fbi.h-da.de
-resulting in an internet address (URL) which can be easily distributed to the public or target group. BUT, **this link opens only an Element Web in the browser** of the people, not in an installed Element Desktop. More universal (espc. for the large group of people with Element Desktop), and more advised by the Matrix-Admin-Team, is the above mentioned method with the matrix.to-Link.
+resulting in an internet address (URL) which can be easily distributed to the public or target group. BUT, **this link opens only an Element Web in the browser** of the participants not in an installed Element Desktop. More universal (espc. for the large group of people with Element Desktop), and recommended by the Matrix-Admin-Team, is the above mentioned method with the matrix.to-Link.
diff --git a/content/why/_index.en.md b/content/why/_index.en.md
index e21df20036f74a05169990fe3c1117ee3be6c48f..054d7dd20b1bf1d80f5f8d51799d1b43e860edda 100644
--- a/content/why/_index.en.md
+++ b/content/why/_index.en.md
@@ -14,9 +14,9 @@ There are many services and programs for instant electronic communication. Matri
- Communication protocol for federated real-time communication (no isolated solution but like e-mail with worldwide connectivity)
- Differentiated communication possible (1:1, multiple teams, topic-specific)
- Decentralized, persistent and interoperable communication (no central control instances, connectable with other protocols and tools)
-- Data protection: end-to-end encryption in 1:1 conversations standard, can be switched on in (group) rooms as required
+- Data protection: end-to-end encryption in 1:1 conversations standard, are switched on in (group) rooms as required
- Web application + desktop client + mobile apps available
- - The contacts on your own cell phone are not automatically passed on to third parties
+ - The cell phopne contacts are not automatically passed on to third parties
- Connection to existing authentication systems (e.g. Darmstadt University of Applied Sciences)
- Existing successful security audit
- Autonomy and control: locally installable (server location Darmstadt University of Applied Sciences)