s/libre/free/

13 files changed, 157 insertions, 83 deletions

diff --git a/_articles/2018-07-17-running-guix-on-nixos.md b/_articles/2018-07-17-running-guix-on-nixos.md
index e409f3c..6005f9f 100644
--- a/_articles/2018-07-17-running-guix-on-nixos.md
+++ b/_articles/2018-07-17-running-guix-on-nixos.md
@@ -12,7 +12,7 @@ Guix on a NixOS machine. Even though the Guix manual explains how to do it
 [0]: https://www.gnu.org/software/guix/manual/en/html_node/Binary-Installation.html#Binary-Installation
 
 I couldn't just install GuixSD because my wireless network card
-doesn't have any free/libre drivers (yet).
+doesn't have any free drivers (yet).
 
 ## Creating `guixbuilder` users
 
diff --git a/_articles/2020-11-14-local-first-software-you-own-your-data-in-spite-of-the-cloud-article-review.md b/_articles/2020-11-14-local-first-software-you-own-your-data-in-spite-of-the-cloud-article-review.md
index 635a9a5..68ae03c 100644
--- a/_articles/2020-11-14-local-first-software-you-own-your-data-in-spite-of-the-cloud-article-review.md
+++ b/_articles/2020-11-14-local-first-software-you-own-your-data-in-spite-of-the-cloud-article-review.md
@@ -110,15 +110,15 @@ If it stops working due do, say, data growth, what are the options? Reverting to
 an earlier backup, and making it read-only? That isn't really a "Long Now", but
 rather a "Long Now as long as the software keeps working as expected".
 
-The point is: if the software isn't free/libre, "The Long Now" isn't achievable
+The point is: if the software isn't free, "The Long Now" isn't achievable
 without a lot of wishful thinking. Maybe the authors were trying to be more
-friendly towards business who don't like libre software, but in doing so they've proposed
+friendly towards business who don't like free software, but in doing so they've proposed
 a contradiction by reconciling "The Long Now" with proprietary software.
 
-It isn't the same as saying that any free/libre software achieves that ideal,
+It isn't the same as saying that any free software achieves that ideal,
 either. The license can still be free, but the source code can become
 unavailable due to cloud rot. Or maybe the build is undocumented, or the build
-tools had specific configuration that one has to guess. A piece of free/libre
+tools had specific configuration that one has to guess. A piece of free
 software can still fail to achieve "The Long Now". Being free doesn't guarantee
 it, just makes it possible.
 
diff --git a/_slides/2020-11-14-on-local-first-beyond-the-crdt-silver-bullet.slides b/_slides/2020-11-14-on-local-first-beyond-the-crdt-silver-bullet.slides
index 47f5f04..33fc239 100644
--- a/_slides/2020-11-14-on-local-first-beyond-the-crdt-silver-bullet.slides
+++ b/_slides/2020-11-14-on-local-first-beyond-the-crdt-silver-bullet.slides
@@ -169,7 +169,7 @@ ERROR: Panic! Stack overflow!
 ```
 ---
 
-### local-first **requires** free/libre software
+### local-first **requires** free software
 
 Otherwise "The Long Now" (ideal nº5) is lost
 
@@ -263,4 +263,4 @@ References:
 
 1. "[Local-First Software: You Own Your Data, in spite of the Cloud](https://martin.kleppmann.com/papers/local-first.pdf)", by M. Kleppmann, A. Wiggins, P. Van Hardenberg and M. F. McGranaghan
 1. [The Morning Paper](https://blog.acolyer.org/2019/11/20/local-first-software/) article
-1. "[A Note on Distributed Computing](https://web.archive.org/web/20130116163535/http://labs.oracle.com/techrep/1994/smli_tr-94-29.pdf)", by J. Waldo, G. Wyant, A. Wollrath and S Kendall
\ No newline at end of file
+1. "[A Note on Distributed Computing](https://web.archive.org/web/20130116163535/http://labs.oracle.com/techrep/1994/smli_tr-94-29.pdf)", by J. Waldo, G. Wyant, A. Wollrath and S Kendall
diff --git a/locale/eo/LC_MESSAGES/_articles/2018-07-17-running-guix-on-nixos.po b/locale/eo/LC_MESSAGES/_articles/2018-07-17-running-guix-on-nixos.po
index dfc690b..c76ab51 100644
--- a/locale/eo/LC_MESSAGES/_articles/2018-07-17-running-guix-on-nixos.po
+++ b/locale/eo/LC_MESSAGES/_articles/2018-07-17-running-guix-on-nixos.po
@@ -18,11 +18,6 @@ msgid ""
 " work properly."
 msgstr ""
 
-msgid ""
-"I couldn't just install GuixSD because my wireless network card doesn't have"
-" any free/libre drivers (yet)."
-msgstr ""
-
 msgid "Creating `guixbuilder` users"
 msgstr ""
 
@@ -228,3 +223,13 @@ msgid ""
 "$ hello\n"
 "Hello, world!\n"
 msgstr ""
+
+msgid ""
+"I couldn't just install GuixSD because my wireless network card doesn't have"
+" any free drivers (yet)."
+msgstr ""
+
+#~ msgid ""
+#~ "I couldn't just install GuixSD because my wireless network card doesn't have"
+#~ " any free/libre drivers (yet)."
+#~ msgstr ""
diff --git a/locale/eo/LC_MESSAGES/_articles/2020-11-14-local-first-software-you-own-your-data-in-spite-of-the-cloud-article-review.po b/locale/eo/LC_MESSAGES/_articles/2020-11-14-local-first-software-you-own-your-data-in-spite-of-the-cloud-article-review.po
index 57ea9cb..03ca2c6 100644
--- a/locale/eo/LC_MESSAGES/_articles/2020-11-14-local-first-software-you-own-your-data-in-spite-of-the-cloud-article-review.po
+++ b/locale/eo/LC_MESSAGES/_articles/2020-11-14-local-first-software-you-own-your-data-in-spite-of-the-cloud-article-review.po
@@ -130,23 +130,6 @@ msgid ""
 msgstr ""
 
 msgid ""
-"The point is: if the software isn't free/libre, \"The Long Now\" isn't "
-"achievable without a lot of wishful thinking. Maybe the authors were trying "
-"to be more friendly towards business who don't like libre software, but in "
-"doing so they've proposed a contradiction by reconciling \"The Long Now\" "
-"with proprietary software."
-msgstr ""
-
-msgid ""
-"It isn't the same as saying that any free/libre software achieves that "
-"ideal, either. The license can still be free, but the source code can become"
-" unavailable due to cloud rot. Or maybe the build is undocumented, or the "
-"build tools had specific configuration that one has to guess. A piece of "
-"free/libre software can still fail to achieve \"The Long Now\". Being free "
-"doesn't guarantee it, just makes it possible."
-msgstr ""
-
-msgid ""
 "An open specification could serve as a blueprint to other implementations, "
 "making the data format more friendly to reverse-engineering. But the re-"
 "implementation still has to exist, at which point the original software "
@@ -443,6 +426,40 @@ msgid ""
 " more being done on the \"local-first\" space."
 msgstr ""
 
+msgid ""
+"The point is: if the software isn't free, \"The Long Now\" isn't achievable "
+"without a lot of wishful thinking. Maybe the authors were trying to be more "
+"friendly towards business who don't like free software, but in doing so "
+"they've proposed a contradiction by reconciling \"The Long Now\" with "
+"proprietary software."
+msgstr ""
+
+msgid ""
+"It isn't the same as saying that any free software achieves that ideal, "
+"either. The license can still be free, but the source code can become "
+"unavailable due to cloud rot. Or maybe the build is undocumented, or the "
+"build tools had specific configuration that one has to guess. A piece of "
+"free software can still fail to achieve \"The Long Now\". Being free doesn't"
+" guarantee it, just makes it possible."
+msgstr ""
+
+#~ msgid ""
+#~ "The point is: if the software isn't free/libre, \"The Long Now\" isn't "
+#~ "achievable without a lot of wishful thinking. Maybe the authors were trying "
+#~ "to be more friendly towards business who don't like libre software, but in "
+#~ "doing so they've proposed a contradiction by reconciling \"The Long Now\" "
+#~ "with proprietary software."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "It isn't the same as saying that any free/libre software achieves that "
+#~ "ideal, either. The license can still be free, but the source code can become"
+#~ " unavailable due to cloud rot. Or maybe the build is undocumented, or the "
+#~ "build tools had specific configuration that one has to guess. A piece of "
+#~ "free/libre software can still fail to achieve \"The Long Now\". Being free "
+#~ "doesn't guarantee it, just makes it possible."
+#~ msgstr ""
+
 #~ msgid "They give examples of artificial restrictions, like this one:"
 #~ msgstr ""
 
diff --git a/locale/eo/LC_MESSAGES/_slides/2020-11-14-on-local-first-beyond-the-crdt-silver-bullet.slides.po b/locale/eo/LC_MESSAGES/_slides/2020-11-14-on-local-first-beyond-the-crdt-silver-bullet.slides.po
index 3164cbf..61a7485 100644
--- a/locale/eo/LC_MESSAGES/_slides/2020-11-14-on-local-first-beyond-the-crdt-silver-bullet.slides.po
+++ b/locale/eo/LC_MESSAGES/_slides/2020-11-14-on-local-first-beyond-the-crdt-silver-bullet.slides.po
@@ -185,9 +185,6 @@ msgid ""
 "ERROR: Panic! Stack overflow!\n"
 msgstr ""
 
-msgid "local-first **requires** free/libre software"
-msgstr ""
-
 msgid "Otherwise \"The Long Now\" (ideal nº5) is lost"
 msgstr ""
 
@@ -318,6 +315,12 @@ msgid ""
 "spite-of-the-cloud-article-review.md"
 msgstr ""
 
+msgid "local-first **requires** free software"
+msgstr ""
+
+#~ msgid "local-first **requires** free/libre software"
+#~ msgstr ""
+
 #~ msgid "these slides: [{{ site.tld }}/slides.html]({% link slides.md %})"
 #~ msgstr ""
 
diff --git a/locale/fr/LC_MESSAGES/_articles/2018-07-17-running-guix-on-nixos.po b/locale/fr/LC_MESSAGES/_articles/2018-07-17-running-guix-on-nixos.po
index dfc690b..c76ab51 100644
--- a/locale/fr/LC_MESSAGES/_articles/2018-07-17-running-guix-on-nixos.po
+++ b/locale/fr/LC_MESSAGES/_articles/2018-07-17-running-guix-on-nixos.po
@@ -18,11 +18,6 @@ msgid ""
 " work properly."
 msgstr ""
 
-msgid ""
-"I couldn't just install GuixSD because my wireless network card doesn't have"
-" any free/libre drivers (yet)."
-msgstr ""
-
 msgid "Creating `guixbuilder` users"
 msgstr ""
 
@@ -228,3 +223,13 @@ msgid ""
 "$ hello\n"
 "Hello, world!\n"
 msgstr ""
+
+msgid ""
+"I couldn't just install GuixSD because my wireless network card doesn't have"
+" any free drivers (yet)."
+msgstr ""
+
+#~ msgid ""
+#~ "I couldn't just install GuixSD because my wireless network card doesn't have"
+#~ " any free/libre drivers (yet)."
+#~ msgstr ""
diff --git a/locale/fr/LC_MESSAGES/_articles/2020-11-14-local-first-software-you-own-your-data-in-spite-of-the-cloud-article-review.po b/locale/fr/LC_MESSAGES/_articles/2020-11-14-local-first-software-you-own-your-data-in-spite-of-the-cloud-article-review.po
index 57ea9cb..03ca2c6 100644
--- a/locale/fr/LC_MESSAGES/_articles/2020-11-14-local-first-software-you-own-your-data-in-spite-of-the-cloud-article-review.po
+++ b/locale/fr/LC_MESSAGES/_articles/2020-11-14-local-first-software-you-own-your-data-in-spite-of-the-cloud-article-review.po
@@ -130,23 +130,6 @@ msgid ""
 msgstr ""
 
 msgid ""
-"The point is: if the software isn't free/libre, \"The Long Now\" isn't "
-"achievable without a lot of wishful thinking. Maybe the authors were trying "
-"to be more friendly towards business who don't like libre software, but in "
-"doing so they've proposed a contradiction by reconciling \"The Long Now\" "
-"with proprietary software."
-msgstr ""
-
-msgid ""
-"It isn't the same as saying that any free/libre software achieves that "
-"ideal, either. The license can still be free, but the source code can become"
-" unavailable due to cloud rot. Or maybe the build is undocumented, or the "
-"build tools had specific configuration that one has to guess. A piece of "
-"free/libre software can still fail to achieve \"The Long Now\". Being free "
-"doesn't guarantee it, just makes it possible."
-msgstr ""
-
-msgid ""
 "An open specification could serve as a blueprint to other implementations, "
 "making the data format more friendly to reverse-engineering. But the re-"
 "implementation still has to exist, at which point the original software "
@@ -443,6 +426,40 @@ msgid ""
 " more being done on the \"local-first\" space."
 msgstr ""
 
+msgid ""
+"The point is: if the software isn't free, \"The Long Now\" isn't achievable "
+"without a lot of wishful thinking. Maybe the authors were trying to be more "
+"friendly towards business who don't like free software, but in doing so "
+"they've proposed a contradiction by reconciling \"The Long Now\" with "
+"proprietary software."
+msgstr ""
+
+msgid ""
+"It isn't the same as saying that any free software achieves that ideal, "
+"either. The license can still be free, but the source code can become "
+"unavailable due to cloud rot. Or maybe the build is undocumented, or the "
+"build tools had specific configuration that one has to guess. A piece of "
+"free software can still fail to achieve \"The Long Now\". Being free doesn't"
+" guarantee it, just makes it possible."
+msgstr ""
+
+#~ msgid ""
+#~ "The point is: if the software isn't free/libre, \"The Long Now\" isn't "
+#~ "achievable without a lot of wishful thinking. Maybe the authors were trying "
+#~ "to be more friendly towards business who don't like libre software, but in "
+#~ "doing so they've proposed a contradiction by reconciling \"The Long Now\" "
+#~ "with proprietary software."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "It isn't the same as saying that any free/libre software achieves that "
+#~ "ideal, either. The license can still be free, but the source code can become"
+#~ " unavailable due to cloud rot. Or maybe the build is undocumented, or the "
+#~ "build tools had specific configuration that one has to guess. A piece of "
+#~ "free/libre software can still fail to achieve \"The Long Now\". Being free "
+#~ "doesn't guarantee it, just makes it possible."
+#~ msgstr ""
+
 #~ msgid "They give examples of artificial restrictions, like this one:"
 #~ msgstr ""
 
diff --git a/locale/fr/LC_MESSAGES/_slides/2020-11-14-on-local-first-beyond-the-crdt-silver-bullet.slides.po b/locale/fr/LC_MESSAGES/_slides/2020-11-14-on-local-first-beyond-the-crdt-silver-bullet.slides.po
index 3164cbf..61a7485 100644
--- a/locale/fr/LC_MESSAGES/_slides/2020-11-14-on-local-first-beyond-the-crdt-silver-bullet.slides.po
+++ b/locale/fr/LC_MESSAGES/_slides/2020-11-14-on-local-first-beyond-the-crdt-silver-bullet.slides.po
@@ -185,9 +185,6 @@ msgid ""
 "ERROR: Panic! Stack overflow!\n"
 msgstr ""
 
-msgid "local-first **requires** free/libre software"
-msgstr ""
-
 msgid "Otherwise \"The Long Now\" (ideal nº5) is lost"
 msgstr ""
 
@@ -318,6 +315,12 @@ msgid ""
 "spite-of-the-cloud-article-review.md"
 msgstr ""
 
+msgid "local-first **requires** free software"
+msgstr ""
+
+#~ msgid "local-first **requires** free/libre software"
+#~ msgstr ""
+
 #~ msgid "these slides: [{{ site.tld }}/slides.html]({% link slides.md %})"
 #~ msgstr ""
 
diff --git a/locale/pt/LC_MESSAGES/_articles/2018-07-17-running-guix-on-nixos.po b/locale/pt/LC_MESSAGES/_articles/2018-07-17-running-guix-on-nixos.po
index dfc690b..c76ab51 100644
--- a/locale/pt/LC_MESSAGES/_articles/2018-07-17-running-guix-on-nixos.po
+++ b/locale/pt/LC_MESSAGES/_articles/2018-07-17-running-guix-on-nixos.po
@@ -18,11 +18,6 @@ msgid ""
 " work properly."
 msgstr ""
 
-msgid ""
-"I couldn't just install GuixSD because my wireless network card doesn't have"
-" any free/libre drivers (yet)."
-msgstr ""
-
 msgid "Creating `guixbuilder` users"
 msgstr ""
 
@@ -228,3 +223,13 @@ msgid ""
 "$ hello\n"
 "Hello, world!\n"
 msgstr ""
+
+msgid ""
+"I couldn't just install GuixSD because my wireless network card doesn't have"
+" any free drivers (yet)."
+msgstr ""
+
+#~ msgid ""
+#~ "I couldn't just install GuixSD because my wireless network card doesn't have"
+#~ " any free/libre drivers (yet)."
+#~ msgstr ""
diff --git a/locale/pt/LC_MESSAGES/_articles/2020-11-14-local-first-software-you-own-your-data-in-spite-of-the-cloud-article-review.po b/locale/pt/LC_MESSAGES/_articles/2020-11-14-local-first-software-you-own-your-data-in-spite-of-the-cloud-article-review.po
index 57ea9cb..03ca2c6 100644
--- a/locale/pt/LC_MESSAGES/_articles/2020-11-14-local-first-software-you-own-your-data-in-spite-of-the-cloud-article-review.po
+++ b/locale/pt/LC_MESSAGES/_articles/2020-11-14-local-first-software-you-own-your-data-in-spite-of-the-cloud-article-review.po
@@ -130,23 +130,6 @@ msgid ""
 msgstr ""
 
 msgid ""
-"The point is: if the software isn't free/libre, \"The Long Now\" isn't "
-"achievable without a lot of wishful thinking. Maybe the authors were trying "
-"to be more friendly towards business who don't like libre software, but in "
-"doing so they've proposed a contradiction by reconciling \"The Long Now\" "
-"with proprietary software."
-msgstr ""
-
-msgid ""
-"It isn't the same as saying that any free/libre software achieves that "
-"ideal, either. The license can still be free, but the source code can become"
-" unavailable due to cloud rot. Or maybe the build is undocumented, or the "
-"build tools had specific configuration that one has to guess. A piece of "
-"free/libre software can still fail to achieve \"The Long Now\". Being free "
-"doesn't guarantee it, just makes it possible."
-msgstr ""
-
-msgid ""
 "An open specification could serve as a blueprint to other implementations, "
 "making the data format more friendly to reverse-engineering. But the re-"
 "implementation still has to exist, at which point the original software "
@@ -443,6 +426,40 @@ msgid ""
 " more being done on the \"local-first\" space."
 msgstr ""
 
+msgid ""
+"The point is: if the software isn't free, \"The Long Now\" isn't achievable "
+"without a lot of wishful thinking. Maybe the authors were trying to be more "
+"friendly towards business who don't like free software, but in doing so "
+"they've proposed a contradiction by reconciling \"The Long Now\" with "
+"proprietary software."
+msgstr ""
+
+msgid ""
+"It isn't the same as saying that any free software achieves that ideal, "
+"either. The license can still be free, but the source code can become "
+"unavailable due to cloud rot. Or maybe the build is undocumented, or the "
+"build tools had specific configuration that one has to guess. A piece of "
+"free software can still fail to achieve \"The Long Now\". Being free doesn't"
+" guarantee it, just makes it possible."
+msgstr ""
+
+#~ msgid ""
+#~ "The point is: if the software isn't free/libre, \"The Long Now\" isn't "
+#~ "achievable without a lot of wishful thinking. Maybe the authors were trying "
+#~ "to be more friendly towards business who don't like libre software, but in "
+#~ "doing so they've proposed a contradiction by reconciling \"The Long Now\" "
+#~ "with proprietary software."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "It isn't the same as saying that any free/libre software achieves that "
+#~ "ideal, either. The license can still be free, but the source code can become"
+#~ " unavailable due to cloud rot. Or maybe the build is undocumented, or the "
+#~ "build tools had specific configuration that one has to guess. A piece of "
+#~ "free/libre software can still fail to achieve \"The Long Now\". Being free "
+#~ "doesn't guarantee it, just makes it possible."
+#~ msgstr ""
+
 #~ msgid "They give examples of artificial restrictions, like this one:"
 #~ msgstr ""
 
diff --git a/locale/pt/LC_MESSAGES/_slides/2020-11-14-on-local-first-beyond-the-crdt-silver-bullet.slides.po b/locale/pt/LC_MESSAGES/_slides/2020-11-14-on-local-first-beyond-the-crdt-silver-bullet.slides.po
index 3164cbf..61a7485 100644
--- a/locale/pt/LC_MESSAGES/_slides/2020-11-14-on-local-first-beyond-the-crdt-silver-bullet.slides.po
+++ b/locale/pt/LC_MESSAGES/_slides/2020-11-14-on-local-first-beyond-the-crdt-silver-bullet.slides.po
@@ -185,9 +185,6 @@ msgid ""
 "ERROR: Panic! Stack overflow!\n"
 msgstr ""
 
-msgid "local-first **requires** free/libre software"
-msgstr ""
-
 msgid "Otherwise \"The Long Now\" (ideal nº5) is lost"
 msgstr ""
 
@@ -318,6 +315,12 @@ msgid ""
 "spite-of-the-cloud-article-review.md"
 msgstr ""
 
+msgid "local-first **requires** free software"
+msgstr ""
+
+#~ msgid "local-first **requires** free/libre software"
+#~ msgstr ""
+
 #~ msgid "these slides: [{{ site.tld }}/slides.html]({% link slides.md %})"
 #~ msgstr ""
 
diff --git a/scripts/spelling/international.txt b/scripts/spelling/international.txt
index 76e85bc..b8a8c27 100644
--- a/scripts/spelling/international.txt
+++ b/scripts/spelling/international.txt
@@ -205,7 +205,6 @@ k8s
 kramdown
 kubernetes
 libedn
-libre
 lockfile
 lockfiles
 lt