From: Moritz Bunkus Date: Tue, 1 Mar 2011 11:52:41 +0000 (+0100) Subject: Merge branch 'master' of lx-office.linet-services.de:lx-office-erp X-Git-Tag: release-2.6.3~61 X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/5d3d2de2e05277f3e790e16066cf5200f0c67389?hp=b6ae20da85f7c02f486dd7ba15713292b61017cb Merge branch 'master' of lx-office.linet-services.de:lx-office-erp --- diff --git a/locale/de/all b/locale/de/all index 842452068..eed49d818 100644 --- a/locale/de/all +++ b/locale/de/all @@ -1114,6 +1114,7 @@ $self->{texts} = { 'Not done yet' => 'Noch nicht fertig', 'Not obsolete' => 'Gültig', 'Note' => 'Hinweis', + 'Note: For Firefox 4 and later the menu XUL menu requires the addon Remote XUL Manager and the Lx-Office server to be white listed.' => 'Bitte beachten: Ab Firefox 4 benötigt das XUL Menü das Addon Remote XUL Manager, in dem der Lx-Office Server eingetragen sein muss.', 'Note: Taxkeys must have a "valid from" date, and will not behave correctly without.' => 'Hinweis: Steuerschlüssel sind fehlerhaft ohne "Gültig ab" Datum', 'Notes' => 'Bemerkungen', 'Notes (will appear on hard copy)' => 'Bemerkungen', diff --git a/scripts/find-use.pl b/scripts/find-use.pl index 554947d76..84129c29f 100755 --- a/scripts/find-use.pl +++ b/scripts/find-use.pl @@ -188,11 +188,13 @@ This module is included in C. Don't worry about it. This module is documented in C to be necessary, or is a dependancy of one of these. Everything alright. -= item !missing +=item !missing These modules are neither core, nor included, nor required. This is ok for developer tools, but should never occur for modules the actual program uses. +=back + =head1 AUTHOR http://www.ledgersmb.org/ - The LedgerSMB team diff --git a/t/002goodperl.t b/t/002goodperl.t index fa205b17c..28b69a4c5 100644 --- a/t/002goodperl.t +++ b/t/002goodperl.t @@ -119,7 +119,8 @@ foreach my $file (@testitems) { next; } while (my $file_line = ) { - if ($file_line =~ m/(<\/?$tags>)/) { + last if $file_line =~ /^__END__/; + if ($file_line =~ m/(<\/?$tags>)/o) { $found_html_count++; $found_html .= $1; } diff --git a/templates/webpages/admin/edit_groups.html b/templates/webpages/admin/edit_groups.html index af71026e0..6056107e1 100644 --- a/templates/webpages/admin/edit_groups.html +++ b/templates/webpages/admin/edit_groups.html @@ -28,7 +28,7 @@

diff --git a/templates/webpages/am/config.html b/templates/webpages/am/config.html index 4ed5a07e8..31cd43264 100644 --- a/templates/webpages/am/config.html +++ b/templates/webpages/am/config.html @@ -1,4 +1,5 @@ [%- USE T8 %] +[%- USE LxERP %] [% USE HTML %]

@@ -164,6 +165,8 @@ +

[% LxERP.t8('Note: For Firefox 4 and later the menu XUL menu requires the addon Remote XUL Manager and the Lx-Office server to be white listed.', 'https://addons.mozilla.org/de/firefox/addon/remote-xul-manager/') %]

+