From: ChrisWi <chris@computersalat.de>
Date: Thu, 24 Aug 2017 14:10:13 +0000 (+0200)
Subject: cross merge and sort de/en special_chars
X-Git-Tag: kivitendo-mebil_0.1-0~10^2~2^2~169^2
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=c48f5c3b361d4c87c8a1b0c0eca0a7a3008d4539;p=kivitendo-erp.git

cross merge and sort de/en special_chars
---

diff --git a/locale/de/special_chars b/locale/de/special_chars
index b82440bfa..314fabcd4 100644
--- a/locale/de/special_chars
+++ b/locale/de/special_chars
@@ -31,8 +31,10 @@ order=< > \n
 order=\\ <pagebreak> & \n \r " $ <bullet> % _ # ^ { } < > £ ± ² ³ ° § ® © ~ \xad \xa0 ➔ → ← ↔ ↕ | − ≤ ≥ ‐ ​ Ω μ Δ λ Ø ø ‑
 \\=\\textbackslash\s
 <pagebreak>=
-"=''
 &=\\&
+\n=\\newline\s
+\r=
+"=''
 $=\\$
 <bullet>=$\\bullet$
 %=\\%
@@ -40,41 +42,39 @@ _=\\_
 # A hash mark starts a comment; therefore the line is ignored. So use
 # its hex code instead.
 \x23=\\#
+^=\\^\\\s
 {=\\{
 }=\\}
 <=$<$
 >=$>$
 £=\\pounds\s
-\n=\\newline\s
-\r=
 ±=$\\pm$
-^=\\^\\\s
 ²=$^2$
 ³=$^3$
 °=$^\\circ$
 §=\\S\s
 ®={\\textregistered}
 ©={\\textcopyright}
+~={\\raisebox{0.5ex}{\\texttildelow}}
 \xad=\\-
+\xa0=~
 ➔=$\\rightarrow$
 →=$\\rightarrow$
 ←=$\\leftarrow$
 ↔=$\\leftrightarrow$
 ↕=$\\updownarrow$
-\xa0=~
 |={\\textbar}
 −={\\textemdash}
 ≤=$\\leq$
 ≥=$\\geq$
 ‐={}-{}
 ​={\\hspace{0pt}}
+Ω=$\\Omega$
 μ={\\textmu}
 Δ=$\\Delta$
-Ω=$\\Omega$
 λ=$\\lambda$
-ø={\\o}
 Ø={\\O}
-~={\\raisebox{0.5ex}{\\texttildelow}}
+ø={\\o}
 ‑={}-{}
 
 [Template/OpenDocument]
diff --git a/locale/en/special_chars b/locale/en/special_chars
index 84373742a..104dd4dbc 100644
--- a/locale/en/special_chars
+++ b/locale/en/special_chars
@@ -29,11 +29,13 @@ order=< > \n
 \n=<br>
 
 [Template/LaTeX]
-order=\\ <pagebreak> & \n \r " $ <bullet> % _ # ^ { } < > £ ± ² ³ ° § ® © ~ \xad \xa0 ➔ → ← | − ≤ ≥ ‐ ​ Ω μ Δ λ Ø ø ‑
+order=\\ <pagebreak> & \n \r " $ <bullet> % _ # ^ { } < > £ ± ² ³ ° § ® © ~ \xad \xa0 ➔ → ← ↔ ↕ | − ≤ ≥ ‐ <200b> Ω μ Δ λ Ø ø ‑
 \\=\\textbackslash\s
 <pagebreak>=
-"=''
 &=\\&
+\n=\\newline\s
+\r=
+"=''
 $=\\$
 <bullet>=$\\bullet$
 %=\\%
@@ -41,39 +43,39 @@ _=\\_
 # A hash mark starts a comment; therefore the line is ignored. So use
 # its hex code instead.
 \x23=\\#
+^=\\^\\\s
 {=\\{
 }=\\}
 <=$<$
 >=$>$
 £=\\pounds\s
-\n=\\newline\s
-\r=
 ±=$\\pm$
-^=\\^\\\s
 ²=$^2$
 ³=$^3$
 °=$^\\circ$
-§=\\S\s
-®={\\textregistered}
-©={\\textcopyright}
+§=\\S
+®=\\textregistered
+©=\\textcopyright
+~={\\raisebox{0.5ex}{\\texttildelow}}
 \xad=\\-
+\xa0=~
 ➔=$\\rightarrow$
 →=$\\rightarrow$
 ←=$\\leftarrow$
-\xa0=~
+↔=$\\leftrightarrow$
+↕=$\\updownarrow$
 |={\\textbar}
 −={\\textemdash}
 ≤=$\\leq$
 ≥=$\\geq$
 ‐={}-{}
 ​={\\hspace{0pt}}
+Ω=$\\Omega$
 μ={\\textmu}
 Δ=$\\Delta$
-Ω=$\\Omega$
-~={\\raisebox{0.5ex}{\\texttildelow}}
 λ=$\\lambda$
-ø={\\o}
 Ø={\\O}
+ø={\\o}
 ‑={}-{}
 
 [Template/OpenDocument]