Merge branch 'dev'

Replace incorrect em dashes with the en dash character.

COPYRIGHT

@@ -1,6 +1,9 @@
-Copyright (C) 2020-2023 luca0N!  Some rights reserved.
+Copyright (C) 2020-2024 luca0N!  Some rights reserved.
 
 All content on the luca0N!.com website - including the luca0N! logo - is
 licensed under the Attribution-ShareAlike 4.0 International license unless
 otherwise stated.  See LICENSE for more information.
 
+Updates sources for this website are available at
+<https://git.luca0n.com/luca0N/luca0N-website>.
+

Makefile

@@ -1,12 +1,20 @@
 # luca0N.com website sources Makefile
 # 2022-09-12
-# https://git.luca0n.com/luca0N-website.git
+# https://git.luca0n.com/luca0N/luca0N-website
 
 SWG=swg
 
-all: output/
+all: output/en/ output/pt/
+
+en: output/en/
+
+pt: output/pt/
+
+output/en/: output/ src/en/
 	$(SWG) src/en/
 	mv src/en/output output/en
+
+output/pt/: output/ src/pt/
 	$(SWG) src/pt/
 	mv src/pt/output output/pt
 

README.md

@@ -4,7 +4,7 @@ This repository contains all sources for the third revision of the luca0N.com we
 
 ## License and copyright notice
 
-Copyright © 2020—2023 luca0N!  Some rights reserved.
+Copyright © 2020–2024 luca0N!  Some rights reserved.
 
 The contents of the luca0N!.com website are licensed under the Attribution-ShareAlike 4.0 International license unless otherwise stated. See [COPYRIGHT](COPYRIGHT) and [LICENSE](LICENSE) for more information.
 
@@ -14,7 +14,7 @@ Here are the instructions to build this website.  It should work on any system,
 
 ### Requirements
 
-- [swg](https://git.luca0n.com/swg.git)
+- [swg](https://git.luca0n.com/luca0N/swg)
 
 ### Building
 
@@ -27,3 +27,8 @@ To delete previously built pages, run the following command:
 ```sh
 $ make clean
 ```
+
+You can also build the English version only with:
+```sh
+$ make en       # or use `pt' to build Portuguese sources
+```

src/en/__swg_template.html

@@ -62,8 +62,8 @@
 			<hr/>
 			<footer>
 				<p>This website is hosted on <a href="https://nautilus.luca0n.com">Nautilus</a>. <a target="_blank" href="https://www.luca0N.com/en/privacy">Privacy Notice</a> | <a target="_blank" href="https://www.luca0N.com/en/tos">Terms of Service</a></p>
-				<p>All content on this webpage—including the luca0N! icon—is licensed under the Creative Commons Attribution-ShareAlike 4.0 International license unless otherwise stated.</p>
+				<p>All content on this webpage—including the luca0N! icon—is licensed under the Creative Commons Attribution-ShareAlike 4.0 International license unless otherwise stated.  <a href="https://git.luca0n.com/luca0N/luca0N-website" target="_blank">[View website sources]</a></p>
-				<p>Copyright © 2020—2023 luca0N!  Some rights reserved.</p>
+				<p>Copyright © 2020–2024 luca0N!  Some rights reserved.</p>
 			</footer>
 		</main>
 	</body>

src/en/assets/luca0n.css

@@ -2,14 +2,14 @@
  * CSS for luca0N.com, version 3
  * Main style
  *
- * https://git.luca0n.com/luca0N-website.git/
+ * https://git.luca0n.com/luca0N/luca0N-website
  */
 
 body {
 	margin: 0;
 	font-family: sans-serif;
 
-	background-color: #ddd;
+	background-color: #eee;
 	color: #333;
 }
 

src/en/assets/luca0n_theme_dark.css

@@ -2,7 +2,7 @@
  * CSS for luca0N.com, version 3
  * Main style, dark theme
  *
- * https://git.luca0n.com/luca0N-website.git/
+ * https://git.luca0n.com/luca0N/luca0N-website
  */
 
 body {

src/en/assets/luca0n_theme_light.css

@@ -2,14 +2,14 @@
  * CSS for luca0N.com, version 3
  * Main style, light theme
  *
- * https://git.luca0n.com/luca0N-website.git/
+ * https://git.luca0n.com/luca0N/luca0N-website
  */
 
 body {
 	margin: 0;
 	font-family: sans-serif;
 
-	background-color: #ddd;
+	background-color: #eee;
 	color: #333;
 }
 

src/en/contact.md

@@ -5,5 +5,12 @@ Want to get in touch with me?  Here's my contact details (feel free to use any o
 - E-mail Address: `luca0n at luca0n dot com` ([PGP encryption](pgp/) is encouraged)
 - XMPP (Jabber) Address: (same as e-mail address)
 - Matrix Address: `@luca0n:luca0n.com`
-- IRC: `luca0N` on Libera.Chat (though 99% of the time I'm just lurking in various channels)
+- IRC: `luca0N` on Libera.Chat (I'm a bit more active there these days)
 - Pleroma (ActivityPub, Fediverse): `at luca0n at luca0n dot com`
+
+## Extras
+
+These are accounts that I have, but don't consider my main ones:
+
+- GitHub: [@luca0N](https://github.com/luca0N) (I am actually on GitHub solely to contribute to FOSS projects hosted on there, but my software stays in [my Git server](https://git.luca0n.com/luca0N).
+

src/en/pgp.md

@@ -1,6 +1,6 @@
 # PGP Public Key
 
-*Last updated: 2023-12-31*
+*Last updated: 2024-07-30*
 
 If you want to send me e-mail, I do accept PGP encrypted messages (and I also strongly suggest you use it).  If you send me encrypted mail, I will encrypt my replies (as long as I can find your public key).
 
@@ -9,14 +9,14 @@ If you want to send me e-mail, I do accept PGP encrypted messages (and I also st
 Here's my public key:
 
 <pre>
-pub   rsa4096 2020-12-12 \[SC\] \[expires: 2024-12-31\]
+pub   rsa4096 2020-12-12 \[SC\] \[expires: 2025-01-26\]
       8C6B06FD67BDFBFF21E181243DB7E87C9EDE084C
 uid           luca0N! &lt;luca0n at luca0n dot com&gt;
-sub   rsa4096 2020-12-12 \[E\] \[expired: 2023-12-31\]
+sub   rsa4096 2020-12-12 \[E\] \[expires: 2025-01-02\]
 sub   rsa4096 2021-01-05 \[S\] \[expired: 2023-01-02\]
 sub   rsa4096 2023-04-02 \[S\] \[expired: 2023-07-01\]
-sub   rsa4096 2023-07-10 \[S\] \[expires: 2024-07-01\]
+sub   rsa4096 2023-07-10 \[S\] \[expires: 2025-01-02\]
-sub   rsa4096 2023-07-30 \[S\] \[expires: 2024-07-01\]
+sub   rsa4096 2023-07-30 \[S\] \[expires: 2025-01-02\]
 </pre>
 
 - [Download binary file](/assets/luca0N.gpg)

src/en/services.md

@@ -12,13 +12,13 @@ By using these services, you agree to the [luca0N.com Terms of Service](tos).
 
 These services are either private, have limited access or are invite-only.
 
-- [luca0N.com Git](https://git.luca0n.com/): this is where I host the source code for my software.
+- [luca0N.com Git](https://git.luca0n.com/)<sup><a href="http://git.e6ta74yrvylu6k6xk6uq52gtfpfxsf2ex3ktrzs2ods2vznbhci6jpqd.onion/">\[Tor\]</a></sup>: this is where I host the source code for my software.
 - [luca0N! Social](https://social.luca0n.com/): this is my self\-hosted Pleroma instance (although I rarely use it).
 - [Matrix](https://matrix.luca0n.com/): my self-hosted Matrix instance.
 
 # Apps
 
-- [Element](https://element.luca0n.com/): an Element web client instance.
+- [Element](https://element.luca0n.com/)<sup><a href="http://element.e6ta74yrvylu6k6xk6uq52gtfpfxsf2ex3ktrzs2ods2vznbhci6jpqd.onion/">\[Tor\]</a></sup>: an Element web client instance.
 
 # APIs
 

src/en/swg.cfg

@@ -1,5 +1,5 @@
 # SWG Context Configuration File
-# Copyright (C) 2023 luca0N! <luca0n.com>
+# Copyright (C) 2022-2024 luca0N! <luca0n.com>
 
 # This is a very minimal .ini-like configuration file.
 #
@@ -24,7 +24,7 @@ WebsitePublisher="luca0N!"
 # published on the website.  Multiple copyright holders can be specified here.
 WebsiteCopyrightHolder="luca0N!"
 # This defines the copyright year or copyright years of the published content.
-WebsiteCopyrightYears="2020-2023"
+WebsiteCopyrightYears="2020—2024"
 # This defines the license of the published content.
 WebsiteContentLicense="CC-BY-SA-4.0"
 

src/pt/__swg_template.html

@@ -62,8 +62,8 @@
 			<hr/>
 			<footer>
 				<p>Este sítio está hospedado em <a href="https://nautilus.luca0n.com">Nautilus</a>. <a target="_blank" href="https://www.luca0N.com/en/privacy">Declaração de Privacidade</a> | <a target="_blank" href="https://www.luca0N.com/en/tos">Termos de Serviço</a></p>
-				<p>Todo o conteúdo neste sítio — incluindo o ícone luca0N! — está sob a licença Atribuição-CompartilhaIgual 4.0 Internacional a não ser que outra licença tenha sido especificada.</p>
+				<p>Todo o conteúdo neste sítio — incluindo o ícone luca0N! — está sob a licença Atribuição-CompartilhaIgual 4.0 Internacional a não ser que outra licença tenha sido especificada. <a href="https://git.luca0n.com/luca0N/luca0N-website" target="_blank">[Ver fontes deste sítio]</a></p>
-				<p>Copyright © 2020—2023 luca0N! Alguns direitos reservados.</p>
+				<p>Copyright © 2020–2024 luca0N! Alguns direitos reservados.</p>
 			</footer>
 		</main>
 	</body>

src/pt/contact.md

@@ -5,5 +5,12 @@ Deseja entrar em contato comigo? Aqui estão os meus detalhes de contato (sinta-
 - Endereço de correio eletrônico: `luca0n arroba luca0n ponto com` ([criptografia PGP](pgp/) é recomendado)
 - Endereço XMPP (Jabber): (o mesmo que o endereço de correio eletrônico)
 - Endereço Matrix: `@luca0n:luca0n.com`
-- IRC: `luca0N` no Libera.Chat (apesar de eu estar inativo 99% das vezes na maioria dos canais)
+- IRC: `luca0N` no Libera.Chat (eu estive mais ativo recentemente)
 - Pleroma (ActivityPub, Fediverse): `arroba luca0n arroba luca0n ponto com`
+
+## Extras
+
+Estas são contas que eu tenho, mas não considero minhas principais:
+
+- GitHub: [@luca0N](https://github.com/luca0N) (Eu estou no GitHub somente para contribuir para projetos FOSS que estão lá, mas meu software continua no [meu servidor Git](https://git.luca0n.com/luca0N).
+

src/pt/pgp.md

@@ -1,22 +1,22 @@
 # Chave pública PGP
 
-*Atualizado pela última vez em: 2023-12-31*
+*Atualizado pela última vez em: 2024-07-30*
 
-Se você quiser me enviar e-mail, eu aceito mensagens criptografadas com PGP (e também recomendo isto). Se você me enviar e-mail criptografado, eu irei enviar minhas responstas criptografadas (se eu conseguir achar a sua chave pública).
+Se você quiser me enviar e-mail, eu aceito mensagens criptografadas com PGP (e também recomendo isto). Se você me enviar e-mail criptografado, eu irei enviar minhas respostas criptografadas (se eu conseguir achar a sua chave pública).
 
 **Aviso importante: Neste momento, eu não estou utilizando nenhum servidor público de chaves (*keyservers*), e este é o único local oficial para baixar minhas chaves.**
 
 Aqui está minha chave:
 
 <pre>
-pub   rsa4096 2020-12-12 \[SC\] \[expires: 2024-12-31\]
+pub   rsa4096 2020-12-12 \[SC\] \[expires: 2025-01-26\]
       8C6B06FD67BDFBFF21E181243DB7E87C9EDE084C
 uid           luca0N! &lt;luca0n at luca0n dot com&gt;
-sub   rsa4096 2020-12-12 \[E\] \[expired: 2023-12-31\]
+sub   rsa4096 2020-12-12 \[E\] \[expires: 2025-01-02\]
 sub   rsa4096 2021-01-05 \[S\] \[expired: 2023-01-02\]
 sub   rsa4096 2023-04-02 \[S\] \[expired: 2023-07-01\]
-sub   rsa4096 2023-07-10 \[S\] \[expires: 2024-07-01\]
+sub   rsa4096 2023-07-10 \[S\] \[expires: 2025-01-02\]
-sub   rsa4096 2023-07-30 \[S\] \[expires: 2024-07-01\]
+sub   rsa4096 2023-07-30 \[S\] \[expires: 2025-01-02\]
 </pre>
 
 - [Download binary file](/assets/luca0N.gpg)

src/pt/services.md

@@ -13,13 +13,13 @@ Ao utilizar estes serviços, você concorda com os [Termos de Serviço luca0N.co
 
 Estes serviços são privados, de acesso limitado ou apenas para convidados.
 
-- [Git luca0N.com](https://git.luca0n.com/): o código-fonte dos meus programas ficam aqui.
+- [Git luca0N.com](https://git.luca0n.com/)<sup><a href="http://git.e6ta74yrvylu6k6xk6uq52gtfpfxsf2ex3ktrzs2ods2vznbhci6jpqd.onion/">\[Tor\]</a></sup>: o código-fonte dos meus programas ficam aqui.
 - [luca0N! Social](https://social.luca0n.com/): é a minha instância do Pleroma (apesar de eu não utilizar ela muito).
 - [Matrix](https://matrix.luca0n.com/): é meu servidor Matrix.
 
 # Aplicativos
 
-- [Element](https://element.luca0n.com/): é uma instância do cliente *web* Element.
+- [Element](https://element.luca0n.com/)<sup><a href="http://element.e6ta74yrvylu6k6xk6uq52gtfpfxsf2ex3ktrzs2ods2vznbhci6jpqd.onion/">\[Tor\]</a></sup>: é uma instância do cliente *web* Element.
 
 # APIs
 

src/pt/swg.cfg

@@ -1,5 +1,5 @@
 # SWG Context Configuration File
-# Copyright (C) 2023 luca0N! <luca0n.com>
+# Copyright (C) 2022-2024 luca0N! <luca0n.com>
 
 # This is a very minimal .ini-like configuration file.
 #
@@ -24,7 +24,7 @@ WebsitePublisher="luca0N!"
 # published on the website.  Multiple copyright holders can be specified here.
 WebsiteCopyrightHolder="luca0N!"
 # This defines the copyright year or copyright years of the published content.
-WebsiteCopyrightYears="2020-2023"
+WebsiteCopyrightYears="2020—2024"
 # This defines the license of the published content.
 WebsiteContentLicense="CC-BY-SA-4.0"