From: Holger Lindemann Date: Tue, 2 Nov 2010 08:40:38 +0000 (+0100) Subject: Merge branch 'master' of ssh://lx-office/~/lx-office-erp X-Git-Tag: release-2.6.2beta1~89^2~5 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=74954e7bd964d9b68a3ab62d81acb5801e4e8a17;hp=6f2893dcf199d5e5147cc2020c2ab6984f4274dc;p=kivitendo-erp.git Merge branch 'master' of ssh://lx-office/~/lx-office-erp --- diff --git a/locale/de/all b/locale/de/all index 2cb27051a..25677233b 100644 --- a/locale/de/all +++ b/locale/de/all @@ -554,7 +554,7 @@ $self->{texts} = { 'Do you really want to delete AP transaction #1?' => 'Wollen Sie wirklich die Kreditorenbuchung #1 löschen?', 'Do you really want to delete AR transaction #1?' => 'Wollen Sie wirklich die Debitorenbuchung #1 löschen?', 'Do you really want to delete GL transaction #1?' => 'Wollen Sie wirklich die Dialogbuchung #1 löschen?', - 'Do you really want to delete this group:' => 'Wollen Sie wirklich diese Gruppe löschen:', + 'Do you really want to delete this group?' => 'Gruppe wirklich löschen?', 'Do you really want to delete this warehouse?' => 'Wollen Sie dieses Lager wirklich löschen?', 'Do you want Lx-Office to create a group for access to all functions?' => 'Wollen Sie, dass Lx-Office eine Gruppe mit Zugriff auf alle Funktionen anlegt?', 'Do you want to limit your search?' => 'Wollen Sie Ihre Suche spezialisieren?', diff --git a/locale/de_DE/all b/locale/de_DE/all index 127d0bffd..d39bf7695 100644 --- a/locale/de_DE/all +++ b/locale/de_DE/all @@ -554,7 +554,7 @@ $self->{texts} = { 'Do you really want to delete AP transaction #1?' => 'Wollen Sie wirklich die Kreditorenbuchung #1 löschen?', 'Do you really want to delete AR transaction #1?' => 'Wollen Sie wirklich die Debitorenbuchung #1 löschen?', 'Do you really want to delete GL transaction #1?' => 'Wollen Sie wirklich die Dialogbuchung #1 löschen?', - 'Do you really want to delete this group:' => 'Wollen Sie wirklich diese Gruppe löschen:', + 'Do you really want to delete this group?' => 'Gruppe wirklich löschen?', 'Do you really want to delete this warehouse?' => 'Wollen Sie dieses Lager wirklich löschen?', 'Do you want Lx-Office to create a group for access to all functions?' => 'Wollen Sie, dass Lx-Office eine Gruppe mit Zugriff auf alle Funktionen anlegt?', 'Do you want to limit your search?' => 'Wollen Sie Ihre Suche spezialisieren?', diff --git a/locale/en/all b/locale/en/all index 2224c7b35..cb322eebd 100644 --- a/locale/en/all +++ b/locale/en/all @@ -554,7 +554,7 @@ $self->{texts} = { 'Do you really want to delete AP transaction #1?' => '', 'Do you really want to delete AR transaction #1?' => '', 'Do you really want to delete GL transaction #1?' => '', - 'Do you really want to delete this group:' => '', + 'Do you really want to delete this group?' => '', 'Do you really want to delete this warehouse?' => '', 'Do you want Lx-Office to create a group for access to all functions?' => '', 'Do you want to limit your search?' => '', diff --git a/locale/fr/all b/locale/fr/all index 1d6cc5441..6b0057729 100644 --- a/locale/fr/all +++ b/locale/fr/all @@ -549,7 +549,7 @@ $self->{texts} = { 'Do you really want to delete AP transaction #1?' => '', 'Do you really want to delete AR transaction #1?' => '', 'Do you really want to delete GL transaction #1?' => '', - 'Do you really want to delete this group:' => '', + 'Do you really want to delete this group?' => '', 'Do you really want to delete this warehouse?' => '', 'Do you want Lx-Office to create a group for access to all functions?' => '', 'Do you want to limit your search?' => '', diff --git a/templates/webpages/admin/delete_group_confirm.html b/templates/webpages/admin/delete_group_confirm.html index e74911efb..1b558c733 100644 --- a/templates/webpages/admin/delete_group_confirm.html +++ b/templates/webpages/admin/delete_group_confirm.html @@ -1,20 +1,18 @@ [%- USE T8 %] [% USE HTML %] - -

[% 'Do you really want to delete this group:' | $T8 %] [% name %] ?

- - - - - - - - + diff --git a/templates/webpages/admin/edit_group.html b/templates/webpages/admin/edit_group.html index 195efbcab..88ced6a67 100644 --- a/templates/webpages/admin/edit_group.html +++ b/templates/webpages/admin/edit_group.html @@ -75,9 +75,8 @@

- - + diff --git a/templates/webpages/admin_printer/edit.html b/templates/webpages/admin_printer/edit.html index c8edd609c..6f50b6410 100644 --- a/templates/webpages/admin_printer/edit.html +++ b/templates/webpages/admin_printer/edit.html @@ -28,12 +28,12 @@
+ [%- IF id %] [%- END %] - diff --git a/templates/webpages/admin_printer/list.html b/templates/webpages/admin_printer/list.html index cd9b78475..6ff4b5e88 100644 --- a/templates/webpages/admin_printer/list.html +++ b/templates/webpages/admin_printer/list.html @@ -19,9 +19,9 @@ [%- IF all_printers.size %] [%- FOREACH row = all_printers %] - [% row.printer_description %] - [% row.printer_command | html %] - [% row.template_code | html %] + [% row.printer_description %] + [% row.printer_command | html %] + [% row.template_code | html %] [%- END %] [%- ELSE %] @@ -37,8 +37,8 @@
- + diff --git a/templates/webpages/admin_printer/login.html b/templates/webpages/admin_printer/login.html index d45f1ce85..0948d1bf1 100644 --- a/templates/webpages/admin_printer/login.html +++ b/templates/webpages/admin_printer/login.html @@ -9,8 +9,8 @@

- +

diff --git a/templates/webpages/generic/error.html b/templates/webpages/generic/error.html index f421e0cb8..cb3f22531 100644 --- a/templates/webpages/generic/error.html +++ b/templates/webpages/generic/error.html @@ -1,10 +1,12 @@ [%- USE T8 %] [% USE HTML %] -

[% IF title_error %][% title_error %][% ELSE %][% 'Error!' | $T8 %][% END %]

[% label_error %]

- +

+ +

+ [%- IF SHOW_BACK_BUTTON %]