From 069fafc44f55c03034877a6caa5adee45293c623 Mon Sep 17 00:00:00 2001
From: Matthew Newton <matthew-git@newtoncomputing.co.uk>
Date: Fri, 5 Aug 2022 08:08:57 +0100
Subject: [PATCH] :lipstick: fix: English - "webserver" is two words

Possibly debatable, but otherwise should be hyphenated, e.g.
"web-server"
---
 contrib/man/fusiondirectory.conf.5    | 2 +-
 contrib/man/fusiondirectory.conf.pod  | 2 +-
 locale/af_ZA/fusiondirectory.po       | 2 +-
 locale/ar/fusiondirectory.po          | 2 +-
 locale/ca/fusiondirectory.po          | 2 +-
 locale/cs_CZ/fusiondirectory.po       | 2 +-
 locale/de/fusiondirectory.po          | 2 +-
 locale/el_GR/fusiondirectory.po       | 2 +-
 locale/en/fusiondirectory.po          | 2 +-
 locale/es/fusiondirectory.po          | 2 +-
 locale/es_CO/fusiondirectory.po       | 2 +-
 locale/es_VE/fusiondirectory.po       | 2 +-
 locale/fa_IR/fusiondirectory.po       | 2 +-
 locale/fi_FI/fusiondirectory.po       | 2 +-
 locale/fr/fusiondirectory.po          | 2 +-
 locale/hu_HU/fusiondirectory.po       | 2 +-
 locale/id/fusiondirectory.po          | 2 +-
 locale/it_IT/fusiondirectory.po       | 2 +-
 locale/ja/fusiondirectory.po          | 2 +-
 locale/ko/fusiondirectory.po          | 2 +-
 locale/lv/fusiondirectory.po          | 2 +-
 locale/nb/fusiondirectory.po          | 2 +-
 locale/nl/fusiondirectory.po          | 4 ++--
 locale/pl/fusiondirectory.po          | 2 +-
 locale/pt/fusiondirectory.po          | 2 +-
 locale/pt_BR/fusiondirectory.po       | 2 +-
 locale/ru/fusiondirectory.po          | 2 +-
 locale/ru@petr1708/fusiondirectory.po | 2 +-
 locale/sv/fusiondirectory.po          | 2 +-
 locale/tr_TR/fusiondirectory.po       | 2 +-
 locale/ug/fusiondirectory.po          | 2 +-
 locale/vi_VN/fusiondirectory.po       | 2 +-
 locale/zh/fusiondirectory.po          | 2 +-
 locale/zh_TW/fusiondirectory.po       | 2 +-
 setup/class_setupStepFinish.inc       | 2 +-
 35 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/contrib/man/fusiondirectory.conf.5 b/contrib/man/fusiondirectory.conf.5
index 9544d1f16..4d647c32a 100644
--- a/contrib/man/fusiondirectory.conf.5
+++ b/contrib/man/fusiondirectory.conf.5
@@ -202,7 +202,7 @@ FusionDirectory will not log anything, if the logging value is empty or set to f
 .IP "\fBtemplateCompileDirectory\fR \fIpath\fR" 4
 .IX Item "templateCompileDirectory path"
 The templateCompileDirectory statements defines the path, where the \s-1PHP\s0 templating engins smarty should store its compiled FusionDirectory templates for improved speed.
-This path needs to be writeable by the user your webserver is running with.
+This path needs to be writeable by the user your web server is running with.
 .IP "\fBignoreAcl\fR \fIdn\fR" 4
 .IX Item "ignoreAcl dn"
 The ignoreAcl value tells FusionDirectory to ignore complete \s-1ACL\s0 sets for the given \s-1DN.\s0 Add your \s-1DN\s0 here and you'll be able to restore accidentally dropped ACLs.
diff --git a/contrib/man/fusiondirectory.conf.pod b/contrib/man/fusiondirectory.conf.pod
index 708b6319e..a1ec7d260 100644
--- a/contrib/man/fusiondirectory.conf.pod
+++ b/contrib/man/fusiondirectory.conf.pod
@@ -67,7 +67,7 @@ FusionDirectory will not log anything, if the logging value is empty or set to f
 =item B<templateCompileDirectory> I<path>
 
 The templateCompileDirectory statements defines the path, where the PHP templating engins smarty should store its compiled FusionDirectory templates for improved speed.
-This path needs to be writeable by the user your webserver is running with.
+This path needs to be writeable by the user your web server is running with.
 
 =item B<ignoreAcl> I<dn>
 
diff --git a/locale/af_ZA/fusiondirectory.po b/locale/af_ZA/fusiondirectory.po
index bfae23c52..358c0a883 100644
--- a/locale/af_ZA/fusiondirectory.po
+++ b/locale/af_ZA/fusiondirectory.po
@@ -4438,7 +4438,7 @@ msgstr ""
 #, php-format
 msgid ""
 "After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
+"user the web server is running with is able to read %s, while other users "
 "shouldn't."
 msgstr ""
 
diff --git a/locale/ar/fusiondirectory.po b/locale/ar/fusiondirectory.po
index 085db1b36..b6026ab05 100644
--- a/locale/ar/fusiondirectory.po
+++ b/locale/ar/fusiondirectory.po
@@ -4442,7 +4442,7 @@ msgstr ""
 #, php-format
 msgid ""
 "After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
+"user the web server is running with is able to read %s, while other users "
 "shouldn't."
 msgstr ""
 
diff --git a/locale/ca/fusiondirectory.po b/locale/ca/fusiondirectory.po
index 6456eb705..97ac80b0e 100644
--- a/locale/ca/fusiondirectory.po
+++ b/locale/ca/fusiondirectory.po
@@ -4447,7 +4447,7 @@ msgstr ""
 #, php-format
 msgid ""
 "After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
+"user the web server is running with is able to read %s, while other users "
 "shouldn't."
 msgstr ""
 
diff --git a/locale/cs_CZ/fusiondirectory.po b/locale/cs_CZ/fusiondirectory.po
index 87312cc92..6fac90800 100644
--- a/locale/cs_CZ/fusiondirectory.po
+++ b/locale/cs_CZ/fusiondirectory.po
@@ -4665,7 +4665,7 @@ msgstr "Soubor s nastaveními není v tuto chvíli čitelný, nebo zcela chybí.
 #, php-format
 msgid ""
 "After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
+"user the web server is running with is able to read %s, while other users "
 "shouldn't."
 msgstr ""
 "Po stažení a umístění souboru do %s se prosím ujistěte, že %s je oprávněn "
diff --git a/locale/de/fusiondirectory.po b/locale/de/fusiondirectory.po
index dc001509b..ff88d356c 100644
--- a/locale/de/fusiondirectory.po
+++ b/locale/de/fusiondirectory.po
@@ -4577,7 +4577,7 @@ msgstr "Die Konfiguration ist momentan nicht lesbar oder existiert nicht."
 #, php-format
 msgid ""
 "After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
+"user the web server is running with is able to read %s, while other users "
 "shouldn't."
 msgstr ""
 "Nach dem Herunterladen und dem Plazieren der Datei unter %s, bitte "
diff --git a/locale/el_GR/fusiondirectory.po b/locale/el_GR/fusiondirectory.po
index 02b369f43..bcbcd6327 100644
--- a/locale/el_GR/fusiondirectory.po
+++ b/locale/el_GR/fusiondirectory.po
@@ -4481,7 +4481,7 @@ msgstr ""
 #, php-format
 msgid ""
 "After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
+"user the web server is running with is able to read %s, while other users "
 "shouldn't."
 msgstr ""
 
diff --git a/locale/en/fusiondirectory.po b/locale/en/fusiondirectory.po
index aa9c41284..93da9c48f 100644
--- a/locale/en/fusiondirectory.po
+++ b/locale/en/fusiondirectory.po
@@ -4316,7 +4316,7 @@ msgstr ""
 #, php-format
 msgid ""
 "After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
+"user the web server is running with is able to read %s, while other users "
 "shouldn't."
 msgstr ""
 
diff --git a/locale/es/fusiondirectory.po b/locale/es/fusiondirectory.po
index 375cded1c..26eccd00c 100644
--- a/locale/es/fusiondirectory.po
+++ b/locale/es/fusiondirectory.po
@@ -4509,7 +4509,7 @@ msgstr "En estos momentos la configuración no es accesible o no existe."
 #, php-format
 msgid ""
 "After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
+"user the web server is running with is able to read %s, while other users "
 "shouldn't."
 msgstr ""
 "Después de descargar y colocar el archivo en %s, por favor asegúrese de que "
diff --git a/locale/es_CO/fusiondirectory.po b/locale/es_CO/fusiondirectory.po
index 6f70ae230..5c19bd80a 100644
--- a/locale/es_CO/fusiondirectory.po
+++ b/locale/es_CO/fusiondirectory.po
@@ -4604,7 +4604,7 @@ msgstr ""
 #, php-format
 msgid ""
 "After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
+"user the web server is running with is able to read %s, while other users "
 "shouldn't."
 msgstr ""
 "Después de descargar y colocar el archivo en %s, por favor verifique que el "
diff --git a/locale/es_VE/fusiondirectory.po b/locale/es_VE/fusiondirectory.po
index 0f91902c1..e6069f315 100644
--- a/locale/es_VE/fusiondirectory.po
+++ b/locale/es_VE/fusiondirectory.po
@@ -4511,7 +4511,7 @@ msgstr "En estos momentos la configuración no es accesible o no existe."
 #, php-format
 msgid ""
 "After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
+"user the web server is running with is able to read %s, while other users "
 "shouldn't."
 msgstr ""
 "Después de descargar y colocar el archivo en %s, por favor asegúrese de que "
diff --git a/locale/fa_IR/fusiondirectory.po b/locale/fa_IR/fusiondirectory.po
index 7f486b276..6f75e93cf 100644
--- a/locale/fa_IR/fusiondirectory.po
+++ b/locale/fa_IR/fusiondirectory.po
@@ -4442,7 +4442,7 @@ msgstr ""
 #, php-format
 msgid ""
 "After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
+"user the web server is running with is able to read %s, while other users "
 "shouldn't."
 msgstr ""
 
diff --git a/locale/fi_FI/fusiondirectory.po b/locale/fi_FI/fusiondirectory.po
index 0a261f9de..4dd4a7e48 100644
--- a/locale/fi_FI/fusiondirectory.po
+++ b/locale/fi_FI/fusiondirectory.po
@@ -4442,7 +4442,7 @@ msgstr ""
 #, php-format
 msgid ""
 "After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
+"user the web server is running with is able to read %s, while other users "
 "shouldn't."
 msgstr ""
 
diff --git a/locale/fr/fusiondirectory.po b/locale/fr/fusiondirectory.po
index 5c21e9a51..b352ef323 100644
--- a/locale/fr/fusiondirectory.po
+++ b/locale/fr/fusiondirectory.po
@@ -4786,7 +4786,7 @@ msgstr "Le fichier de configuration ne peut être lu ou n'existe pas."
 #, php-format
 msgid ""
 "After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
+"user the web server is running with is able to read %s, while other users "
 "shouldn't."
 msgstr ""
 "Après avoir placé le fichier dans le répertoire %s, assurez vous que seul le"
diff --git a/locale/hu_HU/fusiondirectory.po b/locale/hu_HU/fusiondirectory.po
index 805145b9b..7a9420830 100644
--- a/locale/hu_HU/fusiondirectory.po
+++ b/locale/hu_HU/fusiondirectory.po
@@ -4442,7 +4442,7 @@ msgstr ""
 #, php-format
 msgid ""
 "After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
+"user the web server is running with is able to read %s, while other users "
 "shouldn't."
 msgstr ""
 
diff --git a/locale/id/fusiondirectory.po b/locale/id/fusiondirectory.po
index d8e0931dd..8c34606c7 100644
--- a/locale/id/fusiondirectory.po
+++ b/locale/id/fusiondirectory.po
@@ -4438,7 +4438,7 @@ msgstr ""
 #, php-format
 msgid ""
 "After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
+"user the web server is running with is able to read %s, while other users "
 "shouldn't."
 msgstr ""
 
diff --git a/locale/it_IT/fusiondirectory.po b/locale/it_IT/fusiondirectory.po
index d2a009ded..1b0c729c5 100644
--- a/locale/it_IT/fusiondirectory.po
+++ b/locale/it_IT/fusiondirectory.po
@@ -4765,7 +4765,7 @@ msgstr ""
 #, php-format
 msgid ""
 "After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
+"user the web server is running with is able to read %s, while other users "
 "shouldn't."
 msgstr ""
 "Dopo aver scaricato e messo il file nella cartella %s, assicurati che sia "
diff --git a/locale/ja/fusiondirectory.po b/locale/ja/fusiondirectory.po
index 4f1fb6541..2e3a435c2 100644
--- a/locale/ja/fusiondirectory.po
+++ b/locale/ja/fusiondirectory.po
@@ -4438,7 +4438,7 @@ msgstr ""
 #, php-format
 msgid ""
 "After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
+"user the web server is running with is able to read %s, while other users "
 "shouldn't."
 msgstr ""
 
diff --git a/locale/ko/fusiondirectory.po b/locale/ko/fusiondirectory.po
index 5fe44fb45..bf948744f 100644
--- a/locale/ko/fusiondirectory.po
+++ b/locale/ko/fusiondirectory.po
@@ -4445,7 +4445,7 @@ msgstr ""
 #, php-format
 msgid ""
 "After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
+"user the web server is running with is able to read %s, while other users "
 "shouldn't."
 msgstr ""
 
diff --git a/locale/lv/fusiondirectory.po b/locale/lv/fusiondirectory.po
index 809eb20da..9c8b0bd95 100644
--- a/locale/lv/fusiondirectory.po
+++ b/locale/lv/fusiondirectory.po
@@ -4442,7 +4442,7 @@ msgstr ""
 #, php-format
 msgid ""
 "After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
+"user the web server is running with is able to read %s, while other users "
 "shouldn't."
 msgstr ""
 
diff --git a/locale/nb/fusiondirectory.po b/locale/nb/fusiondirectory.po
index 106eff8a5..57e4e51e6 100644
--- a/locale/nb/fusiondirectory.po
+++ b/locale/nb/fusiondirectory.po
@@ -4442,7 +4442,7 @@ msgstr ""
 #, php-format
 msgid ""
 "After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
+"user the web server is running with is able to read %s, while other users "
 "shouldn't."
 msgstr ""
 
diff --git a/locale/nl/fusiondirectory.po b/locale/nl/fusiondirectory.po
index 8a8f8212a..accd7179a 100644
--- a/locale/nl/fusiondirectory.po
+++ b/locale/nl/fusiondirectory.po
@@ -4672,11 +4672,11 @@ msgstr "De configuratie is momenteel niet leesbaar of bestaat niet."
 #, php-format
 msgid ""
 "After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
+"user the web server is running with is able to read %s, while other users "
 "shouldn't."
 msgstr ""
 "Na het downloaden en plaatsen van het bestand onder %s, verifieer a.u.b. dat"
-" de gebruiker die de webserver draait de mogelijkheid heeft om %s te lezen, "
+" de gebruiker die de web server draait de mogelijkheid heeft om %s te lezen, "
 "terwijl andere gebruikers dit niet kunnen."
 
 #: setup/class_setupStepLanguage.inc:59 setup/class_setupStepLanguage.inc:60
diff --git a/locale/pl/fusiondirectory.po b/locale/pl/fusiondirectory.po
index 0d74990df..492dd24b3 100644
--- a/locale/pl/fusiondirectory.po
+++ b/locale/pl/fusiondirectory.po
@@ -4446,7 +4446,7 @@ msgstr ""
 #, php-format
 msgid ""
 "After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
+"user the web server is running with is able to read %s, while other users "
 "shouldn't."
 msgstr ""
 
diff --git a/locale/pt/fusiondirectory.po b/locale/pt/fusiondirectory.po
index 5c72cabcf..5341e2e6f 100644
--- a/locale/pt/fusiondirectory.po
+++ b/locale/pt/fusiondirectory.po
@@ -4447,7 +4447,7 @@ msgstr ""
 #, php-format
 msgid ""
 "After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
+"user the web server is running with is able to read %s, while other users "
 "shouldn't."
 msgstr ""
 
diff --git a/locale/pt_BR/fusiondirectory.po b/locale/pt_BR/fusiondirectory.po
index 2f2c83b6d..5e624e59c 100644
--- a/locale/pt_BR/fusiondirectory.po
+++ b/locale/pt_BR/fusiondirectory.po
@@ -4494,7 +4494,7 @@ msgstr ""
 #, php-format
 msgid ""
 "After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
+"user the web server is running with is able to read %s, while other users "
 "shouldn't."
 msgstr ""
 
diff --git a/locale/ru/fusiondirectory.po b/locale/ru/fusiondirectory.po
index 2d9d98ef6..5d5e133bc 100644
--- a/locale/ru/fusiondirectory.po
+++ b/locale/ru/fusiondirectory.po
@@ -4542,7 +4542,7 @@ msgstr "Конфигурационный файл не читается или 
 #, php-format
 msgid ""
 "After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
+"user the web server is running with is able to read %s, while other users "
 "shouldn't."
 msgstr ""
 "После скачивания и размещения файла в %s, убедитесь что пользователь из под "
diff --git a/locale/ru@petr1708/fusiondirectory.po b/locale/ru@petr1708/fusiondirectory.po
index 92d670940..39135fff9 100644
--- a/locale/ru@petr1708/fusiondirectory.po
+++ b/locale/ru@petr1708/fusiondirectory.po
@@ -4438,7 +4438,7 @@ msgstr ""
 #, php-format
 msgid ""
 "After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
+"user the web server is running with is able to read %s, while other users "
 "shouldn't."
 msgstr ""
 
diff --git a/locale/sv/fusiondirectory.po b/locale/sv/fusiondirectory.po
index 297d02064..77039314a 100644
--- a/locale/sv/fusiondirectory.po
+++ b/locale/sv/fusiondirectory.po
@@ -4548,7 +4548,7 @@ msgstr "Konfigurationen är just nu inte läsbar eller så finns den inte."
 #, php-format
 msgid ""
 "After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
+"user the web server is running with is able to read %s, while other users "
 "shouldn't."
 msgstr ""
 "Efter att ha laddat ner och placerat filen under %s, vänligen säkerställ att"
diff --git a/locale/tr_TR/fusiondirectory.po b/locale/tr_TR/fusiondirectory.po
index 5a5d766d5..b9a2cfaaf 100644
--- a/locale/tr_TR/fusiondirectory.po
+++ b/locale/tr_TR/fusiondirectory.po
@@ -4442,7 +4442,7 @@ msgstr ""
 #, php-format
 msgid ""
 "After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
+"user the web server is running with is able to read %s, while other users "
 "shouldn't."
 msgstr ""
 
diff --git a/locale/ug/fusiondirectory.po b/locale/ug/fusiondirectory.po
index c56de8134..1277ed532 100644
--- a/locale/ug/fusiondirectory.po
+++ b/locale/ug/fusiondirectory.po
@@ -4438,7 +4438,7 @@ msgstr ""
 #, php-format
 msgid ""
 "After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
+"user the web server is running with is able to read %s, while other users "
 "shouldn't."
 msgstr ""
 
diff --git a/locale/vi_VN/fusiondirectory.po b/locale/vi_VN/fusiondirectory.po
index bdf480c3a..8b05c8c76 100644
--- a/locale/vi_VN/fusiondirectory.po
+++ b/locale/vi_VN/fusiondirectory.po
@@ -4497,7 +4497,7 @@ msgstr "Cấu hình hiện tại không thể đọc được hoặc nó không
 #, php-format
 msgid ""
 "After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
+"user the web server is running with is able to read %s, while other users "
 "shouldn't."
 msgstr ""
 
diff --git a/locale/zh/fusiondirectory.po b/locale/zh/fusiondirectory.po
index 3fb8b993f..4b2810a0e 100644
--- a/locale/zh/fusiondirectory.po
+++ b/locale/zh/fusiondirectory.po
@@ -4442,7 +4442,7 @@ msgstr ""
 #, php-format
 msgid ""
 "After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
+"user the web server is running with is able to read %s, while other users "
 "shouldn't."
 msgstr ""
 
diff --git a/locale/zh_TW/fusiondirectory.po b/locale/zh_TW/fusiondirectory.po
index 41686b5f7..732aafa62 100644
--- a/locale/zh_TW/fusiondirectory.po
+++ b/locale/zh_TW/fusiondirectory.po
@@ -4438,7 +4438,7 @@ msgstr ""
 #, php-format
 msgid ""
 "After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
+"user the web server is running with is able to read %s, while other users "
 "shouldn't."
 msgstr ""
 
diff --git a/setup/class_setupStepFinish.inc b/setup/class_setupStepFinish.inc
index c359d678f..14d3e81ca 100644
--- a/setup/class_setupStepFinish.inc
+++ b/setup/class_setupStepFinish.inc
@@ -88,7 +88,7 @@ class setupStepFinish extends setupStep
 
     $smarty = get_smarty();
     $smarty->assign('err_msg',  $err_msg);
-    $smarty->assign('msg2',     sprintf(_('After downloading and placing the file under %s, please make sure that the user the webserver is running with is able to read %s, while other users shouldn\'t.'), CONFIG_DIR, CONFIG_FILE));
+    $smarty->assign('msg2',     sprintf(_('After downloading and placing the file under %s, please make sure that the user the web server is running with is able to read %s, while other users shouldn\'t.'), CONFIG_DIR, CONFIG_FILE));
 
     return parent::render();
   }
-- 
GitLab