merged from 0.6.7 codebase

2 files changed, 74 insertions, 33 deletions

diff --git a/application/resources/OSX/OSX.qrc b/application/resources/OSX/OSX.qrc
index a7d7be17..19fd4b6a 100644
--- a/application/resources/OSX/OSX.qrc
+++ b/application/resources/OSX/OSX.qrc
@@ -1,37 +1,38 @@
 <!DOCTYPE RCC>
 <RCC version="1.0">
-	<qresource prefix="/icons/OSX">
-		<file>index.theme</file>
-		<file>scalable/about.svg</file>
-		<file>scalable/accounts.svg</file>
-		<file>scalable/bug.svg</file>
-		<file>scalable/centralmods.svg</file>
-		<file>scalable/checkupdate.svg</file>
-		<file>scalable/copy.svg</file>
-		<file>scalable/coremods.svg</file>
-		<file>scalable/externaltools.svg</file>
-		<file>scalable/help.svg</file>
+    <qresource prefix="/icons/OSX">
+        <file>index.theme</file>
+        <file>scalable/about.svg</file>
+        <file>scalable/accounts.svg</file>
+        <file>scalable/bug.svg</file>
+        <file>scalable/centralmods.svg</file>
+        <file>scalable/checkupdate.svg</file>
+        <file>scalable/copy.svg</file>
+        <file>scalable/coremods.svg</file>
+        <file>scalable/externaltools.svg</file>
+        <file>scalable/help.svg</file>
         <file>scalable/instance-settings.svg</file>
-		<file>scalable/jarmods.svg</file>
-		<file>scalable/java.svg</file>
-		<file>scalable/loadermods.svg</file>
-		<file>scalable/log.svg</file>
-		<file>scalable/minecraft.svg</file>
-		<file>scalable/multimc.svg</file>
-		<file>scalable/new.svg</file>
-		<file>scalable/news.svg</file>
-		<file>scalable/notes.svg</file>
-		<file>scalable/patreon.svg</file>
-		<file>scalable/proxy.svg</file>
-		<file>scalable/quickmods.svg</file>
-		<file>scalable/refresh.svg</file>
-		<file>scalable/resourcepacks.svg</file>
-		<file>scalable/screenshots.svg</file>
-		<file>scalable/settings.svg</file>
-		<file>scalable/status-bad.svg</file>
-		<file>scalable/status-good.svg</file>
-		<file>scalable/status-yellow.svg</file>
-		<file>scalable/viewfolder.svg</file>
-		<file>scalable/worlds.svg</file>
-	</qresource>
+        <file>scalable/jarmods.svg</file>
+        <file>scalable/java.svg</file>
+        <file>scalable/language.svg</file>
+        <file>scalable/loadermods.svg</file>
+        <file>scalable/log.svg</file>
+        <file>scalable/minecraft.svg</file>
+        <file>scalable/multimc.svg</file>
+        <file>scalable/new.svg</file>
+        <file>scalable/news.svg</file>
+        <file>scalable/notes.svg</file>
+        <file>scalable/patreon.svg</file>
+        <file>scalable/proxy.svg</file>
+        <file>scalable/quickmods.svg</file>
+        <file>scalable/refresh.svg</file>
+        <file>scalable/resourcepacks.svg</file>
+        <file>scalable/screenshots.svg</file>
+        <file>scalable/settings.svg</file>
+        <file>scalable/status-bad.svg</file>
+        <file>scalable/status-good.svg</file>
+        <file>scalable/status-yellow.svg</file>
+        <file>scalable/viewfolder.svg</file>
+        <file>scalable/worlds.svg</file>
+    </qresource>
 </RCC>
diff --git a/application/resources/OSX/scalable/language.svg b/application/resources/OSX/scalable/language.svg
new file mode 100644
index 00000000..4f7d002a
--- /dev/null
+++ b/application/resources/OSX/scalable/language.svg
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   id="Calque_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 24 24"
+   enable-background="new 0 0 24 24"
+   xml:space="preserve"><metadata
+     id="metadata22"><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="defs20" /><path
+     fill-rule="evenodd"
+     clip-rule="evenodd"
+     fill="#E6E6E6"
+     d="M21,20H9c-1.1,0-2-0.9-2-2V6c0-1.1,0.9-2,2-2h12c1.1,0,2,0.9,2,2  v12C23,19.1,22.1,20,21,20z"
+     id="path2" /><rect
+     fill="none"
+     width="24"
+     height="24"
+     id="rect4" /><g
+     id="_x36__8_"><g
+       id="g8"><path
+         d="M 21,4 H 9 C 7.9,4 7,4.9 7,6 v 12 c 0,1.1 0.9,2 2,2 h 12 c 1.1,0 2,-0.9 2,-2 V 6 C 23,4.9 22.1,4 21,4 Z m 1,14 -1,1 H 9 L 8,18 V 6 C 8,5.4 8.4,5 9,5 h 12 c 0.6,0 1,0.4 1,1 z"
+         id="path6"
+         style="fill:#585858" /></g></g><circle
+     cx="-3.8492424"
+     cy="11.559504"
+     r="1"
+     id="circle11"
+     style="clip-rule:evenodd;fill:#ffffff;fill-rule:evenodd" /><path
+     d="m 10.985086,8.5301236 c -0.285244,0 -0.531238,0.2015787 -0.587348,0.480998 L 9.2012867,14.998205 c -0.064883,0.324431 0.1450781,0.638482 0.4689122,0.703366 0.3279037,0.0672 0.6390781,-0.145078 0.7033681,-0.468911 l 0.384313,-1.91432 h 1.69195 l 0.381898,1.91432 c 0.06544,0.328662 0.388374,0.53424 0.705784,0.468911 0.323873,-0.06488 0.533795,-0.378935 0.468912,-0.703366 L 12.809973,9.0111216 c -0.05611,-0.2794193 -0.302101,-0.480998 -0.587347,-0.480998 z m 0.362559,1.3487256 h 0.256212 l 0.478579,2.3953168 h -1.21337 z m 6.429409,-1.5928481 c -0.330857,0 -0.599434,0.2698964 -0.599434,0.6018494 v 0.5994329 h -1.795884 c -0.330855,0 -0.597015,0.269898 -0.597015,0.6018506 0,0.331951 0.266159,0.599434 0.597015,0.599434 h 0.161945 c 0.340555,1.096391 0.840589,1.953495 1.401899,2.629772 -0.439717,0.403341 -0.871563,0.734012 -1.339055,1.104601 -0.25779,0.207035 -0.298799,0.58673 -0.09185,0.845975 0.205993,0.258844 0.58387,0.299404 0.841141,0.09185 0.507959,-0.402258 0.944446,-0.738141 1.421237,-1.177114 0.476792,0.438973 0.95437,0.774856 1.462328,1.177114 0.257273,0.207554 0.635147,0.166994 0.841141,-0.09185 0.206952,-0.259245 0.163525,-0.63894 -0.09426,-0.845975 -0.467495,-0.370589 -0.938012,-0.70126 -1.377731,-1.104601 0.561312,-0.676317 1.102396,-1.53342 1.442991,-2.629772 h 0.159526 c 0.330857,0 0.599433,-0.267483 0.599433,-0.599434 0,-0.3319526 -0.268576,-0.6018506 -0.599433,-0.6018506 H 18.376487 V 8.8878505 c 0,-0.331953 -0.268576,-0.6018494 -0.599433,-0.6018494 z m -0.983747,2.4025669 h 2.006168 c -0.25847,0.696576 -0.641961,1.260479 -1.022421,1.74029 -0.380459,-0.479811 -0.725279,-1.043674 -0.983747,-1.74029 z"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#585858;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.7126205;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     id="rect977" /></svg>
\ No newline at end of file