diff --git a/contrib/man/fusiondirectory.conf.5 b/contrib/man/fusiondirectory.conf.5 index 9544d1f1654d909940cae74a586202cd8d3d85e7..4d647c32a321a13635f2dd14d74f8f3745eb6d79 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 708b6319ef907d5f62be8facfdde480e7dcf3e43..a1ec7d260a872041869b7dd3f506acaf3cc6da18 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 bfae23c52d8104922f1010d8ad53fe7d0f243d12..358c0a883cc8f211d0a50c9d04a4a7488c1980f9 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 085db1b36faca037d82b061f201bb08617e41daa..b6026ab057b89fc7a5d764fd607ca1a955c9bc6a 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 6456eb705690c00257e4e1e173a774b73c6a26a1..97ac80b0eeb778145c195f6ec85e4695d3d198dc 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 87312cc92e94d0277b458421e989d78a111b1b74..6fac90800e27271f92d9f24a836405fe0fd6afa2 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 dc001509b97386cc5163b35475fcb0de282e2359..ff88d356c3a312a423177ce9c18c6fe551da7b57 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 02b369f43bcbc91afdc4681ac91bc9d9b0957088..bcbcd632704da6db63f330a39e0f65dde1b6bd78 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 aa9c41284b3b608c02336ff99838edefa8b558f6..93da9c48f892c7167d347bd7b08563a667b4cdb5 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 375cded1c99c462da31a393e916fb6cdcaf39f09..26eccd00ca1a00d30be707b18ff5830d461980c2 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 6f70ae2302a653e77487cd93db42f1f42ade888c..5c19bd80a85df2973dde57463fceea7aaa24ce18 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 0f91902c1626cff19b1a6be9b97a20543e44502b..e6069f3152997014e644049076be67cb3d1ca55e 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 7f486b2762b3d362db4afddc0fda9a000115348b..6f75e93cf5ef81c5d170468bbd4f808e5ea7bedb 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 0a261f9dea0009c7ccd60760885436de317a5851..4dd4a7e480666f09ec718a553e8b04334864f0d1 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 5c21e9a51813e0680aa1110e31f17351ecd19aad..b352ef323aae6cd352ae2911f016cd4fd6709294 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 805145b9b8d7cfea850184065c84ae341128e527..7a9420830c3e86435d4334b6bc76001e97758531 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 d8e0931dd5ec5e1a0386278f960c8be3f8318e95..8c34606c7bd570c922988067f5c3b966102c1af5 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 d2a009dedbd75fb31ed42f488dd8f8c154bf8b43..1b0c729c5b41ebeaa0e15416848909db7c91cc8d 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 4f1fb654147ca311feab45f22b13e58a2ddeab5a..2e3a435c204c53e6d2a4d2b6780fc2f60d8a4734 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 5fe44fb45ae098c4ca49fef939ce05c6d2c654f3..bf948744faeca86b5d6d85607f78146c7d160dbd 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 809eb20da282c7d7427e59da3c644f4389ab23a2..9c8b0bd95c6e19cd1722fc1ea57a654aea8219b7 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 106eff8a516258571856a4a0e15c22863a51d296..57e4e51e664b4bdea9d14e6f7a3ba1f621849788 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 8a8f8212a1737617ddf9813908904088f24cc59d..accd7179af220bf1d05e10dbfb61fc5627850a3f 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 0d74990df2ae0426e41d517e71046c82265211c7..492dd24b3ffd02070ee194ff7205530708adea5e 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 5c72cabcf5783864425ef4dd8717d9195fd87c8d..5341e2e6fe2e7db5cc369e5e9d5b2e024f1ff76e 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 2f2c83b6ddb8c874a81f58ee9f2c94cd0cf5a712..5e624e59c15616b965609dd2e1902cf4355ed306 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 2d9d98ef6344b24ba6523c6a3173954ed2ebe33f..5d5e133bc88cdc0fe22a4bc004c36524f8bfb8c5 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 92d67094062fe3142a8893029147ac59d5a8a8ef..39135fff9119d3ea371877534a6d2b98686405ea 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 297d02064bf7cf71e0f9ed9978913e9a73c4d3cc..77039314a873c4f12c9d1fdd886efdec3e09c0c3 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 5a5d766d575cad5198cd1d2cd24ccf5a2b0dba7c..b9a2cfaafca764d655cc3863a766a5ff450f17ee 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 c56de8134c8db2038272945db88e2208d06be9a6..1277ed5322721c45fc543b3c4517525d3d6a6d69 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 bdf480c3a687f61fc41cd23164a832e64a4d3d95..8b05c8c7633a60df38186e6aaa14850925a25fbd 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 3fb8b993f440a1bae959473cfbca4c67e0d43e07..4b2810a0ee65b38f13fe04c064f85babdbbb454c 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 41686b5f7e17ec11b02237b3160b46cc8b5d4557..732aafa620a4367e4f24da3c4ba23b8acc3a4437 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 c359d678f2abbeccfe50149d185fae4562ab3fe8..14d3e81ca7414d240718c4515eab1cafe228c9c2 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(); }