Merge branch 'master' of vc.linet-services.de:public/lx-office-erp

diff --combined locale/de/special_chars
index 8e8498b,945b239..c481fe6
--- 1/locale/de/special_chars
--- 2/locale/de/special_chars
+++ b/locale/de/special_chars
@@@ -16,10 -16,6 +16,6 @@@ order=& ä ö ü Ä Ö Ü ß " < 
  order="
  "=&quot;
  
- [XUL]
- order=&
- &=&quot;
- 
  [Template/HTML]
  order=< > \n
  <=&lt;
@@@ -33,7 -29,7 +29,7 @@@ order=< > \
  \n=<br>
  
  [Template/LaTeX]
 -order=\\ <pagebreak> & \n \r " $ <bullet> % _ # ^ { } < > £ ± ² ³ ° § ® ©
 +order=\\ <pagebreak> & \n \r " $ <bullet> % _ # ^ { } < > £ ± ² ³ ° § ® © \xad
  \\=\\textbackslash\s
  <pagebreak>=
  "=''
@@@ -57,9 -53,7 +53,9 @@@ _=\\
  °=$^\\circ$
  §=\\S
  ®=\\textregistered
 -©=\\textcopyright
 +©=\\textcopyrighta
 +\xad=\\-
 +
  
  [Template/OpenDocument]
  order=& < > " ' \x80 \n \r