Merge branches 'pr1110', 'pr1111', 'pr1112' and 'pr1113'

img/taskbar/dark/taskbar_busy.svg

@@ -1,27 +1,72 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 16.1 16" enable-background="new 0 0 16.1 16" xml:space="preserve">
-<path fill="#252325" d="M8,0C6.1,0,4.2,1.3,4.2,3.9v1.9h-1c-1.1,0-1.8,0.8-1.8,1.9v6.5c0,1.1,0.7,1.9,1.9,1.9l9.6,0
-	c1.1,0,1.9-0.8,1.9-1.9V7.6c0-1.1-0.8-1.9-1.9-1.9h-0.9l0-1.9C11.9,1.3,10,0,8,0z M8,1.6c1.3,0,2.2,1,2.2,2.2C10.3,5,9.8,6.2,8,6.9
-	c0.3-0.5,0.4-0.7,0.5-1.2C6.7,5.9,5.8,4.9,5.8,3.8S6.7,1.6,8,1.6z"/>
-<g>
-	<path fill="#C94F50" d="M8,7.7c-1.8,0-3.3,1.5-3.3,3.3c0,1.8,1.5,3.3,3.3,3.3c1.8,0,3.3-1.5,3.3-3.3C11.3,9.2,9.8,7.7,8,7.7z
-		 M8,13.4c-1.3,0-2.4-1.1-2.4-2.4c0-0.7,0.3-1.3,0.7-1.7c0,0,0,0,0,0c0,0,0,0,0.1-0.1c0,0,0,0,0,0c0,0,0,0,0.1-0.1c0,0,0,0,0,0
-		C6.6,9.1,6.7,9,6.8,8.9c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0.1,0
-		c0,0,0,0,0.1,0c0,0,0,0,0.1,0c0,0,0.1,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0.1,0
-		c0,0,0,0,0,0c0,0,0.1,0,0.1,0c0,0,0,0,0,0c0,0,0.1,0,0.1,0c0,0,0,0,0,0l0,0l0,0c0,0,0.1,0,0.1,0c0,0,0,0,0,0c0,0,0.1,0,0.1,0
-		c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0.1,0,0.1,0c0,0,0,0,0,0c0,0,0.1,0,0.1,0c0,0,0,0,0,0
-		c0,0,0.1,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0.1,0
-		c0,0,0,0,0,0c0,0,0.1,0,0.1,0.1c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-		c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0.1,0.1,0.1,0.1c0,0,0,0,0,0c0,0,0,0,0,0.1c0,0,0,0,0,0
-		c0,0,0,0,0,0.1c0,0,0,0,0,0c0,0,0,0,0,0.1c0,0,0,0,0,0c0,0,0,0,0,0.1c0,0,0,0,0,0c0,0.1,0.1,0.2,0.1,0.2c0,0,0,0,0,0c0,0,0,0,0,0.1
-		c0,0,0,0,0,0c0,0,0,0,0,0.1c0,0,0,0,0,0c0,0,0,0,0,0.1c0,0,0,0,0,0l0,0c0,0.2,0.1,0.4,0.1,0.6C10.4,12.3,9.3,13.4,8,13.4z"/>
-	<g>
-		<g>
-			<polyline fill="#C94F50" points="9.4,8.9 5.8,12.5 6.5,13.2 10.2,9.6 			"/>
-		</g>
-	</g>
-</g>
-</svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+    xmlns:dc="http://purl.org/dc/elements/1.1/"
+    xmlns:cc="http://creativecommons.org/ns#"
+    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns:svg="http://www.w3.org/2000/svg"
+    xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="100%"
+   height="100%"
+   viewBox="0 0 16.1 16"
+   id="Layer_1"
+   xml:space="preserve">
+    <metadata
+     id="metadata19">
+        <rdf:RDF>
+            <cc:Work
+         rdf:about="">
+                <dc:format>image/svg+xml</dc:format>
+                <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+                <dc:title></dc:title>
+            </cc:Work>
+        </rdf:RDF>
+    </metadata>
+    <defs
+     id="defs17" />
+    <path
+     d="M 8,0 C 6.1,0 4.2,1.3 4.2,3.9 v 1.9 h -1 C 2.1,5.8 1.4,6.6 1.4,7.7 v 6.5 c 0,1.1 0.7,1.9 1.9,1.9 l 9.6,0 c 1.1,0 1.9,-0.8 1.9,-1.9 V 7.6 C 14.8,6.5 14,5.7 12.9,5.7 H 12 L 12,3.8 C 11.9,1.3 10,0 8,0 z m 0,1.6 c 1.3,0 2.2,1 2.2,2.2 C 10.3,5 9.8,6.2 8,6.9 8.3,6.4 8.4,6.2 8.5,5.7 6.7,5.9 5.8,4.9 5.8,3.8 5.8,2.7 6.7,1.6 8,1.6 z"
+     id="path3"
+     style="fill:#252325" />
+    <path
+     d="m 7.9927197,7.71875 c -1.8159871,0 -3.28125,1.4652629 -3.28125,3.28125 0,1.815987 1.4652629,3.28125 3.28125,3.28125 1.8159871,0 3.3125003,-1.465263 3.3125003,-3.28125 0,-1.8159871 -1.4965132,-3.28125 -3.3125003,-3.28125 z m 0,0.90625 c 1.3198669,0 2.4062503,1.0551331 2.4062503,2.375 0,1.319867 -1.0863834,2.375 -2.4062503,2.375 -1.3198669,0 -2.375,-1.055133 -2.375,-2.375 0,-1.3198669 1.0551331,-2.375 2.375,-2.375 z"
+     id="path3000"
+     style="fill:#c94f50;fill-opacity:1" />
+    <path
+     d="m -6.5762711,11.932203 a 5.3220339,6.237288 0 1 1 -10.6440679,0 5.3220339,6.237288 0 1 1 10.6440679,0 z"
+     id="path2996"
+     style="fill:#ffffff;fill-opacity:1" />
+    <rect
+     width="1.1830783"
+     height="5.3462563"
+     rx="0"
+     ry="0.89710045"
+     x="12.866886"
+     y="-0.54217148"
+     transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)"
+     id="rect3937"
+     style="fill:#c94f50;fill-opacity:1;fill-rule:nonzero" />
+    <g
+     transform="translate(-12.523729,-0.08389831)"
+     id="g3893">
+        <g
+       id="g3877">
+            <g
+         id="g3879">
+                <path
+           d="m 5.6,8.7 c -1.3,1.3 -1.3,3.4 0,4.7 1.3,1.3 3.4,1.3 4.7,0 1.3,-1.3 1.3,-3.4 0,-4.7 C 9,7.4 6.9,7.4 5.6,8.7 z m 4.1,4 c -0.9,0.9 -2.4,0.9 -3.4,0 -0.5,-0.5 -0.7,-1.1 -0.7,-1.8 0,0 0,0 0,0 0,0 0,-0.1 0,-0.1 0,0 0,0 0,0 0,0 0,-0.1 0,-0.1 0,0 0,0 0,0 0,-0.1 0,-0.2 0.1,-0.4 0,0 0,0 0,0 0,0 0,0 0,-0.1 0,0 0,0 0,0 0,0 0,0 0,-0.1 0,0 0,0 0,0 0,0 0,0 0,-0.1 0,0 0,0 0,0 0,0 0,0 0,-0.1 0,0 0,0 0,-0.1 0,0 0,0 0,-0.1 0,0 0,0 0,-0.1 0,0 0,0 0,0 0,0 0,0 0,-0.1 0,0 0,0 0,0 0,0 0,0 0,-0.1 0,0 0,0 0,0 0,0 0,0 0,-0.1 0,0 0,0 0,0 0,0 0,0 0,-0.1 0,0 0,0 0,0 0,0 0.1,-0.1 0.1,-0.1 0,0 0,0 0,0 l 0,0 0,0 c 0,0 0.1,-0.1 0.1,-0.1 0,0 0,0 0,0 0,0 0,0 0.1,-0.1 0,0 0,0 0,0 0,0 0,0 0.1,0 0,0 0,0 0,0 0,0 0,0 0.1,0 0,0 0,0 0,0 0,0 0,0 0.1,0 0,0 0,0 0,0 0,0 0.1,0 0.1,-0.1 0,0 0,0 0,0 0,0 0.1,0 0.1,0 0,0 0,0 0,0 0,0 0,0 0.1,0 0,0 0,0 0,0 0,0 0,0 0.1,0 0,0 0,0 0,0 0,0 0,0 0.1,0 0,0 0,0 0,0 0,0 0,0 0.1,0 0,0 0,0 0,0 0,0 0.1,0 0.1,0 0,0 0,0 0,0 0,0 0,0 0.1,0 0,0 0,0 0,0 0,0 0,0 0.1,0 0,0 0,0 0.1,0 0,0 0,0 0.1,0 0,0 0,0 0.1,0 0,0 0,0 0.1,0 0,0 0,0 0.1,0 0,0 0,0 0,0 0,0 0,0 0.1,0 0,0 0,0 0,0 0.1,0 0.1,0 0.2,0 0,0 0,0 0,0 0,0 0,0 0.1,0 0,0 0,0 0,0 0,0 0,0 0.1,0 0,0 0,0 0,0 0,0 0,0 0.1,0 0,0 0,0 0,0 0,0 0,0 0.1,0 0,0 0,0 0,0 0.1,0 0.2,0.1 0.2,0.1 0,0 0,0 0,0 0,0 0,0 0.1,0 0,0 0,0 0,0 0,0 0,0 0.1,0 0,0 0,0 0,0 0,0 0,0 0.1,0 0,0 0,0 0,0 l 0,0 c 0.2,0.1 0.3,0.2 0.4,0.3 1.3,1.1 1.3,2.6 0.4,3.5 z"
+           id="path3881"
+           style="fill:#ffffff" />
+                <g
+           id="g3883">
+                    <polyline
+             id="polyline3885"
+             points="7.5,8.5 7.5,13.6 8.5,13.6 8.5,8.5    "
+             style="fill:#ffffff" />
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

img/taskbar/dark/taskbar_invisible.svg

@@ -1,28 +1,71 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 16.1 16" enable-background="new 0 0 16.1 16" xml:space="preserve">
-<path fill="#252325" d="M8,0C6.1,0,4.2,1.3,4.2,3.9v1.9h-1c-1.1,0-1.8,0.8-1.8,1.9v6.5c0,1.1,0.7,1.9,1.9,1.9l9.6,0
-	c1.1,0,1.9-0.8,1.9-1.9V7.6c0-1.1-0.8-1.9-1.9-1.9h-0.9l0-1.9C11.9,1.3,10,0,8,0z M8,1.6c1.3,0,2.2,1,2.2,2.2C10.3,5,9.8,6.2,8,6.9
-	c0.3-0.5,0.4-0.7,0.5-1.2C6.7,5.9,5.8,4.9,5.8,3.8S6.7,1.6,8,1.6z"/>
-<g>
-	<g>
-		<path fill="#FFFFFF" d="M5.6,8.7c-1.3,1.3-1.3,3.4,0,4.7c1.3,1.3,3.4,1.3,4.7,0c1.3-1.3,1.3-3.4,0-4.7C9,7.4,6.9,7.4,5.6,8.7z
-			 M9.7,12.7c-0.9,0.9-2.4,0.9-3.4,0c-0.5-0.5-0.7-1.1-0.7-1.8c0,0,0,0,0,0c0,0,0-0.1,0-0.1c0,0,0,0,0,0c0,0,0-0.1,0-0.1
-			c0,0,0,0,0,0c0-0.1,0-0.2,0.1-0.4c0,0,0,0,0,0c0,0,0,0,0-0.1c0,0,0,0,0,0c0,0,0,0,0-0.1c0,0,0,0,0,0c0,0,0,0,0-0.1c0,0,0,0,0,0
-			c0,0,0,0,0-0.1c0,0,0,0,0-0.1c0,0,0,0,0-0.1c0,0,0,0,0-0.1c0,0,0,0,0,0c0,0,0,0,0-0.1c0,0,0,0,0,0c0,0,0,0,0-0.1c0,0,0,0,0,0
-			c0,0,0,0,0-0.1c0,0,0,0,0,0c0,0,0,0,0-0.1c0,0,0,0,0,0c0,0,0.1-0.1,0.1-0.1c0,0,0,0,0,0l0,0l0,0c0,0,0.1-0.1,0.1-0.1c0,0,0,0,0,0
-			c0,0,0,0,0.1-0.1c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0.1,0,0.1-0.1
-			c0,0,0,0,0,0c0,0,0.1,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0
-			c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0.1,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0.1,0c0,0,0,0,0.1,0
-			c0,0,0,0,0.1,0c0,0,0,0,0.1,0c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0c0.1,0,0.1,0,0.2,0c0,0,0,0,0,0c0,0,0,0,0.1,0
-			c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0c0.1,0,0.2,0.1,0.2,0.1c0,0,0,0,0,0
-			c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0l0,0c0.2,0.1,0.3,0.2,0.4,0.3
-			C10.6,10.3,10.6,11.8,9.7,12.7z"/>
-		<g>
-			<polyline fill="#FFFFFF" points="7.5,8.5 7.5,13.6 8.5,13.6 8.5,8.5 			"/>
-		</g>
-	</g>
-</g>
-</svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+    xmlns:dc="http://purl.org/dc/elements/1.1/"
+    xmlns:cc="http://creativecommons.org/ns#"
+    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns:svg="http://www.w3.org/2000/svg"
+    xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="100%"
+   height="100%"
+   viewBox="0 0 16.1 16"
+   id="Layer_1"
+   xml:space="preserve">
+    <metadata
+     id="metadata19">
+        <rdf:RDF>
+            <cc:Work
+         rdf:about="">
+                <dc:format>image/svg+xml</dc:format>
+                <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+                <dc:title></dc:title>
+            </cc:Work>
+        </rdf:RDF>
+    </metadata>
+    <defs
+     id="defs17" />
+    <path
+     d="M 8,0 C 6.1,0 4.2,1.3 4.2,3.9 v 1.9 h -1 C 2.1,5.8 1.4,6.6 1.4,7.7 v 6.5 c 0,1.1 0.7,1.9 1.9,1.9 l 9.6,0 c 1.1,0 1.9,-0.8 1.9,-1.9 V 7.6 C 14.8,6.5 14,5.7 12.9,5.7 H 12 L 12,3.8 C 11.9,1.3 10,0 8,0 z m 0,1.6 c 1.3,0 2.2,1 2.2,2.2 C 10.3,5 9.8,6.2 8,6.9 8.3,6.4 8.4,6.2 8.5,5.7 6.7,5.9 5.8,4.9 5.8,3.8 5.8,2.7 6.7,1.6 8,1.6 z"
+     id="path3"
+     style="fill:#252325" />
+    <path
+     d="m 7.9927197,7.71875 c -1.8159871,0 -3.28125,1.4652629 -3.28125,3.28125 0,1.815987 1.4652629,3.28125 3.28125,3.28125 1.8159871,0 3.3125003,-1.465263 3.3125003,-3.28125 0,-1.8159871 -1.4965132,-3.28125 -3.3125003,-3.28125 z m 0,0.90625 c 1.3198669,0 2.4062503,1.0551331 2.4062503,2.375 0,1.319867 -1.0863834,2.375 -2.4062503,2.375 -1.3198669,0 -2.375,-1.055133 -2.375,-2.375 0,-1.3198669 1.0551331,-2.375 2.375,-2.375 z"
+     id="path3000"
+     style="fill:#dedede;fill-opacity:1" />
+    <path
+     d="m -6.5762711,11.932203 a 5.3220339,6.237288 0 1 1 -10.6440679,0 5.3220339,6.237288 0 1 1 10.6440679,0 z"
+     id="path2996"
+     style="fill:#ffffff;fill-opacity:1" />
+    <rect
+     width="1.1830783"
+     height="5.3462563"
+     rx="0"
+     ry="0.89710045"
+     x="7.4181905"
+     y="8.3502293"
+     id="rect3937"
+     style="fill:#dedede;fill-opacity:1;fill-rule:nonzero" />
+    <g
+     transform="translate(-12.523729,-0.08389831)"
+     id="g3893">
+        <g
+       id="g3877">
+            <g
+         id="g3879">
+                <path
+           d="m 5.6,8.7 c -1.3,1.3 -1.3,3.4 0,4.7 1.3,1.3 3.4,1.3 4.7,0 1.3,-1.3 1.3,-3.4 0,-4.7 C 9,7.4 6.9,7.4 5.6,8.7 z m 4.1,4 c -0.9,0.9 -2.4,0.9 -3.4,0 -0.5,-0.5 -0.7,-1.1 -0.7,-1.8 0,0 0,0 0,0 0,0 0,-0.1 0,-0.1 0,0 0,0 0,0 0,0 0,-0.1 0,-0.1 0,0 0,0 0,0 0,-0.1 0,-0.2 0.1,-0.4 0,0 0,0 0,0 0,0 0,0 0,-0.1 0,0 0,0 0,0 0,0 0,0 0,-0.1 0,0 0,0 0,0 0,0 0,0 0,-0.1 0,0 0,0 0,0 0,0 0,0 0,-0.1 0,0 0,0 0,-0.1 0,0 0,0 0,-0.1 0,0 0,0 0,-0.1 0,0 0,0 0,0 0,0 0,0 0,-0.1 0,0 0,0 0,0 0,0 0,0 0,-0.1 0,0 0,0 0,0 0,0 0,0 0,-0.1 0,0 0,0 0,0 0,0 0,0 0,-0.1 0,0 0,0 0,0 0,0 0.1,-0.1 0.1,-0.1 0,0 0,0 0,0 l 0,0 0,0 c 0,0 0.1,-0.1 0.1,-0.1 0,0 0,0 0,0 0,0 0,0 0.1,-0.1 0,0 0,0 0,0 0,0 0,0 0.1,0 0,0 0,0 0,0 0,0 0,0 0.1,0 0,0 0,0 0,0 0,0 0,0 0.1,0 0,0 0,0 0,0 0,0 0.1,0 0.1,-0.1 0,0 0,0 0,0 0,0 0.1,0 0.1,0 0,0 0,0 0,0 0,0 0,0 0.1,0 0,0 0,0 0,0 0,0 0,0 0.1,0 0,0 0,0 0,0 0,0 0,0 0.1,0 0,0 0,0 0,0 0,0 0,0 0.1,0 0,0 0,0 0,0 0,0 0.1,0 0.1,0 0,0 0,0 0,0 0,0 0,0 0.1,0 0,0 0,0 0,0 0,0 0,0 0.1,0 0,0 0,0 0.1,0 0,0 0,0 0.1,0 0,0 0,0 0.1,0 0,0 0,0 0.1,0 0,0 0,0 0.1,0 0,0 0,0 0,0 0,0 0,0 0.1,0 0,0 0,0 0,0 0.1,0 0.1,0 0.2,0 0,0 0,0 0,0 0,0 0,0 0.1,0 0,0 0,0 0,0 0,0 0,0 0.1,0 0,0 0,0 0,0 0,0 0,0 0.1,0 0,0 0,0 0,0 0,0 0,0 0.1,0 0,0 0,0 0,0 0.1,0 0.2,0.1 0.2,0.1 0,0 0,0 0,0 0,0 0,0 0.1,0 0,0 0,0 0,0 0,0 0,0 0.1,0 0,0 0,0 0,0 0,0 0,0 0.1,0 0,0 0,0 0,0 l 0,0 c 0.2,0.1 0.3,0.2 0.4,0.3 1.3,1.1 1.3,2.6 0.4,3.5 z"
+           id="path3881"
+           style="fill:#ffffff" />
+                <g
+           id="g3883">
+                    <polyline
+             id="polyline3885"
+             points="7.5,8.5 7.5,13.6 8.5,13.6 8.5,8.5    "
+             style="fill:#ffffff" />
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

img/taskbar/light/taskbar_busy.svg

@@ -1,14 +1,72 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-<g>
-	<path fill="#FFFFFF" d="M8,0C6.1,0,4.1,1.3,4.1,3.9v1.9h-1C2,5.7,1.3,6.5,1.3,7.6v6.5c0,1.1,0.7,1.9,1.9,1.9l9.6,0
-		c1.1,0,1.9-0.8,1.9-1.9V7.6c0-1.1-0.8-1.9-1.9-1.9h-0.9l0-1.9C11.9,1.3,9.9,0,8,0z M8,1.6c1.3,0,2.2,1,2.2,2.2
-		C10.2,5,9.7,6.2,8,6.9c0.3-0.5,0.4-0.7,0.5-1.2C6.7,5.9,5.8,4.9,5.8,3.8S6.7,1.6,8,1.6z"/>
-	<path fill="#C94F50" d="M7.9,7.7c-1.8,0-3.3,1.5-3.3,3.3c0,1.8,1.5,3.3,3.3,3.3c1.8,0,3.3-1.4,3.3-3.2C11.3,9.3,9.8,7.7,7.9,7.7z
-		 M5.6,11c0-1.9,2.2-3,3.7-2c-1.1,1.1-2.2,2.2-3.3,3.3C5.7,11.9,5.6,11.5,5.6,11z M7.9,13.4c-0.5,0-0.9-0.1-1.3-0.4
-		c1.1-1.1,2.2-2.2,3.3-3.3C10.9,11.3,9.8,13.4,7.9,13.4z"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+    xmlns:dc="http://purl.org/dc/elements/1.1/"
+    xmlns:cc="http://creativecommons.org/ns#"
+    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns:svg="http://www.w3.org/2000/svg"
+    xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="100%"
+   height="100%"
+   viewBox="0 0 16.1 16"
+   id="Layer_1"
+   xml:space="preserve">
+    <metadata
+     id="metadata19">
+        <rdf:RDF>
+            <cc:Work
+         rdf:about="">
+                <dc:format>image/svg+xml</dc:format>
+                <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+                <dc:title></dc:title>
+            </cc:Work>
+        </rdf:RDF>
+    </metadata>
+    <defs
+     id="defs17" />
+    <path
+     d="M 8,0 C 6.1,0 4.2,1.3 4.2,3.9 v 1.9 h -1 C 2.1,5.8 1.4,6.6 1.4,7.7 v 6.5 c 0,1.1 0.7,1.9 1.9,1.9 l 9.6,0 c 1.1,0 1.9,-0.8 1.9,-1.9 V 7.6 C 14.8,6.5 14,5.7 12.9,5.7 H 12 L 12,3.8 C 11.9,1.3 10,0 8,0 z m 0,1.6 c 1.3,0 2.2,1 2.2,2.2 C 10.3,5 9.8,6.2 8,6.9 8.3,6.4 8.4,6.2 8.5,5.7 6.7,5.9 5.8,4.9 5.8,3.8 5.8,2.7 6.7,1.6 8,1.6 z"
+     id="path3"
+     style="fill:#ffffff" />
+    <path
+     d="m 7.9927197,7.71875 c -1.8159871,0 -3.28125,1.4652629 -3.28125,3.28125 0,1.815987 1.4652629,3.28125 3.28125,3.28125 1.8159871,0 3.3125003,-1.465263 3.3125003,-3.28125 0,-1.8159871 -1.4965132,-3.28125 -3.3125003,-3.28125 z m 0,0.90625 c 1.3198669,0 2.4062503,1.0551331 2.4062503,2.375 0,1.319867 -1.0863834,2.375 -2.4062503,2.375 -1.3198669,0 -2.375,-1.055133 -2.375,-2.375 0,-1.3198669 1.0551331,-2.375 2.375,-2.375 z"
+     id="path3000"
+     style="fill:#c94f50;fill-opacity:1" />
+    <path
+     d="m -6.5762711,11.932203 a 5.3220339,6.237288 0 1 1 -10.6440679,0 5.3220339,6.237288 0 1 1 10.6440679,0 z"
+     id="path2996"
+     style="fill:#ffffff;fill-opacity:1" />
+    <rect
+     width="1.1830783"
+     height="5.3462563"
+     rx="0"
+     ry="0.89710045"
+     x="12.866886"
+     y="-0.54217148"
+     transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)"
+     id="rect3937"
+     style="fill:#c94f50;fill-opacity:1;fill-rule:nonzero" />
+    <g
+     transform="translate(-12.523729,-0.08389831)"
+     id="g3893">
+        <g
+       id="g3877">
+            <g
+         id="g3879">
+                <path
+           d="m 5.6,8.7 c -1.3,1.3 -1.3,3.4 0,4.7 1.3,1.3 3.4,1.3 4.7,0 1.3,-1.3 1.3,-3.4 0,-4.7 C 9,7.4 6.9,7.4 5.6,8.7 z m 4.1,4 c -0.9,0.9 -2.4,0.9 -3.4,0 -0.5,-0.5 -0.7,-1.1 -0.7,-1.8 0,0 0,0 0,0 0,0 0,-0.1 0,-0.1 0,0 0,0 0,0 0,0 0,-0.1 0,-0.1 0,0 0,0 0,0 0,-0.1 0,-0.2 0.1,-0.4 0,0 0,0 0,0 0,0 0,0 0,-0.1 0,0 0,0 0,0 0,0 0,0 0,-0.1 0,0 0,0 0,0 0,0 0,0 0,-0.1 0,0 0,0 0,0 0,0 0,0 0,-0.1 0,0 0,0 0,-0.1 0,0 0,0 0,-0.1 0,0 0,0 0,-0.1 0,0 0,0 0,0 0,0 0,0 0,-0.1 0,0 0,0 0,0 0,0 0,0 0,-0.1 0,0 0,0 0,0 0,0 0,0 0,-0.1 0,0 0,0 0,0 0,0 0,0 0,-0.1 0,0 0,0 0,0 0,0 0.1,-0.1 0.1,-0.1 0,0 0,0 0,0 l 0,0 0,0 c 0,0 0.1,-0.1 0.1,-0.1 0,0 0,0 0,0 0,0 0,0 0.1,-0.1 0,0 0,0 0,0 0,0 0,0 0.1,0 0,0 0,0 0,0 0,0 0,0 0.1,0 0,0 0,0 0,0 0,0 0,0 0.1,0 0,0 0,0 0,0 0,0 0.1,0 0.1,-0.1 0,0 0,0 0,0 0,0 0.1,0 0.1,0 0,0 0,0 0,0 0,0 0,0 0.1,0 0,0 0,0 0,0 0,0 0,0 0.1,0 0,0 0,0 0,0 0,0 0,0 0.1,0 0,0 0,0 0,0 0,0 0,0 0.1,0 0,0 0,0 0,0 0,0 0.1,0 0.1,0 0,0 0,0 0,0 0,0 0,0 0.1,0 0,0 0,0 0,0 0,0 0,0 0.1,0 0,0 0,0 0.1,0 0,0 0,0 0.1,0 0,0 0,0 0.1,0 0,0 0,0 0.1,0 0,0 0,0 0.1,0 0,0 0,0 0,0 0,0 0,0 0.1,0 0,0 0,0 0,0 0.1,0 0.1,0 0.2,0 0,0 0,0 0,0 0,0 0,0 0.1,0 0,0 0,0 0,0 0,0 0,0 0.1,0 0,0 0,0 0,0 0,0 0,0 0.1,0 0,0 0,0 0,0 0,0 0,0 0.1,0 0,0 0,0 0,0 0.1,0 0.2,0.1 0.2,0.1 0,0 0,0 0,0 0,0 0,0 0.1,0 0,0 0,0 0,0 0,0 0,0 0.1,0 0,0 0,0 0,0 0,0 0,0 0.1,0 0,0 0,0 0,0 l 0,0 c 0.2,0.1 0.3,0.2 0.4,0.3 1.3,1.1 1.3,2.6 0.4,3.5 z"
+           id="path3881"
+           style="fill:#ffffff" />
+                <g
+           id="g3883">
+                    <polyline
+             id="polyline3885"
+             points="7.5,8.5 7.5,13.6 8.5,13.6 8.5,8.5    "
+             style="fill:#ffffff" />
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

img/taskbar/light/taskbar_invisible.svg

@@ -1,14 +1,46 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-<g>
-	<path fill="#FFFFFF" d="M8,0C6.1,0,4.1,1.3,4.1,3.9v1.9h-1C2,5.7,1.3,6.5,1.3,7.6v6.5c0,1.1,0.7,1.9,1.9,1.9l9.6,0
-		c1.1,0,1.9-0.8,1.9-1.9V7.6c0-1.1-0.8-1.9-1.9-1.9h-0.9l0-1.9C11.9,1.3,9.9,0,8,0z M8,1.6c1.3,0,2.2,1,2.2,2.2
-		C10.2,5,9.7,6.2,8,6.9c0.3-0.5,0.4-0.7,0.5-1.2C6.7,5.9,5.8,4.9,5.8,3.8S6.7,1.6,8,1.6z"/>
-	<path fill="#252325" d="M5.6,8.7c-1.3,1.3-1.3,3.4,0,4.7c1.3,1.3,3.4,1.3,4.7,0c1.2-1.2,1.3-3.3,0.1-4.6C9.1,7.4,6.9,7.3,5.6,8.7z
-		 M6.3,12.7c-1.4-1.4-0.6-3.6,1.2-4c0,1.6,0,3.1,0,4.7C7,13.3,6.6,13,6.3,12.7z M9.6,12.7c-0.3,0.3-0.7,0.6-1.2,0.6
-		c0-1.6,0-3.1,0-4.7C10.2,9.1,11,11.4,9.6,12.7z"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+    xmlns:dc="http://purl.org/dc/elements/1.1/"
+    xmlns:cc="http://creativecommons.org/ns#"
+    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns:svg="http://www.w3.org/2000/svg"
+    xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="100%"
+   height="100%"
+   viewBox="0 0 16.1 16"
+   id="Layer_1"
+   xml:space="preserve">
+    <metadata
+     id="metadata19">
+        <rdf:RDF>
+            <cc:Work
+         rdf:about="">
+                <dc:format>image/svg+xml</dc:format>
+                <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+                <dc:title></dc:title>
+            </cc:Work>
+        </rdf:RDF>
+    </metadata>
+    <defs
+     id="defs17" />
+    <path
+     d="M 8,0 C 6.1,0 4.2,1.3 4.2,3.9 v 1.9 h -1 C 2.1,5.8 1.4,6.6 1.4,7.7 v 6.5 c 0,1.1 0.7,1.9 1.9,1.9 l 9.6,0 c 1.1,0 1.9,-0.8 1.9,-1.9 V 7.6 C 14.8,6.5 14,5.7 12.9,5.7 H 12 L 12,3.8 C 11.9,1.3 10,0 8,0 z m 0,1.6 c 1.3,0 2.2,1 2.2,2.2 C 10.3,5 9.8,6.2 8,6.9 8.3,6.4 8.4,6.2 8.5,5.7 6.7,5.9 5.8,4.9 5.8,3.8 5.8,2.7 6.7,1.6 8,1.6 z"
+     id="path3"
+     style="fill:#ffffff" />
+    <path
+     d="m 7.9927197,7.71875 c -1.8159871,0 -3.28125,1.4652629 -3.28125,3.28125 0,1.815987 1.4652629,3.28125 3.28125,3.28125 1.8159871,0 3.3125003,-1.465263 3.3125003,-3.28125 0,-1.8159871 -1.4965132,-3.28125 -3.3125003,-3.28125 z m 0,0.90625 c 1.3198669,0 2.4062503,1.0551331 2.4062503,2.375 0,1.319867 -1.0863834,2.375 -2.4062503,2.375 -1.3198669,0 -2.375,-1.055133 -2.375,-2.375 0,-1.3198669 1.0551331,-2.375 2.375,-2.375 z"
+     id="path3000"
+     style="fill:#4e4e4e;fill-opacity:1" />
+    <rect
+     width="1.1830783"
+     height="5.3462563"
+     rx="0"
+     ry="0.89710045"
+     x="7.4181905"
+     y="8.3502293"
+     id="rect3937"
+     style="fill:#4e4e4e;fill-opacity:1;fill-rule:nonzero" />
+</svg>

res.qrc

@@ -201,10 +201,6 @@
         <file>ui/sendButton/sendButtonPressed.png</file>
         <file>ui/settings/mainContent.css</file>
         <file>ui/settings/mainHead.css</file>
-        <file>ui/statusButton/dot_away.png</file>
-        <file>ui/statusButton/dot_busy.png</file>
-        <file>ui/statusButton/dot_idle.png</file>
-        <file>ui/statusButton/dot_online.png</file>
         <file>ui/statusButton/menu_indicator.png</file>
         <file>ui/statusButton/statusButton.css</file>
         <file>ui/stopFileButton/default.png</file>

simple_make.sh

@@ -2,12 +2,12 @@
 
 if which apt-get; then
     sudo apt-get install build-essential qt5-qmake qt5-default libopenal-dev libopencv-dev \
-                         libtool autotools-dev automake checkinstall check libopus-dev libvpx-dev qttools5-dev-tools qtchooser libxss-dev
+                         libtool autotools-dev automake checkinstall check libopus-dev libvpx-dev qttools5-dev-tools qtchooser libxss-dev libqt5svg5*
 elif which pacman; then
-    sudo pacman -S --needed base-devel qt5 opencv openal opus libvpx libxss
+    sudo pacman -S --needed base-devel qt5 opencv openal opus libvpx libxss qt5-svg
 elif which yum; then
     sudo yum groupinstall "Development Tools"
-    sudo yum install qt-devel qt-doc qt-creator opencv-devel openal-soft-devel libtool autoconf automake check check-devel libXScrnSaver-devel
+    sudo yum install qt-devel qt-doc qt-creator opencv-devel openal-soft-devel libtool autoconf automake check check-devel libXScrnSaver-devel qt5-qtsvg
 else
     echo "Unknown package manager, attempting to compile anyways"
 fi

src/mainwindow.ui

@@ -980,6 +980,10 @@ QSplitter:handle{
                <property name="text">
                 <string/>
                </property>
+               <property name="icon">
+                <iconset resource="../res.qrc">
+                 <normaloff>:/img/status/dot_away.png</normaloff>:/img/status/dot_away.png</iconset>
+               </property>
                <property name="iconSize">
                 <size>
                  <width>10</width>
@@ -1775,7 +1779,7 @@ QSplitter:handle{
      <x>0</x>
      <y>0</y>
      <width>775</width>
-     <height>21</height>
+     <height>20</height>
     </rect>
    </property>
   </widget>

src/toxdns.cpp

@@ -220,8 +220,10 @@ fallbackOnTox1:
 #if TOX1_SILENT_FALLBACK
     toxIdStr = queryTox1(record, silent);
 #elif TOX1_ASK_FALLBACK
-    QMessageBox::StandardButton btn = QMessageBox::warning(nullptr, "qTox", tr("It appears that qTox has to use the old tox1 protocol.\n\
-Unfortunately tox1 is not secure. Should it be used anyway?"), QMessageBox::Yes|QMessageBox::No, QMessageBox::No);
+    QMessageBox::StandardButton btn = QMessageBox::warning(nullptr, "qTox", tr("It appears that qTox has to use the old tox1 protocol to access DNS record of your friend's Tox ID.\n\
+Unfortunately tox1 is not secure, and you are at risk of someone hijacking what is sent between you and ToxDNS service.\n\
+Should tox1 be used anyway?\n\
+If unsure, press “No”, so that request to ToxDNS service will not be made using unsecure protocol."), QMessageBox::Yes|QMessageBox::No, QMessageBox::No);
     if (btn == QMessageBox::Yes)
         queryTox1(record, silent);
 #endif
@@ -264,8 +266,10 @@ ToxID ToxDNS::resolveToxAddress(const QString &address, bool silent)
 #if TOX1_SILENT_FALLBACK
             toxId = ToxID::fromString(queryTox1(address, silent));
 #elif TOX1_ASK_FALLBACK
-            QMessageBox::StandardButton btn = QMessageBox::warning(nullptr, "qTox", tr("It appears that qTox has to use the old tox1 protocol.\n\
-Unfortunately tox1 is not secure. Should it be used anyway?"), QMessageBox::Ok|QMessageBox::No, QMessageBox::No);
+            QMessageBox::StandardButton btn = QMessageBox::warning(nullptr, "qTox", tr("It appears that qTox has to use the old tox1 protocol to access DNS record of your friend's Tox ID.\n\
+Unfortunately tox1 is not secure, and you are at risk of someone hijacking what is sent between you and ToxDNS service.\n\
+Should tox1 be used anyway?\n\
+If unsure, press “No”, so that request to ToxDNS service will not be made using unsecure protocol."), QMessageBox::Ok|QMessageBox::No, QMessageBox::No);
             if (btn == QMessageBox::Ok)
                 toxId = ToxID::fromString(queryTox1(address, silent));
 #else

src/widget/widget.cpp

@@ -94,21 +94,22 @@ void Widget::init()
     restoreState(Settings::getInstance().getWindowState());
     ui->mainSplitter->restoreState(Settings::getInstance().getSplitterState());
 
+    statusOnline = new QAction(tr("Online", "Button to set your status to 'Online'"), this);
+    statusOnline->setIcon(QIcon(":img/status/dot_online.png"));
+    connect(statusOnline, SIGNAL(triggered()), this, SLOT(setStatusOnline()));
+    statusAway = new QAction(tr("Away", "Button to set your status to 'Away'"), this);
+    statusAway->setIcon(QIcon(":img/status/dot_idle.png"));
+    connect(statusAway, SIGNAL(triggered()), this, SLOT(setStatusAway()));
+    statusBusy = new QAction(tr("Busy", "Button to set your status to 'Busy'"), this);
+    statusBusy->setIcon(QIcon(":img/status/dot_busy.png"));
+    connect(statusBusy, SIGNAL(triggered()), this, SLOT(setStatusBusy()));
+
     if (QSystemTrayIcon::isSystemTrayAvailable())
     {
         icon = new SystemTrayIcon;
         updateTrayIcon();
         trayMenu = new QMenu;
 
-        statusOnline = new QAction(tr("Online"), this);
-        statusOnline->setIcon(QIcon(":ui/statusButton/dot_online.png"));
-        connect(statusOnline, SIGNAL(triggered()), this, SLOT(setStatusOnline()));
-        statusAway = new QAction(tr("Away"), this);
-        statusAway->setIcon(QIcon(":ui/statusButton/dot_idle.png"));
-        connect(statusAway, SIGNAL(triggered()), this, SLOT(setStatusAway()));
-        statusBusy = new QAction(tr("Busy"), this);
-        statusBusy->setIcon(QIcon(":ui/statusButton/dot_busy.png"));
-        connect(statusBusy, SIGNAL(triggered()), this, SLOT(setStatusBusy()));
         actionQuit = new QAction(tr("&Quit"), this);
         connect(actionQuit, SIGNAL(triggered()), qApp, SLOT(quit()));
 
@@ -184,12 +185,9 @@ void Widget::init()
     ui->statusPanel->setStyleSheet(Style::getStylesheet(":/ui/window/statusPanel.css"));
 
     QMenu *statusButtonMenu = new QMenu(ui->statusButton);
-    QAction* setStatusOnline = statusButtonMenu->addAction(Widget::tr("Online","Button to set your status to 'Online'"));
-    setStatusOnline->setIcon(QIcon(":ui/statusButton/dot_online.png"));
-    QAction* setStatusAway = statusButtonMenu->addAction(Widget::tr("Away","Button to set your status to 'Away'"));
-    setStatusAway->setIcon(QIcon(":ui/statusButton/dot_idle.png"));
-    QAction* setStatusBusy = statusButtonMenu->addAction(Widget::tr("Busy","Button to set your status to 'Busy'"));
-    setStatusBusy->setIcon(QIcon(":ui/statusButton/dot_busy.png"));
+    statusButtonMenu->addAction(statusOnline);
+    statusButtonMenu->addAction(statusAway);
+    statusButtonMenu->addAction(statusBusy);
     ui->statusButton->setMenu(statusButtonMenu);
 
     // disable proportional scaling
@@ -221,9 +219,6 @@ void Widget::init()
     connect(ui->statusLabel, SIGNAL(textChanged(QString, QString)), this, SLOT(onStatusMessageChanged(QString, QString)));
     connect(ui->mainSplitter, &QSplitter::splitterMoved, this, &Widget::onSplitterMoved);
     connect(profilePicture, SIGNAL(clicked()), this, SLOT(onAvatarClicked()));
-    connect(setStatusOnline, SIGNAL(triggered()), this, SLOT(setStatusOnline()));
-    connect(setStatusAway, SIGNAL(triggered()), this, SLOT(setStatusAway()));
-    connect(setStatusBusy, SIGNAL(triggered()), this, SLOT(setStatusBusy()));
     connect(addFriendForm, SIGNAL(friendRequested(QString, QString)), this, SIGNAL(friendRequested(QString, QString)));
     connect(timer, &QTimer::timeout, this, &Widget::onUserAwayCheck);
     connect(timer, &QTimer::timeout, this, &Widget::onEventIconTick);
@@ -443,19 +438,22 @@ void Widget::onStatusSet(Status status)
     {
     case Status::Online:
         ui->statusButton->setProperty("status" ,"online");
+        ui->statusButton->setIcon(QIcon(":img/status/dot_online.png"));
         break;
     case Status::Away:
         ui->statusButton->setProperty("status" ,"away");
+        ui->statusButton->setIcon(QIcon(":img/status/dot_idle.png"));
         break;
     case Status::Busy:
         ui->statusButton->setProperty("status" ,"busy");
+        ui->statusButton->setIcon(QIcon(":img/status/dot_busy.png"));
         break;
     case Status::Offline:
         ui->statusButton->setProperty("status" ,"offline");
+        ui->statusButton->setIcon(QIcon(":img/status/dot_away.png"));
         break;
     }
     updateTrayIcon();
-    Style::repolish(ui->statusButton);
 }
 
 void Widget::setWindowTitle(const QString& title)

translations/de.ts

@@ -743,10 +743,6 @@ Alias:</translation>
         <source>Autoaccept files</source>
         <translation>Dateien automatisch annehmen</translation>
     </message>
-    <message>
-        <source>Save files in</source>
-        <translation type="vanished">Speichern unter</translation>
-    </message>
     <message>
         <location filename="../src/widget/form/settings/generalsettings.ui" line="215"/>
         <source>PushButton</source>
@@ -1260,24 +1256,119 @@ Soll die alte Historiedatei gelöscht werden?</translation>
         <translation>Tippen anzeigen</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/privacysettings.ui" line="60"/>
-        <source>Keep History (unstable)</source>
-        <translation>Historie behalten (instabil)</translation>
+        <location filename="../src/widget/form/settings/privacysettings.ui" line="61"/>
+        <source>Keep chat history (mostly stable)</source>
+        <translation>Chatverlauf speichern (größtenteils stabil)</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/privacysettings.ui" line="70"/>
-        <source>Encryption</source>
-        <translation>Verschlüsselung</translation>
+        <location filename="../src/widget/form/settings/privacysettings.ui" line="71"/>
+        <source>Local file encryption</source>
+        <translation>Lokale Dateien verschlüsseln</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/privacysettings.ui" line="79"/>
-        <source>Encrypt Tox datafile</source>
+        <location filename="../src/widget/form/settings/privacysettings.ui" line="77"/>
+        <source>All Tox communications over the internet are encrypted, and this cannot be disabled. However, you may optionally password protect your local Tox files.</source>
+        <translation>Die gesamte Tox-Kommunikation über das Internet ist verschlüsselt und kann auch nicht deaktiviert werden. Es ist optional auch möglich, die lokal gespeicherten Tox-Daten mit einem Passwort zu schützen.</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/settings/privacysettings.ui" line="92"/>
+        <source>Encrypt Tox data file</source>
         <translation>Tox Datendatei verschlüsseln</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/privacysettings.ui" line="89"/>
-        <source>Encrypt History</source>
-        <translation>Historie verschlüsseln</translation>
+        <location filename="../src/widget/form/settings/privacysettings.ui" line="113"/>
+        <source>Encrypt chat history</source>
+        <translation>Chatverlauf verschlüsseln</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/settings/privacysettings.ui" line="99"/>
+        <location filename="../src/widget/form/settings/privacysettings.ui" line="123"/>
+        <source>Change password</source>
+        <translation>Passwort ändern</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/settings/privacyform.cpp" line="77"/>
+        <source>Please set your new chat history password.</source>
+        <translation>Bitte Passwort zum Verschlüsseln des Chatverlaufs setzen.</translation>
+    </message>    
+    <message>
+        <location filename="../src/widget/form/settings/privacyform.cpp" line="79"/>
+        <source>It appears you have an unused encrypted chat history; if the password matches, it will be added to your current history.</source>
+        <translation>Es scheint als gäbe es einen unverschlüsselten Chatverlauf. Wenn die Passwörter übereinstimmen wird dieser zum aktuellen Chatverlauf hinzugefügt.</translation>
+    </message> 
+    <message>
+        <location filename="../src/widget/form/settings/privacyform.cpp" line="82"/>
+        <source>Use data file password</source>
+        <translation>Nutze das Tox-Datendatei Passwort</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/settings/privacyform.cpp" line="109"/>
+        <source>Successfully decrypted old chat history</source>
+        <translation>Alter Chatverlauf erfolgreich entschlüsselt</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/settings/privacyform.cpp" line="109"/>
+        <source>You have succesfully decrypted the old chat history, and it has been added to your current history and re-encrypted.</source>
+        <translation>Der alte Chatverlauf wurde erfolgreich entschlüsselt, zum aktuellen Chatverlauf hinzugefügt und wieder verschlüsselt.</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/settings/privacyform.cpp" line="116"/>
+        <location filename="../src/widget/form/settings/privacyform.cpp" line="145"/>
+        <location filename="../src/widget/form/settings/privacyform.cpp" line="162"/>
+        <source>Old encrypted chat history</source>
+        <translation>Alter verschlüsselter Chatverlauf</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/settings/privacyform.cpp" line="116"/>
+        <source>There is currently an unused encrypted chat history, but the password you just entered doesn't match.
+Would you like to try again?
+Canceling will delete the old history and set the password to what you just entered.</source>
+        <translation>Es gibt aktuell einen ungenutzten verschlüsselten Chatverlauf, aber das eingegebene Passwort stimmt nicht überein.
+Möchten Sie ein anderes probieren?
+Wenn Sie abbrechen wird der alte Chatverlauf gelöscht und das soeben eingegebene Passwort verwendet.</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/settings/privacyform.cpp" line="116"/>
+        <source>This happens when enabling encryption after previously \"Disabling History\"</source>
+        <translation>Dies passiert, wenn die Verschlüsselung nach einem vorherigen Deaktivieren des Chatverlaufs wieder aktiviert wird.</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/settings/privacyform.cpp" line="146"/>
+        <source>Would you like to decrypt your chat history?
+Otherwise it will be deleted.</source>
+        <translation>Möchten Sie den Chatverlauf entschlüsseln?
+Ansonsten wird dieser gelöscht.</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/settings/privacyform.cpp" line="163"/>
+        <source>Are you sure you want to lose your entire chat history?</source>
+        <translation>Sind Sie sicher, dass der gesamte Chatverlauf gelöscht werden soll?</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/settings/privacyform.cpp" line="195"/>
+        <source>Please set your new data file password.</source>
+        <translation>Bitte Passwort zum Verschlüsseln der Datendatei setzen.</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/settings/privacyform.cpp" line="197"/>
+        <source>Use chat history password</source>
+        <translation>Nutze das Chatverlauf-Passwort</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/settings/privacyform.cpp" line="240"/>
+        <source>Decrypt your data file</source>
+        <translation>Datendatei entschlüsseln</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/settings/privacyform.cpp" line="240"/>
+        <source>Would you like to decrypt your data file?</source>
+        <translation>Möchten Sie die Datendatei entschlüsseln?</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/setpassworddialog.cpp" line="33"/>
+        <location filename="../src/widget/form/setpassworddialog.cpp" line="61"/>
+        <source>The passwords don't match.</source>
+        <translation>Die Passwörter stimmen nicht überein.</translation>
     </message>
     <message>
         <location filename="../src/widget/form/settings/privacysettings.ui" line="102"/>
@@ -1399,14 +1490,24 @@ Es wird beim Neustart von qTox installiert.</translation>
 <context>
     <name>SetPasswordDialog</name>
     <message>
-        <location filename="../src/widget/form/setpassworddialog.ui" line="23"/>
-        <source>Type Password</source>
+        <location filename="../src/widget/form/setpassworddialog.ui" line="14"/>
+        <source>Set your password</source>
+        <translation>Passwort setzen</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/setpassworddialog.ui" line="41"/>
+        <source>Type password</source>
         <translation>Passwort eingeben</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/setpassworddialog.ui" line="37"/>
-        <source>Repeat Password</source>
-        <translation>Passworteingabe wiederholen</translation>
+        <location filename="../src/widget/form/setpassworddialog.ui" line="31"/>
+        <source>Repeat password</source>
+        <translation>Passwort wiederholen</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/setpassworddialog.ui" line="65"/>
+        <source>Password strength</source>
+        <translation>Passwortstärke</translation>
     </message>
 </context>
 <context>

ui/statusButton/statusButton.css

@@ -8,26 +8,6 @@ QPushButton
     height: 40px;
 }
 
-QPushButton#online
-{
-  image: url(":ui/statusButton/dot_online.png") center center;
-}
-
-QPushButton#away
-{
-  image: url(":ui/statusButton/dot_idle.png") center center;
-}
-
-QPushButton#busy
-{
-  image: url(":ui/statusButton/dot_busy.png") center center;
-}
-
-QPushButton#offline
-{
-  image: url(":ui/statusButton/dot_away.png") center center;
-}
-
 QPushButton:default 
 {
    background-color: @themeMediumDark;