diff --git a/admin/js/app.js b/admin/js/app.js index 4483ac60c2..3567c91d54 100644 --- a/admin/js/app.js +++ b/admin/js/app.js @@ -826,7 +826,7 @@ app.classes.admin = AppJS.extend( var _buttons = [ {"button_id": "delete[cancel]","text": this.egw.lang('Cancel'), id: 'delete[cancel]', image: 'cancel', "default":true}, {"button_id": "delete[delete]","text": this.egw.lang('Delete'), id: 'delete[delete]', image: 'delete'}, - {"button_id": "delete[subs]","text": this.egw.lang('Delete including sub-enteries'), id: 'delete[subs]', image: 'delete'} + {"button_id": "delete[subs]","text": this.egw.lang('Delete including sub-entries'), id: 'delete[subs]', image: 'delete'} ]; var action = _action; var self = this; diff --git a/admin/lang/egw_de.lang b/admin/lang/egw_de.lang index d074f42a4d..6144aebaf6 100644 --- a/admin/lang/egw_de.lang +++ b/admin/lang/egw_de.lang @@ -234,6 +234,7 @@ delete application admin de Anwendung löschen delete category admin de Kategorie löschen delete group admin de Gruppe löschen delete identity admin de Identität löschen +delete including sub-entries admin de Inklusive Untereinträge delete peer server admin de Server von Serververbund löschen delete selected entries admin de Ausgewählte Einträge löschen delete the category admin de Kategorie löschen diff --git a/admin/lang/egw_en.lang b/admin/lang/egw_en.lang index 3c5b314f0f..e4a3655950 100644 --- a/admin/lang/egw_en.lang +++ b/admin/lang/egw_en.lang @@ -234,6 +234,7 @@ delete application admin en Delete application delete category admin en Delete category delete group admin en Delete group delete identity admin en Delete identity +delete including sub-entries admin en Delete including sub-entries delete peer server admin en Delete peer server delete selected entries admin en Delete selected entries delete the category admin en Delete the category diff --git a/api/lang/egw_de.lang b/api/lang/egw_de.lang index acf9a158fe..d886c86c5f 100644 --- a/api/lang/egw_de.lang +++ b/api/lang/egw_de.lang @@ -634,7 +634,7 @@ html link to the current record common de HTML-Link zum aktuellen Eintrag. hungary common de UNGARN iceland common de ISLAND icy-orange theme for ckeditor common de icy-orange Theme für den Ckeditor -id common de Id +id common de ID iespell not detected. click ok to go to download page. common de ieSpell nicht gefunden. OK klicken um zur Download Seite zu gehen. if field is disabled an empty table-cell is displayed, for (temporal) removement of a field/cell common de wenn das Feld deaktiviert ist, wird eine leere Tabellenzelle angezeigt, zum (zeitweisen) Entfernen eines Feldes if the clock is enabled would you like it to update it every second or every minute? common de Möchten Sie bei aktivierter Uhr, dass diese sekündlich aktualisiert wird? diff --git a/api/lang/egw_en.lang b/api/lang/egw_en.lang index 9a863b0e88..2e6471ffc9 100644 --- a/api/lang/egw_en.lang +++ b/api/lang/egw_en.lang @@ -636,7 +636,7 @@ html link to the current record common en HTML link to the current record hungary common en HUNGARY iceland common en ICELAND icy-orange theme for ckeditor common en icy-orange theme for ckeditor -id common en id +id common en ID iespell not detected. click ok to go to download page. common en ieSpell not detected. Click OK to go to download page. if field is disabled an empty table-cell is displayed, for (temporal) removement of a field/cell common en If field is disabled an empty table cell is displayed if the clock is enabled would you like it to update it every second or every minute? common en If the clock is enabled would you like it to update it every second or every minute. diff --git a/calendar/lang/egw_de.lang b/calendar/lang/egw_de.lang index 735c4f0050..6f16b73a9c 100644 --- a/calendar/lang/egw_de.lang +++ b/calendar/lang/egw_de.lang @@ -399,6 +399,7 @@ planner by category calendar de Planer nach Kategorien planner by user calendar de Planer nach Benutzern please note: conflict check is never done in the past and always limited by above recurrence horizont. calendar de Bitte beachten: Konfliktprüfung findet nie in der Vergangenheit statt und ist immer durch den obigen Wiederholungs-Bereich beschränkt. please note: you can configure the field assignments after you uploaded the file. calendar de Bitte beachten: Die Feldzuordnung kann NACH dem Hochladen der Datei konfiguriert werden. +please first select participants on the left and then use plus button to add them calendar de Bitte erst links Teilnehmer auswählen um dann mit dem +-Knopf hinzufügen preselected group for entering the planner calendar de Vorausgewählte Gruppe beim Planer-Aufruf prevent deleting of entries admin de Das Löschen von Einträgen verhindern previous calendar de vorherig diff --git a/calendar/lang/egw_en.lang b/calendar/lang/egw_en.lang index ff3d3eb211..991165189a 100644 --- a/calendar/lang/egw_en.lang +++ b/calendar/lang/egw_en.lang @@ -399,6 +399,7 @@ planner by category calendar en Planner by category planner by user calendar en Planner by user please note: conflict check is never done in the past and always limited by above recurrence horizont. calendar en Please note: conflict check is never done in the past and always limited by above recurrence horizont. please note: you can configure the field assignments after you uploaded the file. calendar en Note: You can configure the field assignments AFTER you uploaded the file. +please first select participants on the left and then use plus button to add them calendar en Please first select participants on the left and then use plus button to add them preselected group for entering the planner calendar en Pre-selected group for entering the planner prevent deleting of entries admin en Prevent deleting of entries previous calendar en Previous diff --git a/infolog/js/app.js b/infolog/js/app.js index 4ccc89b0ba..aa8fc57458 100644 --- a/infolog/js/app.js +++ b/infolog/js/app.js @@ -524,7 +524,7 @@ app.classes.infolog = AppJS.extend( */ infolog_print_preview: function() { - this.egw.message('Printing...'); + this.egw.message(this.egw.lang('Printing...')); this.egw.window.print(); }, diff --git a/infolog/lang/egw_de.lang b/infolog/lang/egw_de.lang index f1e4cc9c13..be0190b0ec 100644 --- a/infolog/lang/egw_de.lang +++ b/infolog/lang/egw_de.lang @@ -358,6 +358,7 @@ prefix for sub-entries (default: re:) infolog de Präfix für Untereinträge (Vo price infolog de Preis pricelist infolog de Preisliste primary link infolog de Primäre Verknüpfung +printing... infolog de Drucke... priority infolog de Priorität private infolog de Privat project infolog de Projekt diff --git a/infolog/lang/egw_en.lang b/infolog/lang/egw_en.lang index 17a5de5463..8ef9f13966 100644 --- a/infolog/lang/egw_en.lang +++ b/infolog/lang/egw_en.lang @@ -360,6 +360,7 @@ pricelist infolog en Price list primary link infolog en Primary link priority infolog en Priority private infolog en Private +printing... infolog en Printing... project infolog en Project project id infolog en Project ID project name infolog en Project name diff --git a/preferences/inc/class.preferences_categories_ui.inc.php b/preferences/inc/class.preferences_categories_ui.inc.php index b8dc23a16d..4607e5ed32 100644 --- a/preferences/inc/class.preferences_categories_ui.inc.php +++ b/preferences/inc/class.preferences_categories_ui.inc.php @@ -29,6 +29,9 @@ class preferences_categories_ui extends admin_categories { if (false) parent::__construct (); // parent constructor explicitly not called! Framework::includeCSS('/admin/templates/default/app.css'); + + // Load translations from admin, category stuff is there + \EGroupware\Api\Translation::add_app('admin'); } public function get_rows(&$query, &$rows, &$readonlys)