diff --git a/setup/inc/class.setup_process.inc.php b/setup/inc/class.setup_process.inc.php
index dae5d7d0e7..738e0474cd 100755
--- a/setup/inc/class.setup_process.inc.php
+++ b/setup/inc/class.setup_process.inc.php
@@ -206,7 +206,7 @@ class setup_process
{
$is_windows = strtoupper(substr(PHP_OS,0,3)) == 'WIN';
- $current_config['site_title'] = 'eGroupWare';
+ $current_config['site_title'] = 'EGroupware';
$current_config['hostname'] = isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : 'localhost';
// guessing the eGW url
@@ -235,6 +235,7 @@ class setup_process
}
$current_config['files_dir'] = '/var/lib/'.$egroupwareDirName.'/'.$GLOBALS['egw_setup']->ConfigDomain.'/files';
$current_config['backup_dir'] = '/var/lib/'.$egroupwareDirName.'/'.$GLOBALS['egw_setup']->ConfigDomain.'/backup';
+ $current_config['aspell_path'] = '/usr/bin/aspell';
}
else
{
@@ -246,8 +247,14 @@ class setup_process
{
$current_config['temp_dir'] = 'c:\\path\\to\\temp\\dir';
}
- $current_config['files_dir'] = 'c:\\Program files\\'.$egroupwareDirName.'\\'.$GLOBALS['egw_setup']->ConfigDomain.'\\files';
- $current_config['backup_dir'] = 'c:\\Program files\\'.$egroupwareDirName.'\\'.$GLOBALS['egw_setup']->ConfigDomain.'\\backup';
+ $current_config['files_dir'] = 'C:\\Program Files\\'.$egroupwareDirName.'\\'.$GLOBALS['egw_setup']->ConfigDomain.'\\files';
+ $current_config['backup_dir'] = 'C:\\Program Files\\'.$egroupwareDirName.'\\'.$GLOBALS['egw_setup']->ConfigDomain.'\\backup';
+ $current_config['aspell_path'] = 'C:\Program Files\Aspell\bin\aspell.exe';
+ }
+ // only set aspell path, if it's installed
+ if (!is_executable($current_config['aspell_path']))
+ {
+ unset($current_config['aspell_path']);
}
$datetime =& CreateObject('phpgwapi.egw_datetime');
$current_config['tz_offset'] = $datetime->getbestguess();
diff --git a/setup/lang/egw_cs.lang b/setup/lang/egw_cs.lang
index a452ea11df..713006baaa 100644
--- a/setup/lang/egw_cs.lang
+++ b/setup/lang/egw_cs.lang
@@ -671,3 +671,4 @@ your tables will be dropped and you will lose data setup cs Vaše tabulky budou
your temporary directory '%1' %2 setup cs Váš dočasný adresář '%1' %2
{db | php(default) | php-restore} setup cs {db | php(výchozí) | php-restore}
{off(default) | on} setup cs {off(výchozí) | on}
+complete path to aspell program setup cs Celá cesta k programu aspell
diff --git a/setup/lang/egw_da.lang b/setup/lang/egw_da.lang
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/setup/lang/egw_de.lang b/setup/lang/egw_de.lang
index fa17245ebf..8cc524ef23 100644
--- a/setup/lang/egw_de.lang
+++ b/setup/lang/egw_de.lang
@@ -673,3 +673,4 @@ your tables will be dropped and you will lose data setup de Ihre Tabellen werden
your temporary directory '%1' %2 setup de Ihr temporäres Verzeichnis '%1' %2
{db | php(default) | php-restore} setup de {db | php(Vorgabe) | php-restore}
{off(default) | on} setup de {off(Vorgabe) | on}
+complete path to aspell program setup de Vollständiger Pfad zum Programm ASPELL
diff --git a/setup/lang/egw_el.lang b/setup/lang/egw_el.lang
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/setup/lang/egw_en.lang b/setup/lang/egw_en.lang
index 847678a9c7..f2664eca2f 100644
--- a/setup/lang/egw_en.lang
+++ b/setup/lang/egw_en.lang
@@ -671,3 +671,4 @@ your tables will be dropped and you will lose data setup en Your tables will be
your temporary directory '%1' %2 setup en Your temporary directory '%1' %2
{db | php(default) | php-restore} setup en {db | php(default) | php-restore}
{off(default) | on} setup en {off(default) | on}
+complete path to aspell program setup en Complete path to aspell program
diff --git a/setup/lang/egw_es-es.lang b/setup/lang/egw_es-es.lang
index aeef6c2f02..7190eeaf72 100644
--- a/setup/lang/egw_es-es.lang
+++ b/setup/lang/egw_es-es.lang
@@ -673,3 +673,4 @@ your tables will be dropped and you will lose data setup es-es ¡¡Sus tablas se
your temporary directory '%1' %2 setup es-es Su directorio temporal '%1' %2
{db | php(default) | php-restore} setup es-es {db | php (predeterminado) | php-restore}
{off(default) | on} setup es-es {off (predeterminado) | on}
+complete path to aspell program setup es-es Ruta completa al programa aspell
diff --git a/setup/lang/egw_eu.lang b/setup/lang/egw_eu.lang
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/setup/lang/egw_nl.lang b/setup/lang/egw_nl.lang
index 6d690ff8b1..e4a5dbebbb 100644
--- a/setup/lang/egw_nl.lang
+++ b/setup/lang/egw_nl.lang
@@ -672,3 +672,4 @@ your tables will be dropped and you will lose data setup nl Uw tabellen worden v
your temporary directory '%1' %2 setup nl Uw tijdelijke directory '%1' %2
{db | php(default) | php-restore} setup nl {db | php(default) | php-restore}
{off(default) | on} setup nl {off(default) | on}
+complete path to aspell program setup nl Volledige pad naar aspell programma
diff --git a/setup/lang/egw_pt-br.lang b/setup/lang/egw_pt-br.lang
index 5b2128c65a..89c5dbdc61 100644
--- a/setup/lang/egw_pt-br.lang
+++ b/setup/lang/egw_pt-br.lang
@@ -673,3 +673,4 @@ your tables will be dropped and you will lose data setup pt-br Suas tabelas ser
your temporary directory '%1' %2 setup pt-br Seu diretório temporário '%1' %2
{db | php(default) | php-restore} setup pt-br {db | php(default) | php-restore}
{off(default) | on} setup pt-br {off(default | on}
+complete path to aspell program setup pt-br Caminho completo para o programa aspell
diff --git a/setup/lang/egw_ru.lang b/setup/lang/egw_ru.lang
index 814c2d97ec..2eefb5b19c 100644
--- a/setup/lang/egw_ru.lang
+++ b/setup/lang/egw_ru.lang
@@ -665,3 +665,4 @@ your tables will be dropped and you will lose data setup ru Ваши табли
your temporary directory '%1' %2 setup ru Ваша папка временных файлов '%1' %2
{db | php(default) | php-restore} setup ru {БД | php(по-умолчанию)| php-восстановление}
{off(default) | on} setup ru {выкл(по-умолчанию) | вкл}
+complete path to aspell program setup ru Полный путь до программы проверки орфографии(?)
diff --git a/setup/lang/egw_rw.lang b/setup/lang/egw_rw.lang
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/setup/lang/egw_sk.lang b/setup/lang/egw_sk.lang
index caaabc0efd..66cfbf90cf 100644
--- a/setup/lang/egw_sk.lang
+++ b/setup/lang/egw_sk.lang
@@ -648,3 +648,4 @@ your tables will be dropped and you will lose data setup sk Vaše tabuľky budú
your temporary directory '%1' %2 setup sk Váš adresár dočasných súborov '%1' %2
{db | php(default) | php-restore} setup sk {db | php(predvolené) | php-restore}
{off(default) | on} setup sk {vypnúť(predvolené) | zapnúť}
+complete path to aspell program setup sk Plná cesta ku programu aspell
diff --git a/setup/lang/egw_tr.lang b/setup/lang/egw_tr.lang
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/setup/lang/egw_uk.lang b/setup/lang/egw_uk.lang
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/setup/lang/egw_zh.lang b/setup/lang/egw_zh.lang
index ef1f3c90bc..1557ab7539 100644
--- a/setup/lang/egw_zh.lang
+++ b/setup/lang/egw_zh.lang
@@ -646,3 +646,4 @@ your tables will be dropped and you will lose data setup zh 您的数据表将
your temporary directory '%1' %2 setup zh 您的暂存文件夹 '%1' %2
{db | php(default) | php-restore} setup zh {db | php(默认) | php-restore}
{off(default) | on} setup zh {off(默认) | on}
+complete path to aspell program setup zh Aspell (拼写检查软件)程序的完整路径
diff --git a/setup/templates/default/config.tpl b/setup/templates/default/config.tpl
index 94104f483b..e3d628480c 100644
--- a/setup/templates/default/config.tpl
+++ b/setup/templates/default/config.tpl
@@ -74,6 +74,14 @@
+
+