diff --git a/setup/index.php b/setup/index.php
index e223d98586..7f5b4f0238 100644
--- a/setup/index.php
+++ b/setup/index.php
@@ -153,7 +153,7 @@
$setup_tpl->set_var('img_incomplete',$incomplete);
$setup_tpl->set_var('img_completed',$completed);
- $setup_tpl->set_var('db_step_text',lang('Step 1 - Simple Application Management'));
+ $setup_tpl->set_var('db_step_text',lang('Step %1 - Simple Application Management',1));
switch($GLOBALS['phpgw_info']['setup']['stage']['db'])
{
@@ -292,7 +292,7 @@
}
// Config Section
- $setup_tpl->set_var('config_step_text',lang('Step 2 - Configuration'));
+ $setup_tpl->set_var('config_step_text',lang('Step %1 - Configuration',2));
$GLOBALS['phpgw_info']['setup']['stage']['config'] = $GLOBALS['phpgw_setup']->detection->check_config();
// begin DEBUG code
@@ -340,6 +340,7 @@
{
$btn_config_ldap = '';
}
+/*
$GLOBALS['phpgw_setup']->db->query("select config_value FROM phpgw_config WHERE config_name='webserver_url'");
$GLOBALS['phpgw_setup']->db->next_record();
if ($GLOBALS['phpgw_setup']->db->f(0))
@@ -366,8 +367,10 @@
''.lang('to setup 1 admin account and 3 demo accounts.').''
);
}
- $config_td = "$btn_edit_config" ."$link_make_accts";
- $setup_tpl->set_var('config_table_data',$config_td);
+ $config_td = "$btn_edit_config"."$link_make_accts";
+*/
+ }
+ $setup_tpl->set_var('config_table_data',$btn_edit_config);
$setup_tpl->set_var('ldap_table_data',$btn_config_ldap);
break;
default:
@@ -377,9 +380,34 @@
$setup_tpl->set_var('ldap_table_data',' ');
break;
}
+ // Admin Account Section
+ $setup_tpl->set_var('admin_step_text',lang('Step %1 - Admin Account',3));
+
+ switch($GLOBALS['phpgw_info']['setup']['stage']['config'])
+ {
+ case 10:
+ // check if there is already a user account (not the anonymous account of sitemgr or a group)
+ // Note: this does not check the availiblitly of accounts via other auth-methods then sql !!!
+ $GLOBALS['phpgw_setup']->db->query("SELECT count(*) FROM phpgw_accounts WHERE account_type='u' AND account_lid!='anonymous'",__LINE__,__FILE__);
+ $no_accounts = !$GLOBALS['phpgw_setup']->db->next_record() || !$GLOBALS['phpgw_setup']->db->f(0);
+ $setup_tpl->set_var('admin_status_img',$no_account ? $incomplete : $completed);
+ $setup_tpl->set_var('admin_status_alt',$no_account ? lang('not completed') : lang('completed'));
+ $setup_tpl->set_var('admin_table_data',$GLOBALS['phpgw_setup']->html->make_frm_btn_simple(
+ $no_accounts ? lang('No accounts existing') : lang('Accounts existing'),
+ 'POST','setup_demo.php',
+ 'submit',lang('Create admin account'),
+ ''
+ ));
+ break;
+ default:
+ $setup_tpl->set_var('admin_status_img',$incomplete);
+ $setup_tpl->set_var('admin_status_alt',lang('not completed'));
+ $setup_tpl->set_var('admin_table_data',lang('Not ready for this stage yet'));
+ break;
+ }
// Lang Section
- $setup_tpl->set_var('lang_step_text',lang('Step 3 - Language Management'));
+ $setup_tpl->set_var('lang_step_text',lang('Step %1 - Language Management',4));
$GLOBALS['phpgw_info']['setup']['stage']['lang'] = $GLOBALS['phpgw_setup']->detection->check_lang();
// begin DEBUG code
@@ -430,7 +458,7 @@
break;
}
- $setup_tpl->set_var('apps_step_text',lang('Step 4 - Advanced Application Management'));
+ $setup_tpl->set_var('apps_step_text',lang('Step %1 - Advanced Application Management',5));
// $GLOBALS['phpgw_info']['setup']['stage']['apps'] = $GLOBALS['phpgw_setup']->check_apps();
switch($GLOBALS['phpgw_info']['setup']['stage']['db'])
{
diff --git a/setup/lang/phpgw_de.lang b/setup/lang/phpgw_de.lang
index 3264c1e3e2..e0b2b0ceca 100644
--- a/setup/lang/phpgw_de.lang
+++ b/setup/lang/phpgw_de.lang
@@ -6,6 +6,7 @@
13 (ntp) setup de 13 (ntp)
80 (http) setup de 80 (http)
this will create 1 admin account and 3 demo accounts
the username/passwords are: demo/guest, demo2/guest and demo3/guest. setup de Dies wird 1 Admin- und 3 Demo-Benutzerkonten anlegen.
Die Benutzernamen/Passworte sind: demo/guest, demo2/guest und demo3/guest.
+accounts existing setup de Benutzerkonten existieren
actions setup de Aktionen
add a domain setup de Eine Domain hinzufügen
add auto-created users to this group ('default' will be attempted if this is empty.) setup de Automatisch erzeugte Benutzer zu dieser Grupper hinzufügen ("Default" wird versucht wenn nichts angegeben.)
@@ -85,6 +86,7 @@ convert setup de Konvertieren
could not open header.inc.php for writing! setup de Konnte die Datei header.inc.php nicht zum schreiben öffen!
country selection setup de Länderauswahl
create setup de erstellen
+create admin account setup de Administrator-Konto anlegen
create database setup de Datenbank erzeugen
create demo accounts setup de Demo-Benutzer anlegen
create one now setup de Jetzt erstellen
@@ -240,6 +242,7 @@ name of db user egroupware uses to connect setup de Name des Datenbank-Benutzers
never setup de niemals
new setup de Neu
no setup de Nein
+no accounts existing setup de Keine Benutzerkonten gefunden
no algorithms available setup de Kein Algorithmus verfügbar
no microsoft sql server support found. disabling setup de Keine Unterstützung für Microsoft SQL Server gefunden. Abgeschaltet
no modes available setup de kein Modus verfügbar
@@ -342,10 +345,11 @@ some or all of its tables are missing setup de Einige oder alle Tabellen fehlen
sql encryption type setup de SQL-Verschlüsselungstyp für das Passwort (Vorgabe MD5)
start the postmaster setup de Starten Sie den postmaster
status setup de Status
-step 1 - simple application management setup de Schritt 1 - Einfache Verwaltung der Anwendungen
-step 2 - configuration setup de Schritt 2 - Konfiguration
-step 3 - language management setup de Schritt 3 - Verwaltung der Sprachen
-step 4 - advanced application management setup de Schritt 4 - Erweiterte Verwaltung der Anwendungen
+step %1 - admin account setup de Schrit %1 - Administrator-Konto
+step %1 - advanced application management setup de Schritt %1 - Erweiterte Verwaltung der Anwendungen
+step %1 - configuration setup de Schritt %1 - Konfiguration
+step %1 - language management setup de Schritt %1 - Verwaltung der Sprachen
+step %1 - simple application management setup de Schritt %1 - Einfache Verwaltung der Anwendungen
table change messages setup de Tabellenänderungsmeldungen
tables dropped setup de Tabellen wurden gelöscht
tables installed, unless there are errors printed above setup de Tabellen wurden installiert, auß oben sind Fehlermelungen zu sehen
diff --git a/setup/lang/phpgw_en.lang b/setup/lang/phpgw_en.lang
index eff6b05e04..19e23cb9c0 100644
--- a/setup/lang/phpgw_en.lang
+++ b/setup/lang/phpgw_en.lang
@@ -6,6 +6,7 @@
13 (ntp) setup en 13 (ntp)
80 (http) setup en 80 (http)
this will create 1 admin account and 3 demo accounts
the username/passwords are: demo/guest, demo2/guest and demo3/guest. setup en This will create 1 admin account and 3 demo accounts
The username/passwords are: demo/guest, demo2/guest and demo3/guest.
+accounts existing setup en Accounts existing
actions setup en Actions
add a domain setup en Add a domain
add auto-created users to this group ('default' will be attempted if this is empty.) setup en Add auto-created users to this group ('Default' will be attempted if this is empty.)
@@ -83,6 +84,7 @@ convert setup en Convert
could not open header.inc.php for writing! setup en Could not open header.inc.php for writing!
country selection setup en Country Selection
create setup en Create
+create admin account setup en Create admin account
create database setup en Create Database
create demo accounts setup en Create demo accounts
create one now setup en Create one now
@@ -135,9 +137,7 @@ enable mcrypt setup en Enable MCrypt
enter some random text for app session encryption setup en Enter some random text for app session encryption
enter some random text for app_session
encryption (requires mcrypt) setup en Enter some random text for app_session
encryption (requires mcrypt)
enter the full path for temporary files.
examples: /tmp, c:\temp setup en Enter the full path for temporary files.
Examples: /tmp, C:\TEMP
-enter the full path for temporary files.
examples: /tmp, c:temp setup en
enter the full path for users and group files.
examples: /files, e:\files setup en Enter the full path for users and group files.
Examples: /files, E:\FILES
-enter the full path for users and group files.
examples: /files, e:files setup en
enter the hostname of the machine on which this server is running setup en Enter the hostname of the machine on which this server is running
enter the location of egroupware's url.
example: http://www.domain.com/egroupware or /egroupware
no trailing slash setup en Enter the location of eGroupWare's URL.
Example: http://www.domain.com/egroupware or /egroupware
No trailing slash
enter the site password for peer servers setup en Enter the site password for peer servers
@@ -238,6 +238,7 @@ name of db user egroupware uses to connect setup en Name of db user eGroupWare u
never setup en never
new setup en New
no setup en No
+no accounts existing setup en No accounts existing
no algorithms available setup en no algorithms available
no microsoft sql server support found. disabling setup en No Microsoft SQL Server support found. Disabling
no modes available setup en no modes available
@@ -340,10 +341,11 @@ some or all of its tables are missing setup en Some or all of its tables are mis
sql encryption type setup en SQL encryption type for passwords (default - md5)
start the postmaster setup en Start the postmaster
status setup en Status
-step 1 - simple application management setup en Step 1 - Simple Application Management
-step 2 - configuration setup en Step 2 - Configuration
-step 3 - language management setup en Step 3 - Language Management
-step 4 - advanced application management setup en Step 4 - Advanced Application Management
+step %1 - admin account setup en Step %1 - Admin Account
+step %1 - advanced application management setup en Step %1 - Advanced Application Management
+step %1 - configuration setup en Step %1 - Configuration
+step %1 - language management setup en Step %1 - Language Management
+step %1 - simple application management setup en Step %1 - Simple Application Management
table change messages setup en Table Change Messages
tables dropped setup en tables dropped
tables installed, unless there are errors printed above setup en tables installed, unless there are errors printed above
diff --git a/setup/lang/phpgw_es-es.lang b/setup/lang/phpgw_es-es.lang
index 4cee5fb0f5..7c779574f2 100644
--- a/setup/lang/phpgw_es-es.lang
+++ b/setup/lang/phpgw_es-es.lang
@@ -355,10 +355,10 @@ some or all of its tables are missing setup es-es Algunas o todas de sus tablas
sql encryption type setup es-es Tipo de cifrado SQL para contraseñas (predeterminado - md5)
start the postmaster setup es-es Iniciar el postmaster
status setup es-es Estado
-step 1 - simple application management setup es-es Paso 1 - Administración simple de aplicaciones
-step 2 - configuration setup es-es Paso 2 - Configuración
-step 3 - language management setup es-es Paso 3 - Administración de idiomas
-step 4 - advanced application management setup es-es Paso 4 - Administración avanzada de aplicaciones
+step %1 - simple application management setup es-es Paso %1 - Administración simple de aplicaciones
+step %1 - configuration setup es-es Paso %1 - Configuración
+step %1 - language management setup es-es Paso %1 - Administración de idiomas
+step %1 - advanced application management setup es-es Paso %1 - Administración avanzada de aplicaciones
submit setup es-es Enviar
table change messages setup es-es Mensajes de cambios en las tablas
tables dropped setup es-es tablas eliminadas
diff --git a/setup/lang/phpgw_fi.lang b/setup/lang/phpgw_fi.lang
index f03667f128..b3328619ae 100644
--- a/setup/lang/phpgw_fi.lang
+++ b/setup/lang/phpgw_fi.lang
@@ -181,10 +181,10 @@ setup setup fi Asennus
Show 'powered by' logo on setup fi Näytä 'powered by' logo
some or all of its tables are missing setup fi Ainakin osa tauluista puuttuu
status setup fi Tila
-step 1 - simple application management setup fi Vaihe 1 - Sovellusten hallinta
-step 2 - configuration setup fi Vaihe 2 - Asetukset
-step 3 - language management setup fi Vaihe 3 - Kielten hallinta
-step 4 - advanced application management setup fi Vaihe 4 - Sovellusten hallinta (yksityiskohdat)
+step %1 - simple application management setup fi Vaihe %1 - Sovellusten hallinta
+step %1 - configuration setup fi Vaihe %1 - Asetukset
+step %1 - language management setup fi Vaihe %1 - Kielten hallinta
+step %1 - advanced application management setup fi Vaihe %1 - Sovellusten hallinta (yksityiskohdat)
submit setup fi Lähetä
table change messages setup fi Taulujen muutokset
tables dropped setup fi taulua poistettu
diff --git a/setup/lang/phpgw_fr.lang b/setup/lang/phpgw_fr.lang
index eb44f9c1cb..8b7eeb303e 100644
--- a/setup/lang/phpgw_fr.lang
+++ b/setup/lang/phpgw_fr.lang
@@ -282,10 +282,10 @@ setup the database setup fr Configurer la base de donn
show 'powered by' logo on setup fr Montrer le logo 'propulsé par' sur
some or all of its tables are missing setup fr Certaines ou toutes ses tables manquent
status setup fr Etat
-step 1 - simple application management setup fr Etape 1 - Gestion simple d'applications
-step 2 - configuration setup fr Etape 2 - Configuration
-step 3 - language management setup fr Etape 3 - Gestion des langues
-step 4 - advanced application management setup fr Etape 4 - Gestion avancée d'applications
+step %1 - simple application management setup fr Etape %1 - Gestion simple d'applications
+step %1 - configuration setup fr Etape %1 - Configuration
+step %1 - language management setup fr Etape %1 - Gestion des langues
+step %1 - advanced application management setup fr Etape %1 - Gestion avancée d'applications
table change messages setup fr Messages de changement de table
tables dropped setup fr Tables supprimées
tables installed, unless there are errors printed above setup fr Tables installées, à moins qu'il y ait des messages d'erreur imprimés ci-dessous
diff --git a/setup/lang/phpgw_it.lang b/setup/lang/phpgw_it.lang
index 2e31386ff2..64efbc646c 100644
--- a/setup/lang/phpgw_it.lang
+++ b/setup/lang/phpgw_it.lang
@@ -116,10 +116,10 @@ select your old version setup it Seleziona la tua vecchia versione
setup setup it Setup
some or all of its tables are missing setup it Alcune o tutte delle sue tabelle sono mancanti
status setup it Stato
-step 1 - simple application management setup it Passaggio 1 - Gestione Applicazioni Semplice
-step 2 - configuration setup it Passaggio 2 - Configurazione
-step 3 - language management setup it Passaggio 3 - Gestione Lingue
-step 4 - advanced application management setup it Passaggio 4 - Gestione Applicazioni Avanzata
+step %1 - simple application management setup it Passaggio %1 - Gestione Applicazioni Semplice
+step %1 - configuration setup it Passaggio %1 - Configurazione
+step %1 - language management setup it Passaggio %1 - Gestione Lingue
+step %1 - advanced application management setup it Passaggio %1 - Gestione Applicazioni Avanzata
submit setup it Invia
table change messages setup it Messaggi dalle modifiche alle tabelle
tables dropped setup it tabelle cancellate
diff --git a/setup/lang/phpgw_ja.lang b/setup/lang/phpgw_ja.lang
index 446cc81d67..a7ee4e1188 100644
--- a/setup/lang/phpgw_ja.lang
+++ b/setup/lang/phpgw_ja.lang
@@ -167,10 +167,10 @@ setup setup ja
show 'powered by' logo on setup ja powered by ¥í¥´É½¼¨°ÌÃÖ
some or all of its tables are missing setup ja ɬÍפʥơ¼¥Ö¥ë¤¬Â¸ºß¤·¤Þ¤»¤ó¡£
status setup ja ¾õÂÖɽ¼¨
-step 1 - simple application management setup ja Step 1 - ¥Æ¡¼¥Ö¥ëºîÀ®
-step 2 - configuration setup ja Step 2 - ´Ä¶ÀßÄê
-step 3 - language management setup ja Step 3 - ¸À¸ì´Ä¶ÀßÄê
-step 4 - advanced application management setup ja Step 4 - ¥¢¥×¥ê¥±¡¼¥·¥ç¥óÀßÄê
+step %1 - simple application management setup ja Step %1 - ¥Æ¡¼¥Ö¥ëºîÀ®
+step %1 - configuration setup ja Step %1 - ´Ä¶ÀßÄê
+step %1 - language management setup ja Step %1 - ¸À¸ì´Ä¶ÀßÄê
+step %1 - advanced application management setup ja Step %1 - ¥¢¥×¥ê¥±¡¼¥·¥ç¥óÀßÄê
submit setup ja ¼Â¹Ô
table change messages setup ja ¥Æ¡¼¥Ö¥ëÊѹ¹¥á¥Ã¥»¡¼¥¸
tables dropped setup ja ¥Æ¡¼¥Ö¥ë¤òºï½ü¤·¤Þ¤·¤¿
diff --git a/setup/lang/phpgw_nl.lang b/setup/lang/phpgw_nl.lang
index 96c129c741..c5bd9cf176 100644
--- a/setup/lang/phpgw_nl.lang
+++ b/setup/lang/phpgw_nl.lang
@@ -10,8 +10,6 @@
actions setup nl Acties
add a domain setup nl Een domein toevoegen
add auto-created users to this group ('default' will be attempted if this is empty.) setup nl Automatisch gecreërde gebruikers toevoegen aan deze groep ('Standaard' wordt gebruikt als dit veld leeg is)
-add auto-created users to this group (\'default\' will be attempted if this is empty.) setup nl Automatisch gecreërde gebruikers toevoegen aan deze groep ('Standaard' wordt gebruikt als dit veld leeg is)
-add auto-created users to this group (\\\'default\\\' will be attempted if this is empty.) setup nl Automatisch gecreërde gebruikers toevoegen aan deze groep ('Standaard' wordt gebruikt als dit veld leeg is)
additional settings setup nl Overige instellingen
admin first name setup nl Voornaam beheerder
admin last name setup nl Achternaam beheerder
@@ -65,10 +63,6 @@ you appear to have xml support enabled setup nl XML ondersteuning lijkt te zijn
you are ready for this stage, but this stage is not yet written.
setup nl U bent klaar voor dit stadium, maar dit stadium is nog niet weggeschreven.
you didn't enter a config password for domain %1 setup nl U heeft geen configuratie wachtwoord ingevoerd voor domein %1.
you didn't enter a header admin password setup nl U heeft geen header beheerderwachtwoord ingevoerd.
-you didn\'t enter a config password for domain %1 setup nl U heeft geen configuratie wachtwoord ingevoerd voor domein %1.
-you didn\'t enter a header admin password setup nl U heeft geen header beheerderwachtwoord ingevoerd.
-you didn\\\'t enter a config password for domain %1 setup nl U heeft geen configuratie wachtwoord ingevoerd voor domein %1.
-you didn\\\'t enter a header admin password setup nl U heeft geen header beheerderwachtwoord ingevoerd.
you do not have any languages installed. please install one now
setup nl U heeft nog geen talen geïnstalleerd. Doe dit a.u.b. nu.
you have not created your header.inc.php yet!
you can create it now. setup nl U heeft nog geen header.inc.php gemaakt!
U kunt dit nu doen.
you have successfully logged out setup nl U bent correct uitgelogd.
@@ -78,10 +72,6 @@ you need to select your current charset! setup nl U moet een huidige karakterset
you should either uninstall and then reinstall it, or attempt manual repairs setup nl U moet of proberen de de-installeren en vervolgens opnieuw te installeren of u kunt handmatige reparaties doen
you're using an old configuration file format... setup nl U gebruikt een verouderd bestandsformaat voor de configuratie
you're using an old header.inc.php version... setup nl U gebruikt een verouderde header.inc.php versie...
-you\'re using an old configuration file format... setup nl U gebruikt een verouderd bestandsformaat voor de configuratie
-you\'re using an old header.inc.php version... setup nl U gebruikt een verouderde header.inc.php versie...
-you\\\'re using an old configuration file format... setup nl U gebruikt een verouderd bestandsformaat voor de configuratie
-you\\\'re using an old header.inc.php version... setup nl U gebruikt een verouderde header.inc.php versie...
your applications are current setup nl Uw toepassingen zijn actueel
your database does not exist setup nl U database bestaat niet!
your database is not working! setup nl U database werkt niet!
diff --git a/setup/lang/phpgw_pl.lang b/setup/lang/phpgw_pl.lang
index 9bd6663670..90e4fd2b58 100755
--- a/setup/lang/phpgw_pl.lang
+++ b/setup/lang/phpgw_pl.lang
@@ -182,10 +182,10 @@ setup demo accounts in ldap setup pl Setup demo accounts in LDAP
show 'powered by' logo on setup pl Wy¶wietlaj logo 'powered by'
some or all of its tables are missing setup pl Some or all of its tables are missing
status setup pl Status
-step 1 - simple application management setup pl Krok 1 - Proste zarz±dzanie aplikacj±
-step 2 - configuration setup pl Krok 2 - Konfiguracja
-step 3 - language management setup pl Krok 3 - Zarz±dzanie wersjami jêzykowymi
-step 4 - advanced application management setup pl Step 4 - Zaawansowane zarz±dzanie aplikacj±
+step %1 - simple application management setup pl Krok %1 - Proste zarz±dzanie aplikacj±
+step %1 - configuration setup pl Krok %1 - Konfiguracja
+step %1 - language management setup pl Krok %1 - Zarz±dzanie wersjami jêzykowymi
+step %1 - advanced application management setup pl Step %1 - Zaawansowane zarz±dzanie aplikacj±
submit setup pl OK
table change messages setup pl Komunikaty zmiany tabel
tables dropped setup pl Usuniêto tabele
diff --git a/setup/lang/phpgw_pt-br.lang b/setup/lang/phpgw_pt-br.lang
index b385e731fc..8dc2d070ee 100644
--- a/setup/lang/phpgw_pt-br.lang
+++ b/setup/lang/phpgw_pt-br.lang
@@ -182,10 +182,10 @@ setup setup pt Configura
Show 'powered by' logo on setup pt Área para exibição da logomarca do eGroupWare
some or all of its tables are missing setup pt Algumas ou todas tabelas estão faltando
status setup pt Status
-step 1 - simple application management setup pt Passo 1 - Configuração inicial das aplicações
-step 2 - configuration setup pt Passo 2 - Configuração do sistema
-step 3 - language management setup pt Passo 3 - Configuração de idiomas
-step 4 - advanced application management setup pt Passo 4 - Configuração avançada das aplicações
+step %1 - simple application management setup pt Passo %1 - Configuração inicial das aplicações
+step %1 - configuration setup pt Passo %1 - Configuração do sistema
+step %1 - language management setup pt Passo %1 - Configuração de idiomas
+step %1 - advanced application management setup pt Passo %1 - Configuração avançada das aplicações
submit setup pt Enviar
table change messages setup pt Mensagens de alterações nas tabelas
tables dropped setup pt tabelas removidas
diff --git a/setup/lang/phpgw_pt.lang b/setup/lang/phpgw_pt.lang
index b385e731fc..8dc2d070ee 100644
--- a/setup/lang/phpgw_pt.lang
+++ b/setup/lang/phpgw_pt.lang
@@ -182,10 +182,10 @@ setup setup pt Configura
Show 'powered by' logo on setup pt Área para exibição da logomarca do eGroupWare
some or all of its tables are missing setup pt Algumas ou todas tabelas estão faltando
status setup pt Status
-step 1 - simple application management setup pt Passo 1 - Configuração inicial das aplicações
-step 2 - configuration setup pt Passo 2 - Configuração do sistema
-step 3 - language management setup pt Passo 3 - Configuração de idiomas
-step 4 - advanced application management setup pt Passo 4 - Configuração avançada das aplicações
+step %1 - simple application management setup pt Passo %1 - Configuração inicial das aplicações
+step %1 - configuration setup pt Passo %1 - Configuração do sistema
+step %1 - language management setup pt Passo %1 - Configuração de idiomas
+step %1 - advanced application management setup pt Passo %1 - Configuração avançada das aplicações
submit setup pt Enviar
table change messages setup pt Mensagens de alterações nas tabelas
tables dropped setup pt tabelas removidas
diff --git a/setup/lang/phpgw_sl.lang b/setup/lang/phpgw_sl.lang
index a41552e2f2..52226e6937 100644
--- a/setup/lang/phpgw_sl.lang
+++ b/setup/lang/phpgw_sl.lang
@@ -298,10 +298,10 @@ show 'powered by' logo on setup sl Poka
some or all of its tables are missing setup sl Manjka nekaj ali vse njene tabele
start the postmaster setup sl Poženi postmaster
status setup sl Status
-step 1 - simple application management setup sl Korak 1 - preprosto upravljanje aplikacij
-step 2 - configuration setup sl Korak 2 - konfiguracija
-step 3 - language management setup sl Korak 3 - upravljanje z jeziki
-step 4 - advanced application management setup sl Korak 4 - zahtevno upravljanje aplikacij
+step %1 - simple application management setup sl Korak %1 - preprosto upravljanje aplikacij
+step %1 - configuration setup sl Korak %1 - konfiguracija
+step %1 - language management setup sl Korak %1 - upravljanje z jeziki
+step %1 - advanced application management setup sl Korak %1 - zahtevno upravljanje aplikacij
table change messages setup sl Obvestila o spremembi tabel
tables dropped setup sl tabele odstranjene
tables installed, unless there are errors printed above setup sl tabele nameščene, razen če so zgoraj izpisane napake
diff --git a/setup/lang/phpgw_zh.lang b/setup/lang/phpgw_zh.lang
index be9ae90513..7cf500556f 100644
--- a/setup/lang/phpgw_zh.lang
+++ b/setup/lang/phpgw_zh.lang
@@ -306,10 +306,10 @@ show 'powered by' logo on setup zh 显示 'powered by' å¾½æ ‡
some or all of its tables are missing setup zh ä¸€äº›æˆ–å…¨éƒ¨è¡¨æ ¼ä¸¢å¤±
start the postmaster setup zh å¯åŠ¨ postmaster 守护进程
status setup zh 状æ€
-step 1 - simple application management setup zh æ¥éª¤ 1 - 基本应用程åºç®¡ç†
-step 2 - configuration setup zh æ¥éª¤ 2 - é…ç½®
-step 3 - language management setup zh æ¥éª¤ 3 - è¯è¨€ç®¡ç†
-step 4 - advanced application management setup zh æ¥éª¤ 4 - 高级应用程åºç®¡ç†
+step %1 - simple application management setup zh æ¥éª¤ %1 - 基本应用程åºç®¡ç†
+step %1 - configuration setup zh æ¥éª¤ %1 - é…ç½®
+step %1 - language management setup zh æ¥éª¤ %1 - è¯è¨€ç®¡ç†
+step %1 - advanced application management setup zh æ¥éª¤ %1 - 高级应用程åºç®¡ç†
table change messages setup zh è¡¨æ ¼å˜åŠ¨ä¿¡æ¯
tables dropped setup zh è¡¨æ ¼å·²ç»ç§»é™¤
tables installed, unless there are errors printed above setup zh 如果上é¢æ²¡æœ‰æ˜¾ç¤ºä»»ä½•é”™è¯¯ä¿¡æ¯ï¼Œåˆ™è¡¨æ ¼å·²ç»å®‰è£…
@@ -395,4 +395,4 @@ your header.inc.php needs upgrading. setup zh 您的 header.inc.php 需è¦å‡çº§
your header.inc.php needs upgrading.
make backups! setup zh 您的header.inc.php需è¦å‡çº§.
请åšå¤‡ä»½!
your tables are current setup zh æ‚¨çš„è¡¨æ ¼æ˜¯å½“å‰è¡¨æ ¼
your tables may be altered and you may lose data setup zh æ‚¨çš„è¡¨æ ¼å¯èƒ½æ”¹åŠ¨è¿‡.并å¯èƒ½ä¸¢å¤±éƒ¨åˆ†æ•°æ®
-your tables will be dropped and you will lose data setup zh æ‚¨çš„è¡¨æ ¼å°†è¢«ç§»é™¤ï¼Œæ•°æ®ä¹Ÿä¼šå…¨éƒ¨ä¸¢å¤±
\ No newline at end of file
+your tables will be dropped and you will lose data setup zh æ‚¨çš„è¡¨æ ¼å°†è¢«ç§»é™¤ï¼Œæ•°æ®ä¹Ÿä¼šå…¨éƒ¨ä¸¢å¤±
diff --git a/setup/lang/phpgw_zt.lang b/setup/lang/phpgw_zt.lang
index 68044975e7..fab394a440 100644
--- a/setup/lang/phpgw_zt.lang
+++ b/setup/lang/phpgw_zt.lang
@@ -348,10 +348,10 @@ some or all of its tables are missing setup zt
sql encryption type setup zt SQL ±K½X¥[±Kªº¤è¦¡(¹w³]¬°md5)
start the postmaster setup zt ¶}©lpostmaster
status setup zt ª¬ºA
-step 1 - simple application management setup zt ¨BÆJ¤@¡B°ò¥»À³¥Îµ{¦¡ºÞ²z
-step 2 - configuration setup zt ¨BÆJ¤G¡B²ÕºA³]©w
-step 3 - language management setup zt ¨BÆJ¤T¡B»y¨¥ºÞ²z
-step 4 - advanced application management setup zt ¨BÆJ¥|¡B¶i¶¥À³¥Îµ{¦¡ºÞ²z
+step %1 - simple application management setup zt ¨BÆJ¤@¡B°ò¥»À³¥Îµ{¦¡ºÞ²z
+step %1 - configuration setup zt ¨BÆJ¤G¡B²ÕºA³]©w
+step %1 - language management setup zt ¨BÆJ¤T¡B»y¨¥ºÞ²z
+step %1 - advanced application management setup zt ¨BÆJ¥|¡B¶i¶¥À³¥Îµ{¦¡ºÞ²z
submit setup zt °e¥X
table change messages setup zt ¸ê®Æªí§ó°Ê°T®§
tables dropped setup zt ¸ê®Æªí¤w²¾°£
diff --git a/setup/templates/default/setup_main.tpl b/setup/templates/default/setup_main.tpl
index 061922e352..b49082adc0 100644
--- a/setup/templates/default/setup_main.tpl
+++ b/setup/templates/default/setup_main.tpl
@@ -27,6 +27,19 @@
+
+