Merge pull request 'Add gpg-key-FAQ' (#214 ) from gpg-key-wtfaq into main

Reviewed-on: #214
content/contents+en.lr aktualisiert
2023-10-22 21:49:09 +02:00 · 2023-10-21 15:51:03 +02:00 · 2023-10-21 15:48:46 +02:00 · 2023-10-16 17:11:11 +02:00 · 2023-10-16 17:07:10 +02:00 · 2023-10-16 17:04:25 +02:00
9 changed files with 113 additions and 16 deletions
--- a/content/about/icon_processor.svg
+++ b/content/about/icon_processor.svg
@ -1,15 +1,93 @@
 <?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 207 207" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
-    <g transform="matrix(1.33333,0,0,1.33333,-1069.59,-753.333)">
-        <g transform="matrix(0.295238,0,0,0.295238,776.356,559.833)">
-            <rect x="323.31" y="253.31" width="52.938" height="52.938" style="fill:rgb(30,30,30);"/>
+    <g transform="matrix(1.06701,0,0,1.06701,-3.20103,-3.20103)">
+        <circle cx="100" cy="100" r="97"/>
    </g>
-        <g transform="matrix(0.295238,0,0,0.295238,776.356,559.833)">
-            <path d="M296.62,333.38L403.81,333.38L403.81,226.63L296.62,226.63L296.62,333.38ZM315.87,249.818C315.87,247.63 317.62,245.88 319.808,245.88L380.62,245.88C382.807,245.88 384.557,247.63 384.557,249.818L384.557,310.63C384.557,312.818 382.807,314.568 380.62,314.568L319.808,314.568C317.62,314.568 315.87,312.818 315.87,310.63L315.87,249.818Z" style="fill:rgb(30,30,30);fill-rule:nonzero;"/>
+    <g transform="matrix(41.1641,0,0,41.1641,-0.974567,-3.54711)">
+        <path d="M2.404,0.685C2.404,0.753 2.333,0.825 2.264,0.825C2.179,0.825 2.108,0.753 2.108,0.685C2.108,0.601 2.179,0.529 2.264,0.529C2.333,0.528 2.404,0.6 2.404,0.685Z" style="fill:white;fill-rule:nonzero;"/>
+        <path d="M2.952,0.685C2.952,0.753 2.883,0.825 2.811,0.825C2.727,0.825 2.658,0.753 2.658,0.685C2.658,0.601 2.726,0.529 2.811,0.529C2.883,0.528 2.952,0.6 2.952,0.685Z" style="fill:white;fill-rule:nonzero;"/>
+        <path d="M3.572,0.894C3.572,0.979 3.504,1.035 3.431,1.035C3.345,1.035 3.277,0.979 3.277,0.894C3.277,0.81 3.345,0.741 3.431,0.741C3.504,0.741 3.572,0.809 3.572,0.894Z" style="fill:white;fill-rule:nonzero;"/>
+        <path d="M3.25,1.895C3.25,1.979 3.178,2.048 3.092,2.048C3.025,2.048 2.952,1.979 2.952,1.895C2.952,1.823 3.024,1.754 3.092,1.754C3.178,1.754 3.25,1.823 3.25,1.895Z" style="fill:white;fill-rule:nonzero;"/>
+        <path d="M3.572,2.583C3.572,2.667 3.504,2.739 3.431,2.739C3.345,2.739 3.277,2.667 3.277,2.583C3.277,2.498 3.345,2.442 3.431,2.442C3.504,2.442 3.572,2.499 3.572,2.583Z" style="fill:white;fill-rule:nonzero;"/>
+        <g>
+            <path d="M2.896,4.559C2.87,4.559 2.849,4.539 2.849,4.513L2.849,2.237L2.232,1.618C2.224,1.609 2.218,1.597 2.218,1.585L2.218,0.685C2.218,0.659 2.239,0.638 2.265,0.638C2.29,0.638 2.311,0.659 2.311,0.685L2.311,1.566L2.929,2.185C2.937,2.193 2.943,2.206 2.943,2.218L2.943,4.513C2.943,4.539 2.922,4.559 2.896,4.559Z" style="fill:white;fill-rule:nonzero;"/>
        </g>
-        <g transform="matrix(0.295238,0,0,0.295238,776.356,559.833)">
-            <path d="M350,17.5C205.19,17.5 87.5,135.19 87.5,280C87.5,424.81 205.19,542.5 350,542.5C494.81,542.5 612.5,424.81 612.5,280C612.5,135.19 494.81,17.5 350,17.5ZM419.562,251.56L463.75,251.56C465.938,251.56 467.688,253.31 467.688,255.498C467.688,257.685 465.938,259.435 463.75,259.435L419.562,259.435C417.375,259.435 415.625,257.685 415.625,255.498C415.625,253.31 417.375,251.56 419.562,251.56ZM376.687,166.685C376.687,164.498 378.437,162.748 380.625,162.748C382.812,162.748 384.562,164.498 384.562,166.685L384.562,210.873C384.562,213.061 382.812,214.811 380.625,214.811C378.437,214.811 376.687,213.061 376.687,210.873L376.687,166.685ZM319.812,124.685L340.812,124.685C349.562,124.685 357,132.123 357,140.873L357,210.435C357,212.623 355.25,214.373 353.063,214.373C350.875,214.373 349.125,212.623 349.125,210.435L349.125,140.873C349.125,136.061 345.188,132.561 340.813,132.561L319.813,132.561C317.625,132.561 315.875,130.81 315.875,128.623C315.875,126.435 317.625,124.685 319.813,124.685L319.812,124.685ZM329,166.685L329,210.873C329,213.061 327.25,214.811 325.062,214.811C322.875,214.811 321.125,213.061 321.125,210.873L321.125,166.685C321.125,164.498 322.875,162.748 325.062,162.748C327.25,162.748 329,164.498 329,166.685ZM280.438,308.435L236.688,308.435C234.5,308.435 232.75,306.685 232.75,304.498C232.75,302.31 234.5,300.56 236.688,300.56L280.876,300.56C283.063,300.56 284.813,302.31 284.813,304.498C284.376,307.123 282.626,308.435 280.438,308.435ZM280.438,280.873L210.875,280.873C206.063,280.873 202.563,284.811 202.563,289.186L202.563,310.186C202.563,312.373 200.813,314.123 198.625,314.123C196.438,314.123 194.688,312.373 194.688,310.186L194.688,289.186C194.688,280.436 202.125,272.998 210.876,272.998L280.438,272.998C282.626,272.998 284.376,274.748 284.376,276.935C284.376,279.56 282.626,280.873 280.438,280.873ZM280.438,253.311L236.688,253.311C234.5,253.311 232.75,251.561 232.75,249.373C232.75,247.186 234.5,245.436 236.688,245.436L280.876,245.436C283.063,245.436 284.813,247.186 284.813,249.373C284.813,251.561 282.626,253.311 280.438,253.311ZM323.313,393.311C323.313,395.498 321.563,397.248 319.375,397.248C317.188,397.248 315.438,395.498 315.438,393.311L315.438,349.561C315.438,347.374 317.188,345.624 319.375,345.624C321.563,345.624 323.313,347.374 323.313,349.561L323.313,393.311ZM380.188,435.311L359.188,435.311C350.438,435.311 343,427.873 343,419.123L343,349.561C343,347.374 344.75,345.624 346.937,345.624C349.125,345.624 350.875,347.374 350.875,349.561L350.875,419.123C350.875,423.936 354.812,427.436 359.187,427.436L380.187,427.436C382.375,427.436 384.125,429.186 384.125,431.373C384.125,433.561 382.375,435.311 380.187,435.311L380.188,435.311ZM371,393.311L371,349.561C371,347.374 372.75,345.624 374.938,345.624C377.125,345.624 378.875,347.374 378.875,349.561L378.875,393.749C378.875,395.936 377.125,397.686 374.938,397.686C372.75,397.686 371,395.499 371,393.311ZM411.25,337.311C411.25,339.499 409.5,341.249 407.313,341.249L292.693,341.249C290.505,341.249 288.755,339.499 288.755,337.311L288.755,222.691C288.755,220.503 290.505,218.753 292.693,218.753L407.313,218.753C409.5,218.753 411.25,220.503 411.25,222.691L411.25,337.311ZM463.313,314.123L419.562,314.123C417.375,314.123 415.625,312.373 415.625,310.186C415.625,307.998 417.375,306.248 419.562,306.248L463.75,306.248C465.938,306.248 467.688,307.998 467.688,310.186C467.25,312.373 465.5,314.123 463.313,314.123ZM505.312,270.373C505.312,279.123 497.875,286.561 489.124,286.561L419.562,286.561C417.375,286.561 415.625,284.811 415.625,282.624C415.625,280.436 417.375,278.686 419.562,278.686L489.124,278.686C493.937,278.686 497.437,274.749 497.437,270.374L497.437,249.373C497.437,247.186 499.187,245.436 501.374,245.436C503.562,245.436 505.312,247.186 505.312,249.373L505.312,270.373Z" style="fill:rgb(30,30,30);fill-rule:nonzero;"/>
+        <g transform="matrix(0.7065,0.7078,-0.7078,0.7065,1.4986,-1.1337)">
+            <rect x="1.928" y="1.193" width="0.377" height="0.093" style="fill:white;"/>
+        </g>
+        <g>
+            <path d="M2.929,2.604L2.863,2.538L3.385,2.016L3.385,0.922L3.479,0.922L3.479,2.055L3.463,2.069L2.929,2.604Z" style="fill:white;fill-rule:nonzero;"/>
+        </g>
+        <path d="M3.25,1.106C3.25,1.191 3.178,1.248 3.092,1.248C3.025,1.248 2.952,1.191 2.952,1.106C2.952,1.023 3.024,0.966 3.092,0.966C3.178,0.966 3.25,1.022 3.25,1.106Z" style="fill:white;fill-rule:nonzero;"/>
+        <path d="M3.896,2.007C3.896,2.076 3.826,2.148 3.74,2.148C3.672,2.148 3.6,2.076 3.6,2.007C3.6,1.923 3.672,1.851 3.741,1.851C3.826,1.851 3.896,1.923 3.896,2.007Z" style="fill:white;fill-rule:nonzero;"/>
+        <g>
+            <path d="M3.904,2.576L3.693,2.365L3.693,2.036L3.787,2.036L3.787,2.326L3.971,2.51L3.904,2.576Z" style="fill:white;fill-rule:nonzero;"/>
+        </g>
+        <path d="M3.756,1.316C3.756,1.4 3.813,1.457 3.897,1.457C3.983,1.457 4.051,1.401 4.051,1.316C4.051,1.231 3.983,1.162 3.897,1.162C3.812,1.163 3.756,1.231 3.756,1.316Z" style="fill:white;fill-rule:nonzero;"/>
+        <g transform="matrix(0.6912,0.7226,-0.7226,0.6912,2.2648,-2.146)">
+            <rect x="3.597" y="1.265" width="0.093" height="0.625" style="fill:white;"/>
+        </g>
+        <g transform="matrix(0.7251,0.6886,-0.6886,0.7251,1.6781,-1.7041)">
+            <rect x="2.927" y="1.032" width="0.094" height="0.437" style="fill:white;"/>
+        </g>
+        <g transform="matrix(0.717959,0.6859,-0.676718,0.7277,1.56478,-1.2875)">
+            <rect x="2.351" y="1.092" width="0.093" height="0.437" style="fill:white;"/>
+        </g>
+        <g transform="matrix(0.7251,0.6886,-0.6886,0.7251,1.8903,-0.7361)">
+            <rect x="1.82" y="1.781" width="0.094" height="0.437" style="fill:white;"/>
+        </g>
+        <g transform="matrix(-0.6913,0.7225,-0.7225,-0.6913,6.8001,1.0785)">
+            <rect x="3.123" y="1.774" width="0.094" height="0.435" style="fill:white;"/>
+        </g>
+        <path d="M4.15,2.133C4.15,2.217 4.218,2.289 4.291,2.289C4.377,2.289 4.445,2.217 4.445,2.133C4.445,2.049 4.377,1.992 4.291,1.992C4.219,1.992 4.15,2.048 4.15,2.133Z" style="fill:white;fill-rule:nonzero;"/>
+        <g>
+            <path d="M3.262,4.403C3.237,4.403 3.215,4.381 3.215,4.355L3.215,3.19C3.215,3.177 3.221,3.166 3.231,3.157L4.231,2.143C4.249,2.124 4.278,2.124 4.295,2.143C4.315,2.161 4.315,2.191 4.295,2.209L3.309,3.209L3.309,4.355C3.309,4.381 3.289,4.403 3.262,4.403Z" style="fill:white;fill-rule:nonzero;"/>
+        </g>
+        <g transform="matrix(0.7045,0.7097,-0.7097,0.7045,2.9579,-1.4031)">
+            <rect x="3.117" y="2.472" width="0.094" height="0.756" style="fill:white;"/>
+        </g>
+        <path d="M4.135,2.936C4.135,3.005 4.078,3.077 3.994,3.077C3.91,3.077 3.84,3.005 3.84,2.936C3.84,2.852 3.91,2.781 3.994,2.781C4.078,2.781 4.135,2.852 4.135,2.936Z" style="fill:white;fill-rule:nonzero;"/>
+        <g transform="matrix(0.7123,0.7018,-0.7018,0.7123,3.3593,-1.5923)">
+            <rect x="3.575" y="2.78" width="0.093" height="1.043" style="fill:white;"/>
+        </g>
+        <path d="M1.504,0.894C1.504,0.979 1.573,1.035 1.645,1.035C1.729,1.035 1.798,0.979 1.798,0.894C1.798,0.81 1.73,0.741 1.645,0.741C1.573,0.741 1.504,0.809 1.504,0.894Z" style="fill:white;fill-rule:nonzero;"/>
+        <path d="M1.827,1.895C1.827,1.979 1.899,2.048 1.967,2.048C2.052,2.048 2.124,1.979 2.124,1.895C2.124,1.823 2.052,1.754 1.967,1.754C1.898,1.754 1.827,1.823 1.827,1.895Z" style="fill:white;fill-rule:nonzero;"/>
+        <path d="M1.504,2.583C1.504,2.667 1.56,2.739 1.645,2.739C1.73,2.739 1.798,2.667 1.798,2.583C1.798,2.498 1.73,2.442 1.645,2.442C1.56,2.442 1.504,2.499 1.504,2.583Z" style="fill:white;fill-rule:nonzero;"/>
+        <g>
+            <path d="M2.179,4.559C2.154,4.559 2.133,4.539 2.133,4.513L2.133,2.217C2.133,2.205 2.138,2.193 2.147,2.184L2.765,1.565L2.765,0.685C2.765,0.659 2.787,0.638 2.812,0.638C2.838,0.638 2.859,0.659 2.859,0.685L2.859,1.586C2.859,1.598 2.854,1.61 2.845,1.619L2.226,2.237L2.226,4.513C2.226,4.539 2.205,4.559 2.179,4.559Z" style="fill:white;fill-rule:nonzero;"/>
+        </g>
+        <g>
+            <path d="M2.146,2.604L1.598,2.055L1.598,0.922L1.691,0.922L1.691,2.016L2.212,2.538L2.146,2.604Z" style="fill:white;fill-rule:nonzero;"/>
+        </g>
+        <path d="M1.827,1.106C1.827,1.191 1.899,1.248 1.967,1.248C2.052,1.248 2.124,1.191 2.124,1.106C2.124,1.023 2.052,0.966 1.967,0.966C1.898,0.966 1.827,1.022 1.827,1.106Z" style="fill:white;fill-rule:nonzero;"/>
+        <path d="M1.179,2.007C1.179,2.076 1.25,2.148 1.319,2.148C1.403,2.148 1.475,2.076 1.475,2.007C1.475,1.923 1.403,1.851 1.319,1.851C1.25,1.851 1.179,1.923 1.179,2.007Z" style="fill:white;fill-rule:nonzero;"/>
+        <g>
+            <path d="M1.156,2.576L1.09,2.51L1.273,2.326L1.273,2.036L1.366,2.036L1.366,2.365L1.156,2.576Z" style="fill:white;fill-rule:nonzero;"/>
+        </g>
+        <path d="M2.377,1.191C2.377,1.275 2.445,1.332 2.53,1.332C2.613,1.332 2.67,1.275 2.67,1.191C2.67,1.106 2.613,1.035 2.53,1.035C2.445,1.035 2.377,1.106 2.377,1.191Z" style="fill:white;fill-rule:nonzero;"/>
+        <path d="M2.377,2.289C2.377,2.357 2.445,2.43 2.53,2.43C2.613,2.43 2.67,2.357 2.67,2.289C2.67,2.205 2.613,2.133 2.53,2.133C2.445,2.133 2.377,2.205 2.377,2.289Z" style="fill:white;fill-rule:nonzero;"/>
+        <path d="M2.377,3.443C2.377,3.527 2.445,3.596 2.53,3.596C2.613,3.596 2.67,3.527 2.67,3.443C2.67,3.359 2.614,3.303 2.53,3.303C2.445,3.303 2.377,3.359 2.377,3.443Z" style="fill:white;fill-rule:nonzero;"/>
+        <path d="M1.319,1.316C1.319,1.4 1.25,1.457 1.179,1.457C1.094,1.457 1.025,1.401 1.025,1.316C1.025,1.231 1.094,1.162 1.179,1.162C1.25,1.163 1.319,1.231 1.319,1.316Z" style="fill:white;fill-rule:nonzero;"/>
+        <g transform="matrix(0.7095,0.7047,-0.7047,0.7095,1.5261,-0.5466)">
+            <rect x="1.118" y="1.531" width="0.617" height="0.093" style="fill:white;"/>
+        </g>
+        <path d="M0.925,2.133C0.925,2.217 0.857,2.289 0.772,2.289C0.7,2.289 0.631,2.217 0.631,2.133C0.631,2.049 0.7,1.992 0.772,1.992C0.856,1.992 0.925,2.048 0.925,2.133Z" style="fill:white;fill-rule:nonzero;"/>
+        <g>
+            <path d="M1.814,4.403C1.788,4.403 1.768,4.381 1.768,4.355L1.768,3.209L0.78,2.209C0.762,2.191 0.762,2.161 0.78,2.143C0.798,2.125 0.827,2.125 0.846,2.143L1.847,3.157C1.855,3.166 1.861,3.178 1.861,3.19L1.861,4.355C1.861,4.381 1.839,4.403 1.814,4.403Z" style="fill:white;fill-rule:nonzero;"/>
+        </g>
+        <g transform="matrix(0.7078,0.7065,-0.7065,0.7078,2.5725,-0.518)">
+            <rect x="1.535" y="2.803" width="0.755" height="0.094" style="fill:white;"/>
+        </g>
+        <path d="M0.941,2.936C0.941,3.005 0.998,3.077 1.082,3.077C1.167,3.077 1.223,3.005 1.223,2.936C1.223,2.852 1.167,2.781 1.082,2.781C0.998,2.781 0.941,2.852 0.941,2.936Z" style="fill:white;fill-rule:nonzero;"/>
+        <g transform="matrix(0.7076,0.7066,-0.7066,0.7076,2.7567,-0.0576)">
+            <rect x="0.931" y="3.256" width="1.034" height="0.093" style="fill:white;"/>
+        </g>
+        <g>
+            <path d="M2.53,4.672C2.504,4.672 2.483,4.651 2.483,4.625L2.483,2.261C2.483,2.236 2.504,2.215 2.53,2.215C2.556,2.215 2.577,2.236 2.577,2.261L2.577,4.625C2.577,4.65 2.556,4.672 2.53,4.672Z" style="fill:white;fill-rule:nonzero;"/>
+        </g>
+        <g>
+            <path d="M2.53,4.672C2.504,4.672 2.483,4.651 2.483,4.625L2.483,2.261C2.483,2.236 2.504,2.215 2.53,2.215C2.556,2.215 2.577,2.236 2.577,2.261L2.577,4.625C2.577,4.65 2.556,4.672 2.53,4.672Z" style="fill:white;fill-rule:nonzero;"/>
        </g>
    </g>
 </svg>
--- a/content/contents+en.lr
+++ b/content/contents+en.lr
@ -63,3 +63,7 @@ answer: Basically, only what the law requires of us. When you join, we need your
 question: What worldly goods can I get through the cooperative?
 ----
 answer: You can have from us everything that can be purchased through a normal employer. You need a good bike for the way to work or a new computer? Then you will find everything you need to know in the handbook and how it works.
+#### flow_faq ####
+question: Where can I get your PGP-keys if I want send you an encrypted email?
+----
+answer: You can find the PGP-key for the office [here](https://keys.openpgp.org/vks/v1/by-fingerprint/1129A9F509FE1B36287202A2FE8772F9FB5D572F), and the PGP-key for the Vorstand  [here](https://keys.openpgp.org/vks/v1/by-fingerprint/A703FE08D54FFA0F81C4F0E3A9C311923ECD5808). We also offer them via Web Key Directory so in theory, your email-client should find them automatically. And we uploaded the keys to the usual key servers like [keys.openpgp.org](https://keys.openpgp.org/).
--- a/content/contents.lr
+++ b/content/contents.lr
@ -31,7 +31,7 @@ content_body:
 Die WTF Kooperative eG (Werkkooperative der Technikfreund*innen) ist im Dezember 2020 gegründet worden und bringt geballtes Experten-Know-How aus den verschiedensten Disziplinen der Informationstechnologie an den Start.<br>
 Vom Start weg haben sich über 150 Personen gefunden und dafür gearbeitet, dass die Gründung gelingt.

-Ein Unternehmen, das allen von uns gehört, in dem jeder von uns eine Stimme und das Recht auf Mitsprache hat. Das alles ist nun machbar - in unserer WTF Kooperative eG. Zusammen bilden wir mittlerweile ein über die ganze Bundesrepublik und darüber hinaus verteiltes Kollektiv.
+Eine [Produktivgenossenschaft](https://www.zdk-hamburg.de/blog/2021/03/zur-debatte-mitgliederfoerderung/), die uns allen gehört, in dem jeder von uns eine Stimme und das Recht auf Mitsprache hat, das alles ist nun machbar - in unserer WTF Kooperative eG. Zusammen bilden wir mittlerweile ein über die ganze Bundesrepublik und darüber hinaus verteiltes Kollektiv.

 ----
 content_image: map.png
@ -40,6 +40,10 @@ content_image_alt: Karte der Bundesrepublik mit Regionen in denen Member aktiv s
 ----
 content_image_src:
 #### flow_faq ####
+question: Welche Vorteile habe ich als Kunde von euch und gegenüber anderen Anbietern
+----
+answer: Wir haben uns zum Ziel gesetzt nachhaltig und auf Augenhöhe Projekte umzusetzen – sowohl intern, als auch extern. Das bedeutet das wir immer versuchen gemeinsam herauszufinden wie und welche Umsetzung mit den vorhandenen Ressourcen möglich ist. Geld ist dabei nur ein, aber nicht der entscheidende Faktor. Nachhaltig bedeutet zum Beispiel einer NGO die weniger Geld hat trotzdem den gleichen guten Service zu bieten, wie einem mittelständischen Unternehmen. Wir möchten keine Kaltaquise oder großen Gewinn machen, sondern wegen den guten Ergebnisse weiterempfohlen werden und mit dem Gewinn interne Projekte und damit tolle Ideen unserer Member umsetzen.
+#### flow_faq ####
 question: Ich bin hauptberuflich Vollzeit angestellt, welche Vorteile habe ich von euch?
 ----
 answer: Grundsätzlich kann man sich bei uns auch mit wenigen Stunden in der Woche einbringen. Wir haben große bis winzige Projekte, die sich alle über Unterstützung freuen. Man kann natürlich auch 100 Anteile kaufen und sich nie wieder melden (solche Member haben wir auch). Wir freuen uns jedoch vor allem über Neumitglieder, die der Meinung sind, dass ihre Fähigkeiten einem guten Zweck dienen können und wenn dabei auch noch Geld abspringt: umso besser.
@ -63,3 +67,7 @@ answer: Im Grunde nur das, was das Gesetz von uns verlangt. Bei Eintritt brauche
 question: Welche weltlichen Güter kann ich mir über die Geno holen?
 ----
 answer: Du kannst von uns alles haben, was man über einen normalen Arbeitgeber erwerben kann. Du brauchst ein gutes Rad für den Arbeitsweg oder einen neuen Rechner? Dann findest du auch hierzu alles Wissenswerte im Handbuch und wie es funktioniert.
+#### flow_faq ####
+question: Wo finde ich denn eure PGP-Keys, falls ich euch verschlüsselt schreiben möchte?
+----
+answer: Den Key für unser Office findest du [hier](https://keys.openpgp.org/vks/v1/by-fingerprint/1129A9F509FE1B36287202A2FE8772F9FB5D572F), den Key für den Vorstand [hier](https://keys.openpgp.org/vks/v1/by-fingerprint/A703FE08D54FFA0F81C4F0E3A9C311923ECD5808). Wir stellen die Keys außerdem per Web Key Directory zur Verfügung, dein Emailprogramm sollte sie quasi automatisch finden können. Und natürlich haben wir sie auch auf den üblichen Keyservern wie [keys.openpgp.org](https://keys.openpgp.org/) hochgeladen. 
--- a/content/impressum/contents.lr
+++ b/content/impressum/contents.lr
@ -20,6 +20,8 @@ body:
 **GnuPG Key:**
 [1129A9F509FE1B36287202A2FE8772F9FB5D572F](/gnupg/1129A9F509FE1B36287202A2FE8772F9FB5D572F.asc)

+**Telefon:** 040 / 2285143-0
+
 **USt-ID:** DE340116202

 ## Informationen nach § 2 DL-InfoV
--- a/content/mitglieder/contents+en.lr
+++ b/content/mitglieder/contents+en.lr
@ -15,7 +15,9 @@ Go to [onboarding.wtf-eg.de](https://onboarding.wtf-eg.de) to download the form,
 <p class="indented_box"><strong>WTF Kooperative eG</strong><br>
 Forsmannstr. 14 b<br>
 Hinterhaus, 3. OG<br>
-22303 Hamburg</p>
+22303 Hamburg<br>
+<br>
+Phone: 040 / 2285143-0</p>

 (It is best to print the two-sided form on the front and back of a sheet of paper.)

@ -53,10 +55,10 @@ Casual round for everyone inside and outside WTF: Every Wednesday at 9 pm in the
 #### Onboarding of new members
 Next dates until October 2023:

- 01.08.2023 at 6:30 pm
 - 06.09.2023 at 6:30 pm
 - 02.10.2023 at 6:30 pm
 - 07.11.2023 at 6:30 pm
+- 06.12.2023 at 6:30 pm

 ---
 teaser: WTF Kooperative eG, gegründet im Jahr 2020.
--- a/content/mitglieder/contents.lr
+++ b/content/mitglieder/contents.lr
@ -15,7 +15,9 @@ Unter [onboarding.wtf-eg.de](https://onboarding.wtf-eg.de) das Formular herunter
 <p class="indented_box"><strong>WTF Kooperative eG</strong><br>
 Forsmannstr. 14 b<br>
 Hinterhaus, 3. OG<br>
-22303 Hamburg</p>
+22303 Hamburg<br>
+<br>
+Tel.: 040 / 2285143-0</p>

 (Drucke das zweiseitige Formular am besten auf Vorder- und Rückseite eines Blattes aus)

@ -59,10 +61,10 @@ Lockere Runde für alle inner- und außerhalb der WTF: Jeden Mittwoch um 21 Uhr

 Nächste Termine bis Oktober 2023:

- 01.08.2023 um 18:30 Uhr
 - 06.09.2023 um 18:30 Uhr
 - 02.10.2023 um 18:30 Uhr
 - 07.11.2023 um 18:30 Uhr
+- 06.12.2023 um 18:30 Uhr

 ---
 teaser: WTF Kooperative eG, gegründet im Jahr 2020.
--- a/templates/homepage.html
+++ b/templates/homepage.html
@ -42,7 +42,7 @@
        <iframe class="content__video" src="https://media.ccc.de/v/what-the-f--k-is-wtf-eg/oembed" frameborder="0" allowfullscreen></iframe>
        <h3>Wirtschaft neu gedacht - die WTF Kooperative eG</h3>
        <p>
-          Vortrag von unserem damaligen Vorstand <i>MrSchizo</i> auf der <i>remote Chaos Experience (RC3) 2023</i>.
+          Vortrag von unserem damaligen Vorstand <i>MrSchizo</i> auf der <i>remote Chaos Experience (RC3) 2021</i>.
        </p>
        <iframe class="content__video" src="https://media.ccc.de/v/rc3-2021-r3s-432-wirtschaft-neu-gedacht-die-wtf-kooperative-eg/oembed" frameborder="0" allowfullscreen></iframe>
      </div>
--- a/templates/layout.html
+++ b/templates/layout.html
@ -63,7 +63,7 @@ __        ____________________
  {% if 'manifest.json'|asseturl is defined -%}
    <link rel="manifest" href="{{ 'manifest.json'|asseturl }}">
  {%- endif %}
-  {% if '/js/contact_form_toggle.js'|asseturl is defined and this.title == 'Kontakt' -%}
+  {% if '/js/contact_form_toggle.js'|asseturl is defined and this.title == 'Services' -%}
    <script type="text/javascript" src="{{ '/js/contact_form_toggle.js'|asseturl }}"></script>
  {%- endif %}
 </head>
@ -114,6 +114,7 @@ __        ____________________
                Forsmannstr. 14 b<br/>
                22303 Hamburg<br/>
                <a class="footer__navlink" href="mailto:office@wtf-eg.de">office@wtf-eg.de</a><br/>
+                <a class="footer__navlink" href="tel:+494022851430">040 / 2285143-0</a><br>
                <br/>
                Registergericht: AG Hamburg<br/>
                Registernummer: GnR 1113<br/>
@ -131,7 +132,7 @@ __        ____________________
    {%- if '/js/nav_toggle.js'|asseturl is defined -%}
      <script type="text/javascript" src="{{ '/js/nav_toggle.js'|asseturl }}"></script>
    {%- endif %}
-    {% if '/js/contact_form.js'|asseturl is defined and this.title == 'Kontakt' -%}
+    {% if '/js/contact_form.js'|asseturl is defined and this.title == 'Services' -%}
      <script type="text/javascript" src="{{ '/js/contact_form.js'|asseturl }}"></script>
    {%- endif %}
 </body>
--- a/wtf-eg.lektorproject
+++ b/wtf-eg.lektorproject
@ -11,7 +11,7 @@ url_style = absolute
 enabled = yes
 default = yes
 locale = de_DE
-target = rsync://wtf@www.wtf-eg.net:/srv/www/www.wtf-eg.de/
+target = rsync://wtf@www.wtf-eg.net:/srv/www/www.wtf-eg.de/?delete

 [servers.dev]
 name = dev
Author	SHA1	Message	Date
muli	012e50da92	Merge pull request 'Add gpg-key-FAQ' (#214 ) from gpg-key-wtfaq into main All checks were successful continuous-integration/drone/promote/www Build is passing Details continuous-integration/drone/push Build is passing Details Reviewed-on: #214	2023-10-22 21:49:09 +02:00
zeitschlag	9977859c83	content/contents+en.lr aktualisiert All checks were successful continuous-integration/drone/pr Build is passing Details	2023-10-21 15:51:03 +02:00
zeitschlag	b6baf6b243	content/contents.lr aktualisiert All checks were successful continuous-integration/drone/pr Build is passing Details	2023-10-21 15:48:46 +02:00
zeitschlag	4291056882	Add english pgp-key-wtfaq All checks were successful continuous-integration/drone/pr Build is passing Details	2023-10-16 17:11:11 +02:00
zeitschlag	8831b17f9b	content/contents.lr aktualisiert All checks were successful continuous-integration/drone/pr Build is passing Details	2023-10-16 17:07:10 +02:00
zeitschlag	8090addca2	content/contents.lr aktualisiert All checks were successful continuous-integration/drone/pr Build is passing Details	2023-10-16 17:04:25 +02:00
zeitschlag	20ee49d860	bye git All checks were successful continuous-integration/drone/pr Build is passing Details	2023-10-16 17:02:23 +02:00
zeitschlag	9f5c7799d0	Add gpg-key-FAQ All checks were successful continuous-integration/drone/pr Build is passing Details	2023-10-16 16:55:58 +02:00
muli	743e4bd0ff	Merge pull request '#208_boeses_logo_weg' (#211 ) from #208_boeses_logo_weg into main All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone/promote/www Build is passing Details Reviewed-on: #211	2023-09-20 16:39:46 +02:00
muli	a4b3d396d6	feat: Böses Icon getauscht. All checks were successful continuous-integration/drone/pr Build is passing Details	2023-09-20 16:37:05 +02:00
muli	b4e3d89439	Merge pull request 'feat: Telefonnummer auch im Footer ergänzt.' (#212 ) from #207_telefonnummer into main All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone/promote/www Build is passing Details Reviewed-on: #212	2023-09-17 18:49:09 +02:00
muli	2228bab53a	feat: Telefonnummer auch im Footer ergänzt. All checks were successful continuous-integration/drone/pr Build is passing Details	2023-09-17 18:46:38 +02:00
muli	27105b02c6	Merge pull request 'feat: Formulierungsänderung auf der Homepage.' (#210 ) from homepage_update into main All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone/promote/www Build is passing Details Reviewed-on: #210	2023-09-17 18:25:20 +02:00
muli	8b1a022053	feat: Formulierungsänderung auf der Homepage. All checks were successful continuous-integration/drone/pr Build is passing Details	2023-09-17 18:23:07 +02:00
muli	449e50eaf8	Merge pull request 'feat: Telefonnummer im Impressum und bei Mitlgied werden nachgetragen.' (#209 ) from #207_telefonnummer into main All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #209	2023-09-17 18:17:26 +02:00
muli	9288b4f66f	feat: Telefonnummer im Impressum und bei Mitlgied werden nachgetragen. All checks were successful continuous-integration/drone/pr Build is passing Details	2023-09-17 18:01:52 +02:00
muli	77604d3e20	Merge pull request 'fix: JS für Anzeige und Funktion des Kontaktformulars wird jetzt auf der richtigen Seite geladen.' (#206 ) from fix_contact_form into main All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone/promote/www Build is passing Details Reviewed-on: #206	2023-09-03 19:04:03 +02:00
muli	71333fe693	fix: JS für Anzeige und Funktion des Kontaktformulars wird jetzt auf der richtigen Seite geladen. All checks were successful continuous-integration/drone/pr Build is passing Details	2023-09-03 19:00:15 +02:00
muli	8fdcc4b322	Merge pull request 'feat: Added additonal FAQ from Mascha.' (#205 ) from nachtrag_faq into main All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone/promote/www Build is passing Details Reviewed-on: #205	2023-08-14 12:46:27 +02:00
muli	9a7f058fb5	feat: Added additonal FAQ from Mascha. All checks were successful continuous-integration/drone/pr Build is passing Details	2023-08-14 12:43:38 +02:00
muli	3580d7b7f3	Merge pull request 'fix: RC3 war 2021, nicht 23.' (#204 ) from fix_video_year into main All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone/promote/www Build is passing Details Reviewed-on: #204	2023-08-11 20:04:01 +02:00
muli	5776f4aa51	fix: RC3 war 2021, nicht 23. All checks were successful continuous-integration/drone/pr Build is passing Details	2023-08-11 19:59:29 +02:00
muli	08db41ea3e	Merge pull request 'fix: Onboarding-Termine auf "Mitglied werden".' (#203 ) from onboarding_termine into main All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone/promote/www Build is passing Details Reviewed-on: #203	2023-08-08 21:36:56 +02:00
muli	fffd8c1c2c	fix: Onboarding-Termine auf "Mitglied werden". All checks were successful continuous-integration/drone/pr Build is passing Details	2023-08-08 21:33:42 +02:00
muli	27308adb8c	Merge pull request 'feat: Deployment fixes für live implementieren.' (#202 ) from deployment_fix into main All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #202	2023-08-08 21:30:17 +02:00
muli	4e7a160cd5	feat: Deployment fixes für live implementieren. All checks were successful continuous-integration/drone/pr Build is passing Details	2023-08-08 21:27:40 +02:00
muli	b69ff03e93	Merge pull request 'spielwiese' (#201 ) from spielwiese into main All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone/promote/www Build is passing Details Reviewed-on: #201	2023-08-08 21:18:12 +02:00