diff --git a/helpers/DATA/thunderbird/branding/content/about-wordmark.png b/helpers/DATA/thunderbird/branding/content/about-wordmark.png
deleted file mode 100644
index b0b03473b0aa2e967bd71a0f4fb4331bbf8b7b61..0000000000000000000000000000000000000000
Binary files a/helpers/DATA/thunderbird/branding/content/about-wordmark.png and /dev/null differ
diff --git a/helpers/DATA/thunderbird/branding/content/about-wordmark.svg b/helpers/DATA/thunderbird/branding/content/about-wordmark.svg
index 4fd7a8ca5682dde543aa56d76b9f28a3a5929ddc..f7882191b4d6726fbfac724e1749609583f95505 100644
--- a/helpers/DATA/thunderbird/branding/content/about-wordmark.svg
+++ b/helpers/DATA/thunderbird/branding/content/about-wordmark.svg
@@ -1,273 +1,64 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="52.493332mm"
- height="14.111111mm"
- viewBox="0 0 52.493332 14.111111"
version="1.1"
- id="svg8"
- inkscape:version="0.92.3 (2405546, 2018-03-11)"
- sodipodi:docname="drawing.svg">
- <defs
- id="defs2" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="0.35"
- inkscape:cx="382.05713"
- inkscape:cy="-459.04764"
- inkscape:document-units="mm"
- inkscape:current-layer="layer1"
- showgrid="false"
- inkscape:window-width="918"
- inkscape:window-height="916"
- inkscape:window-x="988"
- inkscape:window-y="171"
- inkscape:window-maximized="0" />
- <metadata
- id="metadata5">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(-6.2592888,-13.265869)">
- <image
- y="13.265869"
- x="6.2592888"
- id="image3791"
- xlink:href="data:image/png;base64,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
-QaIFEGxSypI75hYxUiFSBBhepOpUxgcG0rP5gtIHmZDrmC9CngUBdfQYAcZFniAqHYGSWv+eKYLj
-NINB6K9IVnNHUSl16gQFosSDoOWHEQwvItBB1gAVGhBgyFhSCrWld+qS8OykiYB7pF8VYRjSGH8f
-T8skTX6JTGxD5cDekfoZghj2jlnJ8wX7YDugX+bPOp7sTidWVjqCnxdwkCtUVklnCPVzur6XDlTp
-zpRKySggABvORgDBkggKcBUN2dH66AQUJrUizk+fZ0mwYyhJD/dkk6EN+NWiHr8U0TG41VTuOnKC
-Z2jajrt+YuY04gINDBymMSQEAmaRlfkeWbB508kEqDlbh/9oDTa7qI6ASqKOniHYKuLdZO/rgvm5
-nY3UoTMhdB6qB7sd8Nj7GpSLisyHSv3A+6F/ruv0NJkuCwBGnD0WSJ9wTigArdu6rM0gbZHJoT3p
-WPRMxuZUQBR2Yw4XUDdsU49iwgbpBkYN5BuobQwZBTp4kcs2HY6jbagn+5xuEXEqEjvWFgXZBW+f
-YwZVN6Vpwjqti6RRIWwa9EqFq1Fk9HKuTIUTQ59L1+ixpK/VFWDElh6+jk+bpIDUPwI+hIKIQKKY
-0p70I3ZDJ17AD/4KwLg2YxD6X4BNGbfwXc2R0Lv6P4n0oKwEuJbybGuwQXpKD6U8ulLP8GiEo6f4
-YH5B+ugAYTYUz0aQPWRL3zT8IQvjHU/Y+78xnnaAKmiISd0t3x3G1dZYQK/XuRr0QsQ/iMNAXL3L
-lo+Wj6HpByEH2qAmw1bjfgAPgh+uQwvnZ6oZCDDifh1txIdefv7zV/ef3vCPBpKnNUjU/S9JcE/H
-pMJIawAAAF56VFh0UmF3IHByb2ZpbGUgdHlwZSBpcHRjAAB42j1JuQ2AQAzrMwUjJLYlwjrkGjoK
-9hfhBNiSXzvOq2yZEIwpaNNwNX/EiHJw7ZgEncFsxePzqX72dw2KMIyvutsNMgsU3r/6gaYAAA9K
-aVRYdFhNTDpjb20uYWRvYmUueG1wAAAAAAA8P3hwYWNrZXQgYmVnaW49Iu+7vyIgaWQ9Ilc1TTBN
-cENlaGlIenJlU3pOVGN6a2M5ZCI/Pgo8eDp4bXBtZXRhIHhtbG5zOng9ImFkb2JlOm5zOm1ldGEv
-IiB4OnhtcHRrPSJYTVAgQ29yZSA0LjQuMC1FeGl2MiI+CiA8cmRmOlJERiB4bWxuczpyZGY9Imh0
-dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPgogIDxyZGY6RGVzY3Jp
-cHRpb24gcmRmOmFib3V0PSIiCiAgICB4bWxuczppcHRjRXh0PSJodHRwOi8vaXB0Yy5vcmcvc3Rk
-L0lwdGM0eG1wRXh0LzIwMDgtMDItMjkvIgogICAgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9i
-ZS5jb20veGFwLzEuMC9tbS8iCiAgICB4bWxuczpzdEV2dD0iaHR0cDovL25zLmFkb2JlLmNvbS94
-YXAvMS4wL3NUeXBlL1Jlc291cmNlRXZlbnQjIgogICAgeG1sbnM6cGx1cz0iaHR0cDovL25zLnVz
-ZXBsdXMub3JnL2xkZi94bXAvMS4wLyIKICAgIHhtbG5zOkdJTVA9Imh0dHA6Ly93d3cuZ2ltcC5v
-cmcveG1wLyIKICAgIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIK
-ICAgIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIKICAgeG1wTU06RG9j
-dW1lbnRJRD0iZ2ltcDpkb2NpZDpnaW1wOmU5YWFjYmNiLTBmY2YtNGU5Zi1iNjU2LTA2N2NhYjAz
-YTFiYyIKICAgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDplMDg0YjQyZi1iNmZlLTQ3OTItOGJh
-OS1iZThlOTU0MTAzZTciCiAgIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDpmOGQx
-NzYwYy1hMDM5LTQ5ZWYtYWExMy1mOGE5ZDg3MWIzNTIiCiAgIEdJTVA6QVBJPSIyLjAiCiAgIEdJ
-TVA6UGxhdGZvcm09IkxpbnV4IgogICBHSU1QOlRpbWVTdGFtcD0iMTUxODk5NDkwMjk0MDI4MyIK
-ICAgR0lNUDpWZXJzaW9uPSIyLjkuOSIKICAgZGM6Rm9ybWF0PSJpbWFnZS9wbmciCiAgIHhtcDpD
-cmVhdG9yVG9vbD0iR0lNUCAyLjkvMi4xMCI+CiAgIDxpcHRjRXh0OkxvY2F0aW9uQ3JlYXRlZD4K
-ICAgIDxyZGY6QmFnLz4KICAgPC9pcHRjRXh0OkxvY2F0aW9uQ3JlYXRlZD4KICAgPGlwdGNFeHQ6
-TG9jYXRpb25TaG93bj4KICAgIDxyZGY6QmFnLz4KICAgPC9pcHRjRXh0OkxvY2F0aW9uU2hvd24+
-CiAgIDxpcHRjRXh0OkFydHdvcmtPck9iamVjdD4KICAgIDxyZGY6QmFnLz4KICAgPC9pcHRjRXh0
-OkFydHdvcmtPck9iamVjdD4KICAgPGlwdGNFeHQ6UmVnaXN0cnlJZD4KICAgIDxyZGY6QmFnLz4K
-ICAgPC9pcHRjRXh0OlJlZ2lzdHJ5SWQ+CiAgIDx4bXBNTTpIaXN0b3J5PgogICAgPHJkZjpTZXE+
-CiAgICAgPHJkZjpsaQogICAgICBzdEV2dDphY3Rpb249InNhdmVkIgogICAgICBzdEV2dDpjaGFu
-Z2VkPSIvIgogICAgICBzdEV2dDppbnN0YW5jZUlEPSJ4bXAuaWlkOjRjMmU2YjZlLTMxYTctNGM1
-NS05NjFlLTljNThlOGU2MDg5NCIKICAgICAgc3RFdnQ6c29mdHdhcmVBZ2VudD0iR2ltcCAyLjkv
-Mi4xMCAoTGludXgpIgogICAgICBzdEV2dDp3aGVuPSItMDU6MDAiLz4KICAgIDwvcmRmOlNlcT4K
-ICAgPC94bXBNTTpIaXN0b3J5PgogICA8cGx1czpJbWFnZVN1cHBsaWVyPgogICAgPHJkZjpTZXEv
-PgogICA8L3BsdXM6SW1hZ2VTdXBwbGllcj4KICAgPHBsdXM6SW1hZ2VDcmVhdG9yPgogICAgPHJk
-ZjpTZXEvPgogICA8L3BsdXM6SW1hZ2VDcmVhdG9yPgogICA8cGx1czpDb3B5cmlnaHRPd25lcj4K
-ICAgIDxyZGY6U2VxLz4KICAgPC9wbHVzOkNvcHlyaWdodE93bmVyPgogICA8cGx1czpMaWNlbnNv
-cj4KICAgIDxyZGY6U2VxLz4KICAgPC9wbHVzOkxpY2Vuc29yPgogIDwvcmRmOkRlc2NyaXB0aW9u
-PgogPC9yZGY6UkRGPgo8L3g6eG1wbWV0YT4KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-ICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAg
-ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAg
-ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-ICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-ICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAg
-ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAg
-ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-ICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-ICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAg
-ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAg
-ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-ICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAg
-ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-ICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-ICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAg
-ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAg
-ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-ICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-ICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-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
-"
- preserveAspectRatio="none"
- height="14.111111"
- width="52.493332" />
- <path
- style="fill:#000000;stroke-width:0.28222221"
- d=""
- id="path3794"
- inkscape:connector-curvature="0" />
- </g>
-</svg>
+ id="aboutWordmark"
+ x="0px"
+ y="0px"
+ width="130px"
+ height="38px"
+ viewBox="0 0 130 38"
+ xml:space="preserve"
+ inkscape:version="1.2 (1:1.2.1+202207142221+cd75a1ee6d)"
+ sodipodi:docname="about-wordmark.svg"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
+ id="metadata9"><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
+ id="defs7" /><sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1918"
+ inkscape:window-height="1008"
+ id="namedview5"
+ showgrid="false"
+ inkscape:zoom="4.8940365"
+ inkscape:cx="68.450654"
+ inkscape:cy="28.810574"
+ inkscape:window-x="1366"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="aboutWordmark"
+ inkscape:showpageshadow="2"
+ inkscape:pagecheckerboard="0"
+ inkscape:deskcolor="#d1d1d1" />
+<g
+ aria-label="Icedove"
+ id="text1936-3-9"
+ style="font-weight:bold;font-size:33.6271px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans, Bold';text-align:end;text-anchor:end;fill:#6f6f6f;stroke-width:0.452261"
+ transform="matrix(0.73871871,0,0,0.73871871,-0.40396669,-9.5617209)"><path
+ d="M 0.54684779,37.310169 V 14.175117 H 5.3905954 v 23.135052 z"
+ id="path1988-6-1" /><path
+ d="m 17.393237,37.638559 q -4.039193,0 -6.239403,-2.397245 -2.2002111,-2.413664 -2.2002111,-6.715568 0,-4.400422 2.2166301,-6.846925 2.21663,-2.462922 6.288662,-2.462922 3.136122,0 5.188557,1.57627 2.052435,1.57627 2.577859,4.351163 l -4.646714,0.229873 q -0.197034,-1.362817 -0.985169,-2.167372 -0.788135,-0.820974 -2.23305,-0.820974 -3.563027,0 -3.563027,5.960272 0,6.140887 3.628705,6.140887 1.313559,0 2.200211,-0.820974 0.886652,-0.837394 1.100106,-2.479342 l 4.630294,0.213453 q -0.246292,1.822563 -1.313559,3.251058 -1.050847,1.428495 -2.774893,2.21663 -1.724045,0.771716 -3.874998,0.771716 z"
+ id="path1990-7-2" /><path
+ d="m 35.963673,37.638559 q -4.006354,0 -6.157306,-2.364406 -2.150952,-2.380825 -2.150952,-6.929022 0,-4.400421 2.183791,-6.764827 2.183791,-2.364405 6.190145,-2.364405 3.82574,0 5.845336,2.545019 2.019597,2.528601 2.019597,7.421607 v 0.131356 H 32.499162 q 0,2.594278 0.95233,3.924256 0.96875,1.313559 2.742054,1.313559 2.446503,0 3.086863,-2.118113 l 4.351163,0.377648 q -1.888241,4.827328 -7.667899,4.827328 z m 0,-15.516412 q -1.625529,0 -2.512181,1.132944 -0.870232,1.132945 -0.919491,3.168961 h 6.896183 q -0.131356,-2.150953 -1.034427,-3.218219 -0.903072,-1.083686 -2.430084,-1.083686 z"
+ id="path1992-5-7" /><path
+ d="m 58.901692,37.310169 q -0.06568,-0.246292 -0.164195,-1.231461 -0.0821,-1.001589 -0.0821,-1.658368 h -0.06568 q -1.494173,3.218219 -5.681142,3.218219 -3.103282,0 -4.794489,-2.413664 -1.691207,-2.430084 -1.691207,-6.781247 0,-4.416841 1.773305,-6.814085 1.789723,-2.413664 5.0572,-2.413664 1.888241,0 3.251058,0.788135 1.379237,0.788135 2.118114,2.347986 h 0.03284 l -0.03284,-2.922668 v -6.485696 h 4.613874 v 20.491515 q 0,1.641948 0.131356,3.874998 z m -0.213454,-8.981457 q 0,-2.87341 -0.968749,-4.416841 -0.95233,-1.559851 -2.824151,-1.559851 -1.855402,0 -2.758473,1.510592 -0.903072,1.494173 -0.903072,4.581036 0,6.04237 3.628706,6.04237 1.822562,0 2.824151,-1.59269 1.001588,-1.609109 1.001588,-4.564616 z"
+ id="path1994-3-0" /><path
+ d="m 84.811634,28.410809 q 0,4.318324 -2.397244,6.781247 -2.397245,2.446503 -6.633472,2.446503 -4.154129,0 -6.518534,-2.462923 -2.364406,-2.462922 -2.364406,-6.764827 0,-4.285485 2.364406,-6.731988 2.364405,-2.462922 6.617051,-2.462922 4.351163,0 6.633472,2.380825 2.298727,2.364405 2.298727,6.814085 z m -4.827328,0 q 0,-3.16896 -1.034427,-4.597455 -1.034428,-1.428495 -3.004766,-1.428495 -4.203387,0 -4.203387,6.02595 0,2.971927 1.018008,4.531778 1.034427,1.543431 2.971926,1.543431 4.252646,0 4.252646,-6.075209 z"
+ id="path1996-5-9" /><path
+ d="m 98.127841,37.310169 h -5.516947 l -6.35434,-17.765881 h 4.876587 l 3.103282,9.933788 q 0.246292,0.820974 1.165783,4.10487 0.164195,-0.673198 0.673199,-2.364405 0.509004,-1.691207 3.776481,-11.674253 h 4.827324 z"
+ id="path1998-6-3" /><path
+ d="m 114.44881,37.638559 q -4.00636,0 -6.15731,-2.364406 -2.15095,-2.380825 -2.15095,-6.929022 0,-4.400421 2.18379,-6.764827 2.18379,-2.364405 6.19014,-2.364405 3.82574,0 5.84534,2.545019 2.0196,2.528601 2.0196,7.421607 v 0.131356 h -11.39513 q 0,2.594278 0.95233,3.924256 0.96875,1.313559 2.74206,1.313559 2.4465,0 3.08686,-2.118113 l 4.35116,0.377648 q -1.88824,4.827328 -7.66789,4.827328 z m 0,-15.516412 q -1.62553,0 -2.51219,1.132944 -0.87023,1.132945 -0.91949,3.168961 h 6.89619 q -0.13136,-2.150953 -1.03443,-3.218219 -0.90307,-1.083686 -2.43008,-1.083686 z"
+ id="path2000-2-6" /></g></svg>
diff --git a/helpers/DATA/thunderbird/process-json-files.py b/helpers/DATA/thunderbird/process-json-files.py
index 5eb07f6de4faf595576afdc48ba09c26d52a47d8..53ee523f57aeb801e0aa19216b8c17e1edc387d3 100644
--- a/helpers/DATA/thunderbird/process-json-files.py
+++ b/helpers/DATA/thunderbird/process-json-files.py
@@ -51,10 +51,18 @@ class RemoteSettings:
DUMPS_PATH_ABSOLUTE = arguments.MAIN_PATH / DUMPS_PATH_RELATIVE
_WRAPPER_NAME = 'data'
+ _LAST_MODIFIED_KEY_NAME = 'last_modified'
+
+ @classmethod
+ def get_collection_timestamp(cls, collection):
+ return max((record[cls._LAST_MODIFIED_KEY_NAME]
+ for record in collection.content), default=0)
@classmethod
def wrap(cls, processed):
- return File(processed.path, {cls._WRAPPER_NAME: processed.content})
+ return File(processed.path,
+ {cls._WRAPPER_NAME: processed.content,
+ 'timestamp': cls.get_collection_timestamp(processed)})
@classmethod
def unwrap(cls, parsed_jsons):
@@ -88,13 +96,15 @@ class RemoteSettings:
while timestamp in timestamps:
timestamp += 1
timestamps.append(timestamp)
- record['last_modified'] = timestamp
+ record[cls._LAST_MODIFIED_KEY_NAME] = timestamp
if parsed_schema is not None:
validate(record, schema=parsed_schema)
result.append(record)
+ result.sort(
+ key=lambda record: record[cls._LAST_MODIFIED_KEY_NAME], reverse=True)
cls.OUTPUT_PATH.parent.mkdir(parents=True, exist_ok=True)
return File(cls.OUTPUT_PATH, result)
@@ -109,7 +119,7 @@ class RemoteSettings:
class Changes(RemoteSettings):
JSON_PATHS = tuple(RemoteSettings.DUMPS_PATH_ABSOLUTE.glob('*/*.json'))
- OUTPUT_PATH = RemoteSettings.DUMPS_PATH_ABSOLUTE / 'monitor/changes.json'
+ OUTPUT_PATH = RemoteSettings.DUMPS_PATH_ABSOLUTE / 'monitor/changes'
@classmethod
def wrap(cls, processed):
@@ -124,8 +134,8 @@ class Changes(RemoteSettings):
for collection in unwrapped_jsons:
if collection.path != RemoteSettings.DUMPS_PATH_ABSOLUTE / 'main/example.json':
latest_change = {}
- latest_change['last_modified'] = max(
- (record['last_modified'] for record in collection.content), default=0)
+ latest_change[cls._LAST_MODIFIED_KEY_NAME] = cls.get_collection_timestamp(
+ collection)
latest_change['bucket'] = collection.path.parent.name
latest_change['collection'] = collection.path.stem
changes.append(latest_change)
diff --git a/helpers/make-thunderbird b/helpers/make-thunderbird
index 2f87918ade4b9daff907e9ae83946d96a6cc865d..30791388cab51c4c16c5433297de81505352d9ee 100644
--- a/helpers/make-thunderbird
+++ b/helpers/make-thunderbird
@@ -1,5 +1,6 @@
#!/bin/bash
#
+# Copyright (C) 2022 Luis Guzmán <ark@switnet.org>
# Copyright (C) 2020 Ruben Rodriguez <ruben@trisquel.info>
# Copyright (C) 2019 David Trudgian <dave@trudgian.net>
#
@@ -18,7 +19,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-VERSION=15
+VERSION=16
. ./config
@@ -117,7 +118,10 @@ EOF
#cp toolkit/components/telemetry/healthreport-prefs.js mobile/android/chrome/content/healthreport-prefs.js
# Browser legal page
sed 's%https://www.mozilla.org/legal/privacy/%https://trisquel.info/legal%' -i ./browser/app/profile/firefox.js ./toolkit/content/aboutRights.xhtml
-sed -i 's|https://www.mozilla.org/thunderbird/legal/privacy/|https://trisquel.info/legal|' comm/mail/components/newmailaccount/content/accountProvisioner.js comm/mail/app/profile/all-thunderbird.js
+sed -i 's|https://www.mozilla.org/thunderbird/legal/privacy/|https://trisquel.info/legal|' comm/mail/app/profile/all-thunderbird.js
+sed -i 's|https://www.mozilla.org/en-US/privacy/thunderbird/|https://trisquel.info/legal|' comm/mail/app/profile/all-thunderbird.js
+sed -i 's|https://www.mozilla.org/privacy/|https://trisquel.info/legal|' comm/mail/components/newmailaccount/content/accountProvisioner.xhtml
+grep -rl https://www.mozilla.org/privacy/thunderbird/ | xargs sed -i 's|https://www.mozilla.org/privacy/thunderbird/|https://trisquel.info/legal|'
# Org branding
sed 's/com.ubuntu/org.trisquel/' -i debian/config/mozconfig.in
# Disable DRM support, armhf has no such option.
@@ -132,8 +136,6 @@ ac_add_options --disable-eme
%%endif
ARCH
########################################################
-sed "s_^Maintainer.*_Maintainer: $DEBFULLNAME <$DEBEMAIL>_g" -i debian/control.in
-
sed '/^MOZ_PKG_NAME/s/.*/MOZ_PKG_NAME=icedove/' -i debian/build/config.mk
cat << EOF >> debian/build/config.mk
@@ -172,8 +174,12 @@ find . -type f -not -iregex '.*changelog.*' -not -iregex '.*copyright.*' -not -i
sed 's|https://www.icedove.net/features/|https://trisquel.info/wiki/icedove|' -i comm/mail/base/content/utilityOverlay.js
sed 's|https://www.icedove.net/get-involved/|https://trisquel.info/wiki/|' -i comm/mail/base/content/utilityOverlay.js
-sed 's|https://donate.mozilla.org/.*help-menu|https://trisquel.info/donate/|' -i comm/mail/base/content/utilityOverlay.js
+sed 's|https://give.icedove.net/.*|https://trisquel.info/donate/"|' -i comm/mail/base/content/utilityOverlay.js
+sed 's|https://www.icedove.net/.*/features/|https://trisquel.info/wiki/icedove|' -i comm/mailnews/base/content/msgAccountCentral.xhtml
sed 's|https://give.icedove.net/.*|https://trisquel.info/donate/"|' -i comm/mailnews/base/content/msgAccountCentral.xhtml
+sed 's|https://support.mozilla.org/products/icedove|https://trisquel.info/wiki/icedove|' -i comm/mailnews/base/content/msgAccountCentral.xhtml
+sed 's|https://www.icedove.net/.*/get-involved/|https://trisquel.info/wiki/|' -i comm/mailnews/base/content/msgAccountCentral.xhtml
+sed 's|https://developer.icedove.net/|https://gitlab.trisquel.org/trisquel|' -i comm/mailnews/base/content/msgAccountCentral.xhtml
replace Daily Trisquel comm/mail/branding/
sed '/.*<description.*communityExperimentalDesc/,/\/description/d' -i ./comm/mail/base/content/aboutDialog.xhtml
@@ -185,6 +191,10 @@ sed 's/Provides: mail-reader,/Provides: mail-reader, thunderbird,/' -i debian/co
sed "s/Provides.*/Provides: icedove-locale-@LANGCODE@/" -i debian/control.langpacks
#Manual fixes to allow rebranding processed through hash checks and other changes.
+# Restore wrong replacement module name.
+grep -rl IcedoveProfileImporter.jsm | xargs sed -i 's|IcedoveProfileImporter.jsm|ThunderbirdProfileImporter.jsm|'
+grep -rl IcedoveImport.jsm | xargs sed -i 's|IcedoveImport.jsm|ThunderbirdImport.jsm|'
+grep -rl IcedoveProfileMigrator.jsm | xargs sed -i 's|IcedoveProfileMigrator.jsm|ThunderbirdProfileMigrator.jsm|'
#Fix 1 character bigger than allowed yml line (81 > 80)
sed -i 's|Abrowser is not running. It|Abrowser is not running. It|' toolkit/mozapps/update/pings.yaml
@@ -193,19 +203,19 @@ sed -i \
third_party/dump_syms/vendor/regex/.cargo-checksum.json
sed -i \
-'s|af4ff013841da9bf00cf88ad3ae468f30c122b730ed37327d965d11b8e367459|a68c2df0024ff65f43efd5f5a48fe39a35d859ac459cce8695e4b09120cc1f35|' \
+'s|bcb4b59cfc5f48fbaba954b8ae4daa9eaecf9044afc89208a78a7e995c321b81|5f33885b0cc238abc78622e32bd56e6c550d90f1de419d5d7768c8da7f53f039|' \
third_party/dump_syms/vendor/encoding_rs/.cargo-checksum.json
sed -i \
-'s|eb9f00340e0f6ba3d01f4770356062ab2142e1646c7c2556c9b35348f90980f0|af2b7e2811c649615d4726c7dc4fd9b2e8aa35c229e8225c930e8e7d8e003fa2|' \
+'s|a64116a6d46ab30ce91deabdb4c5388f03be632326e8a00110bfb0c598474a0a|5cd020aae75fdcd21aca4799d302f1720075c9dd6fb12ba19e6403a8012970b2|' \
third_party/dump_syms/vendor/encoding_rs/.cargo-checksum.json
sed -i \
-'s|04fc9b146177e7bf615156b8570fa0f97b89f68a2c02b946778711728b81e81f|16221c6c37245cd078ffdb1bd314e45334ddf60098742fc38b821e733fc4c5ca|' \
+'s|fe4881780e8cd0181748a891102b2dd54c2060546d7648ec1b6435529bd0dcc2|40588888ea0d4b7e86bc1e184be9e667bd1b0480fe00406ebb828821f5080a07|' \
third_party/dump_syms/vendor/h2/.cargo-checksum.json
sed -i \
-'s|caabd31cbcb00172bb7f31a1398dbed27a3bf36b01d69729c3d6fbd9a4008e05|080cba5e2b65e6542f364aa4703a179c58b20e41489573d941ef68b9619a2734|' \
+'s|6f3be57dae549574569b812acab6213f4136ba9c4ad60a21848043d26e6aaece|07f28083516d3660082d9c46fe2349a1099720b4f30cc7431f1cc267690d6505|' \
third_party/dump_syms/vendor/httparse/.cargo-checksum.json
sed -i \
@@ -215,8 +225,27 @@ third_party/dump_syms/vendor/openssl/.cargo-checksum.json
sed -i \
's|82c82f8ef547f67f3f449a0b240e2df4ed538d976a379b07e53d5ce7cde2438c|01baa5e11aa7ec74360151d379ba8b5607abcd34132e69568c816c0116958a26|' \
third_party/dump_syms/vendor/symbolic-minidump/.cargo-checksum.json
+
+sed -i \
+'s|6018b016930c86610953a88ca35e8cebffd2dbbd92f11502c2464ab4281e7bbc|04c8d6c8a498abac61ffb2725484c2732328270e25a7e3ed452657962ce76f4e|' \
+third_party/dump_syms/vendor/bitvec/.cargo-checksum.json
#EO Manual fixing.
+# about: page mods, like rights.
+## Hide extra links in about box
+find -wholename '*/brand.dtd' |xargs /bin/sed 's/trademarkInfo.part1.*/trademarkInfo.part1 "">/' -i
+
+for STRING in rights-intro-point-2 rights-intro-point-3 rights-intro-point-4 rights-intro-point-5 rights-intro-point-6 rights-webservices rights-safebrowsing
+do
+ find -name aboutRights.ftl | xargs sed -i "s/^$STRING.*/$STRING = /"
+done
+##Remove invalid policy for trisquel.
+find -name aboutRights.ftl | xargs sed -i '/rights-intro-point-5/,$d'
+find -name aboutRights.xhtml |xargs sed -i "/rights-intro-point-5/d"
+find -name aboutRights.xhtml |xargs sed -i "/rights-intro-point-6/d"
+find -name aboutRights-unbranded.xhtml |xargs sed -i "/rights-intro-point-5/d"
+#EO about: mods.
+
#Debbuging tools
sed -i 's|this-firefox|this-abrowser|g' devtools/client/framework/test/browser_about-devtools-toolbox_reload.js
#Rebrand debug tools
@@ -225,8 +254,7 @@ devtools/client/themes/images/aboutdebugging-fenix-nightly.svg \
devtools/client/themes/images/aboutdebugging-firefox-aurora.svg \
devtools/client/themes/images/aboutdebugging-firefox-beta.svg \
devtools/client/themes/images/aboutdebugging-firefox-nightly.svg \
-devtools/client/themes/images/aboutdebugging-firefox-release.svg \
-devtools/startup/aboutdevtools/images/dev-edition-logo.svg" | xargs -n1 cp $DATA/debug_brand/debuglogo.svg
+devtools/client/themes/images/aboutdebugging-firefox-release.svg" | xargs -n1 cp $DATA/debug_brand/debuglogo.svg
cp $DATA/debug_brand/debuglogo_gray.svg devtools/client/themes/images/aboutdebugging-firefox-logo.svg
cp $DATA/debug_brand/about-logo.svg comm/mail/branding/icedove/TB-symbolic.svg
cp $DATA/debug_brand/about-logo.svg comm/mail/themes/shared/mail/icons/aboutdebugging-logo.svg