Merge branch 'master' of github:tiyn/wiki

wiki/airsonic.md

@@ -14,4 +14,7 @@ As already mentioned it is possible to use a bunch of different clients because
 the server is compatible with most of the Subsonic clients.
 
 - [Ultrasonic](https://www.f-droid.org/en/packages/org.moire.ultrasonic) is a
-  free and open-source android subsonic/airsonic client.
+  free and open-source android subsonic-compatible client.
+- [Sonixd](https://github.com/jeffvli/sonixd) is a
+  free and open-source cross-plattform subsonic- and jellyfin-compatible client.
+  It uses a look and feel similar to the spotify client.

wiki/linux/arch-linux/package-manager.md

@@ -33,3 +33,18 @@ gpg --lsign <KEYID>
 Where <KEYID> is the placeholder of the identification string of the key.
 It usually gets gets printed in the line above the error looking like
 `FAILED (unknown public key <KEYID>)`.
+
+### Error while updating `is marginal trust`
+  
+Both `yay` and `pacman` use gpg keys to confirm the package manager gets the
+right package.
+It is possible that it runs into errors when importing new keys.
+If the error `[...] Key [...] is marginal trust` occurs while updating the
+system, it can be fixed by running the following commands and then restarting
+the update process of the package manager.
+  
+```sh
+pacman -Sy archlinux-keyring
+pacman-key --populate archlinux
+pacman-key --refresh-keys
+```

wiki/linux/dm-crypt.md

@@ -30,7 +30,7 @@ or the partition is to small for your purposes, make sure to resize the
 partition first accordingly (see [disk management](./disk-management.md)).
 `cryptsetup resize crypt-volume`
 
-## Creating an automatic encryption key with an USB stick
+## Creating an automatic decryption key with an USB stick
 
 This guide assumes you to have an Arch Linux System, as installed in
 [this wikis arch linux installation](./arch-linux/installation.md).

wiki/music.md

@@ -9,10 +9,10 @@ access a server for it.
 ## Server/Client
 
 If you want to keep your system clean of much data, you can use this kind of setup.
-There are differences depending on your preffered client interface.
+There are differences depending on your preffered software interface.
 
 - [Airsonic](./airsonic.md) is a free fork of Subsonic, can be dockerized and has
-  a web-interface.
+  a web-interface and multiple possible client options.
 
 ## Scan CDs
 

wiki/video.md

@@ -31,5 +31,8 @@ This way you don't have to search for your discs all the time.
   ```
 
 - [MKS Extractor GUI](https://www.videohelp.vom/software/MKS-Extractor-GUI)
-  for windows can extract subtitles from a `.mkv` file
+  for windows can extract subtitles from a `.mkv` file.
-- [VidCoder](https://vidcoder.net) for windows can compress `.mkv` files.
+- [Subtitleedit]([https://www.videohelp.vom/software/MKS-Extractor-GUI](https://www.nikse.dk/subtitleedit))
+  for linux can extract subtitles from a `.mkv` file and do ocr.
+- [VidCoder](https://vidcoder.net) for windows can compress `.mkv` files. Its an adapted version of the HandBrake software.
+- [HandBrake]([https://vidcoder.net](https://handbrake.fr/)) for linux can compress `.mkv` files.