diff --git a/admin/addcategory.php b/admin/addcategory.php index 762baacf87..30c6970fed 100644 --- a/admin/addcategory.php +++ b/admin/addcategory.php @@ -28,7 +28,7 @@ if (!$cat_name) { - $error[$errorcount++] = lang('Please enter a name for that category !'); + $error[$errorcount++] = lang('Please enter a name'); } if (!$error) @@ -44,7 +44,7 @@ if ($exists == True) { - $error[$errorcount++] = lang('That category name has been used already !'); + $error[$errorcount++] = lang('That name has been used already'); } } @@ -53,7 +53,7 @@ $main = $c->return_main($cat_parent); if ($main != $cat_main) { - $error[$errorcount++] = lang('You selected an invalid main category !'); + $error[$errorcount++] = lang('You have selected an invalid main category !'); } } @@ -90,10 +90,10 @@ $t->set_var('lang_new_main',lang('New main category')); $t->set_var('main_category_list',$c->formated_list('select','mains',$cat_main)); $t->set_var('lang_parent',lang('Parent category')); - $t->set_var('lang_select_parent',lang('Select parent category')); + $t->set_var('lang_select_parent',lang('Choose the parent category')); $t->set_var('category_list',$c->formated_list('select','all',$cat_parent)); - $t->set_var('lang_name',lang('Category name')); - $t->set_var('lang_descr',lang('Category description')); + $t->set_var('lang_name',lang('Name')); + $t->set_var('lang_descr',lang('Description')); $t->set_var('cat_name',$cat_name); $t->set_var('cat_description',$cat_description); $t->set_var('lang_add',lang('Add')); diff --git a/admin/categories.php b/admin/categories.php index dfc8c4a3f8..89ec84de68 100644 --- a/admin/categories.php +++ b/admin/categories.php @@ -115,7 +115,8 @@ if ($categories[$i]['owner'] == $phpgw_info['user']['account_id']) { - $t->set_var('edit',$phpgw->link('/admin/editcategory.php',"cat_id=$cat_id&start=$start&query=$query&sort=$sort&order=$order&filter=$filter")); + $t->set_var('edit',$phpgw->link('/admin/editcategory.php','cat_id=' . $cat_id . '&start=' . $start . '&query=' . $query . '&sort=' . $sort + . '&order=' . $order . '&filter=' . $filter)); $t->set_var('lang_edit_entry',lang('Edit')); } else @@ -126,7 +127,8 @@ if ($categories[$i]['owner'] == $phpgw_info['user']['account_id']) { - $t->set_var('delete',$phpgw->link('/admin/deletecategory.php',"cat_id=$cat_id&start=$start&query=$query&sort=$sort&order=$order&filter=$filter")); + $t->set_var('delete',$phpgw->link('/admin/deletecategory.php','cat_id=' . $cat_id . '&start=' . $start . '&query=' . $query . '&sort=' . $sort . '&order=' + . $order . '&filter=' . $filter)); $t->set_var('lang_delete_entry',lang('Delete')); } else diff --git a/admin/deletecategory.php b/admin/deletecategory.php index 615efe3904..da294e7a16 100644 --- a/admin/deletecategory.php +++ b/admin/deletecategory.php @@ -38,7 +38,8 @@ { $c->delete($cat_id); } - Header('Location: ' . $phpgw->link('/admin/categories.php',"start=$start&query=$query&sort=$sort&order=$order&filter=$filter")); + Header('Location: ' . $phpgw->link('/admin/categories.php','start=' . $start . '&query=' . $query . '&sort=' . $sort . '&order=' . $order + . '&filter=' . $filter)); } else { @@ -54,13 +55,14 @@ $t->set_block('category_delete','delete','deletehandle'); $t->set_block('category_delete','done','donehandle'); - $nolink = $phpgw->link('/admin/categories.php',"cat_id=$cat_id&start=$start&query=$query&sort=$sort&order=$order&filter=$filter"); + $nolink = $phpgw->link('/admin/categories.php','cat_id=' . $cat_id . '&start=' . $start . '&query=' . $query . '&sort=' . $sort . '&order=' . $order + . '&filter=' . $filter); $apps_cats = $c->exists('subs',$cat_name='',$cat_id); 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.
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/editcategory.php b/admin/editcategory.php index 012df77dd9..8b8b2d2277 100644 --- a/admin/editcategory.php +++ b/admin/editcategory.php @@ -13,8 +13,8 @@ if (! $cat_id) { - Header('Location: ' . $phpgw->link('/admin/categories.php',"sort=$sort&order=$order&query=$query&start=$start" - . "&filter=$filter")); + Header('Location: ' . $phpgw->link('/admin/categories.php','sort=' . $sort . '&order=' . $order . '&query=' . $query + . '&start=' . $start . '&filter=' . $filter)); } $phpgw_info['flags']['currentapp'] = 'admin'; @@ -41,7 +41,7 @@ if (!$cat_name) { - $error[$errorcount++] = lang('Please enter a name for that category !'); + $error[$errorcount++] = lang('Please enter a name'); } if (!$error) @@ -57,7 +57,7 @@ if ($exists == True) { - $error[$errorcount++] = lang('That category name has been used already !'); + $error[$errorcount++] = lang('That name has been used already'); } } @@ -66,7 +66,7 @@ $main = $c->return_main($cat_parent); if ($main != $cat_main) { - $error[$errorcount++] = lang('You selected an invalid main category !'); + $error[$errorcount++] = lang('You have selected an invalid main category !'); } } @@ -99,13 +99,14 @@ $t->set_var('title_categories',lang('Edit global category')); $t->set_var('lang_parent',lang('Parent category')); - $t->set_var('lang_select_parent',lang('Select parent category')); + $t->set_var('lang_select_parent',lang('Choose the parent category')); $t->set_var('actionurl',$phpgw->link('/admin/editcategory.php')); - $t->set_var('deleteurl',$phpgw->link('/admin/deletecategory.php',"cat_id=$cat_id&start=$start&query=$query&sort=$sort&order=$order&filter=$filter")); - $t->set_var('doneurl',$phpgw->link('/admin/categories.php',"start=$start&query=$query&sort=$sort&order=$order&filter=$filter")); + $t->set_var('deleteurl',$phpgw->link('/admin/deletecategory.php','cat_id=' . $cat_id . '&start=' . $start . '&query=' . $query . '&sort=' . $sort + . '&order=' . $order . '&filter=' . $filter)); + $t->set_var('doneurl',$phpgw->link('/admin/categories.php','start=' . $start . '&query=' . $query . '&sort=' . $sort . '&order=' . $order . '&filter=' . $filter)); $t->set_var('hidden_vars',$hidden_vars); - $t->set_var('lang_name',lang('Category name')); - $t->set_var('lang_descr',lang('Category description')); + $t->set_var('lang_name',lang('Name')); + $t->set_var('lang_descr',lang('Description')); $t->set_var('lang_done',lang('Done')); $t->set_var('lang_edit',lang('Edit')); $t->set_var('lang_delete',lang('Delete')); diff --git a/admin/setup/phpgw_de.lang b/admin/setup/phpgw_de.lang index be7c7d681f..cf22e284c2 100644 --- a/admin/setup/phpgw_de.lang +++ b/admin/setup/phpgw_de.lang @@ -68,6 +68,7 @@ that loginid has already been taken admin de Diese LoginID ist bereits vergeben that site has already been entered admin de Diese Site wurde bereits eingegeben the login and password can not be the same admin de Login und Passwort dürfen nicht identisch sein 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 ! 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 bfed754f2a..303d9aa972 100644 --- a/admin/setup/phpgw_en.lang +++ b/admin/setup/phpgw_en.lang @@ -16,14 +16,13 @@ are you sure you want to delete this group ? admin en Are you sure you want to d are you sure you want to delete this news site ? admin en Are you sure you want to delete this news site ? are you sure you want to kill this session ? admin en Are you sure you want to kill this session ? base url admin en Base URL -category description admin en Category description -category name admin en Category name change main screen message admin en Change main screen message city admin en City create group admin en Create Group disabled admin en Disabled display admin en Display edit application admin en Edit application +edit global category admin en Edit global category edit group admin en Edit Group edit user account admin en Edit user account enabled admin en Enabled @@ -65,7 +64,6 @@ percent of users that logged out admin en Percent of users that logged out permissions admin en Permissions permissions this group has admin en Permissions this group has php information admin en PHP Information -please enter a name for that category ! admin en Please enter a name for that category ! re-enter password admin en Re-enter password region admin en Region regions admin en Regions @@ -80,11 +78,11 @@ station admin en Station stations admin en Stations submit changes admin en Submit Changes table admin en Table -that category name has been used already ! admin en That category name has been used already ! that loginid has already been taken admin en That loginid has already been taken that site has already been entered admin en That site has already been entered the login and password can not be the same admin en The login and password can not be 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 ! 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 d5102ee39b..39a42971fb 100644 --- a/phpgwapi/setup/phpgw_de.lang +++ b/phpgwapi/setup/phpgw_de.lang @@ -25,9 +25,13 @@ cancel common de Abbruch category common de Kategorie categories common de Kategorien categories for common de Kategorien für +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 chat common de Chat +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 company common de Firma @@ -47,7 +51,9 @@ e-mail common de E-Mail e-mail preferences common de E-Mail Einstellungen edit common de Editieren email common de E-Mail +edit category common de Kategorie editieren edit categories common de Kategorien editieren +edit x category for common de %1 Kategorie editieren für email signature common de E-Mail Signatur email type common de E-Mail Typ end date common de Enddatum @@ -68,7 +74,7 @@ first page common de erste Seite forum common de Forum friday common de Freitag ftp common de FTP -global common de Globale +global common de Global global categories common de Globale Kategorien global public common de Global Public global public and group public common de öffentliche und Gruppen @@ -103,6 +109,7 @@ last page common de letzte Seite login common de Login logout common de Logout low common de Niedrig +main category common de Hauptkategorie main screen common de Startseite manual common de Handbuch march common de März @@ -113,6 +120,7 @@ mobile phone common de Tel Funk 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 news headlines common de News headlines news reader common de News Reader newsgroups common de Newsgroups @@ -131,10 +139,12 @@ only yours common de nur eigene original common de Original other phone common de Tel sonst. owner common de Besitzer +parent category common de Übergeordnete Kategorie password common de Passwort password has been updated common de Passwort wurde aktualisiert permissions to the files/users directory common de Zugriffsrechte für die Dateien/Benutzer-Verzeichnisse -please set your preferences for this app common de Bitte editieren Sie Ihre Einstellungen für diese Applikation! +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! please x by hand common de Bitte manuell %1 powered by phpgroupware version x common de Powered by phpGroupWare version %1 preferences common de Einstellungen @@ -168,6 +178,7 @@ submit common de Absenden sunday common de Sonntag that phrase already exists common de Diese Phrase existiert bereits the two passwords are not the same common de Die Eingaben stimmen nicht überein +this name has been used already common de Dieser Name ist bereits in Benutzung ! thursday common de Donnerstag time common de Zeit time zone common de Zeitzone @@ -201,6 +212,7 @@ you have 1 high priority event on your calendar today. common de Sie haben heute you have 1 new message! common de Sie haben eine neue Nachricht! you have messages! common de Sie haben Nachrichten! you have no new messages common de Keine neuen Nachrichten +you have selected an invalid main category common de Sie haben eine ungültige Hauptkategorie gewählt ! you have x high priority events on your calendar today. common de Sie haben heute %1 Einträge mit hoher Priorität auf Ihrer Liste! you have x new messages! common de Sie haben %1 neue Nachrichten! your message has been sent common de Ihre Nachricht wurde versandt diff --git a/phpgwapi/setup/phpgw_en.lang b/phpgwapi/setup/phpgw_en.lang index 356772dca4..4eacca9d06 100644 --- a/phpgwapi/setup/phpgw_en.lang +++ b/phpgwapi/setup/phpgw_en.lang @@ -21,8 +21,6 @@ april common en April are you sure you want to delete this entry ? common en Are you sure you want to delete this entry ? august common en August autosave default category common en Autosave Default Category -bookkeeping admins common en Bookkeeping admins -bookkeeping common en Bookkeeping book marks common en Book marks bookmarks common en Bookmarks business city common en Business City @@ -47,7 +45,7 @@ change common en Change charset common en iso-8859-1 chat common en Chat choose a category common en Choose a category -choose the category common en Choose the category +choose the parent category common en Choose the parent category clear common en Clear clear form common en Clear Form company common en Company @@ -122,6 +120,7 @@ last page common en last page login common en Login logout common en Logout low common en Low +main category common en Main category main screen common en Main screen manual common en Manual march common en March @@ -134,6 +133,7 @@ monday common en Monday monitor common en Monitor name common en Name new entry added sucessfully common en New entry added sucessfully +new main category common en New main category newsgroups common en Newsgroups news headlines common en News headlines news reader common en News Reader @@ -157,7 +157,8 @@ password common en Password password has been updated common en Password has been updated permissions to the files/users directory common en permissions to the files/users directory personal common en Personal -please set your preferences for this app common en Please set your preferences for this application +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 please x by hand common en Please %1 by hand powered by phpgroupware version x common en Powered by phpGroupWare version %1 pref common en pref @@ -175,7 +176,6 @@ save common en Save search common en Search select category common en Select Category select headline news sites common en Select Headline News sites -select parent category common en Select parent category send updates via email common en Send updates via EMail september common en September session has been killed common en Session has been killed @@ -191,6 +191,7 @@ submit common en Submit sunday common en Sunday that phrase already exists common en That phrase already exists the two passwords are not the same common en The two passwords are not the same +this name has been used already common en This name has been used already ! thursday common en Thursday time common en Time time zone common en Timezone @@ -220,6 +221,7 @@ you have 1 high priority event on your calendar today. common en You have 1 high you have 1 new message! common en You have 1 new message! you have messages! common en You have messages! you have no new messages common en You have no new messages +you have selected an invalid main category common en You have selected an invalid main category ! you have x high priority events on your calendar today. common en You have %1 high priority events on your calendar today. you have x new messages! common en You have %1 new messages! you must enter a password common en You must enter a password diff --git a/preferences/addcategory.php b/preferences/addcategory.php index f9eaaaa42d..9349913b87 100644 --- a/preferences/addcategory.php +++ b/preferences/addcategory.php @@ -42,7 +42,7 @@ if (!$cat_name) { - $error[$errorcount++] = lang('Please enter a name for that category !'); + $error[$errorcount++] = lang('Please enter a name'); } if (!$error) @@ -58,7 +58,7 @@ if ($exists == True) { - $error[$errorcount++] = lang('That category name has been used already !'); + $error[$errorcount++] = lang('That name has been used already'); } } @@ -67,7 +67,7 @@ $main = $c->return_main($cat_parent); if ($main != $cat_main) { - $error[$errorcount++] = lang('You selected an invalid main category !'); + $error[$errorcount++] = lang('You have selected an invalid main category'); } } @@ -133,7 +133,7 @@ $category_list = $c->formated_list('select','all',$cat_parent); } - $t->set_var('category_select',''); + $t->set_var('category_select',''); $t->set_var('lang_parent',lang('Parent category')); } else diff --git a/preferences/editcategory.php b/preferences/editcategory.php index 0c59dfaf4f..fda95e49fe 100644 --- a/preferences/editcategory.php +++ b/preferences/editcategory.php @@ -48,7 +48,7 @@ if (!$cat_name) { - $error[$errorcount++] = lang('Please enter a name for that category !'); + $error[$errorcount++] = lang('Please enter a name'); } if (!$error) @@ -63,7 +63,7 @@ } if ($exists == True) { - $error[$errorcount++] = lang('That category name has been used already !'); + $error[$errorcount++] = lang('That name has been used already'); } } @@ -72,7 +72,7 @@ $main = $c->return_main($cat_parent); if ($main != $cat_main) { - $error[$errorcount++] = lang('You selected an invalid main category !'); + $error[$errorcount++] = lang('You have selected an invalid main category'); } } @@ -131,7 +131,7 @@ $category_list = $c->formated_list('select','all',$cats[0]['parent']); } - $t->set_var('category_select',''); + $t->set_var('category_select',''); $t->set_var('lang_parent',lang('Parent category')); } else