Merge branch 'master' into untrustedCerts

CHANGELOG.md

@@ -1,5 +1,28 @@
+## 2.0.0 (2017)
+
+- Account-wide search (Nc 12+)
+- Auto upload available on Android 4+
+- Separation between Image & Video for Auto upload
+- Ability to define custom folders for Auto upload
+- Simple contacts backup & restore
+- Server-side Theming support
+- Shared files view
+- Notifications view and Push notifications (on Google Play-powered devices)
+- Favorites, Photos and Activities
+- Fingerprint locking
+- SVG preview
+- Set edit permissions in federated shares of folders (Nc 10+)
+- New sorting dialog
+- User information view
+- Custom external links support
+- Detect server maintainance mode
+- Nicer error views for images & video preview
+- Included privacy policy
+- Preserve modification time of uploaded files
+- Various bug fixes & improvements
+
 ## 1.4.3 (May 22, 2017)
-- Hotfix: ignore oauth header for now and use basic auth to allow new logins for nc12
+- Hotfix: ignore oauth header for now and use basic auth to allow new logins for Nc12
 
 ## 1.4.2 (March 14, 2017)
 - Auto Upload for newly taken photos/images (Android 6+)
@@ -9,7 +32,7 @@
 - Fix re-upload of files
 - Avoid toggling favourite for all selected files
 - Link to providers list in the setup screen
-- further bugfixes and improvements
+- Further bug fixes and improvements
 
 ## 1.4.1 (January 27, 2017)
 - Share URLs to Nextcloud
@@ -19,7 +42,7 @@
 - Navigation drawer: Fix lag on older devices
 - Android 7: Pending jobs in upload view
 - Android 7: Auto upload: ignore ".tmp" files and folders
-- Bugfixes and design improvements
+- Bug fixes and design improvements
 
 ## 1.4.0 (December 8, 2016)
 
@@ -89,4 +112,4 @@
 
 ## 1.0.0 (June 12, 2016)
 
-- Initial release of the Nextcloud Android app 
+- Initial release of the Nextcloud Android app

drawable_resources/get_it_as_apk_backup.svg

@@ -0,0 +1,119 @@
+<?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="http://www.w3.org/2000/svg"
+    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+    id="svg2"
+    version="1.1"
+    inkscape:version="0.91 r13725"
+    width="646"
+    height="250"
+    viewBox="0 0 646 250"
+    sodipodi:docname="get it as apk.svg"
+    inkscape:export-filename="/home/tobi/Daten/projekt/nextcloud/graphic/get it as apk.png"
+    inkscape:export-xdpi="90"
+    inkscape:export-ydpi="90">
+    <metadata
+        id="metadata8">
+        <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/>
+            </cc:Work>
+        </rdf:RDF>
+    </metadata>
+    <defs
+        id="defs6"/>
+    <sodipodi:namedview
+        pagecolor="#ffffff"
+        bordercolor="#666666"
+        borderopacity="1"
+        objecttolerance="10"
+        gridtolerance="10"
+        guidetolerance="10"
+        inkscape:pageopacity="0"
+        inkscape:pageshadow="2"
+        inkscape:window-width="1600"
+        inkscape:window-height="835"
+        id="namedview4"
+        showgrid="false"
+        inkscape:zoom="0.70710678"
+        inkscape:cx="-365.55383"
+        inkscape:cy="112.63522"
+        inkscape:window-x="0"
+        inkscape:window-y="0"
+        inkscape:window-maximized="1"
+        inkscape:current-layer="layer2"
+        showguides="true"
+        inkscape:guide-bbox="true">
+        <sodipodi:guide
+            position="195.16147,-94.752308"
+            orientation="0,1"
+            id="guide4794"/>
+        <sodipodi:guide
+            position="159.80613,-198.697"
+            orientation="0,1"
+            id="guide4796"/>
+    </sodipodi:namedview>
+    <g
+        inkscape:groupmode="layer"
+        id="layer2"
+        inkscape:label="apk"
+        style="display:inline">
+        <rect
+            style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#000000;fill-opacity:1;stroke:#a6a6a6;stroke-width:4;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
+            id="rect4142"
+            width="558.33984"
+            height="163.47433"
+            x="44.59919"
+            y="43.897827"
+            ry="20.533007"/>
+        <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.70548439px;line-height:125%;font-family:Helvetica;-inkscape-font-specification:Helvetica;text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="222.50375"
+       y="90.160751"
+       id="text4163"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan4165"
+         x="222.50375"
+         y="90.160751"
+         style="font-size:32.55822754px;fill:#ffffff">GET IT AS</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:35.25382233px;line-height:125%;font-family:Helvetica;-inkscape-font-specification:Helvetica;text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="223.56383"
+       y="176.70526"
+       id="text4167"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan4169"
+         x="223.56383"
+         y="176.70526"
+         style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-size:88.134552px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Semi-Bold'">APK-File</tspan></text>
+        <g
+            style="fill:#000000"
+            id="g4784"
+            transform="matrix(1.0640299,0,0,1.0640299,-61.475209,-106.93774)">
+            <path
+                id="path4774"
+                d="m 126.7489,161.76071 110.43377,0 0,110.43377 -110.43377,0 z"
+                inkscape:connector-curvature="0"
+                style="fill:none"/>
+            <path
+                id="path4776"
+                d="m 154.35734,244.58604 c 0,2.53077 2.07064,4.60141 4.60141,4.60141 l 4.6014,0 0,16.10493 c 0,3.81916 3.08294,6.9021 6.90212,6.9021 3.81916,0 6.9021,-3.08294 6.9021,-6.9021 l 0,-16.10493 9.20283,0 0,16.10493 c 0,3.81916 3.08294,6.9021 6.9021,6.9021 3.81917,0 6.90212,-3.08294 6.90212,-6.9021 l 0,-16.10493 4.60139,0 c 2.53078,0 4.60141,-2.07064 4.60141,-4.60141 l 0,-46.01408 -55.21688,0 0,46.01408 z m -11.50351,-46.01408 c -3.81918,0 -6.90212,3.08295 -6.90212,6.90212 l 0,32.20986 c 0,3.81915 3.08294,6.9021 6.90212,6.9021 3.81916,0 6.9021,-3.08295 6.9021,-6.9021 l 0,-32.20986 c 0,-3.81917 -3.08294,-6.90212 -6.9021,-6.90212 z m 78.22391,0 c -3.81916,0 -6.9021,3.08295 -6.9021,6.90212 l 0,32.20986 c 0,3.81915 3.08294,6.9021 6.9021,6.9021 3.81917,0 6.90212,-3.08295 6.90212,-6.9021 l 0,-32.20986 c 0,-3.81917 -3.08295,-6.90212 -6.90212,-6.90212 z m -22.86899,-26.87221 5.98182,-5.98182 c 0.9203,-0.92028 0.9203,-2.34672 0,-3.26701 -0.92027,-0.92028 -2.34671,-0.92028 -3.26699,0 l -6.81008,6.81009 c -3.63512,-1.84057 -7.77637,-2.89888 -12.14772,-2.89888 -4.41735,0 -8.55862,1.05831 -12.23974,2.89888 l -6.8561,-6.81009 c -0.92027,-0.92028 -2.34671,-0.92028 -3.267,0 -0.92028,0.92029 -0.92028,2.34673 0,3.26701 l 6.02785,6.02783 c -6.81009,5.01554 -11.27345,13.06801 -11.27345,22.22481 l 55.21688,0 c 0,-9.1568 -4.46335,-17.25529 -11.36547,-22.27082 z m -25.44578,13.06799 -4.60141,0 0,-4.60139 4.60141,0 0,4.60139 z m 23.00703,0 -4.60141,0 0,-4.60139 4.60141,0 0,4.60139 z"
+                inkscape:connector-curvature="0"
+                style="fill:#ffffff"/>
+        </g>
+    </g>
+</svg>

drawable_resources/what_new_instant_upload.svg → drawable_resources/whats_new_auto_upload.svg

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="100%" height="100%" viewBox="0 0 930 650" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41421;">
+<svg width="100%" height="100%" viewBox="0 0 930 650" version="1.1" xmlns="http://www.w3.org/2000/svg"  xml:space="preserve" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41421;">
     <g transform="matrix(1,0,0,1,-75,-170)">
         <g id="what_new_instant_upload">
             <g id="_-Rectangle-" transform="matrix(1,0,0,3.20705,9,-1776.05)">

drawable_resources/whats_new_theming.svg

@@ -0,0 +1,1271 @@
+<?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="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="100%"
+   height="100%"
+   viewBox="0 0 930 650"
+   version="1.1"
+   xml:space="preserve"
+   style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41421;"
+   id="svg373"
+   sodipodi:docname="whats_new_theming.svg"
+   inkscape:export-filename="/tmp/1.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   inkscape:version="0.92.1 r"><metadata
+     id="metadata377"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1600"
+     inkscape:window-height="835"
+     id="namedview375"
+     showgrid="false"
+     inkscape:zoom="0.51346831"
+     inkscape:cx="631.01062"
+     inkscape:cy="261.93335"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg373" /><rect
+     style="color:#000000;clip-rule:evenodd;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.123106;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:1.41420996;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     id="rect4791-6"
+     width="245.39003"
+     height="459.61942"
+     x="335.00327"
+     y="98.846222" /><rect
+     style="color:#000000;clip-rule:evenodd;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.123106;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:1.41420996;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     id="rect4791-7"
+     width="245.39003"
+     height="459.61942"
+     x="633.0033"
+     y="98.846222" /><rect
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.123106;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:1.41420996;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     id="rect4791"
+     width="245.39003"
+     height="459.61942"
+     x="37.003258"
+     y="98.846222" /><g
+     id="_-Rectangle-"
+     transform="matrix(0.92954631,0,0,2.9811015,-154.38588,-1767.4479)"><rect
+       x="202.235"
+       y="761.35303"
+       width="291.229"
+       height="43.366001"
+       style="fill:url(#_Radial1)"
+       id="rect2" /></g><path
+     d="m 254.60706,61.23 c 22.85382,0.03904 41.33785,18.547238 41.33785,41.33785 v 447.28003 c 0,22.81478 -18.52307,41.33785 -41.33785,41.33785 H 66.572854 C 43.758069,591.18573 25.235,572.66266 25.235,549.84788 V 102.56785 C 25.235,79.777238 43.718099,61.269041 66.572854,61.23 Z m 14.97685,67.67748 H 51.596004 V 523.50825 H 269.58391 Z"
+     id="path39"
+     inkscape:connector-curvature="0"
+     style="stroke-width:0.9295463" /><defs
+     id="defs371"><radialGradient
+       id="_Radial1"
+       cx="0"
+       cy="0"
+       r="1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-145.614,0,0,-15.8805,347.849,788.838)"><stop
+         offset="0%"
+         style="stop-color:rgb(0,16,43);stop-opacity:0.480776"
+         id="stop191" /><stop
+         offset="100%"
+         style="stop-color:black;stop-opacity:0"
+         id="stop193" /></radialGradient><linearGradient
+       id="_Linear2"
+       x1="0"
+       y1="0"
+       x2="1"
+       y2="0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-42.6192,-320.496,320.496,-42.6192,347.849,572.965)"><stop
+         offset="0%"
+         style="stop-color:rgb(0,114,167);stop-opacity:1"
+         id="stop196" /><stop
+         offset="100%"
+         style="stop-color:rgb(8,0,101);stop-opacity:1"
+         id="stop198" /></linearGradient><radialGradient
+       id="_Radial3"
+       cx="0"
+       cy="0"
+       r="1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(7.50764,112.339,-276.186,18.4576,292.027,425.187)"><stop
+         offset="0%"
+         style="stop-color:rgb(0,31,53);stop-opacity:1"
+         id="stop201" /><stop
+         offset="100%"
+         style="stop-color:rgb(52,52,92);stop-opacity:1"
+         id="stop203" /></radialGradient><linearGradient
+       id="_Linear4"
+       x1="0"
+       y1="0"
+       x2="1"
+       y2="0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(4.36862,55.7957,-55.7957,4.36862,273.59,385.426)"><stop
+         offset="0%"
+         style="stop-color:rgb(220,234,255);stop-opacity:1"
+         id="stop206" /><stop
+         offset="100%"
+         style="stop-color:rgb(255,255,235);stop-opacity:1"
+         id="stop208" /></linearGradient><linearGradient
+       id="_Linear5"
+       x1="0"
+       y1="0"
+       x2="1"
+       y2="0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-13.3491,-55.4555,100.385,-7.37441,428.378,375.307)"><stop
+         offset="0%"
+         style="stop-color:rgb(220,234,255);stop-opacity:1"
+         id="stop211" /><stop
+         offset="100%"
+         style="stop-color:rgb(255,255,235);stop-opacity:1"
+         id="stop213" /></linearGradient><linearGradient
+       id="_Linear6"
+       x1="0"
+       y1="0"
+       x2="1"
+       y2="0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-13.3491,-55.4555,100.385,-7.37441,428.378,375.307)"><stop
+         offset="0%"
+         style="stop-color:rgb(220,234,255);stop-opacity:1"
+         id="stop216" /><stop
+         offset="100%"
+         style="stop-color:rgb(255,255,235);stop-opacity:1"
+         id="stop218" /></linearGradient><linearGradient
+       id="_Linear7"
+       x1="0"
+       y1="0"
+       x2="1"
+       y2="0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-13.3491,-55.4555,100.385,-7.37441,428.378,375.307)"><stop
+         offset="0%"
+         style="stop-color:rgb(220,234,255);stop-opacity:1"
+         id="stop221" /><stop
+         offset="100%"
+         style="stop-color:rgb(255,255,235);stop-opacity:1"
+         id="stop223" /></linearGradient><linearGradient
+       id="_Linear8"
+       x1="0"
+       y1="0"
+       x2="1"
+       y2="0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-13.3491,-55.4555,100.385,-7.37441,428.378,375.307)"><stop
+         offset="0%"
+         style="stop-color:rgb(220,234,255);stop-opacity:1"
+         id="stop226" /><stop
+         offset="100%"
+         style="stop-color:rgb(255,255,235);stop-opacity:1"
+         id="stop228" /></linearGradient><linearGradient
+       id="_Linear9"
+       x1="0"
+       y1="0"
+       x2="1"
+       y2="0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-13.3491,-55.4555,100.385,-7.37441,428.378,375.307)"><stop
+         offset="0%"
+         style="stop-color:rgb(220,234,255);stop-opacity:1"
+         id="stop231" /><stop
+         offset="100%"
+         style="stop-color:rgb(255,255,235);stop-opacity:1"
+         id="stop233" /></linearGradient><linearGradient
+       id="_Linear10"
+       x1="0"
+       y1="0"
+       x2="1"
+       y2="0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-13.3491,-55.4555,100.385,-7.37441,428.378,375.307)"><stop
+         offset="0%"
+         style="stop-color:rgb(220,234,255);stop-opacity:1"
+         id="stop236" /><stop
+         offset="100%"
+         style="stop-color:rgb(255,255,235);stop-opacity:1"
+         id="stop238" /></linearGradient><linearGradient
+       id="_Linear12"
+       x1="0"
+       y1="0"
+       x2="1"
+       y2="0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-42.6192,-320.496,320.496,-42.6192,347.849,572.965)"><stop
+         offset="0%"
+         style="stop-color:rgb(0,114,167);stop-opacity:1"
+         id="stop241" /><stop
+         offset="100%"
+         style="stop-color:rgb(8,0,101);stop-opacity:1"
+         id="stop243" /></linearGradient><radialGradient
+       id="_Radial13"
+       cx="0"
+       cy="0"
+       r="1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(7.50764,112.339,-276.186,18.4576,292.027,425.187)"><stop
+         offset="0%"
+         style="stop-color:rgb(0,31,53);stop-opacity:1"
+         id="stop246" /><stop
+         offset="100%"
+         style="stop-color:rgb(52,52,92);stop-opacity:1"
+         id="stop248" /></radialGradient><linearGradient
+       id="_Linear14"
+       x1="0"
+       y1="0"
+       x2="1"
+       y2="0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(4.36862,55.7957,-55.7957,4.36862,273.59,385.426)"><stop
+         offset="0%"
+         style="stop-color:rgb(220,234,255);stop-opacity:1"
+         id="stop251" /><stop
+         offset="100%"
+         style="stop-color:rgb(255,255,235);stop-opacity:1"
+         id="stop253" /></linearGradient><linearGradient
+       id="_Linear15"
+       x1="0"
+       y1="0"
+       x2="1"
+       y2="0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-13.3491,-55.4555,100.385,-7.37441,428.378,375.307)"><stop
+         offset="0%"
+         style="stop-color:rgb(220,234,255);stop-opacity:1"
+         id="stop256" /><stop
+         offset="100%"
+         style="stop-color:rgb(255,255,235);stop-opacity:1"
+         id="stop258" /></linearGradient><linearGradient
+       id="_Linear16"
+       x1="0"
+       y1="0"
+       x2="1"
+       y2="0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-13.3491,-55.4555,100.385,-7.37441,428.378,375.307)"><stop
+         offset="0%"
+         style="stop-color:rgb(220,234,255);stop-opacity:1"
+         id="stop261" /><stop
+         offset="100%"
+         style="stop-color:rgb(255,255,235);stop-opacity:1"
+         id="stop263" /></linearGradient><linearGradient
+       id="_Linear17"
+       x1="0"
+       y1="0"
+       x2="1"
+       y2="0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-13.3491,-55.4555,100.385,-7.37441,428.378,375.307)"><stop
+         offset="0%"
+         style="stop-color:rgb(220,234,255);stop-opacity:1"
+         id="stop266" /><stop
+         offset="100%"
+         style="stop-color:rgb(255,255,235);stop-opacity:1"
+         id="stop268" /></linearGradient><linearGradient
+       id="_Linear18"
+       x1="0"
+       y1="0"
+       x2="1"
+       y2="0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-13.3491,-55.4555,100.385,-7.37441,428.378,375.307)"><stop
+         offset="0%"
+         style="stop-color:rgb(220,234,255);stop-opacity:1"
+         id="stop271" /><stop
+         offset="100%"
+         style="stop-color:rgb(255,255,235);stop-opacity:1"
+         id="stop273" /></linearGradient><linearGradient
+       id="_Linear19"
+       x1="0"
+       y1="0"
+       x2="1"
+       y2="0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-13.3491,-55.4555,100.385,-7.37441,428.378,375.307)"><stop
+         offset="0%"
+         style="stop-color:rgb(220,234,255);stop-opacity:1"
+         id="stop276" /><stop
+         offset="100%"
+         style="stop-color:rgb(255,255,235);stop-opacity:1"
+         id="stop278" /></linearGradient><linearGradient
+       id="_Linear21"
+       x1="0"
+       y1="0"
+       x2="1"
+       y2="0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-42.6192,-320.496,320.496,-42.6192,347.849,572.965)"><stop
+         offset="0%"
+         style="stop-color:rgb(0,114,167);stop-opacity:1"
+         id="stop281" /><stop
+         offset="100%"
+         style="stop-color:rgb(8,0,101);stop-opacity:1"
+         id="stop283" /></linearGradient><radialGradient
+       id="_Radial22"
+       cx="0"
+       cy="0"
+       r="1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(7.50764,112.339,-276.186,18.4576,292.027,425.187)"><stop
+         offset="0%"
+         style="stop-color:rgb(0,31,53);stop-opacity:1"
+         id="stop286" /><stop
+         offset="100%"
+         style="stop-color:rgb(52,52,92);stop-opacity:1"
+         id="stop288" /></radialGradient><linearGradient
+       id="_Linear23"
+       x1="0"
+       y1="0"
+       x2="1"
+       y2="0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(4.36862,55.7957,-55.7957,4.36862,273.59,385.426)"><stop
+         offset="0%"
+         style="stop-color:rgb(220,234,255);stop-opacity:1"
+         id="stop291" /><stop
+         offset="100%"
+         style="stop-color:rgb(255,255,235);stop-opacity:1"
+         id="stop293" /></linearGradient><linearGradient
+       id="_Linear24"
+       x1="0"
+       y1="0"
+       x2="1"
+       y2="0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-13.3491,-55.4555,100.385,-7.37441,428.378,375.307)"><stop
+         offset="0%"
+         style="stop-color:rgb(220,234,255);stop-opacity:1"
+         id="stop296" /><stop
+         offset="100%"
+         style="stop-color:rgb(255,255,235);stop-opacity:1"
+         id="stop298" /></linearGradient><linearGradient
+       id="_Linear25"
+       x1="0"
+       y1="0"
+       x2="1"
+       y2="0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-13.3491,-55.4555,100.385,-7.37441,428.378,375.307)"><stop
+         offset="0%"
+         style="stop-color:rgb(220,234,255);stop-opacity:1"
+         id="stop301" /><stop
+         offset="100%"
+         style="stop-color:rgb(255,255,235);stop-opacity:1"
+         id="stop303" /></linearGradient><linearGradient
+       id="_Linear26"
+       x1="0"
+       y1="0"
+       x2="1"
+       y2="0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-13.3491,-55.4555,100.385,-7.37441,428.378,375.307)"><stop
+         offset="0%"
+         style="stop-color:rgb(220,234,255);stop-opacity:1"
+         id="stop306" /><stop
+         offset="100%"
+         style="stop-color:rgb(255,255,235);stop-opacity:1"
+         id="stop308" /></linearGradient><linearGradient
+       id="_Linear27"
+       x1="0"
+       y1="0"
+       x2="1"
+       y2="0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-13.3491,-55.4555,100.385,-7.37441,428.378,375.307)"><stop
+         offset="0%"
+         style="stop-color:rgb(220,234,255);stop-opacity:1"
+         id="stop311" /><stop
+         offset="100%"
+         style="stop-color:rgb(255,255,235);stop-opacity:1"
+         id="stop313" /></linearGradient><linearGradient
+       id="_Linear28"
+       x1="0"
+       y1="0"
+       x2="1"
+       y2="0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-13.3491,-55.4555,100.385,-7.37441,428.378,375.307)"><stop
+         offset="0%"
+         style="stop-color:rgb(220,234,255);stop-opacity:1"
+         id="stop316" /><stop
+         offset="100%"
+         style="stop-color:rgb(255,255,235);stop-opacity:1"
+         id="stop318" /></linearGradient><linearGradient
+       id="_Linear29"
+       x1="0"
+       y1="0"
+       x2="1"
+       y2="0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-13.3491,-55.4555,100.385,-7.37441,428.378,375.307)"><stop
+         offset="0%"
+         style="stop-color:rgb(220,234,255);stop-opacity:1"
+         id="stop321" /><stop
+         offset="100%"
+         style="stop-color:rgb(255,255,235);stop-opacity:1"
+         id="stop323" /></linearGradient><linearGradient
+       id="_Linear31"
+       x1="0"
+       y1="0"
+       x2="1"
+       y2="0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-42.6192,-320.496,320.496,-42.6192,347.849,572.965)"><stop
+         offset="0%"
+         style="stop-color:rgb(0,114,167);stop-opacity:1"
+         id="stop326" /><stop
+         offset="100%"
+         style="stop-color:rgb(8,0,101);stop-opacity:1"
+         id="stop328" /></linearGradient><radialGradient
+       id="_Radial32"
+       cx="0"
+       cy="0"
+       r="1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(7.50764,112.339,-276.186,18.4576,292.027,425.187)"><stop
+         offset="0%"
+         style="stop-color:rgb(0,31,53);stop-opacity:1"
+         id="stop331" /><stop
+         offset="100%"
+         style="stop-color:rgb(52,52,92);stop-opacity:1"
+         id="stop333" /></radialGradient><linearGradient
+       id="_Linear33"
+       x1="0"
+       y1="0"
+       x2="1"
+       y2="0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(4.36862,55.7957,-55.7957,4.36862,273.59,385.426)"><stop
+         offset="0%"
+         style="stop-color:rgb(220,234,255);stop-opacity:1"
+         id="stop336" /><stop
+         offset="100%"
+         style="stop-color:rgb(255,255,235);stop-opacity:1"
+         id="stop338" /></linearGradient><linearGradient
+       id="_Linear34"
+       x1="0"
+       y1="0"
+       x2="1"
+       y2="0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-13.3491,-55.4555,100.385,-7.37441,428.378,375.307)"><stop
+         offset="0%"
+         style="stop-color:rgb(220,234,255);stop-opacity:1"
+         id="stop341" /><stop
+         offset="100%"
+         style="stop-color:rgb(255,255,235);stop-opacity:1"
+         id="stop343" /></linearGradient><linearGradient
+       id="_Linear35"
+       x1="0"
+       y1="0"
+       x2="1"
+       y2="0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-13.3491,-55.4555,100.385,-7.37441,428.378,375.307)"><stop
+         offset="0%"
+         style="stop-color:rgb(220,234,255);stop-opacity:1"
+         id="stop346" /><stop
+         offset="100%"
+         style="stop-color:rgb(255,255,235);stop-opacity:1"
+         id="stop348" /></linearGradient><linearGradient
+       id="_Linear36"
+       x1="0"
+       y1="0"
+       x2="1"
+       y2="0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-13.3491,-55.4555,100.385,-7.37441,428.378,375.307)"><stop
+         offset="0%"
+         style="stop-color:rgb(220,234,255);stop-opacity:1"
+         id="stop351" /><stop
+         offset="100%"
+         style="stop-color:rgb(255,255,235);stop-opacity:1"
+         id="stop353" /></linearGradient><linearGradient
+       id="_Linear37"
+       x1="0"
+       y1="0"
+       x2="1"
+       y2="0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-13.3491,-55.4555,100.385,-7.37441,428.378,375.307)"><stop
+         offset="0%"
+         style="stop-color:rgb(220,234,255);stop-opacity:1"
+         id="stop356" /><stop
+         offset="100%"
+         style="stop-color:rgb(255,255,235);stop-opacity:1"
+         id="stop358" /></linearGradient><linearGradient
+       id="_Linear38"
+       x1="0"
+       y1="0"
+       x2="1"
+       y2="0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-13.3491,-55.4555,100.385,-7.37441,428.378,375.307)"><stop
+         offset="0%"
+         style="stop-color:rgb(220,234,255);stop-opacity:1"
+         id="stop361" /><stop
+         offset="100%"
+         style="stop-color:rgb(255,255,235);stop-opacity:1"
+         id="stop363" /></linearGradient><linearGradient
+       id="_Linear39"
+       x1="0"
+       y1="0"
+       x2="1"
+       y2="0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-13.3491,-55.4555,100.385,-7.37441,428.378,375.307)"><stop
+         offset="0%"
+         style="stop-color:rgb(220,234,255);stop-opacity:1"
+         id="stop366" /><stop
+         offset="100%"
+         style="stop-color:rgb(255,255,235);stop-opacity:1"
+         id="stop368" /></linearGradient><radialGradient
+       id="_Radial1-3"
+       cx="0"
+       cy="0"
+       r="1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-213.83,0,0,-211.365,839.741,281.148)"><stop
+         offset="0%"
+         style="stop-color:black;stop-opacity:0.25"
+         id="stop72" /><stop
+         offset="100%"
+         style="stop-color:black;stop-opacity:0"
+         id="stop74" /></radialGradient><clipPath
+       id="_clip2"><circle
+         cx="495.35901"
+         cy="567.229"
+         r="62.962002"
+         id="circle10" /></clipPath><clipPath
+       id="_clip3"><circle
+         cx="495.35901"
+         cy="567.229"
+         r="62.962002"
+         id="circle25" /></clipPath><clipPath
+       id="_clip4"><circle
+         cx="495.35901"
+         cy="567.229"
+         r="62.962002"
+         id="circle40" /></clipPath><clipPath
+       id="_clip2-6"><circle
+         cx="495.35901"
+         cy="567.229"
+         r="62.962002"
+         id="circle10-5" /></clipPath><clipPath
+       id="_clip3-6"><circle
+         cx="495.35901"
+         cy="567.229"
+         r="62.962002"
+         id="circle25-9" /></clipPath><clipPath
+       id="_clip4-3"><circle
+         cx="495.35901"
+         cy="567.229"
+         r="62.962002"
+         id="circle40-7" /></clipPath><radialGradient
+       id="_Radial1-4"
+       cx="0"
+       cy="0"
+       r="1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-145.614,0,0,-15.8805,347.849,788.838)"><stop
+         offset="0%"
+         style="stop-color:rgb(0,16,43);stop-opacity:0.480776"
+         id="stop191-5" /><stop
+         offset="100%"
+         style="stop-color:black;stop-opacity:0"
+         id="stop193-2" /></radialGradient><clipPath
+       id="_clip2-7"><circle
+         cx="495.35901"
+         cy="567.229"
+         r="62.962002"
+         id="circle10-7" /></clipPath><clipPath
+       id="_clip3-1"><circle
+         cx="495.35901"
+         cy="567.229"
+         r="62.962002"
+         id="circle25-1" /></clipPath><clipPath
+       id="_clip4-5"><circle
+         cx="495.35901"
+         cy="567.229"
+         r="62.962002"
+         id="circle40-9" /></clipPath><radialGradient
+       id="_Radial1-7"
+       cx="0"
+       cy="0"
+       r="1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-145.614,0,0,-15.8805,347.849,788.838)"><stop
+         offset="0%"
+         style="stop-color:rgb(0,16,43);stop-opacity:0.480776"
+         id="stop191-7" /><stop
+         offset="100%"
+         style="stop-color:black;stop-opacity:0"
+         id="stop193-6" /></radialGradient><clipPath
+       id="clipPath4593"><circle
+         cx="495.35901"
+         cy="567.229"
+         r="62.962002"
+         id="circle4591" /></clipPath><clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath6279"><g
+         id="use6281"
+         inkscape:label="Clip"><g
+           style="clip-rule:evenodd;fill-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41420996"
+           id="g6319"
+           transform="matrix(0.21365365,0,0,0.21365365,78.055647,27.610769)" /><g
+           style="display:inline;fill:#000000"
+           id="g6331"
+           transform="matrix(0.27006824,0,0,0.27006824,129.33484,158.17195)"><path
+             id="path6321"
+             d="M 126.7489,161.76071 H 237.18267 V 272.19448 H 126.7489 Z"
+             inkscape:connector-curvature="0"
+             style="fill:none" /><g
+             clip-path="url(#clipPath6290)"
+             id="g6329"><g
+               id="g6327"
+               inkscape:label="Clip"><path
+                 inkscape:connector-curvature="0"
+                 id="path6323"
+                 transform="matrix(3.7027679,0,0,3.7027679,-478.89689,-585.67401)"
+                 d="m 200.70898,144.40234 a 16.817533,16.817533 0 0 0 -16.81836,16.81641 16.817533,16.817533 0 0 0 16.81836,16.81836 16.817533,16.817533 0 0 0 16.81641,-16.81836 16.817533,16.817533 0 0 0 -16.81641,-16.81641 z"
+                 style="clip-rule:evenodd;fill:#ffffff;fill-rule:evenodd;stroke-width:0.21365365;stroke-linejoin:round;stroke-miterlimit:1.41420996" /><path
+                 style="fill:#030303;fill-opacity:1"
+                 inkscape:connector-curvature="0"
+                 d="m 235.24784,66.626925 c 0,2.53077 2.07064,4.60141 4.60141,4.60141 h 4.6014 v 16.10493 c 0,3.81916 3.08294,6.9021 6.90212,6.9021 3.81916,0 6.9021,-3.08294 6.9021,-6.9021 v -16.10493 h 9.20283 v 16.10493 c 0,3.81916 3.08294,6.9021 6.9021,6.9021 3.81917,0 6.90212,-3.08294 6.90212,-6.9021 v -16.10493 h 4.60139 c 2.53078,0 4.60141,-2.07064 4.60141,-4.60141 v -46.01408 h -55.21688 z m -11.50351,-46.01408 c -3.81918,0 -6.90212,3.08295 -6.90212,6.90212 v 32.20986 c 0,3.81915 3.08294,6.9021 6.90212,6.9021 3.81916,0 6.9021,-3.08295 6.9021,-6.9021 v -32.20986 c 0,-3.81917 -3.08294,-6.90212 -6.9021,-6.90212 z m 78.22391,0 c -3.81916,0 -6.9021,3.08295 -6.9021,6.90212 v 32.20986 c 0,3.81915 3.08294,6.9021 6.9021,6.9021 3.81917,0 6.90212,-3.08295 6.90212,-6.9021 v -32.20986 c 0,-3.81917 -3.08295,-6.90212 -6.90212,-6.90212 z m -22.86899,-26.8722046 5.98182,-5.9818204 c 0.9203,-0.92028 0.9203,-2.34672 0,-3.26701 -0.92027,-0.92028 -2.34671,-0.92028 -3.26699,0 l -6.81008,6.8100904 c -3.63512,-1.8405704 -7.77637,-2.8988804 -12.14772,-2.8988804 -4.41735,0 -8.55862,1.05831 -12.23974,2.8988804 l -6.8561,-6.8100904 c -0.92027,-0.92028 -2.34671,-0.92028 -3.267,0 -0.92028,0.92029 -0.92028,2.34673 0,3.26701 l 6.02785,6.0278304 c -6.81009,5.01554 -11.27345,13.06801 -11.27345,22.2248046 h 55.21688 c 0,-9.1567946 -4.46335,-17.2552846 -11.36547,-22.2708146 z m -25.44578,13.06799 h -4.60141 v -4.60139 h 4.60141 z m 23.00703,0 h -4.60141 v -4.60139 h 4.60141 z"
+                 id="path6325" /></g></g></g></g></clipPath><clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath6290"><g
+         transform="translate(1.7688602e-6,6.6121211e-6)"
+         id="use6292"
+         inkscape:label="Clip"
+         style="fill:#000000"><path
+           inkscape:connector-curvature="0"
+           id="path6358"
+           transform="matrix(3.7027679,0,0,3.7027679,-478.89689,-585.67401)"
+           d="m 200.70898,144.40234 a 16.817533,16.817533 0 0 0 -16.81836,16.81641 16.817533,16.817533 0 0 0 16.81836,16.81836 16.817533,16.817533 0 0 0 16.81641,-16.81836 16.817533,16.817533 0 0 0 -16.81641,-16.81641 z"
+           style="clip-rule:evenodd;fill:#ffffff;fill-rule:evenodd;stroke-width:0.21365365;stroke-linejoin:round;stroke-miterlimit:1.41420996" /><path
+           style="fill:#030303;fill-opacity:1"
+           inkscape:connector-curvature="0"
+           d="m 235.24784,66.626925 c 0,2.53077 2.07064,4.60141 4.60141,4.60141 h 4.6014 v 16.10493 c 0,3.81916 3.08294,6.9021 6.90212,6.9021 3.81916,0 6.9021,-3.08294 6.9021,-6.9021 v -16.10493 h 9.20283 v 16.10493 c 0,3.81916 3.08294,6.9021 6.9021,6.9021 3.81917,0 6.90212,-3.08294 6.90212,-6.9021 v -16.10493 h 4.60139 c 2.53078,0 4.60141,-2.07064 4.60141,-4.60141 v -46.01408 h -55.21688 z m -11.50351,-46.01408 c -3.81918,0 -6.90212,3.08295 -6.90212,6.90212 v 32.20986 c 0,3.81915 3.08294,6.9021 6.90212,6.9021 3.81916,0 6.9021,-3.08295 6.9021,-6.9021 v -32.20986 c 0,-3.81917 -3.08294,-6.90212 -6.9021,-6.90212 z m 78.22391,0 c -3.81916,0 -6.9021,3.08295 -6.9021,6.90212 v 32.20986 c 0,3.81915 3.08294,6.9021 6.9021,6.9021 3.81917,0 6.90212,-3.08295 6.90212,-6.9021 v -32.20986 c 0,-3.81917 -3.08295,-6.90212 -6.90212,-6.90212 z m -22.86899,-26.8722046 5.98182,-5.9818204 c 0.9203,-0.92028 0.9203,-2.34672 0,-3.26701 -0.92027,-0.92028 -2.34671,-0.92028 -3.26699,0 l -6.81008,6.8100904 c -3.63512,-1.8405704 -7.77637,-2.8988804 -12.14772,-2.8988804 -4.41735,0 -8.55862,1.05831 -12.23974,2.8988804 l -6.8561,-6.8100904 c -0.92027,-0.92028 -2.34671,-0.92028 -3.267,0 -0.92028,0.92029 -0.92028,2.34673 0,3.26701 l 6.02785,6.0278304 c -6.81009,5.01554 -11.27345,13.06801 -11.27345,22.2248046 h 55.21688 c 0,-9.1567946 -4.46335,-17.2552846 -11.36547,-22.2708146 z m -25.44578,13.06799 h -4.60141 v -4.60139 h 4.60141 z m 23.00703,0 h -4.60141 v -4.60139 h 4.60141 z"
+           id="path6360" /></g></clipPath><clipPath
+       id="_clip2-4"><circle
+         cx="495.35901"
+         cy="567.229"
+         r="62.962002"
+         id="circle10-3" /></clipPath><clipPath
+       id="clipPath4583-4"><circle
+         cx="495.35901"
+         cy="567.229"
+         r="62.962002"
+         id="circle4581-6" /></clipPath><clipPath
+       id="clipPath4583-9"><circle
+         cx="495.35901"
+         cy="567.229"
+         r="62.962002"
+         id="circle4581-3" /></clipPath><clipPath
+       id="_clip4-8"><circle
+         cx="495.35901"
+         cy="567.229"
+         r="62.962002"
+         id="circle40-8" /></clipPath><clipPath
+       id="_clip2-3"><circle
+         cx="495.35901"
+         cy="567.229"
+         r="62.962002"
+         id="circle10-38" /></clipPath><clipPath
+       id="_clip4-37"><circle
+         cx="495.35901"
+         cy="567.229"
+         r="62.962002"
+         id="circle40-3" /></clipPath><clipPath
+       id="_clip2-3-0"><circle
+         cx="495.35901"
+         cy="567.229"
+         r="62.962002"
+         id="circle10-38-8" /></clipPath></defs><g
+     style="clip-rule:evenodd;fill-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41420996"
+     transform="matrix(0.65732901,0,0,0.30747427,-190.23007,51.279763)"
+     id="g8"><rect
+       x="367.892"
+       y="252.46899"
+       width="331.07401"
+       height="351.38501"
+       style="fill-opacity:0.2"
+       id="rect6" /></g><g
+     style="clip-rule:evenodd;fill-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41420996"
+     id="g23"
+     transform="matrix(0.39354121,0,0,0.39354121,-104.20863,-52.023941)"><clipPath
+       id="clipPath4583"><circle
+         id="circle4581"
+         r="62.962002"
+         cy="567.229"
+         cx="495.35901" /></clipPath><g
+       id="g21-3"
+       clip-path="url(#_clip2)"><g
+         id="g15"
+         transform="matrix(0.799878,0,0,0.799878,36.1705,67.0232)"><circle
+           id="circle13"
+           style="fill:#ffffff"
+           r="78.713997"
+           cy="625.35199"
+           cx="574.073" /></g><g
+         id="g19"
+         transform="matrix(7.083,0,0,7.083,436.553,523.945)"><path
+           id="path17"
+           style="fill:#ff0000;fill-rule:nonzero"
+           d="M 8.404,1 C 6.672,1 5.204,2.266 5.204,3.9 5.216,4.416 5.262,5.053 5.57,6.4 V 6.433 L 5.604,6.467 C 5.703,6.75 5.847,6.912 6.037,7.133 6.227,7.354 6.454,7.615 6.67,7.833 6.696,7.859 6.712,7.875 6.737,7.9 6.78,8.086 6.832,8.287 6.87,8.467 6.973,8.945 6.963,9.284 6.937,9.4 c -0.744,0.261 -1.669,0.572 -2.5,0.933 -0.466,0.203 -0.888,0.384 -1.233,0.6 -0.345,0.217 -0.688,0.38 -0.8,0.867 -0.16,0.633 -0.199,0.754 -0.4,1.533 -0.027,0.209 0.083,0.43 0.267,0.534 1.508,0.814 3.824,1.142 6.133,1.133 2.309,-0.009 4.606,-0.356 6.066,-1.133 0.117,-0.074 0.143,-0.109 0.133,-0.234 C 14.56,12.944 14.522,12.266 14.47,11.867 14.452,11.768 14.405,11.674 14.337,11.6 13.873,11.046 13.18,10.708 12.37,10.367 c -0.74,-0.312 -1.607,-0.635 -2.466,-1 -0.049,-0.107 -0.096,-0.419 0,-0.9 0.025,-0.129 0.066,-0.268 0.1,-0.4 0.08,-0.091 0.143,-0.165 0.233,-0.267 0.191,-0.218 0.396,-0.447 0.566,-0.667 0.171,-0.22 0.31,-0.408 0.4,-0.666 l 0.034,-0.034 c 0.348,-1.406 0.348,-1.992 0.366,-2.5 V 3.9 C 11.603,2.266 10.135,1 8.404,1 Z"
+           inkscape:connector-curvature="0" /></g></g></g><g
+     id="g6531"><g
+       transform="matrix(0.2671078,0,0,0.2671078,108.34819,9.708349)"
+       id="g49"
+       style="clip-rule:evenodd;fill-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41420996"><clipPath
+         id="clipPath4603"><circle
+           cx="495.35901"
+           cy="567.229"
+           r="62.962002"
+           id="circle4601" /></clipPath><g
+         clip-path="url(#_clip4)"
+         id="g47"><g
+           transform="matrix(0.799878,0,0,0.799878,36.1705,67.0232)"
+           id="g45"><circle
+             cx="574.073"
+             cy="625.35199"
+             r="78.713997"
+             style="fill:#008000"
+             id="circle43" /></g></g></g><g
+       transform="matrix(1.0324198,0,0,1.0324198,83.105727,-197.79768)"
+       id="g53"
+       style="clip-rule:evenodd;fill-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41420996"><path
+         inkscape:connector-curvature="0"
+         d="m 152.608,331.455 c -8.994,0 -16.288,7.293 -16.288,16.29 0,7.197 4.667,13.302 11.14,15.456 0.815,0.15 1.112,-0.353 1.112,-0.785 0,-0.387 -0.014,-1.411 -0.022,-2.77 -4.531,0.984 -5.487,-2.184 -5.487,-2.184 -0.741,-1.882 -1.809,-2.383 -1.809,-2.383 -1.479,-1.01 0.112,-0.99 0.112,-0.99 1.635,0.115 2.495,1.679 2.495,1.679 1.453,2.489 3.813,1.77 4.741,1.353 0.148,-1.052 0.569,-1.77 1.034,-2.177 -3.617,-0.411 -7.42,-1.809 -7.42,-8.051 0,-1.778 0.635,-3.233 1.677,-4.371 -0.168,-0.412 -0.727,-2.069 0.16,-4.311 0,0 1.367,-0.438 4.479,1.67 1.299,-0.362 2.693,-0.542 4.078,-0.549 1.384,0.007 2.777,0.187 4.078,0.549 3.11,-2.108 4.475,-1.67 4.475,-1.67 0.889,2.242 0.33,3.899 0.163,4.311 1.044,1.138 1.674,2.593 1.674,4.371 0,6.258 -3.809,7.635 -7.437,8.038 0.584,0.503 1.105,1.497 1.105,3.016 0,2.178 -0.02,3.935 -0.02,4.469 0,0.436 0.294,0.943 1.12,0.784 6.468,-2.159 11.131,-8.26 11.131,-15.455 0,-8.997 -7.294,-16.29 -16.291,-16.29 z"
+         style="fill:#ffffff"
+         id="path51" /></g></g><g
+     style="clip-rule:evenodd;fill-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41420996"
+     transform="matrix(0.23134152,0,0,0.25558109,-12.468054,141.7464)"
+     id="g59"><rect
+       x="343.15399"
+       y="229.121"
+       width="458.246"
+       height="43.543999"
+       style="fill:#000000"
+       id="rect57" /></g><g
+     style="clip-rule:evenodd;fill-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41420996"
+     transform="matrix(0.2423356,0,0,0.18348396,-16.240943,177.68646)"
+     id="g63"><rect
+       x="343.15399"
+       y="229.121"
+       width="458.246"
+       height="43.543999"
+       style="fill:#666666"
+       id="rect61" /></g><path
+     d="m 67.69054,257.43086 c -0.69724,0 -1.2831,0.58585 -1.2831,1.2833 v 30.91036 c 0,0.72532 0.56337,1.28327 1.2831,1.28327 h 36.48987 c 0.71974,0 1.28337,-0.55795 1.28337,-1.28327 v -25.32251 c 0,-0.69742 -0.58586,-1.29165 -1.28337,-1.29165 H 85.93544 l -5.57936,-5.5795 z"
+     id="path4"
+     style="clip-rule:evenodd;opacity:0.5;fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke-width:2.78974366;stroke-linejoin:round;stroke-miterlimit:1.41420996"
+     inkscape:connector-curvature="0" /><path
+     d="m 68.01914,306.37829 c -0.69725,0 -1.2831,0.58585 -1.2831,1.2833 v 30.91036 c 0,0.72532 0.56337,1.28326 1.2831,1.28326 h 36.48987 c 0.71973,0 1.28336,-0.55794 1.28336,-1.28326 v -25.32252 c 0,-0.69742 -0.58585,-1.29164 -1.28336,-1.29164 H 86.26404 l -5.57936,-5.5795 z"
+     id="path4-3"
+     style="clip-rule:evenodd;opacity:0.5;fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke-width:2.78974366;stroke-linejoin:round;stroke-miterlimit:1.41420996"
+     inkscape:connector-curvature="0" /><path
+     d="m 66.73904,356.30202 c -0.69725,0 -1.2831,0.58585 -1.2831,1.28329 v 30.91037 c 0,0.72532 0.56337,1.28326 1.2831,1.28326 h 36.48987 c 0.71974,0 1.28337,-0.55794 1.28337,-1.28326 v -25.32252 c 0,-0.69742 -0.58586,-1.29164 -1.28337,-1.29164 H 84.98394 l -5.57936,-5.5795 z"
+     id="path4-2"
+     style="clip-rule:evenodd;opacity:0.5;fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke-width:2.78974366;stroke-linejoin:round;stroke-miterlimit:1.41420996"
+     inkscape:connector-curvature="0" /><path
+     d="m 65.45895,408.78593 c -0.69724,0 -1.2831,0.58585 -1.2831,1.2833 v 30.91036 c 0,0.72532 0.56337,1.28327 1.2831,1.28327 h 36.48987 c 0.71974,0 1.28337,-0.55795 1.28337,-1.28327 v -25.32252 c 0,-0.69742 -0.58586,-1.29164 -1.28337,-1.29164 H 83.70385 l -5.57936,-5.5795 z"
+     id="path4-0"
+     style="clip-rule:evenodd;opacity:0.5;fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke-width:2.78974366;stroke-linejoin:round;stroke-miterlimit:1.41420996"
+     inkscape:connector-curvature="0" /><g
+     style="clip-rule:evenodd;fill-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41420996"
+     transform="matrix(0.92954631,0,0,0.92954631,899.50467,-165.26095)"
+     id="g5086"><path
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;vector-effect:none;fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:1.123106;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:1.41420996;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+       id="path5077"
+       sodipodi:type="arc"
+       sodipodi:cx="-715.50781"
+       sodipodi:cy="703.72699"
+       sodipodi:rx="20.65678"
+       sodipodi:ry="20.65678"
+       sodipodi:start="3.9460498"
+       sodipodi:end="3.9452295"
+       sodipodi:open="true"
+       d="m -729.83334,688.84472 a 20.65678,20.65678 0 0 1 29.20486,0.55369 20.65678,20.65678 0 0 1 -0.5477,29.20497 20.65678,20.65678 0 0 1 -29.20508,-0.54171 20.65678,20.65678 0 0 1 0.53572,-29.20519" /><text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:50.17882156px;line-height:125%;font-family:Helvetica;-inkscape-font-specification:Helvetica;text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2.50894094px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+       x="-730.16003"
+       y="715.36847"
+       id="text5081"><tspan
+         sodipodi:role="line"
+         id="tspan5079"
+         x="-730.16003"
+         y="715.36847"
+         style="stroke-width:2.50894094px;fill:#ffffff;">+</tspan></text>
+</g><rect
+     id="rect61-1"
+     style="clip-rule:evenodd;fill:#000000;fill-rule:evenodd;stroke-width:0.21086654;stroke-linejoin:round;stroke-miterlimit:1.41420996"
+     height="7.9896255"
+     width="111.04933"
+     y="265.78107"
+     x="118.23441" /><rect
+     id="rect61-1-5"
+     style="clip-rule:evenodd;fill:#000000;fill-rule:evenodd;stroke-width:0.21086654;stroke-linejoin:round;stroke-miterlimit:1.41420996"
+     height="7.9896255"
+     width="111.04933"
+     y="314.11743"
+     x="118.23441" /><rect
+     id="rect61-1-54"
+     style="clip-rule:evenodd;fill:#000000;fill-rule:evenodd;stroke-width:0.21086654;stroke-linejoin:round;stroke-miterlimit:1.41420996"
+     height="7.9896255"
+     width="111.04933"
+     y="364.31293"
+     x="118.23441" /><rect
+     id="rect61-1-7"
+     style="clip-rule:evenodd;fill:#000000;fill-rule:evenodd;stroke-width:0.21086654;stroke-linejoin:round;stroke-miterlimit:1.41420996"
+     height="7.9896255"
+     width="111.04933"
+     y="412.64935"
+     x="118.23441" /><g
+     transform="matrix(0.92954631,0,0,2.9811015,143.06892,-1767.4479)"
+     id="_-Rectangle--5"
+     style="clip-rule:evenodd;fill-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41420996"><rect
+       id="rect2-4"
+       style="fill:url(#_Radial1-4)"
+       height="43.366001"
+       width="291.229"
+       y="761.35303"
+       x="202.235" /></g><path
+     inkscape:connector-curvature="0"
+     id="path39-7"
+     d="m 552.06188,61.23 c 22.85382,0.039 41.33785,18.54724 41.33785,41.33785 v 447.28003 c 0,22.81478 -18.52307,41.33785 -41.33785,41.33785 H 364.02767 c -22.81478,0 -41.33785,-18.52307 -41.33785,-41.33785 V 102.56785 c 0,-22.79061 18.4831,-41.29881 41.33785,-41.33785 z m 14.97685,67.67748 H 349.05082 v 394.60077 h 217.98791 z"
+     style="clip-rule:evenodd;fill-rule:evenodd;stroke-width:0.9295463;stroke-linejoin:round;stroke-miterlimit:1.41420996" /><g
+     style="clip-rule:evenodd;fill-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41420996"
+     transform="matrix(0.65732901,0,0,0.30747427,107.22475,51.279763)"
+     id="g8-0"><rect
+       x="367.892"
+       y="252.46899"
+       width="331.07401"
+       height="351.38501"
+       style="fill-opacity:0.2"
+       id="rect6-7" /></g><g
+     style="clip-rule:evenodd;fill-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41420996"
+     transform="matrix(0.23134152,0,0,0.25558109,284.98677,141.7464)"
+     id="g59-7"><rect
+       x="343.15399"
+       y="229.121"
+       width="458.246"
+       height="43.543999"
+       style="fill:#000000"
+       id="rect57-2" /></g><g
+     style="clip-rule:evenodd;fill-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41420996"
+     transform="matrix(0.2423356,0,0,0.18348396,281.21388,177.68646)"
+     id="g63-7"><rect
+       x="343.15399"
+       y="229.121"
+       width="458.246"
+       height="43.543999"
+       style="fill:#666666"
+       id="rect61-2" /></g><path
+     d="m 365.14536,257.43086 c -0.69724,0 -1.2831,0.58585 -1.2831,1.2833 v 30.91036 c 0,0.72532 0.56337,1.28327 1.2831,1.28327 h 36.48987 c 0.71974,0 1.28337,-0.55795 1.28337,-1.28327 v -25.32251 c 0,-0.69742 -0.58586,-1.29165 -1.28337,-1.29165 h -18.24497 l -5.57936,-5.5795 z"
+     id="path4-26"
+     style="clip-rule:evenodd;opacity:0.5;fill:#000080;fill-opacity:1;fill-rule:evenodd;stroke-width:2.78974366;stroke-linejoin:round;stroke-miterlimit:1.41420996"
+     inkscape:connector-curvature="0" /><path
+     d="m 365.47395,306.37829 c -0.69724,0 -1.2831,0.58585 -1.2831,1.2833 v 30.91036 c 0,0.72532 0.56337,1.28326 1.2831,1.28326 h 36.48987 c 0.71974,0 1.28337,-0.55794 1.28337,-1.28326 v -25.32252 c 0,-0.69742 -0.58585,-1.29164 -1.28337,-1.29164 h -18.24496 l -5.57936,-5.5795 z"
+     id="path4-3-1"
+     style="clip-rule:evenodd;opacity:0.5;fill:#000080;fill-opacity:1;fill-rule:evenodd;stroke-width:2.78974366;stroke-linejoin:round;stroke-miterlimit:1.41420996"
+     inkscape:connector-curvature="0" /><path
+     d="m 364.19386,356.30202 c -0.69725,0 -1.2831,0.58585 -1.2831,1.28329 v 30.91037 c 0,0.72532 0.56337,1.28326 1.2831,1.28326 h 36.48987 c 0.71974,0 1.28337,-0.55794 1.28337,-1.28326 v -25.32252 c 0,-0.69742 -0.58586,-1.29164 -1.28337,-1.29164 h -18.24497 l -5.57936,-5.5795 z"
+     id="path4-2-0"
+     style="clip-rule:evenodd;opacity:0.5;fill:#000080;fill-opacity:1;fill-rule:evenodd;stroke-width:2.78974366;stroke-linejoin:round;stroke-miterlimit:1.41420996"
+     inkscape:connector-curvature="0" /><path
+     d="m 362.91377,408.78593 c -0.69724,0 -1.2831,0.58585 -1.2831,1.2833 v 30.91036 c 0,0.72532 0.56337,1.28327 1.2831,1.28327 h 36.48987 c 0.71974,0 1.28337,-0.55795 1.28337,-1.28327 v -25.32252 c 0,-0.69742 -0.58586,-1.29164 -1.28337,-1.29164 h -18.24497 l -5.57936,-5.5795 z"
+     id="path4-0-6"
+     style="clip-rule:evenodd;opacity:0.5;fill:#000080;fill-opacity:1;fill-rule:evenodd;stroke-width:2.78974366;stroke-linejoin:round;stroke-miterlimit:1.41420996"
+     inkscape:connector-curvature="0" /><g
+     transform="matrix(0.92954631,0,0,0.92954631,1196.9595,-165.26096)"
+     id="g5086-1"
+     style="clip-rule:evenodd;fill-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41420996"><path
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;vector-effect:none;fill:#000080;fill-opacity:1;stroke:none;stroke-width:1.123106;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:1.41420996;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+       id="path5077-5"
+       sodipodi:type="arc"
+       sodipodi:cx="-715.50781"
+       sodipodi:cy="703.72699"
+       sodipodi:rx="20.65678"
+       sodipodi:ry="20.65678"
+       sodipodi:start="3.9460498"
+       sodipodi:end="3.9452295"
+       sodipodi:open="true"
+       d="m -729.83334,688.84472 a 20.65678,20.65678 0 0 1 29.20486,0.55369 20.65678,20.65678 0 0 1 -0.5477,29.20497 20.65678,20.65678 0 0 1 -29.20508,-0.54171 20.65678,20.65678 0 0 1 0.53572,-29.20519" /><text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:50.17882156px;line-height:125%;font-family:Helvetica;-inkscape-font-specification:Helvetica;text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2.50894094px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+       x="-730.16003"
+       y="715.36847"
+       id="text5081-9"><tspan
+         sodipodi:role="line"
+         id="tspan5079-4"
+         x="-730.16003"
+         y="715.36847"
+         style="stroke-width:2.50894094px;fill:#ffffff;">+</tspan></text>
+</g><rect
+     id="rect61-1-9"
+     style="clip-rule:evenodd;fill:#000000;fill-rule:evenodd;stroke-width:0.21086654;stroke-linejoin:round;stroke-miterlimit:1.41420996"
+     height="7.9896255"
+     width="111.04933"
+     y="265.78107"
+     x="415.68924" /><rect
+     id="rect61-1-5-0"
+     style="clip-rule:evenodd;fill:#000000;fill-rule:evenodd;stroke-width:0.21086654;stroke-linejoin:round;stroke-miterlimit:1.41420996"
+     height="7.9896255"
+     width="111.04933"
+     y="314.11743"
+     x="415.68924" /><rect
+     id="rect61-1-54-9"
+     style="clip-rule:evenodd;fill:#000000;fill-rule:evenodd;stroke-width:0.21086654;stroke-linejoin:round;stroke-miterlimit:1.41420996"
+     height="7.9896255"
+     width="111.04933"
+     y="364.31293"
+     x="415.68924" /><rect
+     id="rect61-1-7-1"
+     style="clip-rule:evenodd;fill:#000000;fill-rule:evenodd;stroke-width:0.21086654;stroke-linejoin:round;stroke-miterlimit:1.41420996"
+     height="7.9896255"
+     width="111.04933"
+     y="412.64935"
+     x="415.68924" /><g
+     transform="matrix(0.92954631,0,0,2.9811015,438.66465,-1767.4479)"
+     id="_-Rectangle--7"
+     style="clip-rule:evenodd;fill-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41420996"><rect
+       id="rect2-3"
+       style="fill:url(#_Radial1-7)"
+       height="43.366001"
+       width="291.229"
+       y="761.35303"
+       x="202.235" /></g><path
+     inkscape:connector-curvature="0"
+     id="path39-6"
+     d="m 847.6576,61.23 c 22.85383,0.039 41.33786,18.54724 41.33786,41.33785 v 447.28003 c 0,22.81478 -18.52307,41.33785 -41.33786,41.33785 H 659.6234 c -22.81479,0 -41.33785,-18.52307 -41.33785,-41.33785 V 102.56785 c 0,-22.79061 18.48309,-41.29881 41.33785,-41.33785 z m 14.97685,67.67748 h -217.9879 v 394.60077 h 217.9879 z"
+     style="clip-rule:evenodd;fill-rule:evenodd;stroke-width:0.9295463;stroke-linejoin:round;stroke-miterlimit:1.41420996" /><g
+     style="clip-rule:evenodd;fill-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41420996"
+     transform="matrix(0.65732901,0,0,0.30747427,402.82047,51.279763)"
+     id="g8-4"><rect
+       x="367.892"
+       y="252.46899"
+       width="331.07401"
+       height="351.38501"
+       style="fill-opacity:0.2"
+       id="rect6-8" /></g><g
+     style="clip-rule:evenodd;fill-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41420996"
+     transform="matrix(0.23134152,0,0,0.25558109,580.58249,141.7464)"
+     id="g59-4"><rect
+       x="343.15399"
+       y="229.121"
+       width="458.246"
+       height="43.543999"
+       style="fill:#000000"
+       id="rect57-4" /></g><g
+     style="clip-rule:evenodd;fill-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41420996"
+     transform="matrix(0.2423356,0,0,0.18348396,576.8096,177.68646)"
+     id="g63-4"><rect
+       x="343.15399"
+       y="229.121"
+       width="458.246"
+       height="43.543999"
+       style="fill:#666666"
+       id="rect61-4" /></g><path
+     d="m 660.74109,257.43086 c -0.69725,0 -1.2831,0.58585 -1.2831,1.2833 v 30.91036 c 0,0.72532 0.56337,1.28327 1.2831,1.28327 h 36.48987 c 0.71973,0 1.28336,-0.55795 1.28336,-1.28327 v -25.32251 c 0,-0.69742 -0.58585,-1.29165 -1.28336,-1.29165 h -18.24497 l -5.57936,-5.5795 z"
+     id="path4-7"
+     style="clip-rule:evenodd;opacity:0.5;fill:#008000;fill-opacity:1;fill-rule:evenodd;stroke-width:2.78974366;stroke-linejoin:round;stroke-miterlimit:1.41420996"
+     inkscape:connector-curvature="0" /><path
+     d="m 661.06968,306.37829 c -0.69724,0 -1.2831,0.58585 -1.2831,1.2833 v 30.91036 c 0,0.72532 0.56337,1.28326 1.2831,1.28326 h 36.48987 c 0.71974,0 1.28337,-0.55794 1.28337,-1.28326 v -25.32252 c 0,-0.69742 -0.58586,-1.29164 -1.28337,-1.29164 h -18.24497 l -5.57936,-5.5795 z"
+     id="path4-3-6"
+     style="clip-rule:evenodd;opacity:0.5;fill:#008000;fill-opacity:1;fill-rule:evenodd;stroke-width:2.78974366;stroke-linejoin:round;stroke-miterlimit:1.41420996"
+     inkscape:connector-curvature="0" /><path
+     d="m 659.78958,356.30202 c -0.69724,0 -1.2831,0.58585 -1.2831,1.28329 v 30.91037 c 0,0.72532 0.56337,1.28326 1.2831,1.28326 h 36.48987 c 0.71974,0 1.28337,-0.55794 1.28337,-1.28326 v -25.32252 c 0,-0.69742 -0.58585,-1.29164 -1.28337,-1.29164 h -18.24496 l -5.57936,-5.5795 z"
+     id="path4-2-3"
+     style="clip-rule:evenodd;opacity:0.5;fill:#008000;fill-opacity:1;fill-rule:evenodd;stroke-width:2.78974366;stroke-linejoin:round;stroke-miterlimit:1.41420996"
+     inkscape:connector-curvature="0" /><path
+     d="m 658.5095,408.78593 c -0.69725,0 -1.2831,0.58585 -1.2831,1.2833 v 30.91036 c 0,0.72532 0.56337,1.28327 1.2831,1.28327 h 36.48987 c 0.71973,0 1.28336,-0.55795 1.28336,-1.28327 v -25.32252 c 0,-0.69742 -0.58585,-1.29164 -1.28336,-1.29164 H 676.7544 l -5.57936,-5.5795 z"
+     id="path4-0-1"
+     style="clip-rule:evenodd;opacity:0.5;fill:#008000;fill-opacity:1;fill-rule:evenodd;stroke-width:2.78974366;stroke-linejoin:round;stroke-miterlimit:1.41420996"
+     inkscape:connector-curvature="0" /><g
+     transform="matrix(0.92954631,0,0,0.92954631,1492.5552,-165.26096)"
+     id="g5086-7"
+     style="clip-rule:evenodd;fill-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41420996"><path
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;vector-effect:none;fill:#008000;fill-opacity:1;stroke:none;stroke-width:1.123106;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:1.41420996;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+       id="path5077-59"
+       sodipodi:type="arc"
+       sodipodi:cx="-715.50781"
+       sodipodi:cy="703.72699"
+       sodipodi:rx="20.65678"
+       sodipodi:ry="20.65678"
+       sodipodi:start="3.9460498"
+       sodipodi:end="3.9452295"
+       sodipodi:open="true"
+       d="m -729.83334,688.84472 a 20.65678,20.65678 0 0 1 29.20486,0.55369 20.65678,20.65678 0 0 1 -0.5477,29.20497 20.65678,20.65678 0 0 1 -29.20508,-0.54171 20.65678,20.65678 0 0 1 0.53572,-29.20519" /><text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:50.17882156px;line-height:125%;font-family:Helvetica;-inkscape-font-specification:Helvetica;text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2.50894094px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+       x="-730.16003"
+       y="715.36847"
+       id="text5081-6"><tspan
+         sodipodi:role="line"
+         id="tspan5079-2"
+         x="-730.16003"
+         y="715.36847"
+         style="stroke-width:2.50894094px;fill:#ffffff;">+</tspan></text>
+</g><rect
+     id="rect61-1-1"
+     style="clip-rule:evenodd;fill:#000000;fill-rule:evenodd;stroke-width:0.21086654;stroke-linejoin:round;stroke-miterlimit:1.41420996"
+     height="7.9896255"
+     width="111.04933"
+     y="265.78107"
+     x="711.28497" /><rect
+     id="rect61-1-5-7"
+     style="clip-rule:evenodd;fill:#000000;fill-rule:evenodd;stroke-width:0.21086654;stroke-linejoin:round;stroke-miterlimit:1.41420996"
+     height="7.9896255"
+     width="111.04933"
+     y="314.11743"
+     x="711.28497" /><rect
+     id="rect61-1-54-8"
+     style="clip-rule:evenodd;fill:#000000;fill-rule:evenodd;stroke-width:0.21086654;stroke-linejoin:round;stroke-miterlimit:1.41420996"
+     height="7.9896255"
+     width="111.04933"
+     y="364.31293"
+     x="711.28497" /><rect
+     id="rect61-1-7-5"
+     style="clip-rule:evenodd;fill:#000000;fill-rule:evenodd;stroke-width:0.21086654;stroke-linejoin:round;stroke-miterlimit:1.41420996"
+     height="7.9896255"
+     width="111.04933"
+     y="412.64935"
+     x="711.28497" /><rect
+     id="rect61-1-74"
+     style="clip-rule:evenodd;fill:#999999;fill-rule:evenodd;stroke-width:0.14877094;stroke-linejoin:round;stroke-miterlimit:1.41420996"
+     height="7.9896255"
+     width="55.276028"
+     y="277.78107"
+     x="118.23441" /><rect
+     id="rect61-1-74-1"
+     style="clip-rule:evenodd;fill:#999999;fill-rule:evenodd;stroke-width:0.14877094;stroke-linejoin:round;stroke-miterlimit:1.41420996"
+     height="7.9896255"
+     width="55.276028"
+     y="325.78107"
+     x="118.23441" /><rect
+     id="rect61-1-74-8"
+     style="clip-rule:evenodd;fill:#999999;fill-rule:evenodd;stroke-width:0.14877094;stroke-linejoin:round;stroke-miterlimit:1.41420996"
+     height="7.9896255"
+     width="55.276028"
+     y="375.78107"
+     x="118.23441" /><rect
+     id="rect61-1-74-5"
+     style="clip-rule:evenodd;fill:#999999;fill-rule:evenodd;stroke-width:0.14877094;stroke-linejoin:round;stroke-miterlimit:1.41420996"
+     height="7.9896255"
+     width="55.276028"
+     y="423.78107"
+     x="118.23441" /><rect
+     x="416.23441"
+     y="277.78107"
+     width="55.276028"
+     height="7.9896255"
+     style="clip-rule:evenodd;fill:#999999;fill-rule:evenodd;stroke-width:0.14877094;stroke-linejoin:round;stroke-miterlimit:1.41420996"
+     id="rect61-1-74-9" /><rect
+     x="416.23441"
+     y="325.78107"
+     width="55.276028"
+     height="7.9896255"
+     style="clip-rule:evenodd;fill:#999999;fill-rule:evenodd;stroke-width:0.14877094;stroke-linejoin:round;stroke-miterlimit:1.41420996"
+     id="rect61-1-74-1-7" /><rect
+     x="416.23441"
+     y="375.78107"
+     width="55.276028"
+     height="7.9896255"
+     style="clip-rule:evenodd;fill:#999999;fill-rule:evenodd;stroke-width:0.14877094;stroke-linejoin:round;stroke-miterlimit:1.41420996"
+     id="rect61-1-74-8-5" /><rect
+     x="416.23441"
+     y="423.78107"
+     width="55.276028"
+     height="7.9896255"
+     style="clip-rule:evenodd;fill:#999999;fill-rule:evenodd;stroke-width:0.14877094;stroke-linejoin:round;stroke-miterlimit:1.41420996"
+     id="rect61-1-74-5-3" /><rect
+     x="711.61151"
+     y="277.78107"
+     width="55.276028"
+     height="7.9896255"
+     style="clip-rule:evenodd;fill:#999999;fill-rule:evenodd;stroke-width:0.14877094;stroke-linejoin:round;stroke-miterlimit:1.41420996"
+     id="rect61-1-74-88" /><rect
+     x="711.61151"
+     y="325.78107"
+     width="55.276028"
+     height="7.9896255"
+     style="clip-rule:evenodd;fill:#999999;fill-rule:evenodd;stroke-width:0.14877094;stroke-linejoin:round;stroke-miterlimit:1.41420996"
+     id="rect61-1-74-1-3" /><rect
+     x="711.61151"
+     y="375.78107"
+     width="55.276028"
+     height="7.9896255"
+     style="clip-rule:evenodd;fill:#999999;fill-rule:evenodd;stroke-width:0.14877094;stroke-linejoin:round;stroke-miterlimit:1.41420996"
+     id="rect61-1-74-8-1" /><rect
+     x="711.61151"
+     y="423.78107"
+     width="55.276028"
+     height="7.9896255"
+     style="clip-rule:evenodd;fill:#999999;fill-rule:evenodd;stroke-width:0.14877094;stroke-linejoin:round;stroke-miterlimit:1.41420996"
+     id="rect61-1-74-5-8" /><g
+     transform="matrix(0.21365365,0,0,0.21365365,78.744206,25.200811)"
+     id="g30-6"
+     style="clip-rule:evenodd;fill-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41420996" /><path
+     id="path4774"
+     d="m 164.25425,199.44842 h 29.82466 v 29.82465 h -29.82466 z"
+     inkscape:connector-curvature="0"
+     style="fill:none;stroke-width:0.27006823" /><g
+     id="g6583"><g
+       transform="matrix(0.21365323,0,0,0.21365323,78.88114,27.197053)"
+       id="g15-2"
+       style="clip-rule:evenodd;fill:#ffffff;fill-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41420996"><circle
+         cx="574.073"
+         cy="625.35199"
+         r="78.713997"
+         style="fill:#ffffff"
+         id="circle13-2" /></g><path
+       inkscape:connector-curvature="0"
+       id="circle28"
+       d="m 195.93506,149.36633 c -0.15844,0 -0.31713,0.0632 -0.4414,0.1875 -0.24854,0.24854 -0.24854,0.63232 0,0.88086 l 1.6289,1.6289 c -1.83919,1.35454 -3.04492,3.529 -3.04492,6.00196 h 14.91211 c 0,-2.47296 -1.20626,-4.65914 -3.07031,-6.01367 l 1.61718,-1.61719 c 0.24855,-0.24854 0.24856,-0.63232 0,-0.88086 -0.24852,-0.24854 -0.63427,-0.24854 -0.88281,0 l -1.83984,1.83789 c -0.98173,-0.49708 -2.10068,-0.78125 -3.28125,-0.78125 -1.19298,0 -2.31054,0.28417 -3.30469,0.78125 l -1.85156,-1.83789 c -0.12427,-0.12427 -0.28296,-0.1875 -0.44141,-0.1875 z m 1.8711,4.9707 h 1.24218 v 1.24414 h -1.24218 z m 6.21289,0 h 1.24218 v 1.24414 h -1.24218 z m -13.04883,4.9707 c -1.03144,0 -1.86328,0.8338 -1.86328,1.86524 v 8.69922 c 0,1.03143 0.83184,1.86328 1.86328,1.86328 1.03143,0 1.86523,-0.83185 1.86523,-1.86328 v -8.69922 c 0,-1.03144 -0.8338,-1.86524 -1.86523,-1.86524 z m 3.10742,0 v 12.42774 c 0,0.68348 0.55871,1.24219 1.24219,1.24219 h 1.24219 v 3.85937 a 16.817533,16.817533 0 0 0 3.70507,0.71875 c 0.009,-0.0756 0.0234,-0.15032 0.0234,-0.22851 v -4.34961 h 2.48633 v 4.34961 c 0,0.0742 0.0131,0.14493 0.0215,0.21679 a 16.817533,16.817533 0 0 0 3.70508,-0.68945 v -3.87695 h 1.24414 c 0.68348,0 1.24219,-0.55871 1.24219,-1.24219 v -12.42774 z m 18.01953,0 c -1.03143,0 -1.86523,0.8338 -1.86523,1.86524 v 8.69922 c 0,1.03143 0.8338,1.86328 1.86523,1.86328 1.03144,0 1.86328,-0.83185 1.86328,-1.86328 v -8.69922 c 0,-1.03144 -0.83184,-1.86524 -1.86328,-1.86524 z"
+       style="clip-rule:evenodd;fill:#000080;fill-rule:evenodd;stroke-width:0.21365365;stroke-linejoin:round;stroke-miterlimit:1.41420996" /></g><g
+     transform="matrix(1.4733232,0,0,1.4733445,329.21219,-66.328035)"
+     style="clip-rule:evenodd;fill-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41420996"
+     id="g6531-9"><g
+       transform="matrix(0.2671078,0,0,0.2671078,108.34819,9.708349)"
+       id="g49-2"
+       style="clip-rule:evenodd;fill-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41420996"><clipPath
+         id="clipPath4603-88"><circle
+           cx="495.35901"
+           cy="567.229"
+           r="62.962002"
+           id="circle4601-8" /></clipPath><g
+         clip-path="url(#_clip4-8)"
+         id="g47-6"><g
+           transform="matrix(0.799878,0,0,0.799878,36.1705,67.0232)"
+           id="g45-8"><circle
+             cx="574.073"
+             cy="625.35199"
+             r="78.713997"
+             style="fill:#008000"
+             id="circle43-3" /></g></g></g><g
+       transform="matrix(1.0324198,0,0,1.0324198,83.105727,-197.79768)"
+       id="g53-8"
+       style="clip-rule:evenodd;fill-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41420996"><path
+         inkscape:connector-curvature="0"
+         d="m 152.608,331.455 c -8.994,0 -16.288,7.293 -16.288,16.29 0,7.197 4.667,13.302 11.14,15.456 0.815,0.15 1.112,-0.353 1.112,-0.785 0,-0.387 -0.014,-1.411 -0.022,-2.77 -4.531,0.984 -5.487,-2.184 -5.487,-2.184 -0.741,-1.882 -1.809,-2.383 -1.809,-2.383 -1.479,-1.01 0.112,-0.99 0.112,-0.99 1.635,0.115 2.495,1.679 2.495,1.679 1.453,2.489 3.813,1.77 4.741,1.353 0.148,-1.052 0.569,-1.77 1.034,-2.177 -3.617,-0.411 -7.42,-1.809 -7.42,-8.051 0,-1.778 0.635,-3.233 1.677,-4.371 -0.168,-0.412 -0.727,-2.069 0.16,-4.311 0,0 1.367,-0.438 4.479,1.67 1.299,-0.362 2.693,-0.542 4.078,-0.549 1.384,0.007 2.777,0.187 4.078,0.549 3.11,-2.108 4.475,-1.67 4.475,-1.67 0.889,2.242 0.33,3.899 0.163,4.311 1.044,1.138 1.674,2.593 1.674,4.371 0,6.258 -3.809,7.635 -7.437,8.038 0.584,0.503 1.105,1.497 1.105,3.016 0,2.178 -0.02,3.935 -0.02,4.469 0,0.436 0.294,0.943 1.12,0.784 6.468,-2.159 11.131,-8.26 11.131,-15.455 0,-8.997 -7.294,-16.29 -16.291,-16.29 z"
+         style="fill:#ffffff"
+         id="path51-3" /></g></g><g
+     style="clip-rule:evenodd;fill-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41420996"
+     id="g23-0"
+     transform="matrix(0.26710728,0,0,0.26710555,365.8493,9.7096255)"><clipPath
+       id="clipPath4583-47"><circle
+         id="circle4581-68"
+         r="62.962002"
+         cy="567.229"
+         cx="495.35901" /></clipPath><g
+       id="g21-3-9"
+       clip-path="url(#_clip2-3)"><g
+         id="g15-0"
+         transform="matrix(0.799878,0,0,0.799878,36.1705,67.0232)"><circle
+           id="circle13-6"
+           style="fill:#ffffff"
+           r="78.713997"
+           cy="625.35199"
+           cx="574.073" /></g><g
+         id="g19-8"
+         transform="matrix(7.083,0,0,7.083,436.553,523.945)"><path
+           id="path17-7"
+           style="fill:#ff0000;fill-rule:nonzero"
+           d="M 8.404,1 C 6.672,1 5.204,2.266 5.204,3.9 5.216,4.416 5.262,5.053 5.57,6.4 V 6.433 L 5.604,6.467 C 5.703,6.75 5.847,6.912 6.037,7.133 6.227,7.354 6.454,7.615 6.67,7.833 6.696,7.859 6.712,7.875 6.737,7.9 6.78,8.086 6.832,8.287 6.87,8.467 6.973,8.945 6.963,9.284 6.937,9.4 c -0.744,0.261 -1.669,0.572 -2.5,0.933 -0.466,0.203 -0.888,0.384 -1.233,0.6 -0.345,0.217 -0.688,0.38 -0.8,0.867 -0.16,0.633 -0.199,0.754 -0.4,1.533 -0.027,0.209 0.083,0.43 0.267,0.534 1.508,0.814 3.824,1.142 6.133,1.133 2.309,-0.009 4.606,-0.356 6.066,-1.133 0.117,-0.074 0.143,-0.109 0.133,-0.234 C 14.56,12.944 14.522,12.266 14.47,11.867 14.452,11.768 14.405,11.674 14.337,11.6 13.873,11.046 13.18,10.708 12.37,10.367 c -0.74,-0.312 -1.607,-0.635 -2.466,-1 -0.049,-0.107 -0.096,-0.419 0,-0.9 0.025,-0.129 0.066,-0.268 0.1,-0.4 0.08,-0.091 0.143,-0.165 0.233,-0.267 0.191,-0.218 0.396,-0.447 0.566,-0.667 0.171,-0.22 0.31,-0.408 0.4,-0.666 l 0.034,-0.034 c 0.348,-1.406 0.348,-1.992 0.366,-2.5 V 3.9 C 11.603,2.266 10.135,1 8.404,1 Z"
+           inkscape:connector-curvature="0" /></g></g></g><g
+     transform="matrix(1.4733462,0,0,1.4733462,91.26142,-65.718162)"
+     style="clip-rule:evenodd;fill-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41420996"
+     id="g6583-9"><g
+       transform="matrix(0.21365323,0,0,0.21365323,78.88114,27.197053)"
+       id="g15-2-0"
+       style="clip-rule:evenodd;fill:#ffffff;fill-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41420996"><circle
+         cx="574.073"
+         cy="625.35199"
+         r="78.713997"
+         style="fill:#ffffff"
+         id="circle13-2-3" /></g><path
+       inkscape:connector-curvature="0"
+       id="circle28-3"
+       d="m 195.93506,149.36633 c -0.15844,0 -0.31713,0.0632 -0.4414,0.1875 -0.24854,0.24854 -0.24854,0.63232 0,0.88086 l 1.6289,1.6289 c -1.83919,1.35454 -3.04492,3.529 -3.04492,6.00196 h 14.91211 c 0,-2.47296 -1.20626,-4.65914 -3.07031,-6.01367 l 1.61718,-1.61719 c 0.24855,-0.24854 0.24856,-0.63232 0,-0.88086 -0.24852,-0.24854 -0.63427,-0.24854 -0.88281,0 l -1.83984,1.83789 c -0.98173,-0.49708 -2.10068,-0.78125 -3.28125,-0.78125 -1.19298,0 -2.31054,0.28417 -3.30469,0.78125 l -1.85156,-1.83789 c -0.12427,-0.12427 -0.28296,-0.1875 -0.44141,-0.1875 z m 1.8711,4.9707 h 1.24218 v 1.24414 h -1.24218 z m 6.21289,0 h 1.24218 v 1.24414 h -1.24218 z m -13.04883,4.9707 c -1.03144,0 -1.86328,0.8338 -1.86328,1.86524 v 8.69922 c 0,1.03143 0.83184,1.86328 1.86328,1.86328 1.03143,0 1.86523,-0.83185 1.86523,-1.86328 v -8.69922 c 0,-1.03144 -0.8338,-1.86524 -1.86523,-1.86524 z m 3.10742,0 v 12.42774 c 0,0.68348 0.55871,1.24219 1.24219,1.24219 h 1.24219 v 3.85937 a 16.817533,16.817533 0 0 0 3.70507,0.71875 c 0.009,-0.0756 0.0234,-0.15032 0.0234,-0.22851 v -4.34961 h 2.48633 v 4.34961 c 0,0.0742 0.0131,0.14493 0.0215,0.21679 a 16.817533,16.817533 0 0 0 3.70508,-0.68945 v -3.87695 h 1.24414 c 0.68348,0 1.24219,-0.55871 1.24219,-1.24219 v -12.42774 z m 18.01953,0 c -1.03143,0 -1.86523,0.8338 -1.86523,1.86524 v 8.69922 c 0,1.03143 0.8338,1.86328 1.86523,1.86328 1.03144,0 1.86328,-0.83185 1.86328,-1.86328 v -8.69922 c 0,-1.03144 -0.83184,-1.86524 -1.86328,-1.86524 z"
+       style="clip-rule:evenodd;fill:#000080;fill-rule:evenodd;stroke-width:0.21365365;stroke-linejoin:round;stroke-miterlimit:1.41420996" /></g><g
+     transform="translate(297.45498,-0.413993)"
+     style="clip-rule:evenodd;fill-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41420996"
+     id="g6531-2"><g
+       transform="matrix(0.2671078,0,0,0.2671078,108.34819,9.708349)"
+       id="g49-6"
+       style="clip-rule:evenodd;fill-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41420996"><clipPath
+         id="clipPath4603-5"><circle
+           cx="495.35901"
+           cy="567.229"
+           r="62.962002"
+           id="circle4601-2" /></clipPath><g
+         clip-path="url(#_clip4-37)"
+         id="g47-65"><g
+           transform="matrix(0.799878,0,0,0.799878,36.1705,67.0232)"
+           id="g45-87"><circle
+             cx="574.073"
+             cy="625.35199"
+             r="78.713997"
+             style="fill:#008000"
+             id="circle43-9" /></g></g></g><g
+       transform="matrix(1.0324198,0,0,1.0324198,83.105727,-197.79768)"
+       id="g53-6"
+       style="clip-rule:evenodd;fill-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41420996"><path
+         inkscape:connector-curvature="0"
+         d="m 152.608,331.455 c -8.994,0 -16.288,7.293 -16.288,16.29 0,7.197 4.667,13.302 11.14,15.456 0.815,0.15 1.112,-0.353 1.112,-0.785 0,-0.387 -0.014,-1.411 -0.022,-2.77 -4.531,0.984 -5.487,-2.184 -5.487,-2.184 -0.741,-1.882 -1.809,-2.383 -1.809,-2.383 -1.479,-1.01 0.112,-0.99 0.112,-0.99 1.635,0.115 2.495,1.679 2.495,1.679 1.453,2.489 3.813,1.77 4.741,1.353 0.148,-1.052 0.569,-1.77 1.034,-2.177 -3.617,-0.411 -7.42,-1.809 -7.42,-8.051 0,-1.778 0.635,-3.233 1.677,-4.371 -0.168,-0.412 -0.727,-2.069 0.16,-4.311 0,0 1.367,-0.438 4.479,1.67 1.299,-0.362 2.693,-0.542 4.078,-0.549 1.384,0.007 2.777,0.187 4.078,0.549 3.11,-2.108 4.475,-1.67 4.475,-1.67 0.889,2.242 0.33,3.899 0.163,4.311 1.044,1.138 1.674,2.593 1.674,4.371 0,6.258 -3.809,7.635 -7.437,8.038 0.584,0.503 1.105,1.497 1.105,3.016 0,2.178 -0.02,3.935 -0.02,4.469 0,0.436 0.294,0.943 1.12,0.784 6.468,-2.159 11.131,-8.26 11.131,-15.455 0,-8.997 -7.294,-16.29 -16.291,-16.29 z"
+         style="fill:#ffffff"
+         id="path51-04" /></g></g><g
+     transform="translate(632.17926,0.413993)"
+     style="clip-rule:evenodd;fill-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41420996"
+     id="g6583-1"><g
+       transform="matrix(0.21365323,0,0,0.21365323,78.88114,27.197053)"
+       id="g15-2-04"
+       style="clip-rule:evenodd;fill:#ffffff;fill-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41420996"><circle
+         cx="574.073"
+         cy="625.35199"
+         r="78.713997"
+         style="fill:#ffffff"
+         id="circle13-2-8" /></g><path
+       inkscape:connector-curvature="0"
+       id="circle28-7"
+       d="m 195.93506,149.36633 c -0.15844,0 -0.31713,0.0632 -0.4414,0.1875 -0.24854,0.24854 -0.24854,0.63232 0,0.88086 l 1.6289,1.6289 c -1.83919,1.35454 -3.04492,3.529 -3.04492,6.00196 h 14.91211 c 0,-2.47296 -1.20626,-4.65914 -3.07031,-6.01367 l 1.61718,-1.61719 c 0.24855,-0.24854 0.24856,-0.63232 0,-0.88086 -0.24852,-0.24854 -0.63427,-0.24854 -0.88281,0 l -1.83984,1.83789 c -0.98173,-0.49708 -2.10068,-0.78125 -3.28125,-0.78125 -1.19298,0 -2.31054,0.28417 -3.30469,0.78125 l -1.85156,-1.83789 c -0.12427,-0.12427 -0.28296,-0.1875 -0.44141,-0.1875 z m 1.8711,4.9707 h 1.24218 v 1.24414 h -1.24218 z m 6.21289,0 h 1.24218 v 1.24414 h -1.24218 z m -13.04883,4.9707 c -1.03144,0 -1.86328,0.8338 -1.86328,1.86524 v 8.69922 c 0,1.03143 0.83184,1.86328 1.86328,1.86328 1.03143,0 1.86523,-0.83185 1.86523,-1.86328 v -8.69922 c 0,-1.03144 -0.8338,-1.86524 -1.86523,-1.86524 z m 3.10742,0 v 12.42774 c 0,0.68348 0.55871,1.24219 1.24219,1.24219 h 1.24219 v 3.85937 a 16.817533,16.817533 0 0 0 3.70507,0.71875 c 0.009,-0.0756 0.0234,-0.15032 0.0234,-0.22851 v -4.34961 h 2.48633 v 4.34961 c 0,0.0742 0.0131,0.14493 0.0215,0.21679 a 16.817533,16.817533 0 0 0 3.70508,-0.68945 v -3.87695 h 1.24414 c 0.68348,0 1.24219,-0.55871 1.24219,-1.24219 v -12.42774 z m 18.01953,0 c -1.03143,0 -1.86523,0.8338 -1.86523,1.86524 v 8.69922 c 0,1.03143 0.8338,1.86328 1.86523,1.86328 1.03144,0 1.86328,-0.83185 1.86328,-1.86328 v -8.69922 c 0,-1.03144 -0.83184,-1.86524 -1.86328,-1.86524 z"
+       style="clip-rule:evenodd;fill:#000080;fill-rule:evenodd;stroke-width:0.21365365;stroke-linejoin:round;stroke-miterlimit:1.41420996" /></g><g
+     style="clip-rule:evenodd;fill-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41420996"
+     id="g23-0-6"
+     transform="matrix(0.26710728,0,0,0.26710555,661.44502,9.709626)"><clipPath
+       id="clipPath4583-47-2"><circle
+         id="circle4581-68-4"
+         r="62.962002"
+         cy="567.229"
+         cx="495.35901" /></clipPath><g
+       id="g21-3-9-7"
+       clip-path="url(#_clip2-3-0)"><g
+         id="g15-0-9"
+         transform="matrix(0.799878,0,0,0.799878,36.1705,67.0232)"><circle
+           id="circle13-6-3"
+           style="fill:#ffffff"
+           r="78.713997"
+           cy="625.35199"
+           cx="574.073" /></g><g
+         id="g19-8-9"
+         transform="matrix(7.083,0,0,7.083,436.553,523.945)"><path
+           id="path17-7-2"
+           style="fill:#ff0000;fill-rule:nonzero"
+           d="M 8.404,1 C 6.672,1 5.204,2.266 5.204,3.9 5.216,4.416 5.262,5.053 5.57,6.4 V 6.433 L 5.604,6.467 C 5.703,6.75 5.847,6.912 6.037,7.133 6.227,7.354 6.454,7.615 6.67,7.833 6.696,7.859 6.712,7.875 6.737,7.9 6.78,8.086 6.832,8.287 6.87,8.467 6.973,8.945 6.963,9.284 6.937,9.4 c -0.744,0.261 -1.669,0.572 -2.5,0.933 -0.466,0.203 -0.888,0.384 -1.233,0.6 -0.345,0.217 -0.688,0.38 -0.8,0.867 -0.16,0.633 -0.199,0.754 -0.4,1.533 -0.027,0.209 0.083,0.43 0.267,0.534 1.508,0.814 3.824,1.142 6.133,1.133 2.309,-0.009 4.606,-0.356 6.066,-1.133 0.117,-0.074 0.143,-0.109 0.133,-0.234 C 14.56,12.944 14.522,12.266 14.47,11.867 14.452,11.768 14.405,11.674 14.337,11.6 13.873,11.046 13.18,10.708 12.37,10.367 c -0.74,-0.312 -1.607,-0.635 -2.466,-1 -0.049,-0.107 -0.096,-0.419 0,-0.9 0.025,-0.129 0.066,-0.268 0.1,-0.4 0.08,-0.091 0.143,-0.165 0.233,-0.267 0.191,-0.218 0.396,-0.447 0.566,-0.667 0.171,-0.22 0.31,-0.408 0.4,-0.666 l 0.034,-0.034 c 0.348,-1.406 0.348,-1.992 0.366,-2.5 V 3.9 C 11.603,2.266 10.135,1 8.404,1 Z"
+           inkscape:connector-curvature="0" /></g></g></g></svg>

scripts/lint/lint-results.txt

@@ -1,2 +1,2 @@
 DO NOT TOUCH; GENERATED BY DRONE
-      <span class="mdl-layout-title">Lint Report: 1 error and 578 warnings</span>
+      <span class="mdl-layout-title">Lint Report: 1 error and 581 warnings</span>

src/gplay/AndroidManifest.xml

@@ -19,8 +19,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools"
           package="com.owncloud.android"
-          android:versionCode="20000002"
-          android:versionName="2.0.0RC2">
+          android:versionCode="20000003"
+          android:versionName="2.0.0RC3">
 
     <application
         android:name=".MainApp"

src/main/AndroidManifest.xml

@@ -20,8 +20,8 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.owncloud.android"
-          android:versionCode="20000002"
-          android:versionName="2.0.0RC2">
+          android:versionCode="20000003"
+          android:versionName="2.0.0RC3">
 
     <uses-sdk
         android:minSdkVersion="14"

src/main/java/com/owncloud/android/MainApp.java

@@ -219,6 +219,17 @@ public class MainApp extends MultiDexApplication {
         }
     }
 
+    // Non gradle build systems do not provide BuildConfig.VERSION_CODE
+    // so we must fallback to this method :(
+    public static String getVersionName() {
+        try {
+            String thisPackageName = getAppContext().getPackageName();
+            return getAppContext().getPackageManager().getPackageInfo(thisPackageName, 0).versionName;
+        } catch (PackageManager.NameNotFoundException e) {
+            return "";
+        }
+    }
+
     //  From AccountAuthenticator 
     //  public static final String AUTHORITY = "org.owncloud";
     public static String getAuthority() {

src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java

@@ -68,6 +68,7 @@ import android.text.Editable;
 import android.text.InputType;
 import android.text.TextUtils;
 import android.text.TextWatcher;
+import android.util.AndroidRuntimeException;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
@@ -340,13 +341,17 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
     }
 
     private void deleteCookies() {
-        CookieSyncManager.createInstance(this);
-        CookieManager cookieManager = CookieManager.getInstance();
+        try {
+            CookieSyncManager.createInstance(this);
+            CookieManager cookieManager = CookieManager.getInstance();
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            cookieManager.removeAllCookies(null);
-        } else {
-            cookieManager.removeAllCookie();
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                cookieManager.removeAllCookies(null);
+            } else {
+                cookieManager.removeAllCookie();
+            }
+        } catch (AndroidRuntimeException e) {
+            Log_OC.e(TAG, e.getMessage());
         }
     }
 

src/main/java/com/owncloud/android/datamodel/MediaProvider.java

@@ -128,7 +128,8 @@ public class MediaProvider {
                         filePath = cursorImages.getString(cursorImages.getColumnIndexOrThrow(
                                 MediaStore.MediaColumns.DATA));
 
-                        if (filePath != null) {
+                        // check if valid path
+                        if (filePath != null && filePath.lastIndexOf("/") > 0) {
                             mediaFolder.filePaths.add(filePath);
                             mediaFolder.absolutePath = filePath.substring(0, filePath.lastIndexOf("/"));
                         }

src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java

@@ -43,6 +43,7 @@ import com.owncloud.android.authentication.AccountUtils;
 import com.owncloud.android.lib.common.OwnCloudAccount;
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.OwnCloudClientManagerFactory;
+import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.status.OwnCloudVersion;
 import com.owncloud.android.ui.adapter.DiskLruImageCache;
@@ -352,6 +353,10 @@ public class ThumbnailsCacheManager {
                                 getMethod = new GetMethod(uri);
                                 getMethod.setRequestHeader("Cookie",
                                         "nc_sameSiteCookielax=true;nc_sameSiteCookiestrict=true");
+
+                                getMethod.setRequestHeader(RemoteOperation.OCS_API_HEADER,
+                                        RemoteOperation.OCS_API_HEADER_VALUE);
+
                                 int status = mClient.executeMethod(getMethod);
                                 if (status == HttpStatus.SC_OK) {
                                     InputStream inputStream = getMethod.getResponseBodyAsStream();

src/main/java/com/owncloud/android/db/ProviderMeta.java

@@ -32,7 +32,7 @@ import com.owncloud.android.MainApp;
 public class ProviderMeta {
 
     public static final String DB_NAME = "filelist";
-    public static final int DB_VERSION = 23;
+    public static final int DB_VERSION = 24;
 
     private ProviderMeta() {
     }

src/main/java/com/owncloud/android/features/FeatureList.java

@@ -38,9 +38,11 @@ import java.util.regex.Pattern;
  */
 public class FeatureList {
     private static final boolean SHOW_ON_FIRST_RUN = true;
+    private static final boolean SHOW_ON_UPGRADE = false;
 
-    private static final String VERSION_1_0_0 = "1.0.0";
-    private static final String BETA_VERSION_0 = "0";
+    private static final int VERSION_1_0_0 = 10000099;
+    private static final int VERSION_2_0_0 = 20000099;
+    private static final int BETA_VERSION_0 = 0;
 
     static final private FeatureItem featuresList[] = {
             // Basic features showed on first install
@@ -50,10 +52,20 @@ public class FeatureList {
             new FeatureItem(R.drawable.whats_new_accounts,
                     R.string.welcome_feature_2_title, R.string.welcome_feature_2_text,
                     VERSION_1_0_0, BETA_VERSION_0, SHOW_ON_FIRST_RUN),
-            new FeatureItem(R.drawable.what_new_instant_upload,
+            new FeatureItem(R.drawable.whats_new_auto_upload,
                     R.string.welcome_feature_3_title, R.string.welcome_feature_3_text,
                     VERSION_1_0_0, BETA_VERSION_0, SHOW_ON_FIRST_RUN),
-            // Features introduced in certain point in time
+            // 2.0.0
+            new FeatureItem(R.drawable.whats_new_auto_upload, R.string.whats_new_auto_upload_title,
+                    R.string.whats_new_auto_upload_content, VERSION_2_0_0, BETA_VERSION_0, SHOW_ON_UPGRADE, false),
+            new FeatureItem(R.drawable.whats_new_search, R.string.whats_new_search_title,
+                    R.string.whats_new_search_content, VERSION_2_0_0, BETA_VERSION_0, SHOW_ON_UPGRADE, false),
+            new FeatureItem(R.drawable.whats_new_theming, R.string.whats_new_theming_title,
+                    R.string.whats_new_theming_content, VERSION_2_0_0, BETA_VERSION_0, SHOW_ON_UPGRADE, false),
+            new FeatureItem(R.drawable.whats_new_notification, R.string.whats_new_notification_title,
+                    R.string.whats_new_notification_content, VERSION_2_0_0, BETA_VERSION_0, SHOW_ON_UPGRADE, false),
+            new FeatureItem(R.drawable.whats_new_fingerprint, R.string.whats_new_fingerprint_title,
+                    R.string.whats_new_fingerprint_content, VERSION_2_0_0, BETA_VERSION_0, SHOW_ON_UPGRADE, false)
     };
 
     static public FeatureItem[] get() {
@@ -64,7 +76,7 @@ public class FeatureList {
         List<FeatureItem> features = new LinkedList<>();
 
         for (FeatureItem item : get()) {
-            final int itemVersionCode = isBeta ? item.getBetaVersionNumber() : item.getVersionNumber();
+            final int itemVersionCode = isBeta ? item.getBetaVersionNumber() : item.getVersionCode();
             if (isFirstRun && item.shouldShowOnFirstRun()) {
                 features.add(item);
             } else if (!isFirstRun && !item.shouldShowOnFirstRun() &&
@@ -81,21 +93,29 @@ public class FeatureList {
         private int image;
         private int titleText;
         private int contentText;
-        private int versionNumber;
+        private int versionCode;
         private int betaVersion;
         private boolean showOnInitialRun;
+        private boolean contentCentered;
 
-        public FeatureItem(int image, int titleText, int contentText, String version, String betaVersion) {
-            this(image, titleText, contentText, version, betaVersion, false);
+        public FeatureItem(int image, int titleText, int contentText, int version, int betaVersion) {
+            this(image, titleText, contentText, version, betaVersion, false, true);
         }
 
-        public FeatureItem(int image, int titleText, int contentText, String version, String betaVersion, boolean showOnInitialRun) {
+        public FeatureItem(int image, int titleText, int contentText, int version, int betaVersion,
+                           boolean showOnInitialRun) {
+            this(image, titleText, contentText, version, betaVersion, showOnInitialRun, true);
+        }
+
+        public FeatureItem(int image, int titleText, int contentText, int versionCode, int betaVersion,
+                           boolean showOnInitialRun, boolean contentCentered) {
             this.image = image;
             this.titleText = titleText;
             this.contentText = contentText;
-            this.versionNumber = versionCodeFromString(version);
-            this.betaVersion = Integer.parseInt(betaVersion);
+            this.versionCode = versionCode;
+            this.betaVersion = betaVersion;
             this.showOnInitialRun = showOnInitialRun;
+            this.contentCentered = contentCentered;
         }
 
         public boolean shouldShowImage() { return image != DO_NOT_SHOW; }
@@ -107,10 +127,16 @@ public class FeatureList {
         public boolean shouldShowContentText() { return contentText != DO_NOT_SHOW; }
         public int getContentText() { return contentText; }
 
-        public int getVersionNumber() { return versionNumber; }
+        public int getVersionCode() {
+            return versionCode;
+        }
         public int getBetaVersionNumber() { return betaVersion; }
         public boolean shouldShowOnFirstRun() { return showOnInitialRun; }
 
+        public boolean shouldContentCentered() {
+            return contentCentered;
+        }
+
         @Override
         public int describeContents() {
             return 0;
@@ -121,18 +147,20 @@ public class FeatureList {
             dest.writeInt(image);
             dest.writeInt(titleText);
             dest.writeInt(contentText);
-            dest.writeInt(versionNumber);
+            dest.writeInt(versionCode);
             dest.writeInt(betaVersion);
             dest.writeByte((byte) (showOnInitialRun ? 1 : 0));
+            dest.writeByte((byte) (contentCentered ? 1 : 0));
         }
 
         private FeatureItem(Parcel p) {
             image = p.readInt();
             titleText = p.readInt();
             contentText = p.readInt();
-            versionNumber = p.readInt();
+            versionCode = p.readInt();
             betaVersion = p.readInt();
             showOnInitialRun = p.readByte() == 1;
+            contentCentered = p.readByte() == 1;
         }
         public static final Parcelable.Creator CREATOR =
                 new Parcelable.Creator() {
@@ -156,7 +184,7 @@ public class FeatureList {
             return 0;
         }
         return Integer.parseInt(v[0])*(int)(10e6) +
-                Integer.parseInt(v[1])*(int)(10e4) +
+                Integer.parseInt(v[1])*(int)(10e3) +
                 Integer.parseInt(v[2])*100;
     }
 }

src/main/java/com/owncloud/android/providers/FileContentProvider.java

@@ -43,7 +43,6 @@ import android.text.TextUtils;
 import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 import com.owncloud.android.datamodel.OCFile;
-import com.owncloud.android.datamodel.UploadsStorageManager;
 import com.owncloud.android.db.ProviderMeta;
 import com.owncloud.android.db.ProviderMeta.ProviderTableMeta;
 import com.owncloud.android.lib.common.accounts.AccountUtils;
@@ -1067,19 +1066,34 @@ public class FileContentProvider extends ContentProvider {
                 db.beginTransaction();
                 try {
                     // add type column default being CUSTOM (0)
-                    Log_OC.i(SQL, "Add type column and default value 0 (CUSTOM) to synced_folders table");
-                    db.execSQL(ALTER_TABLE + ProviderTableMeta.SYNCED_FOLDERS_TABLE_NAME +
-                            ADD_COLUMN + ProviderTableMeta.SYNCED_FOLDER_TYPE +
-                            " INTEGER " + " DEFAULT 0");
+                    if (!checkIfColumnExists(db, ProviderTableMeta.SYNCED_FOLDERS_TABLE_NAME,
+                            ProviderTableMeta.SYNCED_FOLDER_TYPE)) {
+                        Log_OC.i(SQL, "Add type column and default value 0 (CUSTOM) to synced_folders table");
+                        db.execSQL(ALTER_TABLE + ProviderTableMeta.SYNCED_FOLDERS_TABLE_NAME +
+                                ADD_COLUMN + ProviderTableMeta.SYNCED_FOLDER_TYPE +
+                                " INTEGER " + " DEFAULT 0");
+                    } else {
+                        Log_OC.i(SQL, "Type column of synced_folders table already exists");
+                    }
 
-                    Log_OC.i(SQL, "Add charging and wifi columns to uploads");
-                    db.execSQL(ALTER_TABLE + ProviderTableMeta.UPLOADS_TABLE_NAME +
-                            ADD_COLUMN + ProviderTableMeta.UPLOADS_IS_WIFI_ONLY +
-                            " INTEGER " + " DEFAULT 0");
+                    if (!checkIfColumnExists(db, ProviderTableMeta.SYNCED_FOLDERS_TABLE_NAME,
+                            ProviderTableMeta.UPLOADS_IS_WIFI_ONLY)) {
+                        Log_OC.i(SQL, "Add charging and wifi columns to uploads");
+                        db.execSQL(ALTER_TABLE + ProviderTableMeta.UPLOADS_TABLE_NAME +
+                                ADD_COLUMN + ProviderTableMeta.UPLOADS_IS_WIFI_ONLY +
+                                " INTEGER " + " DEFAULT 0");
+                    } else {
+                        Log_OC.i(SQL, "Wifi column of synced_folders table already exists");
+                    }
 
-                    db.execSQL(ALTER_TABLE + ProviderTableMeta.UPLOADS_TABLE_NAME +
-                            ADD_COLUMN + ProviderTableMeta.UPLOADS_IS_WHILE_CHARGING_ONLY +
-                            " INTEGER " + " DEFAULT 0");
+                    if (!checkIfColumnExists(db, ProviderTableMeta.SYNCED_FOLDERS_TABLE_NAME,
+                            ProviderTableMeta.UPLOADS_IS_WHILE_CHARGING_ONLY)) {
+                        db.execSQL(ALTER_TABLE + ProviderTableMeta.UPLOADS_TABLE_NAME +
+                                ADD_COLUMN + ProviderTableMeta.UPLOADS_IS_WHILE_CHARGING_ONLY +
+                                " INTEGER " + " DEFAULT 0");
+                    } else {
+                        Log_OC.i(SQL, "Charging column of synced_folders table already exists");
+                    }
 
                     // create Filesystem table
                     Log_OC.i(SQL, "Create filesystem table");
@@ -1097,10 +1111,58 @@ public class FileContentProvider extends ContentProvider {
                 if (!upgraded) {
                     Log_OC.i(SQL, String.format(Locale.ENGLISH, UPGRADE_VERSION_MSG, oldVersion, newVersion));
                 }
+
+                if (oldVersion < 24 && newVersion >= 24) {
+                    Log_OC.i(SQL, "Entering in the #24 Re-adding user theming to capabilities table");
+                    db.beginTransaction();
+                    try {
+                        if (!checkIfColumnExists(db, ProviderTableMeta.CAPABILITIES_TABLE_NAME,
+                                ProviderTableMeta.CAPABILITIES_SERVER_NAME)) {
+                            db.execSQL(ALTER_TABLE + ProviderTableMeta.CAPABILITIES_TABLE_NAME +
+                                    ADD_COLUMN + ProviderTableMeta.CAPABILITIES_SERVER_NAME + " TEXT ");
+                        }
+
+                        if (!checkIfColumnExists(db, ProviderTableMeta.CAPABILITIES_TABLE_NAME,
+                                ProviderTableMeta.CAPABILITIES_SERVER_COLOR)) {
+                            db.execSQL(ALTER_TABLE + ProviderTableMeta.CAPABILITIES_TABLE_NAME +
+                                    ADD_COLUMN + ProviderTableMeta.CAPABILITIES_SERVER_COLOR + " TEXT ");
+                        }
+
+                        if (!checkIfColumnExists(db, ProviderTableMeta.CAPABILITIES_TABLE_NAME,
+                                ProviderTableMeta.CAPABILITIES_SERVER_BACKGROUND_URL)) {
+                            db.execSQL(ALTER_TABLE + ProviderTableMeta.CAPABILITIES_TABLE_NAME +
+                                    ADD_COLUMN + ProviderTableMeta.CAPABILITIES_SERVER_BACKGROUND_URL + " TEXT ");
+                        }
+
+                        if (!checkIfColumnExists(db, ProviderTableMeta.CAPABILITIES_TABLE_NAME,
+                                ProviderTableMeta.CAPABILITIES_SERVER_SLOGAN)) {
+                            db.execSQL(ALTER_TABLE + ProviderTableMeta.CAPABILITIES_TABLE_NAME +
+                                    ADD_COLUMN + ProviderTableMeta.CAPABILITIES_SERVER_SLOGAN + " TEXT ");
+                        }
+
+                        upgraded = true;
+                        db.setTransactionSuccessful();
+                    } finally {
+                        db.endTransaction();
+                    }
+                }
+
+                if (!upgraded) {
+                    Log_OC.i(SQL, String.format(Locale.ENGLISH, UPGRADE_VERSION_MSG, oldVersion, newVersion));
+                }
             }
         }
     }
 
+    private boolean checkIfColumnExists(SQLiteDatabase database, String table, String column) {
+        Cursor cursor = database.rawQuery("SELECT * FROM " + table + " LIMIT 0", null);
+        boolean exists = cursor.getColumnIndex(column) != -1;
+
+        cursor.close();
+
+        return exists;
+    }
+
     private void createFilesTable(SQLiteDatabase db) {
 
         db.execSQL("CREATE TABLE " + ProviderTableMeta.FILE_TABLE_NAME + "("

src/main/java/com/owncloud/android/ui/activity/UserInfoActivity.java

@@ -298,7 +298,7 @@ public class UserInfoActivity extends FileActivity {
                             .error(R.drawable.background)
                             .crossFade()
                             .into(target);
-                } else {
+                } else if (!background.isEmpty()) {
                     // plain color
                     int color = Color.parseColor(background);
                     appBar.setBackgroundColor(color);

src/main/java/com/owncloud/android/ui/activity/WhatsNewActivity.java

@@ -1,23 +1,23 @@
 /**
- *   Nextcloud Android client application
+ * Nextcloud Android client application
  *
- *   @author Bartosz Przybylski
- *   Copyright (C) 2015 Bartosz Przybylski
- *   Copyright (C) 2015 ownCloud Inc.
- *   Copyright (C) 2016 Nextcloud.
- *
- *   This program is free software; you can redistribute it and/or
- *   modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- *   License as published by the Free Software Foundation; either
- *   version 3 of the License, or any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- *   You should have received a copy of the GNU Affero General Public
- *   License along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * @author Bartosz Przybylski
+ * Copyright (C) 2015 Bartosz Przybylski
+ * Copyright (C) 2015 ownCloud Inc.
+ * Copyright (C) 2016 Nextcloud.
+ * <p>
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ * <p>
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 package com.owncloud.android.ui.activity;
@@ -36,6 +36,7 @@ import android.support.v4.app.FragmentActivity;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentPagerAdapter;
 import android.support.v4.view.ViewPager;
+import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -77,7 +78,7 @@ public class WhatsNewActivity extends FragmentActivity implements ViewPager.OnPa
         setContentView(R.layout.whats_new_activity);
 
         mProgress = (ProgressIndicator) findViewById(R.id.progressIndicator);
-        mPager = (ViewPager)findViewById(R.id.contentPanel);
+        mPager = (ViewPager) findViewById(R.id.contentPanel);
         final boolean isBeta = getResources().getBoolean(R.bool.is_beta);
         String[] urls = getResources().getStringArray(R.array.whatsnew_urls);
 
@@ -109,8 +110,8 @@ public class WhatsNewActivity extends FragmentActivity implements ViewPager.OnPa
             @Override
             public void onClick(View view) {
                 if (mProgress.hasNextStep()) {
-                    mPager.setCurrentItem(mPager.getCurrentItem()+1, true);
-                    mProgress.animateToStep(mPager.getCurrentItem()+1);
+                    mPager.setCurrentItem(mPager.getCurrentItem() + 1, true);
+                    mProgress.animateToStep(mPager.getCurrentItem() + 1);
                 } else {
                     onFinish();
                     finish();
@@ -134,14 +135,14 @@ public class WhatsNewActivity extends FragmentActivity implements ViewPager.OnPa
             }
         });
 
-        TextView tv = (TextView)findViewById(R.id.welcomeText);
+        TextView tv = (TextView) findViewById(R.id.welcomeText);
 
         if (showWebView) {
             tv.setText(R.string.app_name);
         } else if (isFirstRun()) {
             tv.setText(R.string.empty);
         } else {
-            tv.setText(R.string.whats_new_title);
+            tv.setText(String.format(getString(R.string.whats_new_title), MainApp.getVersionName()));
         }
 
         updateNextButtonIfNeeded();
@@ -205,8 +206,8 @@ public class WhatsNewActivity extends FragmentActivity implements ViewPager.OnPa
         return (isFirstRun() && context instanceof AccountAuthenticatorActivity) ||
                 (
                         !(isFirstRun() && (context instanceof FileDisplayActivity)) &&
-                        !(context instanceof PassCodeActivity) &&
-                        (FeatureList.getFiltered(getLastSeenVersionCode(), isFirstRun(), isBeta).length > 0)
+                                !(context instanceof PassCodeActivity) &&
+                                (FeatureList.getFiltered(getLastSeenVersionCode(), isFirstRun(), isBeta).length > 0)
                 );
     }
 
@@ -217,7 +218,7 @@ public class WhatsNewActivity extends FragmentActivity implements ViewPager.OnPa
 
     @Override
     public void onPageSelected(int position) {
-        mProgress.animateToStep(position+1);
+        mProgress.animateToStep(position + 1);
         updateNextButtonIfNeeded();
     }
 
@@ -284,7 +285,7 @@ public class WhatsNewActivity extends FragmentActivity implements ViewPager.OnPa
 
         private FeatureItem[] mFeatures;
 
-        public FeaturesViewAdapter(FragmentManager fm, FeatureItem[]features) {
+        public FeaturesViewAdapter(FragmentManager fm, FeatureItem[] features) {
             super(fm);
             mFeatures = features;
         }
@@ -314,7 +315,7 @@ public class WhatsNewActivity extends FragmentActivity implements ViewPager.OnPa
         @Override
         public void onCreate(@Nullable Bundle savedInstanceState) {
             super.onCreate(savedInstanceState);
-            mItem = getArguments() != null ? (FeatureItem)getArguments().getParcelable("feature") : null;
+            mItem = getArguments() != null ? (FeatureItem) getArguments().getParcelable("feature") : null;
         }
 
         @Nullable
@@ -324,19 +325,23 @@ public class WhatsNewActivity extends FragmentActivity implements ViewPager.OnPa
                                  @Nullable Bundle savedInstanceState) {
             View v = inflater.inflate(R.layout.whats_new_element, container, false);
 
-            ImageView iv = (ImageView)v.findViewById(R.id.whatsNewImage);
+            ImageView iv = (ImageView) v.findViewById(R.id.whatsNewImage);
             if (mItem.shouldShowImage()) {
                 iv.setImageResource(mItem.getImage());
             }
 
-            TextView tv2 = (TextView)v.findViewById(R.id.whatsNewTitle);
+            TextView tv2 = (TextView) v.findViewById(R.id.whatsNewTitle);
             if (mItem.shouldShowTitleText()) {
                 tv2.setText(mItem.getTitleText());
             }
 
-            tv2 = (TextView)v.findViewById(R.id.whatsNewText);
+            tv2 = (TextView) v.findViewById(R.id.whatsNewText);
             if (mItem.shouldShowContentText()) {
                 tv2.setText(mItem.getContentText());
+
+                if (!mItem.shouldContentCentered()) {
+                    tv2.setGravity(Gravity.START);
+                }
             }
 
             return v;

src/main/java/com/owncloud/android/ui/adapter/ActivityListAdapter.java

@@ -75,8 +75,8 @@ import java.util.List;
 
 public class ActivityListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
-    public static final int HEADER_TYPE = 100;
-    public static final int ACTIVITY_TYPE = 101;
+    private static final int HEADER_TYPE = 100;
+    private static final int ACTIVITY_TYPE = 101;
     private final ActivityListInterface activityListInterface;
     private final int px;
     private static final String TAG = ActivityListAdapter.class.getSimpleName();
@@ -101,7 +101,7 @@ public class ActivityListAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
         String sTime = "";
         for (Object o : activityItems) {
             Activity activity = (Activity) o;
-            String time = null;
+            String time;
             if (activity.getDatetime() != null) {
                 time = DisplayUtils.getRelativeTimestamp(context,
                         activity.getDatetime().getTime()).toString();
@@ -182,18 +182,15 @@ public class ActivityListAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
                 activityViewHolder.list.setVisibility(View.VISIBLE);
                 activityViewHolder.list.removeAllViews();
 
-                activityViewHolder.list.post(new Runnable() {
-                    @Override
-                    public void run() {
-                        int w = activityViewHolder.list.getMeasuredWidth();
-                        int elPxSize = px + 20;
-                        int totalColumnCount = (int) Math.floor(w / elPxSize);
-
-                        try {
-                            activityViewHolder.list.setColumnCount(totalColumnCount);
-                        } catch (IllegalArgumentException e) {
-                            Log_OC.e(TAG, "error setting column count to " + totalColumnCount);
-                        }
+                activityViewHolder.list.post(() -> {
+                    int w = activityViewHolder.list.getMeasuredWidth();
+                    int elPxSize = px + 20;
+                    int totalColumnCount = (int) Math.floor(w / elPxSize);
+
+                    try {
+                        activityViewHolder.list.setColumnCount(totalColumnCount);
+                    } catch (IllegalArgumentException e) {
+                        Log_OC.e(TAG, "error setting column count to " + totalColumnCount);
                     }
                 });
 
@@ -231,12 +228,7 @@ public class ActivityListAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
         params.setMargins(10, 10, 10, 10);
         ImageView imageView = new ImageView(context);
         imageView.setLayoutParams(params);
-        imageView.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                activityListInterface.onActivityClicked(richObject);
-            }
-        });
+        imageView.setOnClickListener(v -> activityListInterface.onActivityClicked(richObject));
         setBitmap(file, imageView);
 
         return imageView;
@@ -246,11 +238,19 @@ public class ActivityListAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
         // No Folder
         if (!file.isFolder()) {
             if ((MimeTypeUtil.isImage(file) || MimeTypeUtil.isVideo(file))) {
-                String uri = mClient.getBaseUri() + "" +
-                        "/index.php/apps/files/api/v1/thumbnail/" +
-                        px + "/" + px + Uri.encode(file.getRemotePath(), "/");
+                int placeholder;
 
-                Glide.with(context).using(new CustomGlideStreamLoader()).load(uri).into(fileIcon); //Using custom fetcher
+                if (MimeTypeUtil.isImage(file)) {
+                    placeholder = R.drawable.file_image;
+                } else {
+                    placeholder = R.drawable.file_movie;
+                }
+
+                String uri = mClient.getBaseUri() + "/index.php/apps/files/api/v1/thumbnail/" + px + "/" + px +
+                        Uri.encode(file.getRemotePath(), "/");
+
+                Glide.with(context).using(new CustomGlideStreamLoader()).load(uri).placeholder(placeholder)
+                        .error(placeholder).into(fileIcon); // using custom fetcher
 
             } else {
                 fileIcon.setImageDrawable(MimeTypeUtil.getFileTypeIcon(file.getMimetype(), file.getFileName(), null));
@@ -258,11 +258,8 @@ public class ActivityListAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
         } else {
             // Folder
             fileIcon.setImageDrawable(
-                    MimeTypeUtil.getFolderTypeIcon(
-                            file.isSharedWithMe() || file.isSharedWithSharee(),
-                            file.isSharedViaLink()
-                    )
-            );
+                    MimeTypeUtil.getFolderTypeIcon(file.isSharedWithMe() || file.isSharedWithSharee(),
+                            file.isSharedViaLink()));
         }
     }
 
@@ -278,8 +275,7 @@ public class ActivityListAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
                 .placeholder(R.drawable.ic_activity)
                 .error(R.drawable.ic_activity)
                 .animate(android.R.anim.fade_in)
-                .listener(new SvgSoftwareLayerSetter<Uri>());
-
+                .listener(new SvgSoftwareLayerSetter<>());
 
         Uri uri = Uri.parse(icon);
         requestBuilder
@@ -319,7 +315,7 @@ public class ActivityListAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
         return ssb;
     }
 
-    public RichObject searchObjectByName(ArrayList<RichObject> richObjectList, String name) {
+    private RichObject searchObjectByName(ArrayList<RichObject> richObjectList, String name) {
         for (RichObject richObject : richObjectList) {
             if (richObject.getTag().equalsIgnoreCase(name))
                 return richObject;

src/main/java/com/owncloud/android/utils/glide/HttpStreamFetcher.java

@@ -28,6 +28,7 @@ import com.owncloud.android.authentication.AccountUtils;
 import com.owncloud.android.lib.common.OwnCloudAccount;
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.OwnCloudClientManagerFactory;
+import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.status.OwnCloudVersion;
 
@@ -65,12 +66,11 @@ public class HttpStreamFetcher implements DataFetcher<InputStream> {
                 GetMethod get = null;
                 try {
                     get = new GetMethod(mURL);
-                    get.setRequestHeader("Cookie",
-                            "nc_sameSiteCookielax=true;nc_sameSiteCookiestrict=true");
+                    get.setRequestHeader("Cookie", "nc_sameSiteCookielax=true;nc_sameSiteCookiestrict=true");
+                    get.setRequestHeader(RemoteOperation.OCS_API_HEADER, RemoteOperation.OCS_API_HEADER_VALUE);
                     int status = mClient.executeMethod(get);
                     if (status == HttpStatus.SC_OK) {
-                        InputStream inputStream = get.getResponseBodyAsStream();
-                        return inputStream;
+                        return get.getResponseBodyAsStream();
                     } else {
                         mClient.exhaustResponse(get.getResponseBodyAsStream());
                     }

src/main/res/layout/whats_new_activity.xml

@@ -34,7 +34,8 @@
         android:layout_marginStart="10dp"
         android:layout_marginTop="5dp"
         android:layout_weight="6"
-        android:gravity="center_vertical"
+        android:textStyle="bold"
+        android:gravity="center"
         android:text="@string/placeholder_sentence"
         android:textAppearance="?android:attr/textAppearanceLarge"
         android:textColor="@color/primary_button_text_color"/>

src/main/res/values-ar/strings.xml

@@ -334,13 +334,9 @@
     <string name="storage_description_default">افتراضي</string>
     <string name="storage_description_unknown">غير معروف</string>
 
-    <!-- What's new feature and texts to show -->
-    <string name="whats_new_title">ما الجديد في ناكست كلاود ؟</string>
-
     <!-- Welcome to Nc intro features -->
     <string name="welcome_feature_1_title">المكان الآمن لجميع بياناتك</string>
     <string name="welcome_feature_2_title"> متعدد الحسابات</string>
-    <string name="welcome_feature_3_title">تحميل فوري</string>
     <string name="whats_new_skip">تخطى</string>
 
     <!-- User information -->

src/main/res/values-ast/strings.xml

@@ -460,14 +460,10 @@
     <string name="storage_description_sd_no">Tarxeta SD %1$d</string>
     <string name="storage_description_unknown">Desconozse</string>
 
-    <!-- What's new feature and texts to show -->
-    <string name="whats_new_title">Qué hai nuevo en Nextcloud</string>
-
     <!-- Welcome to Nc intro features -->
     <string name="welcome_feature_1_title">Un llar seguru pa tolos tos datos</string>
     <string name="welcome_feature_1_text">Accedu, comparti y protexi los tos ficheros en casa y nel trabayu</string>
 
-    <string name="welcome_feature_3_title">Xuba nel intre</string>
     <string name="whats_new_skip">Saltar</string>
 
     <string name="fingerprint_scan_finger">Escania\'l to deu, por favor</string>

src/main/res/values-bg-rBG/strings.xml

@@ -420,14 +420,10 @@
     <string name="storage_description_sd_no">SD карта %1$d</string>
     <string name="storage_description_unknown">Неизвестно</string>
 
-    <!-- What's new feature and texts to show -->
-    <string name="whats_new_title">Kакво ново в Nextcloud</string>
-
     <!-- Welcome to Nc intro features -->
     <string name="welcome_feature_1_title">Безопасен дом за всички ваши данни</string>
     <string name="welcome_feature_2_text">Свържи се към облаците си</string>
 
-    <string name="welcome_feature_3_title">Незабавни качвания</string>
     <string name="welcome_feature_3_text">Съхранявайте вашите снимки безопасно</string>
 
     <string name="whats_new_skip">Пропусни</string>

src/main/res/values-ca/strings.xml

@@ -423,15 +423,11 @@
     <string name="storage_description_sd_no">Targeta SD %1$d</string>
     <string name="storage_description_unknown">Desconegut</string>
 
-    <!-- What's new feature and texts to show -->
-    <string name="whats_new_title">Novetats en Nextcloud</string>
-
     <!-- Welcome to Nc intro features -->
     <string name="welcome_feature_1_title">Un lloc segur per totes les vostres dades</string>
     <string name="welcome_feature_2_title">Multi compte</string>
     <string name="welcome_feature_2_text">Connecteu amb tots els vostres núvols</string>
 
-    <string name="welcome_feature_3_title">Pujada instantània</string>
     <string name="welcome_feature_3_text">Mantingueu les vostres fotos segures</string>
 
     <string name="whats_new_skip">Omet</string>

src/main/res/values-cs-rCZ/strings.xml

@@ -580,9 +580,6 @@
     <string name="storage_description_sd_no">SD karta %1$d</string>
     <string name="storage_description_unknown">Neznámý</string>
 
-    <!-- What's new feature and texts to show -->
-    <string name="whats_new_title">Co je v Nextcloudu nového</string>
-
     <!-- Welcome to Nc intro features -->
     <string name="welcome_feature_1_title">Bezpečné místo pro všechna vaše data</string>
     <string name="welcome_feature_1_text">Přistupujte, sdílejte a ochraňte své domácí a pracovní soubory</string>
@@ -590,7 +587,6 @@
     <string name="welcome_feature_2_title">Multi účet</string>
     <string name="welcome_feature_2_text">Připojte se ke všem svým cloudům</string>
 
-    <string name="welcome_feature_3_title">Okamžité nahrání</string>
     <string name="welcome_feature_3_text">Již se neobávjte o své fotografie</string>
 
     <string name="whats_new_skip">Přeskočit</string>

src/main/res/values-da/strings.xml

@@ -387,9 +387,6 @@
     <string name="storage_description_sd_no">SD-kort %1$d</string>
     <string name="storage_description_unknown">Ukendt</string>
 
-    <!-- What's new feature and texts to show -->
-    <string name="whats_new_title">Hvad er nyt i Nextcloud</string>
-
     <!-- Welcome to Nc intro features -->
     <string name="welcome_feature_1_title">Et sikket hjem til alt dit data</string>
     <string name="whats_new_skip">Spring over</string>

src/main/res/values-de-rDE/strings.xml

@@ -610,9 +610,6 @@
     <string name="storage_description_sd_no">SD Karte %1$d</string>
     <string name="storage_description_unknown">Unbekannt</string>
 
-    <!-- What's new feature and texts to show -->
-    <string name="whats_new_title">Neues in Nextcloud</string>
-
     <!-- Welcome to Nc intro features -->
     <string name="welcome_feature_1_title">Ein sicheres Zuhause für alle Ihre Daten</string>
     <string name="welcome_feature_1_text">Zugriff, Freigabe &amp; Schutz Ihrer Dateien zu Hause und in Ihrem Unternehmen.</string>
@@ -620,7 +617,6 @@
     <string name="welcome_feature_2_title">Mehrfachkonto</string>
     <string name="welcome_feature_2_text">Verbinden Sie sich mit all Ihren Clouds</string>
 
-    <string name="welcome_feature_3_title">Sofortiges Hochladen</string>
     <string name="welcome_feature_3_text">Schützen Sie Ihre Fotos</string>
 
     <string name="whats_new_skip">Überspringen</string>
@@ -676,4 +672,4 @@
 
     <string name="test_server_button">Prüfe Server-Verbindung</string>
     <string name="resharing_is_not_allowed">Resharing/Wiederteilen ist nicht erlaubt.</string>
-</resources>
+    </resources>

src/main/res/values-de/strings.xml

@@ -611,9 +611,6 @@
     <string name="storage_description_sd_no">SD Karte %1$d</string>
     <string name="storage_description_unknown">Unbekannt</string>
 
-    <!-- What's new feature and texts to show -->
-    <string name="whats_new_title">Neues in Nextcloud</string>
-
     <!-- Welcome to Nc intro features -->
     <string name="welcome_feature_1_title">Ein sicheres Zuhause für alle Deine Daten</string>
     <string name="welcome_feature_1_text">Zugriff, Freigabe &amp; Schutz deiner Dateien zu Hause und in deinem Unternehmen.</string>
@@ -621,7 +618,6 @@
     <string name="welcome_feature_2_title">Mehrfachkonto</string>
     <string name="welcome_feature_2_text">Verbinde dich mit all deinen Clouds</string>
 
-    <string name="welcome_feature_3_title">Sofortiges Hochladen</string>
     <string name="welcome_feature_3_text">Schütze deine Fotos</string>
 
     <string name="whats_new_skip">Überspringen</string>
@@ -677,4 +673,4 @@
 
     <string name="test_server_button">Prüfe Server-Verbindung</string>
     <string name="resharing_is_not_allowed">Resharing/Wiederteilen ist nicht erlaubt.</string>
-</resources>
+    </resources>

src/main/res/values-el/strings.xml

@@ -574,9 +574,6 @@
     <string name="storage_description_sd_no">Κάρτα SD %1$d</string>
     <string name="storage_description_unknown">Άγνωστο</string>
 
-    <!-- What's new feature and texts to show -->
-    <string name="whats_new_title">Τι νέο υπάρχει στο Nextcloud</string>
-
     <!-- Welcome to Nc intro features -->
     <string name="welcome_feature_1_title">Μια ασφαλής τοποθεσία για όλα σας τα δεδομένα</string>
     <string name="welcome_feature_1_text">Πρόσβαση, διαμοιρασμός και προστασία των αρχείων σας στο σπίτι και στην εταιρία σας</string>
@@ -584,7 +581,6 @@
     <string name="welcome_feature_2_title">Πολλαπλός λογαριασμός</string>
     <string name="welcome_feature_2_text">Σύνδεση με όλα τα clouds σας</string>
 
-    <string name="welcome_feature_3_title">Άμεση μεταφόρτωση</string>
     <string name="welcome_feature_3_text">Διατήρηση των φωτογραφιών σας με ασφάλεια</string>
 
     <string name="whats_new_skip">Παράλειψη</string>

src/main/res/values-en-rGB/strings.xml

@@ -609,9 +609,6 @@
     <string name="storage_description_sd_no">SD card %1$d</string>
     <string name="storage_description_unknown">Unknown</string>
 
-    <!-- What's new feature and texts to show -->
-    <string name="whats_new_title">What\'s new in Nextcloud</string>
-
     <!-- Welcome to Nc intro features -->
     <string name="welcome_feature_1_title">A safe home for all your data</string>
     <string name="welcome_feature_1_text">Access, share and protect your files at home and at work</string>
@@ -619,7 +616,6 @@
     <string name="welcome_feature_2_title">Multi account</string>
     <string name="welcome_feature_2_text">Connect to all your clouds</string>
 
-    <string name="welcome_feature_3_title">Instant upload</string>
     <string name="welcome_feature_3_text">Keep your photos safe</string>
 
     <string name="whats_new_skip">Skip</string>
@@ -675,4 +671,4 @@
 
     <string name="test_server_button">Test server connection</string>
     <string name="resharing_is_not_allowed">Resharing is not allowed</string>
-</resources>
+    </resources>

src/main/res/values-es-rAR/strings.xml

@@ -43,6 +43,7 @@
     <string name="prefs_passcode">Bloqueo con código de seguridad</string>
     <string name="prefs_fingerprint">Bloqueo por huella digital</string>
     <string name="prefs_fingerprint_notsetup">No se ha establecido ninguna huella digital. </string>
+    <string name="prefs_expert_mode">Modo experto</string>
     <string name="prefs_show_hidden_files">Mostrar archivos ocultos</string>
     <string name="prefs_log_delete_history_button">Borrar historial</string>
     <string name="prefs_calendar_contacts">Sincronizar calendario  &amp; contactos</string>
@@ -50,6 +51,7 @@
     <string name="prefs_calendar_contacts_address_resolve_error">La dirección del servidor para la cuenta no se pudo resolver para DAVdroid</string>
     <string name="prefs_calendar_contacts_no_store_error">No ha sido instalado F-Droid o Google Play </string>
     <string name="prefs_calendar_contacts_sync_setup_successful">Configuración de la sincronizacion del calendario &amp; contactos </string>
+    <string name="prefs_daily_contacts_sync_summary">Backup diario de tus contactos</string>
     <string name="prefs_help">Ayuda</string>
     <string name="prefs_recommend">Recomendar a un amigo</string>
     <string name="prefs_feedback">Retroalimentación</string>
@@ -57,13 +59,17 @@
 
 	<string name="recommend_subject">Prueba  %1$s en tu teléfono inteligente!</string>
 	<string name="recommend_text">Quisiera invitarlo a usar %1$s en su teléfono inteligente\nDescargue aquí: %2$s</string>
+    <string name="recommend_urls">1 %1$s o 2 %2$s</string>
+
     <string name="auth_check_server">Verficar el servidor</string>
+    <string name="auth_host_url">Dirección del servidor https://&#8230;</string>
     <string name="auth_username">Nombre de usuario</string>
     <string name="auth_password">Contraseña</string>
     <string name="auth_register">Aún no tiene un servidor? \nHaga click aquí para obtener uno de un proveedor</string>
     <string name="sync_string_files">Archivos</string>
     <string name="setup_btn_connect">Conectar</string>
     <string name="uploader_btn_upload_text">Cargar</string>
+    <string name="uploader_btn_alternative_text">Elige</string>
     <string name="uploader_top_message">Seleccione la carpeta de cargas</string>
     <string name="uploader_wrn_no_account_title">No se encontró la cuenta</string>
     <string name="uploader_wrn_no_account_text">No existen cuentas  %1$s en su dispositivo. Favor de configurar una cuenta primero.</string>
@@ -82,6 +88,7 @@
     <string name="uploader_upload_files_behaviour_upload_and_delete_from_source">Borrar el archivo de la carpeta de origen</string>
     <string name="file_list_seconds_ago">hace algunos segundos</string>
     <string name="file_list_empty_headline">No hay archivos aquí</string>
+    <string name="folder_list_empty_headline">No hay carpetas aquí</string>
     <string name="file_list_empty">Cargue algún contenido o sincronice con sus dispositivos.</string>
     <string name="file_list_empty_favorites">Marque algunos archivos como favoritos o sincronice con sus dispositivos.</string>
     <string name="file_list_empty_favorites_filter_list">Los archivos y carpetas que marque como favoritos se mostrarán aquí</string>
@@ -89,6 +96,7 @@
     <string name="file_list_loading">Cargando&#8230;</string>
     <string name="file_list_no_app_for_file_type">No se cuenta con una aplicación que maneje este tipo de achivo. </string>
     <string name="local_file_list_empty">No hay archivos en esta carpeta</string>
+    <string name="local_folder_list_empty">No hay más carpetas.</string>
     <string name="file_list_empty_headline_search">No hay resultados en esta carpeta</string>
     <string name="file_list_empty_headline_server_search">No hay resultados</string>
     <string name="file_list_empty_favorite_headline">Aún no hay nada marcado como favorito</string>
@@ -98,6 +106,7 @@
     <string name="file_list_empty_headline_server_search_photos">No hay fotos</string>
     <string name="file_list_empty_search">¿Tal vez está dentro de una carpeta diferente?</string>
     <string name="file_list_empty_recently_modified">No se encontraron archivos que hayan sido modificado en los últimos 7 días</string>
+    <string name="file_list_empty_recently_modified_filter">No se encontraron archivos modificados los últimos 7 días.</string>
     <string name="file_list_empty_recently_added">No se encontraron archivos agregados recientemente</string>
     <string name="file_list_empty_recently_added_filter">Su búsqueda no encontró archivos recientemente agregados. </string>
     <string name="file_list_empty_text_photos">Cargue algunas fotos o active la carga automática.</string>
@@ -136,10 +145,15 @@
     <string name="common_unknown">desconocido</string>
     <string name="common_error_unknown">Error desconocido</string>
     <string name="common_pending">Pendiente</string>
+    <string name="common_delete">Borrar</string>
     <string name="about_title">Acerca de</string>
     <string name="change_password">Cambiar contraseña</string>
     <string name="delete_account">Eliminar cuenta</string>
+    <string name="delete_account_warning">Borrar cuenta 1 %s con todos los archivos locales?
+\n\nDeleting no se puede deshacer.</string>
     <string name="create_account">Crear cuenta</string>
+    <string name="avatar">Avatar</string>
+    <string name="active_user">Usuario activo</string>
     <string name="upload_chooser_title">Cargar desde &#8230;</string>
     <string name="uploader_info_dirname">Nombre de la carpeta</string>
     <string name="uploader_upload_in_progress_ticker">Cargando &#8230;</string>
@@ -151,6 +165,7 @@
     <string name="uploader_upload_failed_credentials_error">Falla en la carga, necesita autenticarse de nuevo</string>
     <string name="uploads_view_title">Cargas</string>
     <string name="uploads_view_group_current_uploads">Actual</string>
+    <string name="uploads_view_group_failed_uploads">Fallido / Pendiente de reinicio</string>
     <string name="uploads_view_group_finished_uploads">Cargado</string>
     <string name="uploads_view_upload_status_succeeded">Completado</string>
     <string name="uploads_view_upload_status_cancelled">Cancelado</string>
@@ -186,7 +201,7 @@
     <string name="sync_fail_in_favourites_content">El contenido de%1$d archivos no pudo ser sincronizado (%2$d conflictos)</string>
     <string name="sync_foreign_files_forgotten_ticker">Algunos archivos locales se han perdido</string>
     <string name="sync_foreign_files_forgotten_content">%1$d archivos de la carpeta %2$s no pudieron ser copiadas</string>
-    <string name="sync_foreign_files_forgotten_explanation">A partir de la versión 1.3.16, los archivos cargados desde este dispositivo son copiados a la carpeta local %1$s para prevenir perdidas de datos cuando un archivo se sincroniza entre múltiples cuentas. \n\nDervado de este cambio, todos los archivos cargados con versiones anteriores de la aplicación fueron copiados a la carpeta %2$s. Sin embargo, un error evitó que se completara esta operación durante la sincronizacion de la cuenta. Usted puede dejar el(los) archivo(s) como está(n) y eliminar la liga a %3$s, o bine, mover el(los) archivo(s) a la carpeta %1$s y mantener la liga a%4$s.\n\nSe enlistan a continuación los archivos locales así como los archivos remotos en %5$s a donde estaban ligados.</string>
+    <string name="sync_foreign_files_forgotten_explanation">A partir de la versión 1.3.16, los archivos cargados desde este dispositivo son copiados a la carpeta local %1$s para prevenir perdidas de datos cuando un archivo se sincroniza entre múltiples cuentas. \n\nDue de este cambio, todos los archivos cargados con versiones anteriores de la aplicación fueron copiados a la carpeta %2$s. Sin embargo, un error evitó que se completara esta operación durante la sincronizacion de la cuenta. Usted puede dejar el(los) archivo(s) como está(n) y eliminar la liga a %3$s, o bien, mover el(los) archivo(s) a la carpeta %1$s y mantener la liga a%4$s.\n\nSe enlistan a continuación los archivo(s) local(es) así como los archivos remoto(s) en %5$s a donde estaban ligados.</string>
     <string name="sync_current_folder_was_removed">La carpeta %1$s ya no existe</string>
     <string name="foreign_files_move">Mover todo</string>
     <string name="foreign_files_success">Todos los archivos fueron movidos</string>
@@ -251,6 +266,7 @@
 	<string name="auth_expired_oauth_token_toast">Su autorización ha expirado. Favor de volver a autorizar</string>
 	<string name="auth_expired_basic_auth_toast">Por favor ingrese su contraseña actual</string>
 	<string name="auth_expired_saml_sso_token_toast">Su sesión ha expirado. Favor de conectarse de nuevo</string>
+	<string name="auth_connecting_auth_server">Conectando al servidor de autenticación 1 &#8230;</string>
 	<string name="auth_unsupported_auth_method">El servidor no soporta este método de autenticación</string>
 	<string name="auth_unsupported_multiaccount">%1$s no soporta cuentas múltiples</string>
 	<string name="auth_fail_get_user_name">Su servidor no está regresando un ID de usuario correcto, favor de contactar al adminitrador</string>
@@ -278,12 +294,16 @@
     <string name="filename_forbidden_characters">Caracteres inválidos: / \\ &lt; &gt; : \" | ? *</string>
     <string name="filename_forbidden_charaters_from_server">El nombre del archivo contiene al menos un carácter inválido.</string>
     <string name="filename_empty">El nombre del archivo no puede estar vacío</string>
+    <string name="wait_a_moment">Espere un momento&#8230;</string>
     <string name="wait_checking_credentials">Verificando credenciales almacenadas</string>
     <string name="filedisplay_unexpected_bad_get_content">Problema inesperado, favor de seleccionar el archivo desde una aplicación diferente</string>
     <string name="filedisplay_no_file_selected">No se ha seleccionado algún archivo</string>
     <string name="activity_chooser_title">Enviar el link a &#8230;</string>
     <string name="wait_for_tmp_copy_from_private_storage">Copiando el archivo desde almacenamiento privado</string>
     
+    <string name="oauth_check_onoff">Iniciando sesión con OAuth 2.0</string> 
+    <string name="oauth_login_connection">Conectando al servidor OAuth 2.0&#8230;</string>
+        
     <string name="ssl_validator_header">La identidad del sitio no pudo ser verificada</string>
     <string name="ssl_validator_reason_cert_not_trusted">- El certificado del servidor no es de confianza</string>
     <string name="ssl_validator_reason_cert_expired">- El certificado del servidor expiró</string>
@@ -324,7 +344,8 @@
     <string name="instant_video_upload_on_wifi">Cargar videos sólo a través de Wi-Fi</string>
     <string name="instant_video_upload_on_charging">Cargar archivos sólo con el dispositivo conectado a la toma de corriente</string>
     <string name="instant_upload_on_charging">Cargar archivos sólo con el dispositivo conectado a la toma de corriente</string>
-    <string name="instant_upload_path">/CargasInstantáneas</string>
+    <string name="instant_upload_path">/SubidasInstantáneas</string>
+    <string name="auto_upload_path">/SubidasAutomáticas</string>
     <string name="conflict_title">Conflicto de archivo</string>
     <string name="conflict_message">¿Qué archivos desea mantener? Si selecciona ambas versiones, se le agregará un número al nombre del archivo local.</string>
     <string name="conflict_keep_both">Mantener ambas</string>
@@ -337,6 +358,8 @@
 
     <string name="error__upload__local_file_not_copied">%1$s no pudo ser copiado a la carpeta local %2$s</string>
     <string name="prefs_instant_upload_path_title">Carpeta de carga instantánea</string>
+    <string name="prefs_synced_folders_local_path_title">Carpeta local</string>
+    <string name="prefs_synced_folders_remote_path_title">Carpeta remota</string>
     <string name="prefs_instant_upload_path_use_subfolders_title">Usar sub carpetas</string>
     <string name="prefs_instant_upload_path_use_subfolders_summary">Almacenar en sub carpetas con base en el año y mes</string>
 
@@ -386,6 +409,13 @@
     <string name="file_migration_cleaning">Limpiando&#8230;</string>
     <string name="file_migration_restoring_accounts_configuration">Guardando la configuración de las cuentas&#8230;</string>
     <string name="file_migration_ok_finished">Terminado</string>
+    <string name="file_migration_failed_not_enough_space">Error: Espacio insuficiente</string>
+    <string name="file_migration_failed_not_writable">Error: No se puede escribir el archivo de destino</string>
+    <string name="file_migration_failed_not_readable">Error: No se puede leer el archivo de origen</string>
+    <string name="file_migration_failed_dir_already_exists">Error: El directorio Nextcloud ya existe </string>
+    <string name="file_migration_failed_while_coping">Error: Fallo durante la migración</string>
+    <string name="file_migration_failed_while_updating_index">Error: Fallo al actualizar el índice</string>
+
     <string name="file_migration_directory_already_exists">La carpeta de datos ya existe. Seleccione una de las siguientes opciones:</string>
     <string name="file_migration_override_data_folder">Reemplazar</string>
     <string name="file_migration_use_data_folder">Usar</string>
@@ -450,6 +480,7 @@
     <string name="file_list__footer__files">%1$d archivos</string>
     <string name="file_list__footer__files_and_folder">%1$d archivos, 1 carpeta</string>
     <string name="file_list__footer__files_and_folders">%1$d archivos, %2$d carpetas</string>
+    <string name="set_picture_as">Usar imagen como</string>
     <string name="set_as">Establecer Como</string>
 
     <string name="prefs_instant_behaviour_dialogTitle">El archivo original será&#8230;</string>
@@ -457,6 +488,8 @@
     <string name="upload_copy_files">Copiar archivo</string>
     <string name="upload_move_files">Mover archivo</string>
     <string name="select_all">Seleccionar todo</string>
+    <string name="deselect_all">Deseleccionar todo</string>
+
     <string name="pref_behaviour_entries_keep_file">mantenido en la carpeta original</string>
     <string name="pref_behaviour_entries_move">movido a la capreta de la aplicación</string>
     <string name="pref_behaviour_entries_delete_file">Borrado</string>
@@ -487,6 +520,9 @@
     <string name="share_known_remote_clarification">%1$s ( a las %2$s )</string>
 
     <string name="share_sharee_unavailable"> Actualice la versión del servidor para permitir compartir entre usuarios desde dentro de sus clientes.\nFavor de contactar a su adminsitrador</string>
+    <string name="filedetails_share_link_enable">Compartir por link habilitado</string>
+    <string name="filedetails_share_link_disable">No compartido por link</string>
+    <string name="filedetails_share_users_with_access">Usuarios y grupos con acceso</string>
     <string name="share_privilege_can_share">puede compartir</string>
     <string name="share_privilege_can_edit">puede editar</string>
     <string name="share_privilege_can_edit_create">crear</string>
@@ -495,7 +531,12 @@
     <string name="edit_share_unshare">Dejar de compartir</string>
     <string name="edit_share_done">terminado</string>
 
+    <string name="action_retry_uploads">Reintentar subidas fallidas</string>
+    <string name="action_clear_failed_uploads">Borrar subidas fallidas</string>
+    <string name="action_clear_successful_uploads">Borrar subidas exitosas</string>
     <string name="action_clear_finished_uploads">Borrar cargas terminadas</string>
+    <string name="action_force_rescan">Forzar reescaneo</string>
+
     <string name="action_switch_grid_view">Vista de cuadrícula</string>
     <string name="action_switch_list_view">Vista de lista</string>
 
@@ -509,20 +550,43 @@
     <string name="confirmation_remove_files_alert">¿Realmente desea eliminar los elementos seleccionados?</string>
     <string name="confirmation_remove_folders_alert">¿Realmente desea eliminar los elementos seleccionados y su contenido?</string>
     <string name="maintenance_mode">El servidor se encuentra en modo mantenimiento</string>
+    <string name="lock_failed">Fallo al bloquear el archivo</string>
+
     <string name="uploads_view_upload_status_waiting_for_charging">Aguardando la regarga del dispositivo </string>
     <string name="actionbar_search">Buscar</string>
     <string name="files_drop_not_supported">Esta es una característica de Nextcloud, favor de actualizar.</string>
     <string name="learn_more">Conozca más</string>
+    <string name="drawer_synced_folders">Carga automática</string>
     <string name="drawer_participate">Participe</string>
     <string name="participate_testing_headline">Ayúdenos probando</string>
     <string name="participate_testing_bug_text">¿Encontró una falla? ¿Hay algo raro?</string>
+    <string name="participate_testing_report_text">Reportar un error en GitHub</string>
     <string name="participate_testing_version_text">¿Le interesaría ayudarnos a probar la siguiente versión?</string>
     <string name="participate_beta_headline">Probar la versión de desarrollo</string>
     <string name="participate_beta_text">Esto incluye todas las últimas funcionalidades y es lo más nuevo. Fallas/errores pueden ocurrir y si es el caso, favor de reportarnoslos. </string>
     <string name="participate_release_candidate_headline">Candidato a lanzamiento</string>
+    <string name="participate_release_candidate_text">El candidato de lanzamiento (RC) es una instantánea de la próxima versión y se espera que sea estable. Probando su configuración individual podría ayudar a asegurar esto. Regístrese para realizar pruebas en Play Store o busque manualmente en la sección \"Versión\" de F-Droid.</string>
     <string name="participate_contribute_headline">Contribuya activamente</string>
+    <string name="participate_contribute_irc_text">Únase al chat en IRC:</string>
+    <string name="participate_contribute_forum_text">Ayudar a otros en el</string>
+    <string name="participate_contribute_forum_forum">Foro</string>
+    <string name="participate_contribute_translate_translate">Traducir</string>
+    <string name="participate_contribute_translate_text">La app</string>
+    <string name="participate_contribute_github_text">Revisar, modificar y escribir código, vea %1$s para detalles</string>
+    <string name="participate_rc_play_store">Obtenga candidato de lanzamiento en Google Play store</string>
+    <string name="participate_rc_fdroid">Obtenga candidato de lanzamiento via f-droid store</string>
+    <string name="participate_dev_fdroid">Obtenga la versión de desarrollo via f-droid store</string>
+    <string name="participate_dev_direct_download">Obtenga la versión de desarrollo via descarga directa</string>
     <string name="move_to">Mover a&#8230;</string>
     <string name="copy_to">Copiar a&#8230;</string>
+    <string name="choose_remote_folder">Seleccione carpeta remota &#8230;</string>
+    <string name="choose_local_folder">Seleccione carpeta local&#8230;</string>
+    <string name="synced_folders_loading_folders">Cargando carpetas&#8230;</string>
+    <string name="synced_folders_no_results">No se encontraron carpetas de medios</string>
+    <string name="synced_folders_preferences">Preferencias de carga automática</string>
+    <string name="synced_folders_settings">Configuración</string>
+    <string name="synced_folders_new_info">La carga instantánea ha sido completamente modernizada. Reconfigure su carga automática desde el menu principal. \n\nDisfrute de las nuevas y extendidas capacidades de la carga automática. </string>
+    <string name="synced_folders_preferences_folder_path">Para %1$s</string>
     <plurals name="items_selected_count">
         <item quantity="one">%d seleccionado</item>
         <item quantity="other">%d seleccionado</item>
@@ -546,9 +610,6 @@
     <string name="storage_description_sd_no">tarjeta SD %1$d</string>
     <string name="storage_description_unknown">Desconocido</string>
 
-    <!-- What's new feature and texts to show -->
-    <string name="whats_new_title">Qué hay de nuevo en Nextcloud</string>
-
     <!-- Welcome to Nc intro features -->
     <string name="welcome_feature_1_title">Un lugar seguro para todos sus datos</string>
     <string name="welcome_feature_1_text">Acceda, comparta y proteja sus archivos en casa y la oficina</string>
@@ -556,7 +617,6 @@
     <string name="welcome_feature_2_title">Multi cuenta</string>
     <string name="welcome_feature_2_text">Conéctese a todas sus nubes</string>
 
-    <string name="welcome_feature_3_title">Carga instatánea</string>
     <string name="welcome_feature_3_text">Mantenga sus fotos seguras</string>
 
     <string name="whats_new_skip">Saltar</string>
@@ -580,7 +640,10 @@
     <string name="webview_error">Se presentó un error</string>
     <string name="prefs_category_about">Acerca de</string>
 
+    <string name="actionbar_contacts">Copia de seguridad de los contactos</string>
     <string name="actionbar_contacts_restore">Restaurar contactos</string>
+    <string name="contacts_backup_button">Realizar copia de seguridad de los contactos</string>
+    <string name="contacts_automatic_backup">Copia de seguridad automática</string>
     <string name="contacts_last_backup">Último respaldo</string>
     <string name="contacts_read_permission">Se requiere el permiso para leer la lista de contactos</string>
     <string name="contacts_write_permission">Se requiere el permiso para cambiar la lista de contactos</string>
@@ -602,4 +665,11 @@
     <string name="privacy">Privacidad</string>
     <string name="file_not_found">¡Archivo no encontrado!</string>
 
+    <!-- Auto upload -->
+    <string name="autoupload_custom_folder">Configurar una carpeta personalizada</string>
+    <string name="autoupload_create_new_custom_folder">Crear una nueva carpeta personalizada</string>
+    <string name="synced_folders_configure_folders">Configurar carpetas</string>
+
+    <string name="test_server_button">Testear conexión con el servidor</string>
+    <string name="resharing_is_not_allowed">No se permite volver a compartir</string>
     </resources>

src/main/res/values-es-rMX/strings.xml

@@ -609,9 +609,6 @@
     <string name="storage_description_sd_no">tarjeta SD %1$d</string>
     <string name="storage_description_unknown">Desconocido</string>
 
-    <!-- What's new feature and texts to show -->
-    <string name="whats_new_title">Qué hay de nuevo en Nextcloud</string>
-
     <!-- Welcome to Nc intro features -->
     <string name="welcome_feature_1_title">Un lugar seguro para todos tus datos</string>
     <string name="welcome_feature_1_text">Accede, comparte y proteje tus archivos en casa y la oficina</string>
@@ -619,7 +616,6 @@
     <string name="welcome_feature_2_title">Multi cuenta</string>
     <string name="welcome_feature_2_text">Conéctate a todas tsus nubes</string>
 
-    <string name="welcome_feature_3_title">Carga automática</string>
     <string name="welcome_feature_3_text">Manten tus fotos seguras</string>
 
     <string name="whats_new_skip">Saltar</string>
@@ -675,4 +671,4 @@
 
     <string name="test_server_button">Probar la conexión del servidor</string>
     <string name="resharing_is_not_allowed">No está permitido recompartir</string>
-</resources>
+    </resources>

src/main/res/values-es/strings.xml

@@ -609,9 +609,6 @@
     <string name="storage_description_sd_no">Tarjeta SD %1$d</string>
     <string name="storage_description_unknown">Desconocido</string>
 
-    <!-- What's new feature and texts to show -->
-    <string name="whats_new_title">Qué hay de nuevo en Nextcloud</string>
-
     <!-- Welcome to Nc intro features -->
     <string name="welcome_feature_1_title">Un lugar seguro para tus datos</string>
     <string name="welcome_feature_1_text">Accede, comparte y protege tus archivos en casa y en el trabajo</string>
@@ -619,7 +616,6 @@
     <string name="welcome_feature_2_title">Múltiples cuentas</string>
     <string name="welcome_feature_2_text">Conecta con todas tus nubes</string>
 
-    <string name="welcome_feature_3_title">Subida instantánea</string>
     <string name="welcome_feature_3_text">Mantén seguras tus fotos</string>
 
     <string name="whats_new_skip">Omitir</string>
@@ -675,4 +671,4 @@
 
     <string name="test_server_button">Probar conexión con servidor</string>
     <string name="resharing_is_not_allowed">No se permite compartir de nuevo</string>
-</resources>
+    </resources>

src/main/res/values-fi-rFI/strings.xml

@@ -431,15 +431,11 @@
     <string name="storage_description_sd_no">SD kortti %1$d</string>
     <string name="storage_description_unknown">Tuntematon</string>
 
-    <!-- What's new feature and texts to show -->
-    <string name="whats_new_title">Mitä uutta Nextcloudissa</string>
-
     <!-- Welcome to Nc intro features -->
     <string name="welcome_feature_1_title">Turvallinen koti kaikille tiedostoillesi</string>
     <string name="welcome_feature_2_title">Useita käyttäjätilejä</string>
     <string name="welcome_feature_2_text">Yhdistä kaikkiin pilviisi</string>
 
-    <string name="welcome_feature_3_title">Välitön lähetys</string>
     <string name="welcome_feature_3_text">Pidä kuvasi tallessa</string>
 
     <string name="whats_new_skip">Skippaa</string>

src/main/res/values-fr/strings.xml

@@ -609,9 +609,6 @@
     <string name="storage_description_sd_no">Carte SD %1$d</string>
     <string name="storage_description_unknown">Inconnu</string>
 
-    <!-- What's new feature and texts to show -->
-    <string name="whats_new_title">Quoi de neuf dans Nextcloud</string>
-
     <!-- Welcome to Nc intro features -->
     <string name="welcome_feature_1_title">Un endroit sûr pour toutes vos données</string>
     <string name="welcome_feature_1_text">Accédez, partagez et protégez vos fichiers personnels et professionnels</string>
@@ -619,7 +616,6 @@
     <string name="welcome_feature_2_title">Multi-compte</string>
     <string name="welcome_feature_2_text">Connectez-vous avec plusieurs comptes clouds</string>
 
-    <string name="welcome_feature_3_title">Téléversement immédiat</string>
     <string name="welcome_feature_3_text">Conservez vos photos en toute sécurité</string>
 
     <string name="whats_new_skip">Ignorer</string>
@@ -675,4 +671,4 @@
 
     <string name="test_server_button">Tester la connexion du serveur</string>
     <string name="resharing_is_not_allowed">Le repartage n\'est pas autorisé</string>
-</resources>
+    </resources>

src/main/res/values-hu-rHU/strings.xml

@@ -466,15 +466,11 @@
     <string name="storage_description_sd_no">SD kártya %1$d</string>
     <string name="storage_description_unknown">Ismeretlen</string>
 
-    <!-- What's new feature and texts to show -->
-    <string name="whats_new_title">Nextcloud hírek</string>
-
     <!-- Welcome to Nc intro features -->
     <string name="welcome_feature_1_title">Egy biztonságos hely az adataidnak</string>
     <string name="welcome_feature_2_title">Többszörös fiók</string>
     <string name="welcome_feature_2_text">Csatlakozás az összes felhődhöz</string>
 
-    <string name="welcome_feature_3_title">Azonnali feltöltés</string>
     <string name="welcome_feature_3_text">Tartsd biztonságban a fotóidat</string>
 
     <string name="whats_new_skip">Kihagy</string>

src/main/res/values-id/strings.xml

@@ -383,15 +383,11 @@
     <string name="storage_description_sd_no">Kartu SD %1$d</string>
     <string name="storage_description_unknown">Tidak diketahui</string>
 
-    <!-- What's new feature and texts to show -->
-    <string name="whats_new_title">Apa yang baru di Nextcloud</string>
-
     <!-- Welcome to Nc intro features -->
     <string name="welcome_feature_1_title">Tempat yang aman untuk semua data anda</string>
     <string name="welcome_feature_2_title">Multi akun</string>
     <string name="welcome_feature_2_text">Sambung ke semua cloud anda</string>
 
-    <string name="welcome_feature_3_title">Unggah Instan</string>
     <string name="welcome_feature_3_text">Jaga foto anda tetap aman</string>
 
     <string name="whats_new_skip">Lewat</string>

src/main/res/values-is/strings.xml

@@ -579,9 +579,6 @@ Smelltu hér til að fá þér einn frá þjónustuaðila.</string>
     <string name="storage_description_sd_no">SD-minniskort %1$d</string>
     <string name="storage_description_unknown">Óþekkt</string>
 
-    <!-- What's new feature and texts to show -->
-    <string name="whats_new_title">Hvað er nýtt í Nextcloud</string>
-
     <!-- Welcome to Nc intro features -->
     <string name="welcome_feature_1_title">Öruggur staður fyrir öll gögnin þín</string>
     <string name="welcome_feature_1_text">Haltu utan um, deildu og verndaðu skrárnar þínar, hvort sem er heima eða á vinnustað</string>
@@ -589,7 +586,6 @@ Smelltu hér til að fá þér einn frá þjónustuaðila.</string>
     <string name="welcome_feature_2_title">Margir aðgangar</string>
     <string name="welcome_feature_2_text">Tengdu öll gagnaskýin þín</string>
 
-    <string name="welcome_feature_3_title">Bein innsending</string>
     <string name="welcome_feature_3_text">Haltu ljósmyndunum þínum öruggum</string>
 
     <string name="whats_new_skip">Sleppa</string>

src/main/res/values-it/strings.xml

@@ -90,6 +90,7 @@
     <string name="file_list_empty_headline">Qui non c\'è alcun file</string>
     <string name="folder_list_empty_headline">Qui non c\'è alcuna cartella</string>
     <string name="file_list_empty">Carica alcuni contenuti o sincronizza con i tuoi dispositivi.</string>
+    <string name="file_list_empty_favorites">Rendi preferiti alcuni file o sincronizza con i tuoi dispositivi.</string>
     <string name="file_list_empty_favorites_filter_list">I file e le cartelle che marchi come preferiti saranno mostrati qui</string>
     <string name="file_list_empty_favorites_filter">La tua ricerca non ha restituito alcun file preferito.</string>
     <string name="file_list_loading">Caricamento in corso&#8230;</string>
@@ -127,6 +128,7 @@
     <string name="filedetails_download">Scarica</string>
     <string name="filedetails_sync_file">Sincronizza</string>
     <string name="filedetails_renamed_in_upload_msg">File rinominato in %1$s durante il caricamento</string>
+    <string name="list_layout">Struttura a elenco</string>
     <string name="action_share">Condividi</string>
     <string name="common_yes">Sì</string>
     <string name="common_no">No</string>
@@ -516,6 +518,7 @@
     <string name="share_email_clarification">%1$s (email)</string>
     <string name="share_known_remote_clarification">%1$s ( su %2$s )</string>
 
+    <string name="share_sharee_unavailable">Aggiorna la versione del server per consentire la condivisione tra utenti dai loro client.\nContatta il tuo amministratore</string>
     <string name="filedetails_share_link_enable">Condivisi tramite collegamento abilitata</string>
     <string name="filedetails_share_link_disable">Non condivisi tramite collegamento</string>
     <string name="filedetails_share_users_with_access">Utenti e gruppi con accesso</string>
@@ -537,6 +540,7 @@
     <string name="action_switch_list_view">Vista Elenco</string>
 
     <string name="manage_space_title">Gestisci lo spazio</string>
+    <string name="manage_space_description">Impostazioni, database e certificati del server dai dati di %1$s saranno eliminati definitivamente.\n\ni file scaricati non saranno interessati.\n\nQuesto processo può richiedere del tempo.</string>
     <string name="manage_space_clear_data">Cancella i dati</string>
     <string name="manage_space_error">Alcuni file non possono essere eliminati.</string>
 
@@ -558,13 +562,16 @@
     <string name="participate_testing_report_text">Segnala un problema su GitHub</string>
     <string name="participate_testing_version_text">Sei interessato ad aiutarci provando la prossima versione?</string>
     <string name="participate_beta_headline">Prova la versione di sviluppo</string>
+    <string name="participate_beta_text">Ciò include tutte le funzionalità di prossima introduzione e potrebbe presentare seri problemi di stabilità. Bug/errori possono verificars. Se e quando li riscontrerai, segnalaci le tue scoperte.</string>
     <string name="participate_release_candidate_headline">Candidata al rilascio</string>
+    <string name="participate_release_candidate_text">La candidata al rilascio (RC) è un\'istantanea della versione successiva e dovrebbe essere stabile. Effettuando dei test sulla tua configurazione, puoi aiutarci a esserene sicuri. Registrati per la fase test su Google Play o controlla manualmente nella sezione \"Versione\" di F-Droid.</string>
     <string name="participate_contribute_headline">Contribuisci attivamente</string>
     <string name="participate_contribute_irc_text">Entra in chat su IRC:</string>
     <string name="participate_contribute_forum_text">Aiuta gli altri sul</string>
     <string name="participate_contribute_forum_forum">forum</string>
     <string name="participate_contribute_translate_translate">Traduci</string>
     <string name="participate_contribute_translate_text">l\'applicazione</string>
+    <string name="participate_contribute_github_text">Esamina, correggi e scrivi codice, vedi %1$s per i dettagli</string>
     <string name="participate_rc_play_store">Ottieni la candidata al rilascio tramite Google Play</string>
     <string name="participate_rc_fdroid">Ottieni la candidata al rilascio tramite F-Droid</string>
     <string name="participate_dev_fdroid">Ottieni la versione di sviluppo tramite F-Droid</string>
@@ -577,6 +584,7 @@
     <string name="synced_folders_no_results">Nessuna cartella di file multimediali trovata.</string>
     <string name="synced_folders_preferences">Preferenze per il caricamento automatico</string>
     <string name="synced_folders_settings">Impostazioni</string>
+    <string name="synced_folders_new_info">Il caricamento istantaneo è stato riscritto completamente. Riconfigura il caricamento automatico dal menu principale.\n\nGoditi il nuovo ed esteso caricamento automatico.</string>
     <string name="synced_folders_preferences_folder_path">Per %1$s</string>
     <plurals name="items_selected_count">
         <item quantity="one">%d selezionato</item>
@@ -601,9 +609,6 @@
     <string name="storage_description_sd_no">Scheda SD %1$d</string>
     <string name="storage_description_unknown">Sconosciuto</string>
 
-    <!-- What's new feature and texts to show -->
-    <string name="whats_new_title">Cosa c\'è di nuovo in Nextcloud</string>
-
     <!-- Welcome to Nc intro features -->
     <string name="welcome_feature_1_title">Un posto sicuro per tutti i tuoi dati</string>
     <string name="welcome_feature_1_text">Accedi, condividi e proteggi i tuoi file a casa e al lavoro</string>
@@ -611,7 +616,6 @@
     <string name="welcome_feature_2_title">Account multipli</string>
     <string name="welcome_feature_2_text">Collega tutti i tuoi cloud</string>
 
-    <string name="welcome_feature_3_title">Caricamento istantaneo</string>
     <string name="welcome_feature_3_text">Tieni al sicuro le tue foto</string>
 
     <string name="whats_new_skip">Salta</string>
@@ -631,6 +635,7 @@
 
     <!-- Activities -->
     <string name="activities_no_results_headline">Ancora nessuna attività</string>
+    <string name="activities_no_results_message">Questo flusso mostrerà eventi come\naggiunte, modifiche e condivisioni</string>
     <string name="webview_error">Si è verificato un errore</string>
     <string name="prefs_category_about">Informazioni</string>
 
@@ -665,4 +670,5 @@
     <string name="synced_folders_configure_folders">Configura cartelle</string>
 
     <string name="test_server_button">Prova di connessione al server</string>
+    <string name="resharing_is_not_allowed">La ri-condivisione non è consentita</string>
     </resources>

src/main/res/values-ja-rJP/strings.xml

@@ -465,15 +465,11 @@
     <string name="storage_description_sd_no">SD カード %1$d</string>
     <string name="storage_description_unknown">不明</string>
 
-    <!-- What's new feature and texts to show -->
-    <string name="whats_new_title">Nextcloudの新しい点:</string>
-
     <!-- Welcome to Nc intro features -->
     <string name="welcome_feature_1_title">すべてのデータの安全なホーム</string>
     <string name="welcome_feature_2_title">マルチアカウント</string>
     <string name="welcome_feature_2_text">すべてのクラウドへ接続する</string>
 
-    <string name="welcome_feature_3_title">自動アップロード</string>
     <string name="welcome_feature_3_text">あなたの写真を安全に保つ</string>
 
     <string name="whats_new_skip">スキップ</string>

src/main/res/values-lv/strings.xml

@@ -381,15 +381,11 @@
     <string name="storage_description_sd_no">SD karte %1$d</string>
     <string name="storage_description_unknown">Nezināms</string>
 
-    <!-- What's new feature and texts to show -->
-    <string name="whats_new_title">Kas jauns Nextcloud</string>
-
     <!-- Welcome to Nc intro features -->
     <string name="welcome_feature_1_title">Droša vieta visiem jūsu datiem</string>
     <string name="welcome_feature_2_title">Multi konts</string>
     <string name="welcome_feature_2_text">Savienoties ar visiem mākoņiem</string>
 
-    <string name="welcome_feature_3_title">Tūlītēja augšupielāde</string>
     <string name="welcome_feature_3_text">Glabājiet savus fotoattēlus drošībā</string>
 
     <string name="whats_new_skip">Izlaist</string>

src/main/res/values-nb-rNO/strings.xml

@@ -43,6 +43,7 @@
     <string name="prefs_passcode">Passordlås</string>
     <string name="prefs_fingerprint">Fingeravtrykkslås</string>
     <string name="prefs_fingerprint_notsetup">Det har ikke blitt satt opp noen fingeravtrykk.</string>
+    <string name="prefs_expert_mode">Ekspertmodus</string>
     <string name="prefs_show_hidden_files">Vis skjulte filer</string>
     <string name="prefs_log_delete_history_button">Slett historikk</string>
     <string name="prefs_calendar_contacts">Synkroniser kalender &amp; kontakter</string>
@@ -68,6 +69,7 @@
     <string name="sync_string_files">Filer</string>
     <string name="setup_btn_connect">Koble til</string>
     <string name="uploader_btn_upload_text">Last opp</string>
+    <string name="uploader_btn_alternative_text">Velg</string>
     <string name="uploader_top_message">Velg opplastingsmappe</string>
     <string name="uploader_wrn_no_account_title">Ingen konto funnet</string>
     <string name="uploader_wrn_no_account_text">Det finnes ingen %1$s-kontoer på enheten din. Sett opp en konto først.</string>
@@ -86,6 +88,7 @@
     <string name="uploader_upload_files_behaviour_upload_and_delete_from_source">Slett filen fra kildemappen</string>
     <string name="file_list_seconds_ago">for få sekunder siden</string>
     <string name="file_list_empty_headline">Ingen filer her</string>
+    <string name="folder_list_empty_headline">Ingen mapper her</string>
     <string name="file_list_empty">Last opp innhold eller synkroniser med enhetene dine.</string>
     <string name="file_list_empty_favorites">Marker noen filer som favoritter eller synkroniser enhetene dine.</string>
     <string name="file_list_empty_favorites_filter_list">Filer og mapper du markerer som favoritter vil vises her</string>
@@ -93,6 +96,7 @@
     <string name="file_list_loading">Laster&#8230;</string>
     <string name="file_list_no_app_for_file_type">Inget program funnet for filtypen.</string>
     <string name="local_file_list_empty">Det er ingen filer i denne mappen.</string>
+    <string name="local_folder_list_empty">Det er ingen flere mapper.</string>
     <string name="file_list_empty_headline_search">Ingen resultater i denne mappen</string>
     <string name="file_list_empty_headline_server_search">Ingen resultater</string>
     <string name="file_list_empty_favorite_headline">Ingen favoritter ennå</string>
@@ -141,11 +145,14 @@
     <string name="common_unknown">ukjent</string>
     <string name="common_error_unknown">Ukjent feil</string>
     <string name="common_pending">Venter</string>
+    <string name="common_delete">Slett</string>
     <string name="about_title">Om</string>
     <string name="change_password">Endre passord</string>
     <string name="delete_account">Fjern konto</string>
     <string name="delete_account_warning">Slett kontoen %s med alle lokale filer?\n\nSletting kan ikke angres.</string>
     <string name="create_account">Opprett konto</string>
+    <string name="avatar">Avatar</string>
+    <string name="active_user">Aktiv bruker</string>
     <string name="upload_chooser_title">Last opp fra &#8230;</string>
     <string name="uploader_info_dirname">Mappenavn</string>
     <string name="uploader_upload_in_progress_ticker">Laster opp &#8230;</string>
@@ -157,6 +164,7 @@
     <string name="uploader_upload_failed_credentials_error">Opplasting mislyktes, du må logge inn på nytt</string>
     <string name="uploads_view_title">Opplastinger</string>
     <string name="uploads_view_group_current_uploads">Nåværende</string>
+    <string name="uploads_view_group_failed_uploads">Feilet / Venter på omstart</string>
     <string name="uploads_view_group_finished_uploads">Opplastet</string>
     <string name="uploads_view_upload_status_succeeded">Ferdig</string>
     <string name="uploads_view_upload_status_cancelled">Avbrutt</string>
@@ -285,6 +293,7 @@
     <string name="filename_forbidden_characters">Forbudte tegn: / \\ &lt; &gt; : \" | ? *</string>
     <string name="filename_forbidden_charaters_from_server">Filnavnet inneholder minst ett ulovlig tegn</string>
     <string name="filename_empty">Filnavn kan ikke være tomt</string>
+    <string name="wait_a_moment">Vent et øyeblikk&#8230;</string>
     <string name="wait_checking_credentials">Sjekker lagrede påloggingsdetaljer</string>
     <string name="filedisplay_unexpected_bad_get_content">Uventet problem; velg filen fra et annet program</string>
     <string name="filedisplay_no_file_selected">Ingen fil ble valgt</string>
@@ -348,6 +357,8 @@
 
     <string name="error__upload__local_file_not_copied">%1$s kunne ikke kopieres til lokal mappe %2$s</string>
     <string name="prefs_instant_upload_path_title">Mappe for umiddelbar opplasting</string>
+    <string name="prefs_synced_folders_local_path_title">Lokal mappe</string>
+    <string name="prefs_synced_folders_remote_path_title">Mappe annensteds hen</string>
     <string name="prefs_instant_upload_path_use_subfolders_title">Bruk undermapper</string>
     <string name="prefs_instant_upload_path_use_subfolders_summary">Lagre filer i undermapper basert på år og måned</string>
 
@@ -510,6 +521,7 @@
     <string name="share_sharee_unavailable">Beklager, tjenerversjonen din tillater ikke klienter å dele med brukere. \nKontakt systemadministratoren</string>
     <string name="filedetails_share_link_enable">Deling med lenke påskrudd</string>
     <string name="filedetails_share_link_disable">Ikke delt med lenke</string>
+    <string name="filedetails_share_users_with_access">Brukere og grupper med tilgang</string>
     <string name="share_privilege_can_share">kan dele</string>
     <string name="share_privilege_can_edit">kan redigere</string>
     <string name="share_privilege_can_edit_create">opprette</string>
@@ -518,7 +530,12 @@
     <string name="edit_share_unshare">Avslutt deling</string>
     <string name="edit_share_done">ferdig</string>
 
+    <string name="action_retry_uploads">Prøv å laste opp igjen.</string>
+    <string name="action_clear_failed_uploads">Fjern feilede opplastinger</string>
+    <string name="action_clear_successful_uploads">Fjern fullførte opplastinger</string>
     <string name="action_clear_finished_uploads">Slett alle ferdige</string>
+    <string name="action_force_rescan">Tving reskanning</string>
+
     <string name="action_switch_grid_view">Rutenett-visning</string>
     <string name="action_switch_list_view">Listevisning</string>
 
@@ -532,10 +549,13 @@
     <string name="confirmation_remove_files_alert">Vil du virkelig fjerne de valgte elementene?</string>
     <string name="confirmation_remove_folders_alert">Vil du virkelig fjerne de valgte elementene og dets innhold?</string>
     <string name="maintenance_mode">Tjener i vedlikeholdsmodus</string>
+    <string name="lock_failed">Kunne ikke låse filen</string>
+
     <string name="uploads_view_upload_status_waiting_for_charging">Venter på lading av enhet.</string>
     <string name="actionbar_search">Søk</string>
     <string name="files_drop_not_supported">Dette er en Nextcloud funksjon, oppdater.</string>
     <string name="learn_more">Lær mer</string>
+    <string name="drawer_synced_folders">Auto-opplasting</string>
     <string name="drawer_participate">Delta</string>
     <string name="participate_testing_headline">Hjelp oss å teste</string>
     <string name="participate_testing_bug_text">Funnet en feil? Føles noe rart?</string>
@@ -551,9 +571,21 @@
     <string name="participate_contribute_forum_forum">forumet</string>
     <string name="participate_contribute_translate_translate">Oversett</string>
     <string name="participate_contribute_translate_text">programmet</string>
+    <string name="participate_contribute_github_text">Gjennomse, endre og skriv kode, se %1$s for detaljer</string>
+    <string name="participate_rc_play_store">Få lanseringskandidaten via Google Play butikken</string>
+    <string name="participate_rc_fdroid">Få lanseringskandidaten via f-droid app butikk</string>
+    <string name="participate_dev_fdroid">Få utviklingsversjonen via f-droid app butikk</string>
+    <string name="participate_dev_direct_download">Få utviklingsversjonen via direkte nedlasting</string>
     <string name="move_to">Flytt til&#8230;</string>
     <string name="copy_to">Kopier til&#8230;</string>
+    <string name="choose_remote_folder">Velg fjernmappe&#8230;</string>
+    <string name="choose_local_folder">Velg lokal mappe&#8230;</string>
+    <string name="synced_folders_loading_folders">Laster mapper&#8230;</string>
+    <string name="synced_folders_no_results">Ingen mediamapper funnet.</string>
+    <string name="synced_folders_preferences">Alternativer for auto-opplasting</string>
     <string name="synced_folders_settings">Innstillinger</string>
+    <string name="synced_folders_new_info">Umiddelbar opplasting er fullstendig omarbeidet. Du må sette opp auto-opplasting på nytt fra hovedmenyen.\n\nKos deg med den nye og utvidede auto-opplastingen.</string>
+    <string name="synced_folders_preferences_folder_path">For %1$s</string>
     <plurals name="items_selected_count">
         <item quantity="one">%d valgt</item>
         <item quantity="other">%d valgte</item>
@@ -577,9 +609,6 @@
     <string name="storage_description_sd_no">SD-kort %1$d</string>
     <string name="storage_description_unknown">Ukjent</string>
 
-    <!-- What's new feature and texts to show -->
-    <string name="whats_new_title">Hva er nytt i Nextcloud</string>
-
     <!-- Welcome to Nc intro features -->
     <string name="welcome_feature_1_title">Et trygt hjem for alle dine data</string>
     <string name="welcome_feature_1_text">Benytt, del og beskytt filene dine hjemme og i din bedrift</string>
@@ -587,7 +616,6 @@
     <string name="welcome_feature_2_title">Multi-konto</string>
     <string name="welcome_feature_2_text">Foren alle skyene dine</string>
 
-    <string name="welcome_feature_3_title">Umiddelbar opplasting</string>
     <string name="welcome_feature_3_text">Hold bildene dine trygge</string>
 
     <string name="whats_new_skip">Hopp over</string>
@@ -636,5 +664,11 @@
     <string name="privacy">Personvern</string>
     <string name="file_not_found">Finner ikke filen!</string>
 
+    <!-- Auto upload -->
+    <string name="autoupload_custom_folder">Sett opp en tilpasset mappe</string>
+    <string name="autoupload_create_new_custom_folder">Lag ny tilpasset mappe oppsett</string>
+    <string name="synced_folders_configure_folders">Sett opp mapper</string>
+
     <string name="test_server_button">Test tjenertilkobling</string>
+    <string name="resharing_is_not_allowed">Videredeling er ikke tillatt</string>
     </resources>

src/main/res/values-nl/strings.xml

@@ -43,6 +43,7 @@
     <string name="prefs_passcode">Toegangscode</string>
     <string name="prefs_fingerprint">Vingerafdrukbeveiliging</string>
     <string name="prefs_fingerprint_notsetup">Er zijn geen vingerafdrukken ingesteld.</string>
+    <string name="prefs_expert_mode">Expertmodus</string>
     <string name="prefs_show_hidden_files">Verborgen bestanden weergeven</string>
     <string name="prefs_log_delete_history_button">Verwijder geschiedenis</string>
     <string name="prefs_calendar_contacts">Synchroniseren agenda &amp; contactpersonen</string>
@@ -50,6 +51,7 @@
     <string name="prefs_calendar_contacts_address_resolve_error">Serveradres voor dit account kon niet worden gevonden voor DAVdroid</string>
     <string name="prefs_calendar_contacts_no_store_error">Noch F-droid, noch Google Play is geïnstalleerd</string>
     <string name="prefs_calendar_contacts_sync_setup_successful">Agenda &amp; contactpersonen sync instellingen</string>
+    <string name="prefs_daily_contacts_sync_summary">Dagelijkse back-up van je contactpersonen</string>
     <string name="prefs_help">Help</string>
     <string name="prefs_recommend">Aanbevelen bij vriend</string>
     <string name="prefs_feedback">Feedback</string>
@@ -60,6 +62,7 @@
     <string name="recommend_urls">%1$s or %2$s</string>
 
     <string name="auth_check_server">Controleer server</string>
+    <string name="auth_host_url">Serveradres https://&#8230;</string>
     <string name="auth_username">Gebruikersnaam</string>
     <string name="auth_password">Wachtwoord</string>
     <string name="auth_register">Heb je nog geen server?\n
@@ -67,6 +70,7 @@ Kies er eentje van een provider.</string>
     <string name="sync_string_files">Bestanden</string>
     <string name="setup_btn_connect">Verbinden</string>
     <string name="uploader_btn_upload_text">Uploaden</string>
+    <string name="uploader_btn_alternative_text">Kies</string>
     <string name="uploader_top_message">Kies een uploadmap</string>
     <string name="uploader_wrn_no_account_title">Geen account gevonden</string>
     <string name="uploader_wrn_no_account_text">Er zijn geen %1$s-accounts op dit apparaat. Stel eerst een account in.</string>
@@ -85,6 +89,7 @@ Kies er eentje van een provider.</string>
     <string name="uploader_upload_files_behaviour_upload_and_delete_from_source">Verwijder bestand uit bronmap</string>
     <string name="file_list_seconds_ago">seconden geleden</string>
     <string name="file_list_empty_headline">Hier geen bestanden</string>
+    <string name="folder_list_empty_headline">Hier zijn geen bestanden</string>
     <string name="file_list_empty">Upload je inhoud of synchroniseer met je apparaten.</string>
     <string name="file_list_empty_favorites">Maak enkele bestanden favoriet of synchroniseer met je apparaten!</string>
     <string name="file_list_empty_favorites_filter_list">Bestanden en mappen gemarkeerd als favoriet worden hier getoond</string>
@@ -92,6 +97,7 @@ Kies er eentje van een provider.</string>
     <string name="file_list_loading">Laden&#8230;</string>
     <string name="file_list_no_app_for_file_type">Er is geen app ingesteld om dit bestandformaat te behandelen.</string>
     <string name="local_file_list_empty">Er staan geen bestanden in deze map.</string>
+    <string name="local_folder_list_empty">Er zijn niet meer mappen.</string>
     <string name="file_list_empty_headline_search">Geen resultaten in deze map</string>
     <string name="file_list_empty_headline_server_search">Geen resultaten</string>
     <string name="file_list_empty_favorite_headline">Nog niets als favoriet gemarkeerd</string>
@@ -140,11 +146,14 @@ Kies er eentje van een provider.</string>
     <string name="common_unknown">onbekend</string>
     <string name="common_error_unknown">Onbekende fout</string>
     <string name="common_pending">In behandeling</string>
+    <string name="common_delete">Verwijderen</string>
     <string name="about_title">Over</string>
     <string name="change_password">Wachtwoord wijzigen</string>
     <string name="delete_account">Account verwijderen</string>
     <string name="delete_account_warning">Verwijder account %s met alle lokale bestanden? Het verwijderen kan niet worden teruggedraaid.</string>
     <string name="create_account">Account aanmaken</string>
+    <string name="avatar">Avatar</string>
+    <string name="active_user">Actieve gebruiker</string>
     <string name="upload_chooser_title">Upload van &#8230;</string>
     <string name="uploader_info_dirname">Mapnaam</string>
     <string name="uploader_upload_in_progress_ticker">Uploaden&#160;&#8230;</string>
@@ -156,6 +165,7 @@ Kies er eentje van een provider.</string>
     <string name="uploader_upload_failed_credentials_error">Uploaden mislukt, je moet opnieuw inloggen</string>
     <string name="uploads_view_title">Uploads</string>
     <string name="uploads_view_group_current_uploads">Huidige</string>
+    <string name="uploads_view_group_failed_uploads">Mislukt / Wacht op herstart</string>
     <string name="uploads_view_group_finished_uploads">Geüpload</string>
     <string name="uploads_view_upload_status_succeeded">Voltooid</string>
     <string name="uploads_view_upload_status_cancelled">Geannuleerd</string>
@@ -256,6 +266,7 @@ Kies er eentje van een provider.</string>
 	<string name="auth_expired_oauth_token_toast">Je autorisatie is verstreken. Autoriseer opnieuw</string>
 	<string name="auth_expired_basic_auth_toast">Voer het huidige wachtwoord in</string>
 	<string name="auth_expired_saml_sso_token_toast">Je sessie is verstreken. Verbind opnieuw</string>
+	<string name="auth_connecting_auth_server">Verbinden met authenticatie server&#8230;</string>
 	<string name="auth_unsupported_auth_method">De server ondersteunt deze authenticatiemethode niet</string>
 	<string name="auth_unsupported_multiaccount">%1$s ondersteunt het gebruik van meerdere accounts niet</string>
 	<string name="auth_fail_get_user_name">Je server geeft geen goede userid terug, neem contact op met je beheerder</string>
@@ -283,6 +294,7 @@ Kies er eentje van een provider.</string>
     <string name="filename_forbidden_characters">Verboden tekens: / \\ &lt; &gt; : " | ? *</string>
     <string name="filename_forbidden_charaters_from_server">De bestandsnaam bevat ten minste één ongeldig teken</string>
     <string name="filename_empty">Bestandsnaam mag niet leeg zijn</string>
+    <string name="wait_a_moment">Even geduld&#8230;</string>
     <string name="wait_checking_credentials">Opgeslagen inloggegevens nakijken</string>
     <string name="filedisplay_unexpected_bad_get_content">Onverwacht probleem; probeer het bestand met een andere app te selecteren</string>
     <string name="filedisplay_no_file_selected">Geen bestand geselecteerd</string>
@@ -290,6 +302,8 @@ Kies er eentje van een provider.</string>
     <string name="wait_for_tmp_copy_from_private_storage">Bestand vanaf privéopslag kopiëren</string>
     
     <string name="oauth_check_onoff">Inloggen met OAuth 2.0</string> 
+    <string name="oauth_login_connection">Verbinden met OAuth 2.0 server&#8230;</string>
+        
     <string name="ssl_validator_header">De identiteit van de site kan niet worden gecontroleerd</string>
     <string name="ssl_validator_reason_cert_not_trusted">- Het servercertificaat wordt niet vertrouwd</string>
     <string name="ssl_validator_reason_cert_expired">- Het servercertificaat is verlopen</string>
@@ -344,6 +358,8 @@ Kies er eentje van een provider.</string>
 
     <string name="error__upload__local_file_not_copied">%1$s kon niet worden gekopieerd naar de lokale map %2$s</string>
     <string name="prefs_instant_upload_path_title">Directe-uploadmap</string>
+    <string name="prefs_synced_folders_local_path_title">Lokale map</string>
+    <string name="prefs_synced_folders_remote_path_title">Externe map</string>
     <string name="prefs_instant_upload_path_use_subfolders_title">Gebruik submappen</string>
     <string name="prefs_instant_upload_path_use_subfolders_summary">Opslaan in submappen, gebaseerd op jaar en maand</string>
 
@@ -504,6 +520,9 @@ Kies er eentje van een provider.</string>
     <string name="share_known_remote_clarification">%1$s ( op %2$s )</string>
 
     <string name="share_sharee_unavailable">Helaas, je serverversie staat niet toe om binnen clients te delen met gebruikers.\nNeem contact op met je beheerder</string>
+    <string name="filedetails_share_link_enable">Delen via een link ingeschakeld</string>
+    <string name="filedetails_share_link_disable">Niet gedeeld met een link</string>
+    <string name="filedetails_share_users_with_access">Gebruikers en groepen met toegang</string>
     <string name="share_privilege_can_share">kan delen</string>
     <string name="share_privilege_can_edit">kan bewerken</string>
     <string name="share_privilege_can_edit_create">creëer</string>
@@ -512,7 +531,12 @@ Kies er eentje van een provider.</string>
     <string name="edit_share_unshare">Stop met delen</string>
     <string name="edit_share_done">gedaan</string>
 
+    <string name="action_retry_uploads">Probeer mislukte uploads opnieuw</string>
+    <string name="action_clear_failed_uploads">Wis mislukte uploads</string>
+    <string name="action_clear_successful_uploads">Wis gelukte uploads</string>
     <string name="action_clear_finished_uploads">Alle voltoooide opschonen</string>
+    <string name="action_force_rescan">Indexering forceren</string>
+
     <string name="action_switch_grid_view">Rasterindeling </string>
     <string name="action_switch_list_view">Lijstindeling</string>
 
@@ -526,10 +550,13 @@ Kies er eentje van een provider.</string>
     <string name="confirmation_remove_files_alert">Wil je de geselecteerde objecten echt verwijderen?</string>
     <string name="confirmation_remove_folders_alert">Wil je de geselecteerde objecten en hun inhoud echt verwijderen?</string>
     <string name="maintenance_mode">Server in onderhoudsmodus</string>
+    <string name="lock_failed">Kan bestand niet vergrendelen</string>
+
     <string name="uploads_view_upload_status_waiting_for_charging">Wachten to apparaat wordt opgeladen</string>
     <string name="actionbar_search">Zoeken</string>
     <string name="files_drop_not_supported">Dit is een Nextcloud-optie, gelieve te updaten.</string>
     <string name="learn_more">Meer weten</string>
+    <string name="drawer_synced_folders">Automatisch uploaden</string>
     <string name="drawer_participate">Meedoen</string>
     <string name="participate_testing_headline">Help bij testen</string>
     <string name="participate_testing_bug_text">Bug gevonden? Rare dingen?</string>
@@ -540,11 +567,26 @@ Kies er eentje van een provider.</string>
     <string name="participate_release_candidate_headline">Release candidate</string>
     <string name="participate_release_candidate_text">De release candidate (RC) is een snapshot van de komende versie en is naar verwachting stabiel. Door een test met je eigen installatie verzeker je hier van. Meld je aan voor het testen in de Play store of kijk handmatig bij sectie \"Versie\" van F-Droid.</string>
     <string name="participate_contribute_headline">Actief meedoen</string>
+    <string name="participate_contribute_irc_text">Join de chat op IRC:</string>
+    <string name="participate_contribute_forum_text">Help anderen met het</string>
     <string name="participate_contribute_forum_forum">forum</string>
     <string name="participate_contribute_translate_translate">Vertalen</string>
     <string name="participate_contribute_translate_text">de app</string>
+    <string name="participate_contribute_github_text">Bekijk, wijzig en schrijf code, zie %1$s voor details</string>
+    <string name="participate_rc_play_store">Ontvang release candidate via Google Play store</string>
+    <string name="participate_rc_fdroid">Ontvang release candidate via f-droid app store</string>
+    <string name="participate_dev_fdroid">Ontvang development release via f-droid app store</string>
+    <string name="participate_dev_direct_download">Ontvang development release via directe download</string>
     <string name="move_to">Verplaats naar&#160;&#8230;</string>
     <string name="copy_to">Kopieer naar&#160;&#8230;</string>
+    <string name="choose_remote_folder">Kies externe map&#8230;</string>
+    <string name="choose_local_folder">Kies lokale map&#8230;</string>
+    <string name="synced_folders_loading_folders">Mappen laden&#8230;</string>
+    <string name="synced_folders_no_results">Geen mediamappen gevonden.</string>
+    <string name="synced_folders_preferences">Voorkeuren voor automatisch uploaden</string>
+    <string name="synced_folders_settings">Instellingen</string>
+    <string name="synced_folders_new_info">Automatisch uploaden is helemaal herzien. Herconfigureer je auto-uploadfunctie in het hoofdmenu.\n\nVeel plezier met de nieuwe en meer uitgebreide auto-upload.</string>
+    <string name="synced_folders_preferences_folder_path">Voor %1$s</string>
     <plurals name="items_selected_count">
         <item quantity="one">%d geselecteerd</item>
         <item quantity="other">%d geselecteerd</item>
@@ -568,9 +610,6 @@ Kies er eentje van een provider.</string>
     <string name="storage_description_sd_no">SD-kaart %1$d</string>
     <string name="storage_description_unknown">Onbekend</string>
 
-    <!-- What's new feature and texts to show -->
-    <string name="whats_new_title">Nieuw in Nextcloud</string>
-
     <!-- Welcome to Nc intro features -->
     <string name="welcome_feature_1_title">Een veilige plek voor al je gegevens</string>
     <string name="welcome_feature_1_text">Benader, deel &amp; beveilig je gegevens thuis en binnen je organisatie</string>
@@ -578,7 +617,6 @@ Kies er eentje van een provider.</string>
     <string name="welcome_feature_2_title">Meerdere accounts</string>
     <string name="welcome_feature_2_text">Verbind met al je clouds</string>
 
-    <string name="welcome_feature_3_title">Direct uploaden</string>
     <string name="welcome_feature_3_text">Hou je foto\'s veilig</string>
 
     <string name="whats_new_skip">Overslaan</string>
@@ -627,5 +665,11 @@ Kies er eentje van een provider.</string>
     <string name="privacy">Privacy</string>
     <string name="file_not_found">Bestand niet gevonden!</string>
 
+    <!-- Auto upload -->
+    <string name="autoupload_custom_folder">Instellen aangepaste map</string>
+    <string name="autoupload_create_new_custom_folder">Maak aangepaste nieuwe map aan</string>
+    <string name="synced_folders_configure_folders">Mappen instellen</string>
+
     <string name="test_server_button">Test server verbinding</string>
+    <string name="resharing_is_not_allowed">Verder delen is niet toegestaan</string>
     </resources>

src/main/res/values-pl/strings.xml

@@ -550,9 +550,6 @@
     <string name="storage_description_sd_no">karta SD %1$d</string>
     <string name="storage_description_unknown">Nieznany</string>
 
-    <!-- What's new feature and texts to show -->
-    <string name="whats_new_title">Co nowego w Nextcloud</string>
-
     <!-- Welcome to Nc intro features -->
     <string name="welcome_feature_1_title">Bezpieczny dom dla wszystkich danych</string>
     <string name="welcome_feature_1_text">Dostęp, współdzielenie i ochrona Twoich plików w domu i w pracy</string>
@@ -560,7 +557,6 @@
     <string name="welcome_feature_2_title">Wiele kont</string>
     <string name="welcome_feature_2_text">Podłącz się do wszystkich swoich chmur</string>
 
-    <string name="welcome_feature_3_title">Natychmiastowe wysyłanie</string>
     <string name="welcome_feature_3_text">Twoje zdjęcia będą bezpieczne</string>
 
     <string name="whats_new_skip">Pomiń</string>

src/main/res/values-pt-rBR/strings.xml

@@ -609,9 +609,6 @@
     <string name="storage_description_sd_no">Cartão SD %1$d</string>
     <string name="storage_description_unknown">Desconhecido</string>
 
-    <!-- What's new feature and texts to show -->
-    <string name="whats_new_title">O que há de novo no Nextcloud</string>
-
     <!-- Welcome to Nc intro features -->
     <string name="welcome_feature_1_title">Um local seguro para seus dados</string>
     <string name="welcome_feature_1_text">Acesse, compartilhe e proteja seus arquivos, em casa e no trabalho</string>
@@ -619,7 +616,6 @@
     <string name="welcome_feature_2_title">Multi contas</string>
     <string name="welcome_feature_2_text">Conectar em todas as suas Nuvens</string>
 
-    <string name="welcome_feature_3_title">Envio automático</string>
     <string name="welcome_feature_3_text">Mantenha seguras as suas fotos</string>
 
     <string name="whats_new_skip">Saltar</string>
@@ -675,4 +671,4 @@
 
     <string name="test_server_button">Teste de conexão ao servidor</string>
     <string name="resharing_is_not_allowed">Recompartilhamento não é permitido</string>
-</resources>
+    </resources>

src/main/res/values-pt-rPT/strings.xml

@@ -350,15 +350,11 @@
     <string name="storage_description_sd_no">Cartão SD %1$d</string>
     <string name="storage_description_unknown">Desconhecido</string>
 
-    <!-- What's new feature and texts to show -->
-    <string name="whats_new_title">O que há de novo da Nextcloud</string>
-
     <!-- Welcome to Nc intro features -->
     <string name="welcome_feature_1_title">Um lugar seguro para todos os seus dados</string>
     <string name="welcome_feature_2_title">Conta multipla</string>
     <string name="welcome_feature_2_text">Ligar-se a todas as suas contas cloud</string>
 
-    <string name="welcome_feature_3_title">Carregamento instantâneo </string>
     <string name="whats_new_skip">Passar à frente</string>
 
     </resources>

src/main/res/values-ro/strings.xml

@@ -403,15 +403,11 @@
     <string name="storage_description_sd_no">Card SD %1$d</string>
     <string name="storage_description_unknown">Necunoscut</string>
 
-    <!-- What's new feature and texts to show -->
-    <string name="whats_new_title">Ce este nou în Nextcloud</string>
-
     <!-- Welcome to Nc intro features -->
     <string name="welcome_feature_1_title">O casă sigură pentru toate datele tale</string>
     <string name="welcome_feature_2_title">Conturi multiple</string>
     <string name="welcome_feature_2_text">Conectează-te la toate cloud-urile tale</string>
 
-    <string name="welcome_feature_3_title">Încărcare instantă</string>
     <string name="welcome_feature_3_text">Păstrează-ți fotografiile în siguranță</string>
 
     <string name="whats_new_skip">Sari peste</string>

src/main/res/values-ru/strings.xml

@@ -613,9 +613,6 @@
     <string name="storage_description_sd_no">SD карта %1$d</string>
     <string name="storage_description_unknown">Неизвестно</string>
 
-    <!-- What's new feature and texts to show -->
-    <string name="whats_new_title">Что нового в Nextcloud</string>
-
     <!-- Welcome to Nc intro features -->
     <string name="welcome_feature_1_title">Надежный дом для всех ваших данных</string>
     <string name="welcome_feature_1_text">Доступ, общий доступ и защита ваших файлов для дома и предприятия</string>
@@ -623,7 +620,6 @@
     <string name="welcome_feature_2_title">Работа с несколькими аккаунтами</string>
     <string name="welcome_feature_2_text">Доступ ко всем вашим облакам</string>
 
-    <string name="welcome_feature_3_title">Немедленная выгрузка</string>
     <string name="welcome_feature_3_text">Держите ваши фотографии в безопасности</string>
 
     <string name="whats_new_skip">Пропустить</string>
@@ -679,4 +675,4 @@
 
     <string name="test_server_button">Проверить соединение с сервером</string>
     <string name="resharing_is_not_allowed">Повторное открытие доступа запрещено</string>
-</resources>
+    </resources>

src/main/res/values-sk-rSK/strings.xml

@@ -393,15 +393,11 @@
     <string name="storage_description_sd_no">SD karta %1$d</string>
     <string name="storage_description_unknown">Neznámy</string>
 
-    <!-- What's new feature and texts to show -->
-    <string name="whats_new_title">Čo je nové v Nextcloud</string>
-
     <!-- Welcome to Nc intro features -->
     <string name="welcome_feature_1_title">Bezpečný domov pre všetky vaše dáta</string>
     <string name="welcome_feature_2_title">Viac účtov</string>
     <string name="welcome_feature_2_text">Pripojte sa k všetkým vaším cloudovým službám</string>
 
-    <string name="welcome_feature_3_title">Okamžité nahratie</string>
     <string name="welcome_feature_3_text">Udržujte svoje fotografie v bezpečí</string>
 
     <string name="whats_new_skip">Preskočiť</string>

src/main/res/values-sl/strings.xml

@@ -557,6 +557,5 @@
     <string name="upload_file_dialog_title">Vnesi ime in zvrst datoteke za nalaganje</string>
     <string name="storage_description_unknown">Neznano</string>
 
-    <string name="welcome_feature_3_title">Hipno nalaganje</string>
     <string name="contacts_automatic_backup">Samodejno shranjevanje</string>
     </resources>

src/main/res/values-sq/strings.xml

@@ -609,9 +609,6 @@
     <string name="storage_description_sd_no">Kart SD %1$d</string>
     <string name="storage_description_unknown">E panjohur</string>
 
-    <!-- What's new feature and texts to show -->
-    <string name="whats_new_title">Çfarë është e re në Nextcloud</string>
-
     <!-- Welcome to Nc intro features -->
     <string name="welcome_feature_1_title">Një shtëpi e sigurt për të gjitha të dhënat tuaja</string>
     <string name="welcome_feature_1_text">Akseso, ndaj dhe mbro skedarët e tuaja në shtëpinë dhe organizatën tuaj.</string>
@@ -619,7 +616,6 @@
     <string name="welcome_feature_2_title">Llogari e shumfishtë</string>
     <string name="welcome_feature_2_text">Lidhuni me të gjitha shërbimet cloud</string>
 
-    <string name="welcome_feature_3_title">Ngarkim i menjëhershëm</string>
     <string name="welcome_feature_3_text">Mbajini fotot të sigurta</string>
 
     <string name="whats_new_skip">Kalo</string>
@@ -675,4 +671,4 @@
 
     <string name="test_server_button">Testo lidhjen e serverit</string>
     <string name="resharing_is_not_allowed">Ri-shpërndarja nuk lejohet</string>
-</resources>
+    </resources>

src/main/res/values-sv/strings.xml

@@ -393,15 +393,11 @@
     <string name="storage_description_sd_no">SD kort %1$d</string>
     <string name="storage_description_unknown">Okänd</string>
 
-    <!-- What's new feature and texts to show -->
-    <string name="whats_new_title">Vad är nytt i Nextcloud</string>
-
     <!-- Welcome to Nc intro features -->
     <string name="welcome_feature_1_title">En säker plats för all din data</string>
     <string name="welcome_feature_2_title">Multikonto</string>
     <string name="welcome_feature_2_text">Anslut alla dina moln</string>
 
-    <string name="welcome_feature_3_title">Automatisk uppladdning</string>
     <string name="welcome_feature_3_text">Lagra dina foton på ett säkert ställe</string>
 
     <string name="whats_new_skip">Hoppa över</string>

src/main/res/values-tr/strings.xml

@@ -609,9 +609,6 @@
     <string name="storage_description_sd_no">SD kart  %1$d</string>
     <string name="storage_description_unknown">Bilinmiyor</string>
 
-    <!-- What's new feature and texts to show -->
-    <string name="whats_new_title">Nextcloud yenilikleri</string>
-
     <!-- Welcome to Nc intro features -->
     <string name="welcome_feature_1_title">Verileriniz için güvenli bir yer!</string>
     <string name="welcome_feature_1_text">Ev ya da iş yerinizdeki dosyalarınıza erişin, paylaşın ve koruyun</string>
@@ -619,7 +616,6 @@
     <string name="welcome_feature_2_title">Birden çok hesap</string>
     <string name="welcome_feature_2_text">Tüm bulut hesaplarınıza bağlanın</string>
 
-    <string name="welcome_feature_3_title">Anında yükleme</string>
     <string name="welcome_feature_3_text">Fotoğraflarınızı koruyun</string>
 
     <string name="whats_new_skip">Atla</string>
@@ -675,4 +671,4 @@
 
     <string name="test_server_button">Sunucu bağlantısını sına</string>
     <string name="resharing_is_not_allowed">Yeniden paylaşıma izin verilmiyor</string>
-</resources>
+    </resources>

src/main/res/values-uk/strings.xml

@@ -337,15 +337,11 @@
     <string name="storage_description_sd_no">SD картка %1$d</string>
     <string name="storage_description_unknown">Невідомо</string>
 
-    <!-- What's new feature and texts to show -->
-    <string name="whats_new_title">Що нового у Nextcloud</string>
-
     <!-- Welcome to Nc intro features -->
     <string name="welcome_feature_1_title">Безпечний дім для Ваших даних</string>
     <string name="welcome_feature_2_title">Декілька облікових записів</string>
     <string name="welcome_feature_2_text">З\'єднайтеся з всіма Вашими хмарами</string>
 
-    <string name="welcome_feature_3_title">Миттєве вивантаження</string>
     <string name="welcome_feature_3_text">Тримайте свої фото у безпеці</string>
 
     <string name="whats_new_skip">Пропустити</string>

src/main/res/values-zh-rCN/strings.xml

@@ -576,9 +576,6 @@
     <string name="storage_description_sd_no">SD卡%1$d</string>
     <string name="storage_description_unknown">不知道</string>
 
-    <!-- What's new feature and texts to show -->
-    <string name="whats_new_title">有什么新东西在Nextcloud里</string>
-
     <!-- Welcome to Nc intro features -->
     <string name="welcome_feature_1_title">给你所有的数据一个安全的家</string>
     <string name="welcome_feature_1_text">访问，共享和保护您的文件在家里和工作</string>
@@ -586,7 +583,6 @@
     <string name="welcome_feature_2_title">多用户</string>
     <string name="welcome_feature_2_text">联接你所有的云</string>
 
-    <string name="welcome_feature_3_title">即时上传</string>
     <string name="welcome_feature_3_text">保护你的照片安全</string>
 
     <string name="whats_new_skip">跳过</string>

src/main/res/values/strings.xml

@@ -623,7 +623,7 @@
     <string name="storage_description_unknown">Unknown</string>
 
     <!-- What's new feature and texts to show -->
-    <string name="whats_new_title">What\'s new in Nextcloud</string>
+    <string name="whats_new_title">What\'s new in %1$s</string>
 
     <!-- Welcome to Nc intro features -->
     <string name="welcome_feature_1_title">A safe home for all your data</string>
@@ -632,9 +632,21 @@
     <string name="welcome_feature_2_title">Multi account</string>
     <string name="welcome_feature_2_text">Connect to all your clouds</string>
 
-    <string name="welcome_feature_3_title">Instant upload</string>
+    <string name="welcome_feature_3_title">Auto upload</string>
     <string name="welcome_feature_3_text">Keep your photos safe</string>
 
+    <string name="whats_new_auto_upload_title">Enhanced auto upload</string>
+    <string name="whats_new_auto_upload_content">\u2022 for all android versions\n\u2022 less battery consumption\n\u2022 more reliable, but not instant\n\u2022 separation of images &amp; videos</string>
+
+    <string name="whats_new_search_title">Full server search</string>
+    <string name="whats_new_search_content">\u2022 Not only in current folder\n\u2022 Returns results from complete server\n\u2022 Directly open files/folders\n\u2022 Supported in NC12 and above</string>
+
+    <string name="whats_new_theming_title">Theming support</string>
+    <string name="whats_new_theming_content">If enabled on server app will show\n\u2022 background image\n\u2022 server name\n\u2022 use color to distinguish accounts</string>
+
+    <string name="whats_new_notification_title">Notification support</string>
+    <string name="whats_new_notification_content">Get notifications like\n\u2022 new remote share\n\u2022 comment mentions\n\u2022 admin announcements</string>
+
     <string name="whats_new_skip">Skip</string>
 
     <string name="fingerprint_scan_finger">Please scan your finger</string>
@@ -690,4 +702,6 @@
     <string name="test_server_button">Test server connection</string>
     <string name="info_separator" translatable="false">,</string>
     <string name="resharing_is_not_allowed">Resharing is not allowed</string>
+    <string name="whats_new_fingerprint_title">Unlock with fingerprint</string>
+    <string name="whats_new_fingerprint_content">Use your fingerprint to unlock the app</string>
 </resources>

src/modified/AndroidManifest.xml

@@ -19,8 +19,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools"
           package="com.owncloud.android"
-          android:versionCode="20000002"
-          android:versionName="2.0.0RC2">
+          android:versionCode="20000003"
+          android:versionName="2.0.0RC3">
 
     <application
         android:name=".MainApp"