Try to harmonize wording + fix some typos

en: satellite server
de: Satellitenserver

6 files changed, 13 insertions, 13 deletions

diff --git a/satellit_installer/documentation/satellit_installer b/satellit_installer/documentation/satellit_installer
index 20ee482..db16e58 100644
--- a/satellit_installer/documentation/satellit_installer
+++ b/satellit_installer/documentation/satellit_installer
@@ -4,7 +4,7 @@ An automated installation script for bwLehrpool satellite server
 
 1. Preface 
 
-The satellite_installer script automatically installs a bwLehrpool satellite 
+The satellit_installer script automatically installs a bwLehrpool satellite 
 server on top of a naked Linux OS. Currently supported is Debian 7.5 wheezy. 
 
 It may also work on other Debian based Linux systems as long as packages 
@@ -33,7 +33,7 @@ any system services so you can (and should!) keep your server always up to date.
 
 Please remember that a database entry in the master server is needed for any 
 satellite server to function, as the bwSuite clients will first connect to the 
-master server which will forward connecting clients via username resoltuion to 
+master server which will forward connecting clients via username resolution to 
 an appropriate satellite server. Or, in other words: If this master server 
 database entry is missing, your satellite server will never see any connect.
 
@@ -64,12 +64,12 @@ any needed system packages and helper files needed to function.
 So:
 
 1. change into the script directory (.../setup-scripts/satellit_installer).
-2. Start the script: ./satellite-installer
+2. Start the script: ./satellit-installer
 3. Read script output for eventual warnings.
 4. Log out and re-log in to trigger the dropped script, or simply reboot
    and re-login (a reboot is not quite necessary, but will not hurt either)
 5. At the end of the dropped script choose 'y' to reboot, or do some other 
-   stuff, as long as you do not forget to reboot prior using the Satellite.
+   stuff, as long as you do not forget to reboot prior using the satellite.
 
 
 4. What to do if the script has thrown any errors?
diff --git a/satellit_installer/static_files/system/etc/issue b/satellit_installer/static_files/system/etc/issue
index 2a0945d..a097cee 100644
--- a/satellit_installer/static_files/system/etc/issue
+++ b/satellit_installer/static_files/system/etc/issue
@@ -1,5 +1,5 @@
 -------------------------------------------------
-   bwLehrpool Satellite Server (Debian \S{VERSION_ID})
+   bwLehrpool Satellitenserver (Debian \S{VERSION_ID})
 -------------------------------------------------
 
 Bitte loggen Sie sich als Nutzer "bwlp" ein, um die
diff --git a/satellit_installer/static_files/system/etc/issue.disabled b/satellit_installer/static_files/system/etc/issue.disabled
index 857ec97..078ef2a 100644
--- a/satellit_installer/static_files/system/etc/issue.disabled
+++ b/satellit_installer/static_files/system/etc/issue.disabled
@@ -1,5 +1,5 @@
 -------------------------------------------------
-   bwLehrpool Satellite Server (Debian \S{VERSION_ID})
+   bwLehrpool Satellitenserver (Debian \S{VERSION_ID})
 -------------------------------------------------
 
 Web interface for configuration:
diff --git a/satellit_installer/static_files/system/opt/openslx/firstboot.sh b/satellit_installer/static_files/system/opt/openslx/firstboot.sh
index 04f5e93..fe75c1d 100755
--- a/satellit_installer/static_files/system/opt/openslx/firstboot.sh
+++ b/satellit_installer/static_files/system/opt/openslx/firstboot.sh
@@ -118,7 +118,7 @@ ssh-keygen -q -N "" -f "$KEY" \
 
 # Write MOTD
 cat > /etc/motd <<THEREDOC
->        *** bwLehrpool Satelliten-Server, Version $VERSION ***
+>        *** bwLehrpool Satellitenserver, Version $VERSION ***
 >                 Eingerichtet am $(date)
 >
 > Wenn Sie sich als 'bwlp' eingeloggt haben, haben Sie nun folgende Optionen:
diff --git a/satellit_installer/static_files/system/opt/openslx/firstrun.sh b/satellit_installer/static_files/system/opt/openslx/firstrun.sh
index 80e235c..b4c6ba2 100755
--- a/satellit_installer/static_files/system/opt/openslx/firstrun.sh
+++ b/satellit_installer/static_files/system/opt/openslx/firstrun.sh
@@ -2,7 +2,7 @@
 
 cat <<-HEREDOC
 >
-> Willkommen zur Grundkonfiguration des bwLehrpool-Satellitenservers.
+> Willkommen zur Grundkonfiguration des bwLehrpool Satellitenservers.
 >
 > Diese einmalige Konfiguration dient dazu, das Passwort des System-Users
 > "bwlp" zu ändern (für Terminal, SSH), sowie ggf. die
diff --git a/satellit_upgrader/updater.template.sh b/satellit_upgrader/updater.template.sh
index 31e7cc6..85066dd 100644
--- a/satellit_upgrader/updater.template.sh
+++ b/satellit_upgrader/updater.template.sh
@@ -4,7 +4,7 @@
 [ "x$1" != "x--exec-self" ] && exec /bin/bash "$0" --exec-self "$@"
 
 if [ ! -d "/opt/dmsd" ] && [ ! -d "/srv/openslx/www/slx-admin" ]; then
-	echo "This system doesn't look like a bwLehrpool Satellite Server"
+	echo "This system doesn't look like a bwLehrpool satellite server"
 	echo "(Or this updater is really old)"
 	exit 1
 fi
@@ -53,13 +53,13 @@ if [[ "$(uname -m)" == i?86 ]]; then
 fi
 
 if (( MAJOR < 9 )); then
-	echo "This Version of the bwLehrpool Satellite Server is too old!"
+	echo "This Version of the bwLehrpool satellite server is too old!"
 	echo "Back up your existing configuration via slx-admin and import it into a"
 	echo "fresh install, or manually dist-upgrade this server."
 	exit 1
 fi
 if (( MAJOR > 12 )); then
-	echo "This Version of the bwLehrpool Satellite Server is too new!"
+	echo "This Version of the bwLehrpool satellite server is too new!"
 	exit 1
 fi
 if (( MAJOR == 9 )); then
@@ -262,7 +262,7 @@ daemon_reload=
 if [ -n "$TGZ_SLXADMIN" ]; then
 	declare -rg CURRENT_WEBIF_VERSION="$( < "${PATH_SLXADMIN}/version"  tail -n 1 )"
 	# Print state of affairs
-	echo "bwLehrpool Satellite Server Update"
+	echo "bwLehrpool satellite server update"
 	echo -n "Currently installed version: "
 	sed -r 's/([0-9]{4})([0-9]{3})([0-9]{2})/\1-\2-\3/' <<<"$CURRENT_WEBIF_VERSION"
 	echo -n "This update package:         "
@@ -940,7 +940,7 @@ for i in /opt/openslx/restore.d/*/init.sh; do
 done
 
 # Patch the update version in /etc/motd
-sed -r -i 's/(bwLehrpool Satelliten-Server, Version[^[(*]*)\s*([[(]Update.*[])])?\s*/\1 [Update: '"${SLXADMIN_FOOTER}"'] /g' /etc/motd
+sed -r -i 's/(bwLehrpool Satelliten[-sS]*erver, Version[^[(*]*)\s*([[(]Update.*[])])?\s*/\1 [Update: '"${SLXADMIN_FOOTER}"'] /g' /etc/motd
 
 echo ""
 echo "Update complete. This update needs a reboot to be working as intended. Please do so now."