merge trunk

2021-07-14 13:09:26 -07:00 · 2021-07-14 13:09:26 -07:00 · 782c838fc8
parent e9d28e76ea c63a1ae489
commit 782c838fc8
24 changed files with 103 additions and 74 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -30,7 +30,7 @@ steps:
        path: /root/.pub-cache
    commands:
      - ./fetch-tor.sh
-      - echo `git describe --tags` > VERSION
+      - echo `git describe --tags --abbrev=1` > VERSION
      - echo `date +%G-%m-%d-%H-%M` > BUILDDATE
      - flutter pub get
      - mkdir deploy
@ -195,9 +195,9 @@ steps:
  - name: fetch
    image: openpriv/flutter-desktop:windows-sdk30-fdev2.3rc
    commands:
-      - powershell -command "Invoke-WebRequest -Uri https://dist.torproject.org/torbrowser/10.0.18/tor-win64-0.4.5.9.zip -OutFile tor.zip"
-      - powershell -command "if ((Get-FileHash tor.zip -Algorithm sha512).Hash -ne '72764eb07ad8ab511603aba0734951ca003989f5f4686af91ba220217b4a8a4bcc5f571b59f52c847932f6efedf847b111621983050fcddbb8099d43ca66fb07' ) { Write-Error 'tor.zip sha512sum mismatch' }"
-      - git describe --tags > VERSION
+      - powershell -command "Invoke-WebRequest -Uri https://dist.torproject.org/torbrowser/10.5a17/tor-win64-0.4.6.5.zip -OutFile tor.zip"
+      - powershell -command "if ((Get-FileHash tor.zip -Algorithm sha512).Hash -ne '7917561a7a063440a1ddfa9cb544ab9ffd09de84cea3dd66e3cc9cd349dd9f85b74a522ec390d7a974bc19b424c4d53af60e57bbc47e763d13cab6a203c4592f' ) { Write-Error 'tor.zip sha512sum mismatch' }"
+      - git describe --tags --abbrev=1 > VERSION
      - powershell -command "Get-Date -Format 'yyyy-MM-dd-HH-mm'" > BUILDDATE
      - .\fetch-libcwtch-go.ps1

--- a/README.md
+++ b/README.md
@ -68,6 +68,7 @@ In Lokalise, hit Download and make sure:
 * Format is set to "Flutter (.arb)
 * Output filename is set to `l10n/intl_%LANG_ISO%.%FORMAT%`
 * Empty translations is set to "Replace with base language"
+* Order "Last Update"

 Build, download and unzip the output, overwriting `lib/l10n`. The next time Flwtch is built, Flutter will notice the changes and update `app_localizations.dart` accordingly (thanks to `generate:true` in `pubspec.yaml`).

--- a/assets/core/Cwtch_knott_white.svg
+++ b/assets/core/Cwtch_knott_white.svg
@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 24.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
 <svg
   xmlns:dc="http://purl.org/dc/elements/1.1/"
   xmlns:cc="http://creativecommons.org/ns#"
@ -20,7 +18,7 @@
   inkscape:export-filename="/home/sarah/PARA/projects/cwtch/assets/core/knott-white.png"
   inkscape:export-xdpi="98.300003"
   inkscape:export-ydpi="98.300003"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"><metadata
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15)"><metadata
   id="metadata35"><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><defs
@ -38,12 +36,13 @@
   id="namedview31"
   showgrid="false"
   inkscape:zoom="1.3350176"
-   inkscape:cx="-56.414859"
-   inkscape:cy="254.41396"
+   inkscape:cx="267.02429"
+   inkscape:cy="221.87173"
   inkscape:window-x="0"
   inkscape:window-y="31"
   inkscape:window-maximized="1"
-   inkscape:current-layer="Layer_1" />
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0" />
 <style
   type="text/css"
   id="style2">
@ -247,153 +246,154 @@
 <g
   transform="translate(2.1186441)"
   id="g61"
-   style="fill:#000000;stroke:#000000;stroke-opacity:1;stroke-width:7.4999999;stroke-miterlimit:4;stroke-dasharray:none">
+   style="fill:#000000;stroke:#000000;stroke-opacity:1;stroke-width:8.4;stroke-miterlimit:4;stroke-dasharray:none">
 	<path
-   style="fill:#000000;stroke:#000000;stroke-opacity:1;stroke-width:7.4999999;stroke-miterlimit:4;stroke-dasharray:none"
+   style="fill:#000000;stroke:#000000;stroke-opacity:1;stroke-width:8.4;stroke-miterlimit:4;stroke-dasharray:none"
   inkscape:connector-curvature="0"
   id="path37"
   d="m 465.94,209.46 c -0.72,3.49 -2.35,7.45 -4.95,12.03 l 21.16,21.16 c 2.83,-5.51 7.14,-15.16 9.47,-26.61 4.76,-23.39 -0.6,-43.02 -15.93,-58.35 -28.01,-28.01 -57.26,-30.61 -94.84,-8.43 -9.04,5.34 -18.64,12.24 -28.55,20.51 -22.58,18.86 -47.88,45.85 -75.22,80.23 17.91,22.52 35,41.95 50.83,57.79 7.26,7.26 14.4,13.91 21.27,19.81 l 18.76,-18.76 c -6.83,-5.78 -13.98,-12.41 -21.32,-19.75 -10.39,-10.39 -21.5,-22.57 -32.99,-36.19 l -2.43,-2.9 2.44,-2.89 c 21.03,-24.91 40.59,-44.8 58.14,-59.09 11.14,-9.08 21.56,-15.98 30.98,-20.53 8.14,-3.92 15.55,-6.11 22.03,-6.49 3.16,-0.19 8.05,-0.15 14,2.3 5.84,2.4 11.79,6.68 18.2,13.09 2.39,2.39 5.82,6.25 7.91,12.08 2.16,6.02 2.51,12.85 1.07,20.88 z"
   class="st0" />
 	<path
-   style="fill:#000000;stroke:#000000;stroke-opacity:1;stroke-width:7.4999999;stroke-miterlimit:4;stroke-dasharray:none"
+   style="fill:#000000;stroke:#000000;stroke-opacity:1;stroke-width:8.4;stroke-miterlimit:4;stroke-dasharray:none"
   inkscape:connector-curvature="0"
   id="path39"
   d="M 355.44,371.4 450,276.85 c -5.56,-8.23 -12.85,-16.22 -16.93,-20.49 l -93.37,93.37 c 6.02,7.42 11.29,14.68 15.74,21.67 z"
   class="st0" />
 	<path
-   style="fill:#000000;stroke:#000000;stroke-opacity:1;stroke-width:7.4999999;stroke-miterlimit:4;stroke-dasharray:none"
+   style="fill:#000000;stroke:#000000;stroke-opacity:1;stroke-width:8.4;stroke-miterlimit:4;stroke-dasharray:none"
   inkscape:connector-curvature="0"
   id="path41"
   d="m 475.69,342.31 c 15.32,-15.32 20.68,-34.95 15.93,-58.34 -3.3,-16.23 -10.57,-28.84 -11.98,-31.18 l -75.82,-75.82 c -6.95,3.64 -14.5,8.63 -22.52,14.89 l 58.13,58.14 -0.03,0.03 c 4.8,5.01 13.98,15.11 20.13,25.07 3.75,6.08 5.87,11.21 6.46,15.66 1.42,7.98 1.06,14.77 -1.09,20.77 -2.09,5.83 -5.51,9.68 -7.91,12.08 -6.83,6.83 -13.16,11.26 -19.37,13.55 -6.33,2.34 -11.55,2.09 -15.39,1.6 -5.05,-0.63 -10.62,-2.28 -16.58,-4.9 L 385.9,353.6 c 35.17,19.04 63.04,15.46 89.79,-11.29 z"
   class="st0" />
 	<path
-   style="fill:#000000;stroke:#000000;stroke-opacity:1;stroke-width:7.4999999;stroke-miterlimit:4;stroke-dasharray:none"
+   style="fill:#000000;stroke:#000000;stroke-opacity:1;stroke-width:8.4;stroke-miterlimit:4;stroke-dasharray:none"
   inkscape:connector-curvature="0"
   id="path43"
   d="m 311.53,35.11 c 5.83,2.09 9.68,5.51 12.08,7.91 6.83,6.83 11.26,13.16 13.55,19.37 2.34,6.33 2.09,11.55 1.6,15.39 -0.63,5.05 -2.28,10.62 -4.9,16.58 L 353.6,114.1 C 372.64,78.93 369.06,51.06 342.31,24.31 326.99,8.99 307.36,3.63 283.97,8.38 c -16.23,3.3 -28.84,10.57 -31.18,11.98 l -75.82,75.82 c 3.64,6.95 8.63,14.5 14.89,22.52 L 250,60.57 l 0.03,0.03 c 5.01,-4.8 15.11,-13.98 25.07,-20.13 6.08,-3.75 11.21,-5.87 15.66,-6.46 7.98,-1.41 14.77,-1.05 20.77,1.1 z"
   class="st0" />
 	<path
-   style="fill:#000000;stroke:#000000;stroke-opacity:1;stroke-width:7.4999999;stroke-miterlimit:4;stroke-dasharray:none"
+   style="fill:#000000;stroke:#000000;stroke-opacity:1;stroke-width:8.4;stroke-miterlimit:4;stroke-dasharray:none"
   inkscape:connector-curvature="0"
   id="path45"
   d="m 157.69,24.31 c -28.01,28.01 -30.61,57.26 -8.43,94.84 5.34,9.04 12.24,18.64 20.51,28.54 18.86,22.58 45.85,47.88 80.23,75.22 22.52,-17.91 41.95,-35 57.79,-50.83 7.26,-7.26 13.91,-14.4 19.81,-21.27 l -18.76,-18.76 c -5.78,6.83 -12.41,13.98 -19.75,21.32 -10.39,10.39 -22.57,21.49 -36.19,32.99 l -2.9,2.44 -2.89,-2.44 C 222.2,165.33 202.31,145.77 188.02,128.22 178.94,117.08 172.04,106.66 167.49,97.24 163.57,89.1 161.38,81.69 161,75.21 c -0.19,-3.16 -0.15,-8.05 2.3,-14 2.4,-5.84 6.68,-11.79 13.09,-18.2 2.39,-2.39 6.25,-5.82 12.08,-7.91 6.02,-2.16 12.85,-2.51 20.87,-1.07 l 0.11,0.02 c 3.49,0.72 7.45,2.35 12.03,4.95 L 242.64,17.84 C 237.13,15.01 227.48,10.7 216.02,8.37 192.64,3.63 173.01,8.99 157.69,24.31 Z"
   class="st0" />
 	<path
-   style="fill:#000000;stroke:#000000;stroke-opacity:1;stroke-width:7.4999999;stroke-miterlimit:4;stroke-dasharray:none"
+   style="fill:#000000;stroke:#000000;stroke-opacity:1;stroke-width:8.4;stroke-miterlimit:4;stroke-dasharray:none"
   inkscape:connector-curvature="0"
   id="path47"
   d="m 276.85,50 c -8.23,5.56 -16.22,12.85 -20.49,16.92 l 93.37,93.37 c 7.42,-6.02 14.68,-11.29 21.67,-15.74 z"
   class="st0" />
 	<path
-   style="fill:#000000;stroke:#000000;stroke-opacity:1;stroke-width:7.4999999;stroke-miterlimit:4;stroke-dasharray:none"
+   style="fill:#000000;stroke:#000000;stroke-opacity:1;stroke-width:8.4;stroke-miterlimit:4;stroke-dasharray:none"
   inkscape:connector-curvature="0"
   id="path49"
   d="m 24.31,342.31 c 28.01,28.01 57.26,30.61 94.84,8.43 9.04,-5.34 18.64,-12.24 28.54,-20.51 22.58,-18.86 47.88,-45.85 75.22,-80.23 -17.91,-22.52 -35,-41.95 -50.83,-57.79 -7.26,-7.26 -14.4,-13.91 -21.27,-19.81 l -18.76,18.76 c 6.83,5.78 13.98,12.41 21.32,19.75 10.39,10.39 21.5,22.57 32.99,36.19 l 2.44,2.89 -2.44,2.89 c -21.03,24.91 -40.59,44.8 -58.14,59.09 -11.14,9.08 -21.56,15.98 -30.98,20.53 -8.14,3.92 -15.55,6.11 -22.03,6.49 -3.16,0.19 -8.05,0.15 -14,-2.3 -5.84,-2.4 -11.79,-6.68 -18.2,-13.09 -2.39,-2.39 -5.82,-6.25 -7.91,-12.08 -2.16,-6.02 -2.51,-12.85 -1.07,-20.88 l 0.02,-0.11 C 34.77,287.04 36.4,283.08 39,278.5 L 17.84,257.34 c -2.83,5.51 -7.14,15.17 -9.47,26.63 -4.74,23.39 0.62,43.02 15.94,58.34 z"
   class="st0" />
 	<path
-   style="fill:#000000;stroke:#000000;stroke-opacity:1;stroke-width:7.4999999;stroke-miterlimit:4;stroke-dasharray:none"
+   style="fill:#000000;stroke:#000000;stroke-opacity:1;stroke-width:8.4;stroke-miterlimit:4;stroke-dasharray:none"
   inkscape:connector-curvature="0"
   id="path51"
   d="m 60.57,250 0.03,-0.03 c -4.8,-5.02 -13.98,-15.11 -20.13,-25.07 -3.75,-6.08 -5.87,-11.21 -6.46,-15.66 -1.42,-7.98 -1.06,-14.77 1.09,-20.77 2.09,-5.83 5.51,-9.68 7.91,-12.08 6.83,-6.83 13.16,-11.26 19.37,-13.55 6.33,-2.34 11.55,-2.09 15.39,-1.6 5.05,0.63 10.62,2.28 16.58,4.9 L 114.09,146.4 C 78.92,127.36 51.05,130.94 24.3,157.69 8.99,173.01 3.63,192.64 8.38,216.03 c 3.3,16.23 10.57,28.84 11.98,31.18 l 75.82,75.82 c 6.95,-3.64 14.5,-8.63 22.52,-14.89 z"
   class="st0" />
 	<path
-   style="fill:#000000;stroke:#000000;stroke-opacity:1;stroke-width:7.4999999;stroke-miterlimit:4;stroke-dasharray:none"
+   style="fill:#000000;stroke:#000000;stroke-opacity:1;stroke-width:8.4;stroke-miterlimit:4;stroke-dasharray:none"
   inkscape:connector-curvature="0"
   id="path53"
   d="m 66.93,243.64 93.37,-93.37 c -6.02,-7.42 -11.29,-14.68 -15.74,-21.67 L 50,223.15 c 5.57,8.23 12.85,16.23 16.93,20.49 z"
   class="st0" />
 	<path
-   style="fill:#000000;stroke:#000000;stroke-opacity:1;stroke-width:7.4999999;stroke-miterlimit:4;stroke-dasharray:none"
+   style="fill:#000000;stroke:#000000;stroke-opacity:1;stroke-width:8.4;stroke-miterlimit:4;stroke-dasharray:none"
   inkscape:connector-curvature="0"
   id="path55"
   d="m 342.31,475.69 c 28.01,-28.01 30.61,-57.26 8.43,-94.84 -5.34,-9.04 -12.24,-18.64 -20.51,-28.54 -18.86,-22.58 -45.85,-47.88 -80.23,-75.22 -22.52,17.91 -41.95,35 -57.79,50.83 -7.26,7.26 -13.91,14.4 -19.81,21.27 l 18.76,18.76 c 5.78,-6.83 12.41,-13.98 19.75,-21.32 10.39,-10.39 22.57,-21.49 36.19,-32.99 l 2.89,-2.44 2.89,2.44 c 24.91,21.03 44.8,40.59 59.09,58.14 9.08,11.14 15.98,21.56 20.53,30.98 3.93,8.14 6.11,15.56 6.49,22.03 0.19,3.16 0.15,8.05 -2.3,14 -2.4,5.84 -6.68,11.79 -13.09,18.2 -2.39,2.39 -6.25,5.82 -12.08,7.91 -6.02,2.16 -12.85,2.51 -20.88,1.07 l -0.11,-0.02 c -3.49,-0.72 -7.45,-2.35 -12.03,-4.95 l -21.16,21.16 c 5.5,2.83 15.15,7.13 26.59,9.46 23.41,4.76 43.05,-0.6 58.38,-15.93 z"
   class="st0" />
 	<path
-   style="fill:#000000;stroke:#000000;stroke-opacity:1;stroke-width:7.4999999;stroke-miterlimit:4;stroke-dasharray:none"
+   style="fill:#000000;stroke:#000000;stroke-opacity:1;stroke-width:8.4;stroke-miterlimit:4;stroke-dasharray:none"
   inkscape:connector-curvature="0"
   id="path57"
   d="M 243.64,433.07 150.27,339.7 c -7.42,6.02 -14.68,11.29 -21.67,15.74 L 223.15,450 c 8.23,-5.57 16.23,-12.85 20.49,-16.93 z"
   class="st0" />
 	<path
-   style="fill:#000000;stroke:#000000;stroke-opacity:1;stroke-width:7.4999999;stroke-miterlimit:4;stroke-dasharray:none"
+   style="fill:#000000;stroke:#000000;stroke-opacity:1;stroke-width:8.4;stroke-miterlimit:4;stroke-dasharray:none"
   inkscape:connector-curvature="0"
   id="path59"
   d="m 157.69,475.69 c 15.32,15.32 34.95,20.68 58.33,15.93 16.24,-3.3 28.85,-10.58 31.19,-11.98 l 75.82,-75.82 c -3.64,-6.95 -8.63,-14.5 -14.89,-22.52 L 250,439.43 249.97,439.4 c -5.01,4.8 -15.11,13.98 -25.07,20.13 -6.08,3.75 -11.21,5.87 -15.66,6.46 -7.98,1.42 -14.77,1.06 -20.77,-1.09 -5.83,-2.09 -9.68,-5.51 -12.08,-7.91 -6.83,-6.83 -11.26,-13.16 -13.55,-19.37 -2.34,-6.33 -2.09,-11.55 -1.6,-15.39 0.63,-5.05 2.28,-10.62 4.9,-16.58 L 146.4,385.9 c -19.04,35.17 -15.46,63.04 11.29,89.79 z"
   class="st0" />
 </g><g
   id="g28"
-   transform="translate(2.1186441)">
+   transform="translate(2.1186441)"
+   style="stroke-width:1.4;stroke-miterlimit:4;stroke-dasharray:none">
 	<path
   class="st0"
   d="m 465.94,209.46 c -0.72,3.49 -2.35,7.45 -4.95,12.03 l 21.16,21.16 c 2.83,-5.51 7.14,-15.16 9.47,-26.61 4.76,-23.39 -0.6,-43.02 -15.93,-58.35 -28.01,-28.01 -57.26,-30.61 -94.84,-8.43 -9.04,5.34 -18.64,12.24 -28.55,20.51 -22.58,18.86 -47.88,45.85 -75.22,80.23 17.91,22.52 35,41.95 50.83,57.79 7.26,7.26 14.4,13.91 21.27,19.81 l 18.76,-18.76 c -6.83,-5.78 -13.98,-12.41 -21.32,-19.75 -10.39,-10.39 -21.5,-22.57 -32.99,-36.19 l -2.43,-2.9 2.44,-2.89 c 21.03,-24.91 40.59,-44.8 58.14,-59.09 11.14,-9.08 21.56,-15.98 30.98,-20.53 8.14,-3.92 15.55,-6.11 22.03,-6.49 3.16,-0.19 8.05,-0.15 14,2.3 5.84,2.4 11.79,6.68 18.2,13.09 2.39,2.39 5.82,6.25 7.91,12.08 2.16,6.02 2.51,12.85 1.07,20.88 z"
   id="path4"
   inkscape:connector-curvature="0"
-   style="fill:#ffffff" />
+   style="fill:#ffffff;stroke-width:1.4;stroke-miterlimit:4;stroke-dasharray:none" />
 	<path
   class="st0"
   d="M 355.44,371.4 450,276.85 c -5.56,-8.23 -12.85,-16.22 -16.93,-20.49 l -93.37,93.37 c 6.02,7.42 11.29,14.68 15.74,21.67 z"
   id="path6"
   inkscape:connector-curvature="0"
-   style="fill:#ffffff" />
+   style="fill:#ffffff;stroke-width:1.4;stroke-miterlimit:4;stroke-dasharray:none" />
 	<path
   class="st0"
   d="m 475.69,342.31 c 15.32,-15.32 20.68,-34.95 15.93,-58.34 -3.3,-16.23 -10.57,-28.84 -11.98,-31.18 l -75.82,-75.82 c -6.95,3.64 -14.5,8.63 -22.52,14.89 l 58.13,58.14 -0.03,0.03 c 4.8,5.01 13.98,15.11 20.13,25.07 3.75,6.08 5.87,11.21 6.46,15.66 1.42,7.98 1.06,14.77 -1.09,20.77 -2.09,5.83 -5.51,9.68 -7.91,12.08 -6.83,6.83 -13.16,11.26 -19.37,13.55 -6.33,2.34 -11.55,2.09 -15.39,1.6 -5.05,-0.63 -10.62,-2.28 -16.58,-4.9 L 385.9,353.6 c 35.17,19.04 63.04,15.46 89.79,-11.29 z"
   id="path8"
   inkscape:connector-curvature="0"
-   style="fill:#ffffff" />
+   style="fill:#ffffff;stroke-width:1.4;stroke-miterlimit:4;stroke-dasharray:none" />
 	<path
   class="st0"
   d="m 311.53,35.11 c 5.83,2.09 9.68,5.51 12.08,7.91 6.83,6.83 11.26,13.16 13.55,19.37 2.34,6.33 2.09,11.55 1.6,15.39 -0.63,5.05 -2.28,10.62 -4.9,16.58 L 353.6,114.1 C 372.64,78.93 369.06,51.06 342.31,24.31 326.99,8.99 307.36,3.63 283.97,8.38 c -16.23,3.3 -28.84,10.57 -31.18,11.98 l -75.82,75.82 c 3.64,6.95 8.63,14.5 14.89,22.52 L 250,60.57 l 0.03,0.03 c 5.01,-4.8 15.11,-13.98 25.07,-20.13 6.08,-3.75 11.21,-5.87 15.66,-6.46 7.98,-1.41 14.77,-1.05 20.77,1.1 z"
   id="path10"
   inkscape:connector-curvature="0"
-   style="fill:#ffffff" />
+   style="fill:#ffffff;stroke-width:1.4;stroke-miterlimit:4;stroke-dasharray:none" />
 	<path
   class="st0"
   d="m 157.69,24.31 c -28.01,28.01 -30.61,57.26 -8.43,94.84 5.34,9.04 12.24,18.64 20.51,28.54 18.86,22.58 45.85,47.88 80.23,75.22 22.52,-17.91 41.95,-35 57.79,-50.83 7.26,-7.26 13.91,-14.4 19.81,-21.27 l -18.76,-18.76 c -5.78,6.83 -12.41,13.98 -19.75,21.32 -10.39,10.39 -22.57,21.49 -36.19,32.99 l -2.9,2.44 -2.89,-2.44 C 222.2,165.33 202.31,145.77 188.02,128.22 178.94,117.08 172.04,106.66 167.49,97.24 163.57,89.1 161.38,81.69 161,75.21 c -0.19,-3.16 -0.15,-8.05 2.3,-14 2.4,-5.84 6.68,-11.79 13.09,-18.2 2.39,-2.39 6.25,-5.82 12.08,-7.91 6.02,-2.16 12.85,-2.51 20.87,-1.07 l 0.11,0.02 c 3.49,0.72 7.45,2.35 12.03,4.95 L 242.64,17.84 C 237.13,15.01 227.48,10.7 216.02,8.37 192.64,3.63 173.01,8.99 157.69,24.31 Z"
   id="path12"
   inkscape:connector-curvature="0"
-   style="fill:#ffffff" />
+   style="fill:#ffffff;stroke-width:1.4;stroke-miterlimit:4;stroke-dasharray:none" />
 	<path
   class="st0"
   d="m 276.85,50 c -8.23,5.56 -16.22,12.85 -20.49,16.92 l 93.37,93.37 c 7.42,-6.02 14.68,-11.29 21.67,-15.74 z"
   id="path14"
   inkscape:connector-curvature="0"
-   style="fill:#ffffff" />
+   style="fill:#ffffff;stroke-width:1.4;stroke-miterlimit:4;stroke-dasharray:none" />
 	<path
   class="st0"
   d="m 24.31,342.31 c 28.01,28.01 57.26,30.61 94.84,8.43 9.04,-5.34 18.64,-12.24 28.54,-20.51 22.58,-18.86 47.88,-45.85 75.22,-80.23 -17.91,-22.52 -35,-41.95 -50.83,-57.79 -7.26,-7.26 -14.4,-13.91 -21.27,-19.81 l -18.76,18.76 c 6.83,5.78 13.98,12.41 21.32,19.75 10.39,10.39 21.5,22.57 32.99,36.19 l 2.44,2.89 -2.44,2.89 c -21.03,24.91 -40.59,44.8 -58.14,59.09 -11.14,9.08 -21.56,15.98 -30.98,20.53 -8.14,3.92 -15.55,6.11 -22.03,6.49 -3.16,0.19 -8.05,0.15 -14,-2.3 -5.84,-2.4 -11.79,-6.68 -18.2,-13.09 -2.39,-2.39 -5.82,-6.25 -7.91,-12.08 -2.16,-6.02 -2.51,-12.85 -1.07,-20.88 l 0.02,-0.11 C 34.77,287.04 36.4,283.08 39,278.5 L 17.84,257.34 c -2.83,5.51 -7.14,15.17 -9.47,26.63 -4.74,23.39 0.62,43.02 15.94,58.34 z"
   id="path16"
   inkscape:connector-curvature="0"
-   style="fill:#ffffff" />
+   style="fill:#ffffff;stroke-width:1.4;stroke-miterlimit:4;stroke-dasharray:none" />
 	<path
   class="st0"
   d="m 60.57,250 0.03,-0.03 c -4.8,-5.02 -13.98,-15.11 -20.13,-25.07 -3.75,-6.08 -5.87,-11.21 -6.46,-15.66 -1.42,-7.98 -1.06,-14.77 1.09,-20.77 2.09,-5.83 5.51,-9.68 7.91,-12.08 6.83,-6.83 13.16,-11.26 19.37,-13.55 6.33,-2.34 11.55,-2.09 15.39,-1.6 5.05,0.63 10.62,2.28 16.58,4.9 L 114.09,146.4 C 78.92,127.36 51.05,130.94 24.3,157.69 8.99,173.01 3.63,192.64 8.38,216.03 c 3.3,16.23 10.57,28.84 11.98,31.18 l 75.82,75.82 c 6.95,-3.64 14.5,-8.63 22.52,-14.89 z"
   id="path18"
   inkscape:connector-curvature="0"
-   style="fill:#ffffff" />
+   style="fill:#ffffff;stroke-width:1.4;stroke-miterlimit:4;stroke-dasharray:none" />
 	<path
   class="st0"
   d="m 66.93,243.64 93.37,-93.37 c -6.02,-7.42 -11.29,-14.68 -15.74,-21.67 L 50,223.15 c 5.57,8.23 12.85,16.23 16.93,20.49 z"
   id="path20"
   inkscape:connector-curvature="0"
-   style="fill:#ffffff" />
+   style="fill:#ffffff;stroke-width:1.4;stroke-miterlimit:4;stroke-dasharray:none" />
 	<path
   class="st0"
   d="m 342.31,475.69 c 28.01,-28.01 30.61,-57.26 8.43,-94.84 -5.34,-9.04 -12.24,-18.64 -20.51,-28.54 -18.86,-22.58 -45.85,-47.88 -80.23,-75.22 -22.52,17.91 -41.95,35 -57.79,50.83 -7.26,7.26 -13.91,14.4 -19.81,21.27 l 18.76,18.76 c 5.78,-6.83 12.41,-13.98 19.75,-21.32 10.39,-10.39 22.57,-21.49 36.19,-32.99 l 2.89,-2.44 2.89,2.44 c 24.91,21.03 44.8,40.59 59.09,58.14 9.08,11.14 15.98,21.56 20.53,30.98 3.93,8.14 6.11,15.56 6.49,22.03 0.19,3.16 0.15,8.05 -2.3,14 -2.4,5.84 -6.68,11.79 -13.09,18.2 -2.39,2.39 -6.25,5.82 -12.08,7.91 -6.02,2.16 -12.85,2.51 -20.88,1.07 l -0.11,-0.02 c -3.49,-0.72 -7.45,-2.35 -12.03,-4.95 l -21.16,21.16 c 5.5,2.83 15.15,7.13 26.59,9.46 23.41,4.76 43.05,-0.6 58.38,-15.93 z"
   id="path22"
   inkscape:connector-curvature="0"
-   style="fill:#ffffff" />
+   style="fill:#ffffff;stroke-width:1.4;stroke-miterlimit:4;stroke-dasharray:none" />
 	<path
   class="st0"
   d="M 243.64,433.07 150.27,339.7 c -7.42,6.02 -14.68,11.29 -21.67,15.74 L 223.15,450 c 8.23,-5.57 16.23,-12.85 20.49,-16.93 z"
   id="path24"
   inkscape:connector-curvature="0"
-   style="fill:#ffffff" />
+   style="fill:#ffffff;stroke-width:1.4;stroke-miterlimit:4;stroke-dasharray:none" />
 	<path
   class="st0"
   d="m 157.69,475.69 c 15.32,15.32 34.95,20.68 58.33,15.93 16.24,-3.3 28.85,-10.58 31.19,-11.98 l 75.82,-75.82 c -3.64,-6.95 -8.63,-14.5 -14.89,-22.52 L 250,439.43 249.97,439.4 c -5.01,4.8 -15.11,13.98 -25.07,20.13 -6.08,3.75 -11.21,5.87 -15.66,6.46 -7.98,1.42 -14.77,1.06 -20.77,-1.09 -5.83,-2.09 -9.68,-5.51 -12.08,-7.91 -6.83,-6.83 -11.26,-13.16 -13.55,-19.37 -2.34,-6.33 -2.09,-11.55 -1.6,-15.39 0.63,-5.05 2.28,-10.62 4.9,-16.58 L 146.4,385.9 c -19.04,35.17 -15.46,63.04 11.29,89.79 z"
   id="path26"
   inkscape:connector-curvature="0"
-   style="fill:#ffffff" />
+   style="fill:#ffffff;stroke-width:1.4;stroke-miterlimit:4;stroke-dasharray:none" />
 </g>
-</svg>
+</svg>
--- a/cwtch.png
+++ b/cwtch.png
--- a/lib/cwtch/cwtchNotifier.dart
+++ b/lib/cwtch/cwtchNotifier.dart
@ -68,7 +68,13 @@ class CwtchNotifier {
        }
        if (profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(data["GroupID"]) == null) {
          profileCN.getProfile(data["ProfileOnion"])?.contactList.add(ContactInfoState(data["ProfileOnion"], data["GroupID"],
-              authorization: ContactAuthorization.approved, imagePath: data["PicturePath"], nickname: data["GroupName"], status: status, server: data["GroupServer"], isGroup: true, lastMessageTime: DateTime.now()));
+              authorization: ContactAuthorization.approved,
+              imagePath: data["PicturePath"],
+              nickname: data["GroupName"],
+              status: status,
+              server: data["GroupServer"],
+              isGroup: true,
+              lastMessageTime: DateTime.now()));
          profileCN.getProfile(data["ProfileOnion"])?.contactList.updateLastMessageTime(data["GroupID"], DateTime.now());
        }
        break;
--- a/lib/l10n/intl_pl.arb
+++ b/lib/l10n/intl_pl.arb
@ -1,6 +1,8 @@
 {
    "@@locale": "pl",
-    "@@last_modified": "2021-07-10T17:32:01+02:00",
+    "@@last_modified": "2021-07-14T01:50:27+02:00",
+    "plainProfileDescription": "We recommend that you protect your Cwtch profiles with a password. If you do not set a password on this profile then anyone who has access to this device may be able to access information about this profile, including contacts, messages and sensitive cryptographic keys.",
+    "encryptedProfileDescription": "Encrypting a profile with a password protects it from other people who may also use this device. Encrypted profiles cannot be decrypted, displayed or accessed until the correct password is entered to unlock them.",
    "addContactConfirm": "Add contact %1",
    "addContact": "Add contact",
    "contactGoto": "Go to conversation with %1",
--- a/lib/main.dart
+++ b/lib/main.dart
@ -1,4 +1,5 @@
 import 'dart:convert';
+import 'package:cwtch/config.dart';
 import 'package:cwtch/notification_manager.dart';
 import 'package:cwtch/views/messageview.dart';
 import 'package:cwtch/widgets/rightshiftfixer.dart';
@ -28,7 +29,7 @@ var globalTorStatus = TorStatus();
 var globalAppState = AppState();

 void main() {
-  print("main()");
+  print("Cwtch version: ${EnvironmentConfig.BUILD_VER} built on: ${EnvironmentConfig.BUILD_DATE}");
  LicenseRegistry.addLicense(() => licenses());
  WidgetsFlutterBinding.ensureInitialized();
  print("runApp()");
--- a/lib/model.dart
+++ b/lib/model.dart
@ -329,14 +329,10 @@ class ProfileInfoState extends ChangeNotifier {
  }
 }

-enum ContactAuthorization {
-  unknown,
-  approved,
-  blocked
-}
+enum ContactAuthorization { unknown, approved, blocked }

 ContactAuthorization stringToContactAuthorization(String authStr) {
-  switch(authStr) {
+  switch (authStr) {
    case "approved":
      return ContactAuthorization.approved;
    case "blocked":
@ -346,7 +342,6 @@ ContactAuthorization stringToContactAuthorization(String authStr) {
  }
 }

-
 class ContactInfoState extends ChangeNotifier {
  final String profileOnion;
  final String onion;
--- a/lib/models/message.dart
+++ b/lib/models/message.dart
@ -23,8 +23,6 @@ const TorV3ContactHandleLength = 56;
 // Defines the length of a Cwtch v2 Group.
 const GroupConversationHandleLength = 32;

-
-
 abstract class Message {
  MessageMetadata getMetadata();
  Widget getWidget(BuildContext context);
--- a/lib/models/messages/quotedmessage.dart
+++ b/lib/models/messages/quotedmessage.dart
@ -10,6 +10,17 @@ import 'package:provider/provider.dart';
 import '../../main.dart';
 import '../../model.dart';

+class QuotedMessageStructure {
+  final String quotedHash;
+  final String body;
+  QuotedMessageStructure(this.quotedHash, this.body);
+
+  Map<String, dynamic> toJson() => {
+        'quotedHash': quotedHash,
+        'body': body,
+      };
+}
+
 class LocallyIndexedMessage {
  final dynamic message;
  final int index;
--- a/lib/views/addeditprofileview.dart
+++ b/lib/views/addeditprofileview.dart
@ -136,7 +136,12 @@ class _AddEditProfileViewState extends State<AddEditProfileView> {
                              // We only allow setting password types on profile creation
                              Visibility(
                                  visible: Provider.of<ProfileInfoState>(context).onion.isEmpty,
-                                  child: Row(mainAxisAlignment: MainAxisAlignment.center, children: <Widget>[
+                                  child: SizedBox(
+                                    height: 20,
+                                  )),
+                              Visibility(
+                                  visible: Provider.of<ProfileInfoState>(context).onion.isEmpty,
+                                  child: Column(mainAxisAlignment: MainAxisAlignment.center, children: <Widget>[
                                    Checkbox(
                                      value: usePassword,
                                      fillColor: MaterialStateProperty.all(theme.current().defaultButtonColor()),
@ -147,6 +152,16 @@ class _AddEditProfileViewState extends State<AddEditProfileView> {
                                      AppLocalizations.of(context)!.radioUsePassword,
                                      style: TextStyle(color: theme.current().mainTextColor()),
                                    ),
+                                    SizedBox(
+                                      height: 20,
+                                    ),
+                                    Flexible(
+                                        child: Padding(
+                                            padding: EdgeInsets.symmetric(horizontal: 24),
+                                            child: Text(
+                                              usePassword ? AppLocalizations.of(context)!.encryptedProfileDescription : AppLocalizations.of(context)!.plainProfileDescription,
+                                              textAlign: TextAlign.center,
+                                            )))
                                  ])),
                              SizedBox(
                                height: 20,
--- a/lib/views/globalsettingsview.dart
+++ b/lib/views/globalsettingsview.dart
@ -34,6 +34,7 @@ class _GlobalSettingsViewState extends State<GlobalSettingsView> {
  Widget _buildSettingsList() {
    return Consumer<Settings>(builder: (context, settings, child) {
      return LayoutBuilder(builder: (BuildContext context, BoxConstraints viewportConstraints) {
+        var appIcon = Icon(Icons.info, color: settings.current().mainTextColor());
        return Scrollbar(
            isAlwaysShown: true,
            child: SingleChildScrollView(
@ -177,12 +178,17 @@ class _GlobalSettingsViewState extends State<GlobalSettingsView> {
                            ],
                          )),
                      AboutListTile(
-                        icon: Icon(Icons.info, color: settings.current().mainTextColor()),
-                        applicationIcon: Padding(padding: EdgeInsets.all(5), child: Icon(CwtchIcons.cwtch_knott)),
-                        applicationName: "Cwtch (Flutter UI)",
-                        applicationVersion: AppLocalizations.of(context)!.versionBuilddate.replaceAll("%1", EnvironmentConfig.BUILD_VER).replaceAll("%2", EnvironmentConfig.BUILD_DATE),
-                        applicationLegalese: '\u{a9} 2021 Open Privacy Research Society',
-                      ),
+                          icon: appIcon,
+                          applicationIcon: Padding(padding: EdgeInsets.all(5), child: Icon(CwtchIcons.cwtch_knott)),
+                          applicationName: "Cwtch (Flutter UI)",
+                          applicationLegalese: '\u{a9} 2021 Open Privacy Research Society',
+                          aboutBoxChildren: <Widget>[
+                            Padding(
+                              padding: EdgeInsets.fromLTRB(
+                                  24.0 + 10.0 + (appIcon.size ?? 24.0), 16.0, 0.0, 0.0), // About has 24 padding (ln 389) and there appears to be another 10 of padding in the widget
+                              child: SelectableText(AppLocalizations.of(context)!.versionBuilddate.replaceAll("%1", EnvironmentConfig.BUILD_VER).replaceAll("%2", EnvironmentConfig.BUILD_DATE)),
+                            )
+                          ]),
                    ]))));
      });
    });
--- a/lib/views/messageview.dart
+++ b/lib/views/messageview.dart
@ -3,6 +3,7 @@ import 'dart:io';
 import 'package:crypto/crypto.dart';
 import 'package:cwtch/cwtch_icons_icons.dart';
 import 'package:cwtch/models/message.dart';
+import 'package:cwtch/models/messages/quotedmessage.dart';
 import 'package:cwtch/widgets/malformedbubble.dart';
 import 'package:cwtch/widgets/messageloadingbubble.dart';
 import 'package:cwtch/widgets/profileimage.dart';
@ -127,7 +128,7 @@ class _MessageViewState extends State<MessageView> {
            var bytes1 = utf8.encode(messageWrapper["PeerID"] + messageWrapper['Message']);
            var digest1 = sha256.convert(bytes1);
            var contentHash = base64Encode(digest1.bytes);
-            var quotedMessage = "{\"quotedHash\":\"" + contentHash + "\",\"body\":\"" + ctrlrCompose.value.text + "\"}";
+            var quotedMessage = jsonEncode(QuotedMessageStructure(contentHash, ctrlrCompose.value.text));
            ChatMessage cm = new ChatMessage(o: QuotedMessageOverlay, d: quotedMessage);
            Provider.of<FlwtchState>(context, listen: false)
                .cwtch
@ -206,7 +207,7 @@ class _MessageViewState extends State<MessageView> {
                          suffixIcon: IconButton(
                            icon: Icon(CwtchIcons.send_24px, size: 24, color: Provider.of<Settings>(context).theme.mainTextColor()),
                            tooltip: AppLocalizations.of(context)!.sendMessage,
-                            onPressed: isOffline ? null :_sendMessage,
+                            onPressed: isOffline ? null : _sendMessage,
                          ),
                        )))),
          ),
--- a/lib/views/torstatusview.dart
+++ b/lib/views/torstatusview.dart
@ -54,7 +54,7 @@ class _TorStatusView extends State<TorStatusView> {
                      ),
                      ListTile(
                        title: Text(AppLocalizations.of(context)!.torVersion),
-                        subtitle: Text(torStatus.version),
+                        subtitle: SelectableText(torStatus.version),
                      ),
                    ]))));
      });
--- a/lib/widgets/contactrow.dart
+++ b/lib/widgets/contactrow.dart
@ -99,8 +99,6 @@ class _ContactRowState extends State<ContactRow> {
        ));
  }

-
-
  void _btnApprove() {
    Provider.of<FlwtchState>(context, listen: false)
        .cwtch
--- a/lib/widgets/messagerow.dart
+++ b/lib/widgets/messagerow.dart
@ -25,7 +25,7 @@ class MessageRowState extends State<MessageRow> {
  @override
  Widget build(BuildContext context) {
    var fromMe = Provider.of<MessageMetadata>(context).senderHandle == Provider.of<ProfileInfoState>(context).onion;
-    var isContact = Provider.of<ContactListState>(context).getContact(Provider.of<MessageMetadata>(context).senderHandle) != null;
+    var isContact = Provider.of<ProfileInfoState>(context).contactList.getContact(Provider.of<MessageMetadata>(context).senderHandle) != null;

    var senderDisplayStr = "";
    if (!fromMe) {
@ -39,6 +39,7 @@ class MessageRowState extends State<MessageRow> {

    Widget wdgIcons = Visibility(
        visible: this.showMenu,
+        maintainSize: true,
        child: IconButton(
            tooltip: AppLocalizations.of(context)!.tooltipReplyToThisMessage,
            onPressed: () {
@ -127,10 +128,7 @@ class MessageRowState extends State<MessageRow> {
      style: ButtonStyle(padding: MaterialStateProperty.all(EdgeInsets.all(20))),
      child: Text(AppLocalizations.of(context)!.addContact),
      onPressed: () {
-        Provider
-            .of<FlwtchState>(context, listen: false)
-            .cwtch
-            .ImportBundle(profileOnion, senderOnion);
+        Provider.of<FlwtchState>(context, listen: false).cwtch.ImportBundle(profileOnion, senderOnion);
        final snackBar = SnackBar(
          content: Text(AppLocalizations.of(context)!.successfullAddedContact),
          duration: Duration(seconds: 2),
--- a/lib/widgets/profileimage.dart
+++ b/lib/widgets/profileimage.dart
@ -5,7 +5,8 @@ import 'package:provider/provider.dart';
 import '../settings.dart';

 class ProfileImage extends StatefulWidget {
-  ProfileImage({required this.imagePath, required this.diameter, required this.border, this.badgeCount = 0, required this.badgeColor, required this.badgeTextColor, this.maskOut = false, this.tooltip = ""});
+  ProfileImage(
+      {required this.imagePath, required this.diameter, required this.border, this.badgeCount = 0, required this.badgeColor, required this.badgeTextColor, this.maskOut = false, this.tooltip = ""});
  final double diameter;
  final String imagePath;
  final Color border;
@ -28,8 +29,8 @@ class _ProfileImageState extends State<ProfileImage> {
      // We need some theme specific blending here...we might want to consider making this a theme level attribute
      colorBlendMode: !widget.maskOut
          ? Provider.of<Settings>(context).theme.identifier() == "dark"
-          ? BlendMode.softLight
-          : BlendMode.darken
+              ? BlendMode.softLight
+              : BlendMode.darken
          : BlendMode.srcOut,
      color: Provider.of<Settings>(context).theme.backgroundHilightElementColor(),
      isAntiAlias: true,
@ -47,11 +48,7 @@ class _ProfileImageState extends State<ProfileImage> {
              color: widget.border,
              child: Padding(
                  padding: const EdgeInsets.all(2.0), //border size
-                  child: ClipOval(
-                      clipBehavior: Clip.antiAlias,
-                      child: widget.tooltip == "" ? image : Tooltip(
-                        message: widget.tooltip,
-                        child: image))))),
+                  child: ClipOval(clipBehavior: Clip.antiAlias, child: widget.tooltip == "" ? image : Tooltip(message: widget.tooltip, child: image))))),
      Visibility(
          visible: widget.badgeCount > 0,
          child: Positioned(
--- a/linux/cwtch.png
+++ b/linux/cwtch.png
--- a/windows/runner/resources/knot_128.ico
+++ b/windows/runner/resources/knot_128.ico
--- a/windows/runner/resources/knot_16.ico
+++ b/windows/runner/resources/knot_16.ico
--- a/windows/runner/resources/knot_256.ico
+++ b/windows/runner/resources/knot_256.ico
--- a/windows/runner/resources/knot_32.ico
+++ b/windows/runner/resources/knot_32.ico
--- a/windows/runner/resources/knot_48.ico
+++ b/windows/runner/resources/knot_48.ico
--- a/windows/runner/resources/knot_64.ico
+++ b/windows/runner/resources/knot_64.ico