diff --git a/admin/deletecategory.php b/admin/deletecategory.php index 6df72aba41..ce04ec2b0a 100644 --- a/admin/deletecategory.php +++ b/admin/deletecategory.php @@ -62,7 +62,8 @@ if ($apps_cats==True) { - $t->set_var('messages',lang('This category is currently being used by applications as a parent category.
You will need to remove the subcategories before you can delete the parent category')); + $t->set_var('messages',lang('This category is currently being used by applications as a parent category') . '
' + . lang('You will need to remove the subcategories before you can delete the parent category')); $t->set_var('hidden_vars',$hidden_vars); $t->set_var('lang_subs',''); $t->set_var('subs',''); diff --git a/admin/setup/phpgw_de.lang b/admin/setup/phpgw_de.lang index f3513a2a95..d3956ad8af 100644 --- a/admin/setup/phpgw_de.lang +++ b/admin/setup/phpgw_de.lang @@ -68,7 +68,8 @@ that loginid has already been taken admin de Diese LoginID ist bereits vergeben the login and password can not be the same admin de Login und Passwort dürfen nicht identisch sein the two passwords are not the same admin de Die beiden Paßwörter stimmen nicht überein they must be removed before you can continue admin de Sie müssen zuvor aus dieser entfernt werden -This category is currently being used by applications as a parent category.
You will need to remove the subcategories before you can delete the parent category admin de Diese Kategorie wird gegenwärtig als übergeordnete Kategorie benutzt.
Sie müssen erst die untergeordneten Kategorien löschen ! +This category is currently being used by applications as a parent category admin de Diese Kategorie wird gegenwärtig als übergeordnete Kategorie benutzt. +You will need to remove the subcategories before you can delete the parent category admin de Sie müssen erst die Unterkategorien löschen befor Sie die Übergeordnete Kategorie löschen können ! total records admin de Anzahl Datensätze insgesamt user accounts admin de Benutzerkonten user groups admin de Benutzergruppen diff --git a/admin/setup/phpgw_en.lang b/admin/setup/phpgw_en.lang index 1def051ada..643250f655 100644 --- a/admin/setup/phpgw_en.lang +++ b/admin/setup/phpgw_en.lang @@ -70,7 +70,8 @@ that loginid has already been taken admin en That loginid has already been taken the login and password can not be the same admin en The login and password can not be the same the two passwords are not the same admin en The two passwords are not the same they must be removed before you can continue admin en They must be removed before you can continue -This category is currently being used by applications as a parent category.
You will need to remove the subcategories before you can delete the parent category admin en This category is currently being used by applications as a parent category.
You will need to remove the subcategories before you can delete the parent category ! +This category is currently being used by applications as a parent category admin en This category is currently being used by applications as a parent category. +You will need to remove the subcategories before you can delete the parent category admin en You will need to remove the subcategories before you can delete the parent category ! total records admin en Total records user accounts admin en User accounts user groups admin en User groups diff --git a/phpgwapi/setup/phpgw_de.lang b/phpgwapi/setup/phpgw_de.lang index 3d0123a6cb..d8d267fafa 100644 --- a/phpgwapi/setup/phpgw_de.lang +++ b/phpgwapi/setup/phpgw_de.lang @@ -1,6 +1,5 @@ access common de Zugriff access not permitted common de Zugriff verweigert -access type common de Zugriffstyp acl common de ACL active common de Aktiv add common de Hinzufügen @@ -21,7 +20,6 @@ category x has been added ! common de Kategorie %1 wurde hinzugefügt ! category x has been updated ! common de Kategorie %1 wurde überarbeitet ! change common de Ändern charset common de iso-8859-1 -choose a category common de Wählen einer Kategorie choose the parent category common de Wählen der übergeordneten Kategorie clear common de Zurücksetzen clear form common de Eingaben löschen @@ -48,8 +46,6 @@ email common de E-Mail enabled common de Verfügbar end date common de Enddatum end time common de Endzeit -entry has been deleted sucessfully common de Eintrag erfolgreich gelöscht -entry updated sucessfully common de Eintrag erfolgreich aktualisiert error common de Fehler february common de Februar files common de Dateien @@ -86,7 +82,6 @@ medium common de Mittel message common de Nachricht monday common de Montag name common de Name -new entry added sucessfully common de Neuer Eintrag erfolgreich hinzugefügt new main category common de neue Hauptkategorie no common de Nein no matchs found common de Keine Treffer gefunden. @@ -103,7 +98,6 @@ overview common de Überblick owner common de Besitzer parent category common de Übergeordnete Kategorie password common de Passwort -password has been updated common de Passwort wurde aktualisiert please enter a name common de Bitte geben Sie einen Namen ein ! please set your preferences for this application common de Bitte editieren Sie Ihre Einstellungen für diese Applikation! powered by phpgroupware version x common de Powered by phpGroupWare version %1 @@ -120,10 +114,8 @@ select category common de Kategorie ausw september common de September session has been killed common de Session wurde gelöscht show all common de alle anzeigen -show new messages on main screen common de Neue Nachrichten auf der Startseite anzeigen showing x common de %1 Einträge showing x - x of x common de %1 Einträge - %2 von %3 -sorry, there was a problem processing your request. common de Sorry, es gab ein Problem bei der Bearbeitung Ihrer Anfrage. start date common de Startdatum start time common de Startzeit status common de Status @@ -149,13 +141,10 @@ wednesday common de Mittwoch which groups common de Welche Gruppen written by: common de Geschrieben von: yes common de ja -you are required to change your password during your first login common de Das Passwort muß beim ersten Login geändert werden! you have selected an invalid date common en Sie haben ein ungültiges Datum gewählt ! you have selected an invalid main category common de Sie haben eine ungültige Hauptkategorie gewählt ! your search returned 1 match common de Ihre Suche ergab einen Treffer your search returned x matchs common de Ihre Suche ergab %1 Treffer -your settings have been updated common de Ihre Einstellungen wurden aktualisiert bad login or password login de Bad login or password -sorry, your login has expired login de Sorry - Login abgelaufen you have been successfully logged out login de Abmeldung erfolgreich your session could not be verified. login de Ihre Sitzung konnte nicht verifiziert werden. diff --git a/phpgwapi/setup/phpgw_en.lang b/phpgwapi/setup/phpgw_en.lang index 91ff7e030a..64e4af9e79 100644 --- a/phpgwapi/setup/phpgw_en.lang +++ b/phpgwapi/setup/phpgw_en.lang @@ -1,6 +1,5 @@ access common en Access access not permitted common en Access not permitted -access type common en Access type acl common en ACL active common en Active add common en Add @@ -21,7 +20,6 @@ category x has been added ! common en Category %1 has been added ! category x has been updated ! common en Category %1 has been updated ! change common en Change charset common en iso-8859-1 -choose a category common en Choose a category choose the parent category common en Choose the parent category clear common en Clear clear form common en Clear Form @@ -49,8 +47,6 @@ email common en E-Mail enabled common en Enabled end date common en End date end time common en End time -entry has been deleted sucessfully common en Entry has been deleted sucessfully -entry updated sucessfully common en Entry updated sucessfully error common en Error february common en February fields common en Fields @@ -71,7 +67,6 @@ help common en Help high common en High home common en Home it has been more then x days since you changed your password common en It has been more then %1 days since you changed your password -it is recommended that you run setup to upgrade your tables to the current version common en It is recommended that you run setup to upgrade your tables to the current version january common en January july common en July june common en June @@ -89,7 +84,6 @@ medium common en Medium message common en Message monday common en Monday name common en Name -new entry added sucessfully common en New entry added sucessfully new main category common en New main category next common en Next no common en No @@ -107,12 +101,10 @@ overview common en Overview owner common en Owner parent category common en Parent Category password common en Password -password has been updated common en Password has been updated personal common en Personal please enter a name common en Please enter a name ! please set your preferences for this application common en Please set your preferences for this application powered by phpgroupware version x common en Powered by phpGroupWare version %1 -prefer common en Prefer preferences common en Preferences print common en Print priority common en Priority @@ -129,7 +121,6 @@ session has been killed common en Session has been killed show all common en show all showing x common en showing %1 showing x - x of x common en showing %1 - %2 of %3 -sorry, there was a problem processing your request. common en Sorry, there was a problem processing your request. start date common en Start date start time common en Start time status common en Status @@ -154,16 +145,11 @@ wednesday common en Wednesday which groups common en Which groups written by: common en Written by: yes common en Yes -you are required to change your password during your first login common en You are required to change your password during your first login you have selected an invalid date common en You have selected an invalid date ! you have selected an invalid main category common en You have selected an invalid main category ! -you must enter a password common en You must enter a password your search returned 1 match common en your search returned 1 match your search returned x matchs common en your search returned %1 matches -your settings have been updated common en Your settings have been Updated bad login or password login en Bad login or password -sorry, your login has expired login en Sorry, your login has expired username login en Username -you are running a newer version of phpGroupWare than your database is setup for common en You are running a newer version of phpGroupWare than your database is setup for you have been successfully logged out login en You have been successfully logged out your session could not be verified. login en Your session could not be verified.