summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCody Brownstein <cbrownstein@liquidityllc.com>2017-05-19 01:21:54 -0700
committerCody Brownstein <cbrownstein@liquidityllc.com>2017-05-19 12:23:31 -0700
commitb5ad7f96bdd8715211454d2d92d6097429381036 (patch)
treee1a97fb86b79a542ebe005b06d5f47e0527d2a76
parent7f34d391ab0d300946a057bf7afd7f7c4a3fbfa5 (diff)
Replace occurrences of "Mac OS X" and "Mac OS" with "macOS"
-rw-r--r--[l---------]HACKING.mdwn267
-rw-r--r--wiki/src/blueprint/Port_Tails_Installer_to_OS_X.mdwn2
-rw-r--r--wiki/src/blueprint/UX_roadmap.mdwn14
-rw-r--r--wiki/src/blueprint/bootstrapping.mdwn4
-rw-r--r--wiki/src/blueprint/bootstrapping/installer.mdwn22
-rw-r--r--wiki/src/blueprint/usb_install_and_upgrade/future_spec.mdwn4
-rw-r--r--wiki/src/contribute/chat.mdwn2
-rw-r--r--wiki/src/contribute/roadmap.mdwn2
-rw-r--r--wiki/src/doc.de.po6
-rw-r--r--wiki/src/doc.fa.po4
-rw-r--r--wiki/src/doc.fr.po8
-rw-r--r--wiki/src/doc.it.po8
-rw-r--r--wiki/src/doc.mdwn4
-rw-r--r--wiki/src/doc.pt.po8
-rw-r--r--wiki/src/doc/advanced_topics/virtualization.de.po6
-rw-r--r--wiki/src/doc/advanced_topics/virtualization.fa.po4
-rw-r--r--wiki/src/doc/advanced_topics/virtualization.fr.po8
-rw-r--r--wiki/src/doc/advanced_topics/virtualization.it.po4
-rw-r--r--wiki/src/doc/advanced_topics/virtualization.mdwn4
-rw-r--r--wiki/src/doc/advanced_topics/virtualization.pt.po4
-rw-r--r--wiki/src/doc/advanced_topics/virtualization/virtualbox.de.po21
-rw-r--r--wiki/src/doc/advanced_topics/virtualization/virtualbox.fa.po12
-rw-r--r--wiki/src/doc/advanced_topics/virtualization/virtualbox.fr.po27
-rw-r--r--wiki/src/doc/advanced_topics/virtualization/virtualbox.it.po12
-rw-r--r--wiki/src/doc/advanced_topics/virtualization/virtualbox.mdwn6
-rw-r--r--wiki/src/doc/advanced_topics/virtualization/virtualbox.pt.po12
-rw-r--r--wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fr.po2
-rw-r--r--wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.it.po2
-rw-r--r--wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.pt.po4
-rw-r--r--wiki/src/doc/first_steps/reset.de.po2
-rw-r--r--wiki/src/doc/first_steps/reset.fa.po2
-rw-r--r--wiki/src/doc/first_steps/reset.fr.po4
-rw-r--r--wiki/src/doc/first_steps/reset.it.po4
-rw-r--r--wiki/src/doc/first_steps/reset.mdwn2
-rw-r--r--wiki/src/doc/first_steps/reset.pt.po2
-rw-r--r--wiki/src/doc/first_steps/reset/mac.de.po4
-rw-r--r--wiki/src/doc/first_steps/reset/mac.fa.po2
-rw-r--r--wiki/src/doc/first_steps/reset/mac.fr.po4
-rw-r--r--wiki/src/doc/first_steps/reset/mac.it.po2
-rw-r--r--wiki/src/doc/first_steps/reset/mac.mdwn2
-rw-r--r--wiki/src/doc/first_steps/reset/mac.pt.po2
-rw-r--r--wiki/src/doc/first_steps/upgrade.de.po4
-rw-r--r--wiki/src/doc/first_steps/upgrade.fa.po2
-rw-r--r--wiki/src/doc/first_steps/upgrade.fr.po4
-rw-r--r--wiki/src/doc/first_steps/upgrade.it.po4
-rw-r--r--wiki/src/doc/first_steps/upgrade.mdwn2
-rw-r--r--wiki/src/doc/first_steps/upgrade.pt.po2
-rw-r--r--wiki/src/install/download/openpgp.de.po8
-rw-r--r--wiki/src/install/download/openpgp.fa.po4
-rw-r--r--wiki/src/install/download/openpgp.fr.po8
-rw-r--r--wiki/src/install/download/openpgp.it.po8
-rw-r--r--wiki/src/install/download/openpgp.mdwn4
-rw-r--r--wiki/src/install/download/openpgp.pt.po4
-rw-r--r--wiki/src/install/dvd.de.po8
-rw-r--r--wiki/src/install/dvd.fa.po4
-rw-r--r--wiki/src/install/dvd.fr.po8
-rw-r--r--wiki/src/install/dvd.it.po8
-rw-r--r--wiki/src/install/dvd.mdwn4
-rw-r--r--wiki/src/install/dvd.pt.po4
-rw-r--r--wiki/src/install/inc/router/why_two.inline.de.po4
-rw-r--r--wiki/src/install/inc/router/why_two.inline.fa.po2
-rw-r--r--wiki/src/install/inc/router/why_two.inline.fr.po4
-rw-r--r--wiki/src/install/inc/router/why_two.inline.html2
-rw-r--r--wiki/src/install/inc/router/why_two.inline.it.po4
-rw-r--r--wiki/src/install/inc/router/why_two.inline.pt.po4
-rw-r--r--wiki/src/install/mac/dvd.de.po4
-rw-r--r--wiki/src/install/mac/dvd.fa.po2
-rw-r--r--wiki/src/install/mac/dvd.fr.po4
-rw-r--r--wiki/src/install/mac/dvd.it.po8
-rw-r--r--wiki/src/install/mac/dvd.mdwn2
-rw-r--r--wiki/src/install/mac/dvd.pt.po2
-rw-r--r--wiki/src/install/mac/usb.de.po4
-rw-r--r--wiki/src/install/mac/usb.fa.po2
-rw-r--r--wiki/src/install/mac/usb.fr.po4
-rw-r--r--wiki/src/install/mac/usb.it.po8
-rw-r--r--wiki/src/install/mac/usb.mdwn2
-rw-r--r--wiki/src/install/mac/usb.pt.po2
-rw-r--r--wiki/src/install/os.de.po4
-rw-r--r--wiki/src/install/os.fa.po2
-rw-r--r--wiki/src/install/os.fr.po4
-rw-r--r--wiki/src/install/os.html2
-rw-r--r--wiki/src/install/os.it.po4
-rw-r--r--wiki/src/install/os.pt.po2
-rw-r--r--wiki/src/news/our_plans_for_2017.de.po4
-rw-r--r--wiki/src/news/our_plans_for_2017.fa.po4
-rw-r--r--wiki/src/news/our_plans_for_2017.fr.po8
-rw-r--r--wiki/src/news/our_plans_for_2017.it.po4
-rw-r--r--wiki/src/news/our_plans_for_2017.mdwn4
-rw-r--r--wiki/src/news/our_plans_for_2017.pt.po4
-rw-r--r--wiki/src/news/report_2011_05-06.mdwn2
-rw-r--r--wiki/src/news/report_2015_07.mdwn2
-rw-r--r--wiki/src/news/report_2015_08.mdwn2
-rw-r--r--wiki/src/news/report_2016_03.mdwn2
-rw-r--r--wiki/src/news/test_3.0-beta4.fr.po11
-rw-r--r--wiki/src/news/version_2.12.de.po4
-rw-r--r--wiki/src/press/media_appearances_2015.mdwn2
-rw-r--r--wiki/src/support/chat.de.po4
-rw-r--r--wiki/src/support/chat.fa.po4
-rw-r--r--wiki/src/support/chat.fr.po4
-rw-r--r--wiki/src/support/chat.it.po2
-rw-r--r--wiki/src/support/chat.mdwn2
-rw-r--r--wiki/src/support/chat.pt.po6
-rw-r--r--wiki/src/support/talk.de.po4
-rw-r--r--wiki/src/support/talk.fa.po2
-rw-r--r--wiki/src/support/talk.fr.po4
-rw-r--r--wiki/src/support/talk.pt.po4
106 files changed, 525 insertions, 251 deletions
diff --git a/HACKING.mdwn b/HACKING.mdwn
index c1c40d5..ffba9ed 120000..100644
--- a/HACKING.mdwn
+++ b/HACKING.mdwn
@@ -1 +1,266 @@
-wiki/src/contribute/how/code/HACKING.mdwn \ No newline at end of file
+[[!meta title="Writing code for Tails"]]
+
+Hi, prospective Tails contributor! This document is intended to
+quickly (in 20 minutes!) get you up to speed on how to write code for
+Tails by giving a brief overview the Tails source tree and Git branch
+organization without referring to more detailed (and hence longer)
+resources. As such it might not be enough for some specific things,
+but it should cover 95% of use cases for aspiring code
+contributors. Also, this document risks getting out of date, so don't
+trust every single detail as the written word of `$DEITY`.
+
+Note that this document will not teach you how to *contribute* code to
+Tails; it will only introduce you how to *write* code for Tails. Once
+you have something to contribute, please read our
+[[extensive instructions for contributors|contribute/how/code]].
+
+[[!toc levels=2]]
+
+# Git branch organization
+
+* `master`: as soon as something is pushed to this branch in Tails
+ main git repository, the live Tails' website is rebuilt. This branch
+ is *only* used for the website. Don't waste time trying to build it,
+ or basing new branches on it if you intend to build them!
+
+* `devel`: This is the development branch, where new features end
+ up. In general you should base new branches on this one.
+
+* `stable`: When a new major Tails release is out, we merge `devel`
+ into `stable` and use it to build minor releases (e.g. when there's
+ a new Tor Browser (= Firefox ESR) release) and emergency releases
+ from. We only merge security fixes and bugfixes into this branch, so
+ new such branches should be based on `stable`.
+
+* `testing`: After a freeze for a new major release (e.g. when we
+ prepare release candidates), this is the branch were the continued
+ work for this release happens. At that point `devel` is used for the
+ *next* major release. Bugfixes on new features introduced in the
+ this upcoming Tails release should be based on this branch (as
+ should new translations).
+
+* `feature/DEBIAN_NEXT`: The development branch for Tails based on the
+ next Debian major release.
+
+* `feature/XXXX-*`, `bugfix/XXXX-*`, `test/XXXX-*`: We use this naming
+ scheme for the branches if new features, bugfixes and automated
+ tests, where `XXXX` refers to the Redmine ticket they fix.
+
+We will sometimes talk about "base branches", which are `stable`,
+`testing`, `devel` and `feature/DEBIAN_NEXT`. When developing a new
+branch, this should be the branch you based it on. It will be used
+during the build to determine which packages from Tails APT repo to
+install (see some details about this below).
+
+For detailed information see our
+[[documentation about Git|contribute/git]].
+
+# Important files and directories
+
+Some of the more important files during build, and for running Tails
+sessions, are listed below. In general, just look at the existing
+files or content to understand the format -- we won't explain them
+fully here most of the time.
+
+
+## config/chroot_sources/
+
+The files in here determine which APT repositories to use during
+build, and in the resulting Tails image.
+
+Note that while it is possible to add non-Debian repositories, and
+that it is fine to do so for testing/development purposes, limitations
+inherent in Tails' APT snapshot system (see below) prevents us from
+using them in releases. In fact, in releases we can only use:
+
+* Debian's APT repository
+* `deb.torproject.org`
+* `deb.tails.boum.org`
+
+So, if you need a package from some other repository, feel free to add
+through this mechanism it when developing your branch. When it's time
+to merge we will figure out the best way to get the packages available
+to us, usually by importing them to `deb.tails.boum.org`. The
+preferred solution is always to have the packages available in
+Debian.
+
+
+## config/chroot_apt/preferences
+
+The `/etc/apt/preferences` file that will be used during the build
+process, and later copied in to the resulting Tails filesystem. We use
+it *heavily*. If you want to install a package (or another version of
+a package) that is not in the stable Debian release, you will have to
+add a pinning rule in this file in order to make it install.
+
+
+## config/chroot_local-packageslists/tails-common.list
+
+The primary list of packages to install in Tails. Sometimes extra
+magic has to be done when installing a package, and then we install it
+with a build-time hook (see `config/chroot_local-hooks/` below). If
+the package is to be installed from another source than Debian Stable,
+make sure to add a pinning rule (see `config/chroot_apt/preferences`
+above).
+
+
+## config/chroot_local-packages/
+
+If you put a `.deb` here, it will be installed with high priority
+(disregarding the rules in `config/chroot_apt/preferences`). This is
+useful for testing purposes only!
+
+
+## config/base_branch
+
+This encodes which base branch (see above) the current branch is based
+on (the base branches themselves are "based" on themselves). In
+practice this determines which APT suite from `deb.tails.boum.org` to
+use (so if `config/base_branch` contains `devel`, then the `devel` APT
+suite will be used). These APT suites are the place where we upload
+all our custom Debian packages.
+
+
+## config/APT_overlays.d/
+
+Each file here corresponds to an APT suite on `deb.tails.boum.org` to
+be used. E.g. if we have `config/APT_overlays.d/feature-1234-example`
+then the `feature-1234-example` APT suite will be used. Each branch
+that is pushed to Tails' main Git repo will automatically have such a
+suite created (but with illegal charactes changed to `-`, so
+`feature/1234-example` becomes `feature-1234-example`).
+
+This is useful for importing specific package versions in between
+Tails releases, and gives us very exact control of which branches gets
+which packages.
+
+
+## config/APT_snapshots.d/
+
+The APT repositories used to install packages during the build process
+are snapshotted several times per day. The files in here simply encode
+which snapshot to use for each APT repository. In general, the `devel`
+branch always uses the latest snapshots, while all other branches more
+or less use the snapshot from the last feature freeze (when we prepare
+the release candidate for the last Tails major release). This way only
+`devel` is a bit crazy, and the build result depends on what happens
+e.g. in Debian's APT repository from day to day. Other branches remain
+pretty much the same until these snapshots are bumped, or something
+changes in `deb.tails.boum.org` (but then you should just merge your
+base branch, and all should be good again).
+
+For detailed information see our
+[[documentation about APT repositories|contribute/APT_repository]].
+
+## config/binary_*
+
+These files are about what will happen outside of Tails filesystem, on
+the ISO9660 filesystem of the resulting `.iso` image.
+
+
+## config/chroot_local-includes/
+
+These files and directories will be copied into the Tails file system,
+overwriting existing file. This is the main way to include e.g. static
+configurations, custom scripts, and similar things not handled by
+Debian packages.
+
+
+## config/chroot_local-patches/
+
+These patches will be applied on `/` of the Tails filesystem right
+after `config/chroot_local-includes/` is copied in. Here we patch
+various configuration files and similar installed by Debian packages,
+but where we still want to keep any changes made upstream. Remember,
+if we use `config/chroot_local-includes/` files are *overwritten*, so
+any such upstream changes are lost. With a patch we'll get them as
+well as our desired change (and we get build failures as a
+"notification" when the upstream has changed in a conflicting way,
+which is nice).
+
+
+## config/chroot_local-hooks/
+
+These scripts will run right after the patches in
+`config/chroot_local-patches/` are applied. Here we can pretty much do
+anything we want. We use it to reconfigure various things, install
+packages that require extra magic, programatically generating various
+files (images, configurations, even some scripts), cleaning up
+unneeded files etc.
+
+
+## config/chroot_local-includes/lib/live/config/
+
+These scripts will be run early during Tails' boot process, in lexical
+order. Quite a few of them are installed by the `live-config` package,
+but we have some custom ones in there as well. Note that
+`0030-user-setup` is when the Live user (`amnesia`) is created, so
+prior to that any reference to it won't work (e.g. in the build-hooks
+in `config/chroot_local-hooks/`).
+
+
+## config/chroot_local-includes/etc/skel/
+
+This is the seed for the Live user's (`amnesia` for now) home
+directory. Put static application configuration files ("dot files" and
+"dot dirs") here!
+
+
+## config/chroot_local-includes/usr/share/tails/
+
+A directory where we dump Tails-specific files with no obvious place
+to live. Generally these are files needed during build (and then we
+clean them up with a build hook) or during Tails operation (e.g. by
+some script).
+
+
+## config/chroot_local-includes/usr/local/
+
+This is where we put most of the custom scripts shipped in Tails. Some
+honorable mentions are:
+
+* `config/chroot_local-includes/usr/local/sbin/` for scripts used by
+ root only.
+* `config/chroot_local-includes/usr/local/bin/` for scripts used by
+ non-root users (and root too).
+* `config/chroot_local-includes/usr/local/lib/` for scripts that we
+ don't want to expose to the user at all times (it's not in the
+ `$PATH`).
+* `config/chroot_local-includes/usr/local/lib/tails-shell-library/`
+ for "libraries" often included in the above scripts.
+
+
+# Overview of the build process
+
+The order of how things are applied matters greatly. In terms of the
+files and directories you have learned about above, this is how Tails
+is built, in order:
+
+1. A minimal Debian system is `debootstrap`:ed.
+2. APT is set up according to `config/chroot_sources/` and
+ `config/chroot_apt/preferences` (and `config/APT_overlays.d/` and
+ `config/APT_snapshots.d/`).
+3. Packages listed in
+ `config/chroot_local-packageslists/tails-common.list` are
+ installed.
+4. Packages stored in `config/chroot_local-packages/` are installed.
+5. Everyting in `config/chroot_local-includes/` is copied to `/`,
+ overwriting existing files.
+6. All patches in `config/chroot_local-patches/` are applied on `/`.
+7. All build-time hooks in `config/chroot_local-hooks/` are run.
+8. Now the Tails filesystem is done!
+9. The ISO9660 filesystem used in the resulting `.iso` image is
+ created according to `config/binary_*`.
+
+# Building Tails
+
+Just follow the "Using Vagrant" section in our
+[[contribute/build#vagrant]] instruction. Copy-pasting the shell
+commands should be enough. Then it's as simple as:
+
+ rake build
+
+although you may want to look through the build options you can supply
+via the `TAILS_BUILD_OPTIONS` environment variable.
+
+Happy hacking!
diff --git a/wiki/src/blueprint/Port_Tails_Installer_to_OS_X.mdwn b/wiki/src/blueprint/Port_Tails_Installer_to_OS_X.mdwn
index 4ca6162..2a3bd26 100644
--- a/wiki/src/blueprint/Port_Tails_Installer_to_OS_X.mdwn
+++ b/wiki/src/blueprint/Port_Tails_Installer_to_OS_X.mdwn
@@ -1,6 +1,6 @@
# Introduction
-This is an on-going feasibility on how to port the Tails Installer to the Mac OS X operating system.
+This is an on-going feasibility on how to port the Tails Installer to the macOS operating system.
## Considerations
diff --git a/wiki/src/blueprint/UX_roadmap.mdwn b/wiki/src/blueprint/UX_roadmap.mdwn
index a7dd540..5df94aa 100644
--- a/wiki/src/blueprint/UX_roadmap.mdwn
+++ b/wiki/src/blueprint/UX_roadmap.mdwn
@@ -11,7 +11,7 @@ We organized several workshops at NUMA to improve the usability of Tails. We rea
- to install Tails;
- to boot Tails.
-We want to improve this situation.
+We want to improve this situation.
First-time visitors on the Tails website should be able to enjoy a consistent experience, from understanding if Tails is the right tool for them, to achieving their actual goals by using it.
@@ -44,9 +44,9 @@ Next
* Screen locker [[!tails_ticket 5684]]
* User-friendly backup system [[!tails_ticket 5301]]
* Localized clock [[!tails_ticket 6284]]
-* Tails Installer on Mac OS X [[!tails_ticket 8559]]
+* Tails Installer on macOS [[!tails_ticket 8559]]
* OpenPGP Applet [[!tails_ticket 7778 ]]
-* Shut down [[!tails_ticket 5417 ]]
+* Shut down [[!tails_ticket 5417 ]]
2. Installation
@@ -55,7 +55,7 @@ Next
A big work in done in 2015 to [[improve the installation workflow|blueprint/bootstrapping/]].
1. Refactor the installation documentation and add visual aids.
-2. Automatic ISO verification [[!tails_ticket 7552]]
+2. Automatic ISO verification [[!tails_ticket 7552]]
3. Multiplatform installer [[!tails_ticket 7544]]
In 2016, we want to go on:
@@ -105,9 +105,3 @@ Depending on grants and availibilities, here are the big steps we could do:
-----------
- 2018 : Promote Tails outside of the website, regarding the differents people and use cases where Tails could be usefull.
-
-
-
-
-
-
diff --git a/wiki/src/blueprint/bootstrapping.mdwn b/wiki/src/blueprint/bootstrapping.mdwn
index 6f7df77..c6326c9 100644
--- a/wiki/src/blueprint/bootstrapping.mdwn
+++ b/wiki/src/blueprint/bootstrapping.mdwn
@@ -61,7 +61,7 @@ Notes:
- **Debian** is a path for Debian derivatives where Tails Installer is
available. That will be the case of Ubuntu starting from 15.10,
Debian Jessie backports, and Debian Stretch ([[!tails_ticket 8805]]).
-- **Other OS** is Windows, Mac OS X, Fedora, etc.
+- **Other OS** is Windows, macOS, Fedora, etc.
- **OpenPGP with Debian keyring** are command line instructions for verifying the
Tails signing key against the Debian keyring.
- **Extension from Debian** takes for granted that the ISO verification
@@ -122,7 +122,7 @@ The comments, placed after ':' correspond to our rough objectives for
- Next LTS, 16.04: Tails Installer? [[!tails_ticket 8806]]
- Next, 15.10: Tails Installer? [[!tails_ticket 8806]]
- Windows: UUI
- - Mac OS X: command line or new graphical tool? [[!tails_ticket 8802]]
+ - macOS: command line or new graphical tool? [[!tails_ticket 8802]]
- Virtualization: VirtualBox, GNOME Boxes, virt-manager
- Upgrade from ISO (full upgrade or nightly)
- Full upgrade
diff --git a/wiki/src/blueprint/bootstrapping/installer.mdwn b/wiki/src/blueprint/bootstrapping/installer.mdwn
index e590eb0..4a02122 100644
--- a/wiki/src/blueprint/bootstrapping/installer.mdwn
+++ b/wiki/src/blueprint/bootstrapping/installer.mdwn
@@ -16,7 +16,7 @@ requires having two USB sticks and going through manual installation
steps, often using command line.
We want to eliminate the need for a first temporary Tails and have Tails
-Installer available on Linux, Windows, and Mac OS.
+Installer available on Linux, Windows, and macOS.
As part of the ISO verification process we also want to push more
verification logic to Tails Installer. See the [[blueprint on ISO
@@ -34,8 +34,8 @@ Roadmap
----
In 2015 we will work on porting Tails Installer to Debian. This is a
-first step before having Tails available on any other platform.
-This requires rethinking the scenarios in which Tails Installer is
+first step before having Tails available on any other platform.
+This requires rethinking the scenarios in which Tails Installer is
used ([[!tails_ticket 7046]]) and adapting its interface accordingly.
Those are the improvements that we propose for 2015:
@@ -67,22 +67,22 @@ First of all:
2. Simplify the splash screen a bit thanks to the autodetection code:
merge "Clone and Install" and "Clone and Upgrade" into one single
"Clone" button: Depending on whether the destination device already
- has Tails installed or not, dynamically change the label of main
+ has Tails installed or not, dynamically change the label of main
action button to "Install" or "Upgrade" (for the second device).
- (Note: this breaks the "re-installing Tails from scratch" use case,
- but IIRC we already have documented how to uninstall Tails, so that's
+ (Note: this breaks the "re-installing Tails from scratch" use case,
+ but IIRC we already have documented how to uninstall Tails, so that's
no big deal). ([[!tails_ticket 9006]])
3. If the destination device already has Tails installed, add a second
- button below or side-by-side with the "Install" button with the label
- "Upgrade". This allows to choose once more to either reinstall Tails
+ button below or side-by-side with the "Install" button with the label
+ "Upgrade". This allows to choose once more to either reinstall Tails
from scratch or to upgrade the exisiting installation.
4. When using the installer in Tails (as opposed to using the installer
- from another platform), remove the splash screen and add a "Clone"
+ from another platform), remove the splash screen and add a "Clone"
button to the main interface. ([[!tails_ticket 8859]])
And then:
-- If using the installer outside of Tails, point to the website to
+- If using the installer outside of Tails, point to the website to
download the ISO. ([[!tails_ticket 8867]])
- Make it possible to "Upgrade from ISO" from
the command line. See the [[Debian Hacker|bootstrapping#tools]] bootstrapping path. ([[!tails_ticket 8861]])
@@ -90,7 +90,7 @@ And then:
the command line. See the [[Debian Hacker|bootstrapping#tools]] bootstrapping path. ([[!tails_ticket 8861]]).
- Store version of Tails on destination key after install and upgrade. ([[!tails_ticket 8863]])
- This would allow to display version in "Target Device". ([[!tails_ticket 8862]])
-- Have Tails Installer available on Mac OS as there is currently no suitable other
+- Have Tails Installer available on macOS as there is currently no suitable other
installation technique using a graphical interface.
Future
diff --git a/wiki/src/blueprint/usb_install_and_upgrade/future_spec.mdwn b/wiki/src/blueprint/usb_install_and_upgrade/future_spec.mdwn
index 3558a5a..bb67e20 100644
--- a/wiki/src/blueprint/usb_install_and_upgrade/future_spec.mdwn
+++ b/wiki/src/blueprint/usb_install_and_upgrade/future_spec.mdwn
@@ -56,8 +56,8 @@ Distribution
============
Tails installer shall be available and working on a few selected non-Tails
-operating systems, such as Debian GNU/Linux, Ubuntu, Microsoft Windows
-or Mac OS X. This would allow one-step installation of Tails, instead of the
+operating systems, such as Debian GNU/Linux, Ubuntu, Microsoft Windows
+or macOS. This would allow one-step installation of Tails, instead of the
current way of doing things, that requires an intermediate step: either burning
a DVD or cat'ing a hybrid'ed ISO to a temporary USB stick.
diff --git a/wiki/src/contribute/chat.mdwn b/wiki/src/contribute/chat.mdwn
index 6be3690..59289b2 100644
--- a/wiki/src/contribute/chat.mdwn
+++ b/wiki/src/contribute/chat.mdwn
@@ -5,7 +5,7 @@ we have a dedicated chatroom for contributors.
To join it, use your preferred instant messaging client that supports XMPP, e.g.
[[Pidgin|http://www.pidgin.im/]], which runs on Windows, GNU/Linux and
-Mac OS X.
+macOS.
Here are the needed technical details:
diff --git a/wiki/src/contribute/roadmap.mdwn b/wiki/src/contribute/roadmap.mdwn
index 0ca47e6..5a5f1db 100644
--- a/wiki/src/contribute/roadmap.mdwn
+++ b/wiki/src/contribute/roadmap.mdwn
@@ -20,7 +20,7 @@ Here is a summary of our priorities for the next years:
Mac, and automatic upgrades ([[!tails_ticket 11679]])
- **Graphical installation method for macOS**: what would it take
to document tools other than Tails Installer to do a graphical
- installation from Mac OS? ([[!tails_ticket 11682]])
+ installation from macOS? ([[!tails_ticket 11682]])
- **Explain better what Tails is** and what makes it so awesome ([[!tails_ticket 9814]])
- **Security hardening**
diff --git a/wiki/src/doc.de.po b/wiki/src/doc.de.po
index 37ebe13..0fd71a9 100644
--- a/wiki/src/doc.de.po
+++ b/wiki/src/doc.de.po
@@ -110,13 +110,13 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
-"[[Install from Mac OS X by burning a DVD first|install/mac/dvd/overview]]"
+"[[Install from macOS by burning a DVD first|install/mac/dvd/overview]]"
msgstr ""
-"[[Von Mac OS X aus eine DVD brennen und anschließend installieren|install/"
+"[[Von macOS aus eine DVD brennen und anschließend installieren|install/"
"mac/dvd/overview]]"
#. type: Bullet: ' - '
-msgid "[[Install from Mac OS X and the command line|install/mac/usb/overview]]"
+msgid "[[Install from macOS and the command line|install/mac/usb/overview]]"
msgstr ""
"[[Installation von Mac aus unter Nutzung der Kommandozeile|install/mac/usb/"
"overview]]"
diff --git a/wiki/src/doc.fa.po b/wiki/src/doc.fa.po
index 9dae63b..4bb0ff3 100644
--- a/wiki/src/doc.fa.po
+++ b/wiki/src/doc.fa.po
@@ -97,11 +97,11 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
-"[[Install from Mac OS X by burning a DVD first|install/mac/dvd/overview]]"
+"[[Install from macOS by burning a DVD first|install/mac/dvd/overview]]"
msgstr ""
#. type: Bullet: ' - '
-msgid "[[Install from Mac OS X and the command line|install/mac/usb/overview]]"
+msgid "[[Install from macOS and the command line|install/mac/usb/overview]]"
msgstr ""
#. type: Bullet: ' - '
diff --git a/wiki/src/doc.fr.po b/wiki/src/doc.fr.po
index 29c0610..70c6f1b 100644
--- a/wiki/src/doc.fr.po
+++ b/wiki/src/doc.fr.po
@@ -102,15 +102,15 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
-"[[Install from Mac OS X by burning a DVD first|install/mac/dvd/overview]]"
+"[[Install from macOS by burning a DVD first|install/mac/dvd/overview]]"
msgstr ""
-"[[Installation à partir de Mac OS X en gravant d'abord un DVD|install/mac/"
+"[[Installation à partir de macOS en gravant d'abord un DVD|install/mac/"
"dvd/overview]]"
#. type: Bullet: ' - '
-msgid "[[Install from Mac OS X and the command line|install/mac/usb/overview]]"
+msgid "[[Install from macOS and the command line|install/mac/usb/overview]]"
msgstr ""
-"[[Installation depuis Mac OS X en ligne de commande|install/mac/usb/"
+"[[Installation depuis macOS en ligne de commande|install/mac/usb/"
"overview]]"
#. type: Bullet: ' - '
diff --git a/wiki/src/doc.it.po b/wiki/src/doc.it.po
index 5328887..900a3b1 100644
--- a/wiki/src/doc.it.po
+++ b/wiki/src/doc.it.po
@@ -104,14 +104,14 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
-"[[Install from Mac OS X by burning a DVD first|install/mac/dvd/overview]]"
+"[[Install from macOS by burning a DVD first|install/mac/dvd/overview]]"
msgstr ""
-"[[Installa da Mac OS X masterizzandoti un DVD|install/mac/dvd/overview]]"
+"[[Installa da macOS masterizzandoti un DVD|install/mac/dvd/overview]]"
#. type: Bullet: ' - '
-msgid "[[Install from Mac OS X and the command line|install/mac/usb/overview]]"
+msgid "[[Install from macOS and the command line|install/mac/usb/overview]]"
msgstr ""
-"[[Installa da Mac OS X e utilizza il terminale|install/mac/usb/overview]]"
+"[[Installa da macOS e utilizza il terminale|install/mac/usb/overview]]"
#. type: Bullet: ' - '
msgid "[[Burn a DVD|install/dvd]]"
diff --git a/wiki/src/doc.mdwn b/wiki/src/doc.mdwn
index 70e5815..a7f5649 100644
--- a/wiki/src/doc.mdwn
+++ b/wiki/src/doc.mdwn
@@ -24,8 +24,8 @@ documentation|/contribute/how/documentation]].
- [[Install from Debian, Ubuntu, or Mint|install/debian/usb/overview]]
- [[Install from Debian, Ubuntu, or Mint using the command line and GnuPG|install/expert/usb/overview]]
- [[Install from other Linux distributions|install/linux/usb/overview]]
- - [[Install from Mac OS X by burning a DVD first|install/mac/dvd/overview]]
- - [[Install from Mac OS X and the command line|install/mac/usb/overview]]
+ - [[Install from macOS by burning a DVD first|install/mac/dvd/overview]]
+ - [[Install from macOS and the command line|install/mac/usb/overview]]
- [[Burn a DVD|install/dvd]]
- [[Download without installing|install/download]]
- [[Download and verify using OpenPGP|install/download/openpgp]]
diff --git a/wiki/src/doc.pt.po b/wiki/src/doc.pt.po
index 2fa85b1..2cfd128 100644
--- a/wiki/src/doc.pt.po
+++ b/wiki/src/doc.pt.po
@@ -108,15 +108,15 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
-"[[Install from Mac OS X by burning a DVD first|install/mac/dvd/overview]]"
+"[[Install from macOS by burning a DVD first|install/mac/dvd/overview]]"
msgstr ""
-"[[Instale a partir de um Mac OS X gravando um DVD primeiro|install/mac/dvd/"
+"[[Instale a partir de um macOS gravando um DVD primeiro|install/mac/dvd/"
"overview]]"
#. type: Bullet: ' - '
-msgid "[[Install from Mac OS X and the command line|install/mac/usb/overview]]"
+msgid "[[Install from macOS and the command line|install/mac/usb/overview]]"
msgstr ""
-"[[Instale a partir de um Mac OS X usando a linha de comando|install/mac/usb/"
+"[[Instale a partir de um macOS usando a linha de comando|install/mac/usb/"
"overview]]"
#. type: Bullet: ' - '
diff --git a/wiki/src/doc/advanced_topics/virtualization.de.po b/wiki/src/doc/advanced_topics/virtualization.de.po
index f338590..4f8863f 100644
--- a/wiki/src/doc/advanced_topics/virtualization.de.po
+++ b/wiki/src/doc/advanced_topics/virtualization.de.po
@@ -39,12 +39,12 @@ msgstr ""
#. type: Plain text
msgid ""
"With virtual machines, it is possible to run Tails inside a *host* operating "
-"system (Linux, Windows, or Mac OS&nbsp;X). A virtual machine emulates a real "
+"system (Linux, Windows, or macOS). A virtual machine emulates a real "
"computer and its operating system, called *guest* which appears in a window "
"on the *host* operating system."
msgstr ""
"Mit virtuellen Maschinen ist es möglich, Tails innerhalb eines *Host*-"
-"Betriebssystems auszuführen (Linux, Windows, oder Mac OS&nbsp;X). Eine "
+"Betriebssystems auszuführen (Linux, Windows, oder macOS). Eine "
"virtuelle Maschine emuliert einen echten Computer und sein Betriebssystem, "
"genannt *Gast*, und erscheint in einem Fenster auf dem *Host*-Betriebssystem."
@@ -220,7 +220,7 @@ msgstr "Lösungen zur Virtualisierung\n"
msgid ""
"To run Tails inside a virtual machine, you need to have virtualization "
"software installed on the host operating system. Different virtualization "
-"software exist for Linux, Windows, and Mac OS&nbsp;X."
+"software exist for Linux, Windows, and macOS."
msgstr ""
"Um Tails in einer virtuellen Maschine auszuführen, ist es nötig, dass Sie "
"Virtualisierungssoftware auf dem Hostbetriebssystem installiert haben. Es "
diff --git a/wiki/src/doc/advanced_topics/virtualization.fa.po b/wiki/src/doc/advanced_topics/virtualization.fa.po
index f432cb3..472c361 100644
--- a/wiki/src/doc/advanced_topics/virtualization.fa.po
+++ b/wiki/src/doc/advanced_topics/virtualization.fa.po
@@ -42,7 +42,7 @@ msgstr ""
#. type: Plain text
msgid ""
"With virtual machines, it is possible to run Tails inside a *host* operating "
-"system (Linux, Windows, or Mac OS&nbsp;X). A virtual machine emulates a real "
+"system (Linux, Windows, or macOS). A virtual machine emulates a real "
"computer and its operating system, called *guest* which appears in a window "
"on the *host* operating system."
msgstr ""
@@ -221,7 +221,7 @@ msgstr "راه‌حل‌های مجازی‌سازی\n"
msgid ""
"To run Tails inside a virtual machine, you need to have virtualization "
"software installed on the host operating system. Different virtualization "
-"software exist for Linux, Windows, and Mac OS&nbsp;X."
+"software exist for Linux, Windows, and macOS."
msgstr ""
"برای اجرای تیلز در یک ماشین مجازی باید یک نرم‌افزار مجازی‌سازی روی سیستم‌"
"عامل میزبان نصب کرده باشید. نرم‌افزارهای مجازی‌سازی مختلفی برای لینوکس، "
diff --git a/wiki/src/doc/advanced_topics/virtualization.fr.po b/wiki/src/doc/advanced_topics/virtualization.fr.po
index 3b94470..aec9f8b 100644
--- a/wiki/src/doc/advanced_topics/virtualization.fr.po
+++ b/wiki/src/doc/advanced_topics/virtualization.fr.po
@@ -39,7 +39,7 @@ msgstr ""
#. type: Plain text
msgid ""
"With virtual machines, it is possible to run Tails inside a *host* operating "
-"system (Linux, Windows, or Mac OS&nbsp;X). A virtual machine emulates a real "
+"system (Linux, Windows, or macOS). A virtual machine emulates a real "
"computer and its operating system, called *guest* which appears in a window "
"on the *host* operating system."
msgstr ""
@@ -222,7 +222,7 @@ msgstr "Solutions de virtualisation\n"
msgid ""
"To run Tails inside a virtual machine, you need to have virtualization "
"software installed on the host operating system. Different virtualization "
-"software exist for Linux, Windows, and Mac OS&nbsp;X."
+"software exist for Linux, Windows, and macOS."
msgstr ""
"Pour faire tourner Tails dans une machine virtuelle, vous avez besoin d'un "
"logiciel de virtualisation installé sur le système d'exploitation hôte. "
@@ -314,7 +314,7 @@ msgstr " [[Voir la documentation correspondante.|virt-manager]]\n"
#~ "to use the Internet anonymously with Tails. For those, a so called "
#~ "[virtual machine](http://en.wikipedia.org/wiki/Virtual_machine) can be "
#~ "used to run Tails inside the \"host\" operating system installed on the "
-#~ "computer (e.g. Microsoft Windows, Mac OS X, etc.). Essentially these "
+#~ "computer (e.g. Microsoft Windows, macOS, etc.). Essentially these "
#~ "programs emulate real computers that you can run \"guest\" operating "
#~ "systems (in this case Tails) in so they appear in a window within the "
#~ "host operating system. Using one of these technologies allows for "
@@ -326,7 +326,7 @@ msgstr " [[Voir la documentation correspondante.|virt-manager]]\n"
#~ "Pour ces personnes, une [machine virtuelle](http://fr.wikipedia.org/wiki/"
#~ "machine_virtuelle) peut être utilisée pour démarrer Tails à l'intérieur "
#~ "du système d'exploitation \"hôte\" installé dans l'ordinateur (e.x. "
-#~ "Microsoft Windows, Mac OS X, etc.). Globalement, ces programmes simulent "
+#~ "Microsoft Windows, macOS, etc.). Globalement, ces programmes simulent "
#~ "des ordinateurs réels à l'intérieur desquels vous pouvez démarrer des "
#~ "systèmes d'exploitation \"invités\" (dans ce cas Tails). Ils apparaissent "
#~ "alors dans une fenêtre à l'intérieur du système d'exploitation hôte. "
diff --git a/wiki/src/doc/advanced_topics/virtualization.it.po b/wiki/src/doc/advanced_topics/virtualization.it.po
index c580972..c2b86a2 100644
--- a/wiki/src/doc/advanced_topics/virtualization.it.po
+++ b/wiki/src/doc/advanced_topics/virtualization.it.po
@@ -36,7 +36,7 @@ msgstr ""
#. type: Plain text
msgid ""
"With virtual machines, it is possible to run Tails inside a *host* operating "
-"system (Linux, Windows, or Mac OS&nbsp;X). A virtual machine emulates a real "
+"system (Linux, Windows, or macOS). A virtual machine emulates a real "
"computer and its operating system, called *guest* which appears in a window "
"on the *host* operating system."
msgstr ""
@@ -181,7 +181,7 @@ msgstr ""
msgid ""
"To run Tails inside a virtual machine, you need to have virtualization "
"software installed on the host operating system. Different virtualization "
-"software exist for Linux, Windows, and Mac OS&nbsp;X."
+"software exist for Linux, Windows, and macOS."
msgstr ""
#. type: Plain text
diff --git a/wiki/src/doc/advanced_topics/virtualization.mdwn b/wiki/src/doc/advanced_topics/virtualization.mdwn
index 66acf56..f8acdaf 100644
--- a/wiki/src/doc/advanced_topics/virtualization.mdwn
+++ b/wiki/src/doc/advanced_topics/virtualization.mdwn
@@ -7,7 +7,7 @@ restart your computer every time. This is possible using
[[!wikipedia Virtual_machine desc="virtual machines"]].
With virtual machines, it is possible to run Tails inside a *host*
-operating system (Linux, Windows, or Mac OS&nbsp;X). A virtual machine
+operating system (Linux, Windows, or macOS). A virtual machine
emulates a real computer and its operating system, called *guest* which
appears in a window on the *host* operating system.
@@ -88,7 +88,7 @@ Virtualization solutions
To run Tails inside a virtual machine, you need to have
virtualization software installed on the host operating system.
-Different virtualization software exist for Linux, Windows, and Mac OS&nbsp;X.
+Different virtualization software exist for Linux, Windows, and macOS.
<div class="note">
diff --git a/wiki/src/doc/advanced_topics/virtualization.pt.po b/wiki/src/doc/advanced_topics/virtualization.pt.po
index d60de74..7bb0f9d 100644
--- a/wiki/src/doc/advanced_topics/virtualization.pt.po
+++ b/wiki/src/doc/advanced_topics/virtualization.pt.po
@@ -36,7 +36,7 @@ msgstr ""
#. type: Plain text
msgid ""
"With virtual machines, it is possible to run Tails inside a *host* operating "
-"system (Linux, Windows, or Mac OS&nbsp;X). A virtual machine emulates a real "
+"system (Linux, Windows, or macOS). A virtual machine emulates a real "
"computer and its operating system, called *guest* which appears in a window "
"on the *host* operating system."
msgstr ""
@@ -181,7 +181,7 @@ msgstr ""
msgid ""
"To run Tails inside a virtual machine, you need to have virtualization "
"software installed on the host operating system. Different virtualization "
-"software exist for Linux, Windows, and Mac OS&nbsp;X."
+"software exist for Linux, Windows, and macOS."
msgstr ""
#. type: Plain text
diff --git a/wiki/src/doc/advanced_topics/virtualization/virtualbox.de.po b/wiki/src/doc/advanced_topics/virtualization/virtualbox.de.po
index e2d5475..b825460 100644
--- a/wiki/src/doc/advanced_topics/virtualization/virtualbox.de.po
+++ b/wiki/src/doc/advanced_topics/virtualization/virtualbox.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2017-02-16 11:27+0100\n"
+"POT-Creation-Date: 2017-05-18 16:33-0700\n"
"PO-Revision-Date: 2017-02-16 11:29+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: \n"
@@ -26,11 +26,11 @@ msgstr "[[!meta title=\"VirtualBox\"]]\n"
msgid ""
"It is possible to run Tails in a virtual machine using [<span\n"
"class=\"application\">VirtualBox</span>](https://www.virtualbox.org/) from a\n"
-"Windows, Linux, or Mac OS&nbsp;X host operating system.\n"
+"Windows, Linux, or macOS host operating system.\n"
msgstr ""
"Es ist möglich, Tails in einer virtuellen Maschine mit [<span\n"
"class=\"application\">VirtualBox</span>](https://www.virtualbox.org/) von einem\n"
-"Windows, Linux, oder Mac OS&nbsp;X Hostbetriebssystem auszuführen.\n"
+"Windows, Linux, oder macOS Hostbetriebssystem auszuführen.\n"
#. type: Plain text
#, no-wrap
@@ -98,10 +98,13 @@ msgstr ""
"auf eingebaute Festplatten|encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked]]\n"
"von Tails verstehen, bevor Sie diese Funktion benutzen.</p>\n"
-#. type: Title =
-#, no-wrap
-msgid "Security considerations for Windows and Mac OS X\n"
-msgstr "Sicherheitsbedenken für Windows und Mac OS X\n"
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "Security considerations for Windows and macOS\n"
+msgid ""
+"Security considerations for Windows and macOS\n"
+"================================================\n"
+msgstr "Sicherheitsbedenken für Windows und macOS\n"
#. type: Plain text
msgid ""
@@ -116,11 +119,11 @@ msgstr ""
#. type: Plain text
msgid ""
-"Microsoft Windows and Mac OS X being proprietary software, they cannot be "
+"Microsoft Windows and macOS being proprietary software, they cannot be "
"considered trustworthy. Only run Tails in a virtual machine on Windows or OS "
"X for testing purposes and do not rely on it for security."
msgstr ""
-"Microsoft Windows und Mac OS X sind proprietäre Software, diese können nicht "
+"Microsoft Windows und macOS sind proprietäre Software, diese können nicht "
"als vertrauenswürdig eingestuft werden. Betreiben Sie Tails in einer "
"virtuellen Maschine unter Windows oder OS X nur für Testzwecke und vertrauen "
"Sie bezüglich Sicherheit nicht darauf."
diff --git a/wiki/src/doc/advanced_topics/virtualization/virtualbox.fa.po b/wiki/src/doc/advanced_topics/virtualization/virtualbox.fa.po
index d1d10b1..bed35ea 100644
--- a/wiki/src/doc/advanced_topics/virtualization/virtualbox.fa.po
+++ b/wiki/src/doc/advanced_topics/virtualization/virtualbox.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-16 11:27+0100\n"
+"POT-Creation-Date: 2017-05-18 16:33-0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -26,7 +26,7 @@ msgstr ""
msgid ""
"It is possible to run Tails in a virtual machine using [<span\n"
"class=\"application\">VirtualBox</span>](https://www.virtualbox.org/) from a\n"
-"Windows, Linux, or Mac OS&nbsp;X host operating system.\n"
+"Windows, Linux, or macOS host operating system.\n"
msgstr ""
#. type: Plain text
@@ -82,9 +82,11 @@ msgid ""
"from Tails before using this feature.</p>\n"
msgstr ""
-#. type: Title =
+#. type: Plain text
#, no-wrap
-msgid "Security considerations for Windows and Mac OS X\n"
+msgid ""
+"Security considerations for Windows and macOS\n"
+"================================================\n"
msgstr ""
#. type: Plain text
@@ -96,7 +98,7 @@ msgstr ""
#. type: Plain text
msgid ""
-"Microsoft Windows and Mac OS X being proprietary software, they cannot be "
+"Microsoft Windows and macOS being proprietary software, they cannot be "
"considered trustworthy. Only run Tails in a virtual machine on Windows or OS "
"X for testing purposes and do not rely on it for security."
msgstr ""
diff --git a/wiki/src/doc/advanced_topics/virtualization/virtualbox.fr.po b/wiki/src/doc/advanced_topics/virtualization/virtualbox.fr.po
index 7f0951e..df80dd8 100644
--- a/wiki/src/doc/advanced_topics/virtualization/virtualbox.fr.po
+++ b/wiki/src/doc/advanced_topics/virtualization/virtualbox.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2017-02-16 11:27+0100\n"
+"POT-Creation-Date: 2017-05-18 16:33-0700\n"
"PO-Revision-Date: 2017-02-16 11:29+0100\n"
"Last-Translator: Chre <tor@renaudineau.org>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -26,11 +26,11 @@ msgstr "[[!meta title=\"VirtualBox\"]]\n"
msgid ""
"It is possible to run Tails in a virtual machine using [<span\n"
"class=\"application\">VirtualBox</span>](https://www.virtualbox.org/) from a\n"
-"Windows, Linux, or Mac OS&nbsp;X host operating system.\n"
+"Windows, Linux, or macOS host operating system.\n"
msgstr ""
"Il est possible d'utiliser Tails dans une machine virtuelle avec [<span\n"
"class=\"application\">VirtualBox</span>](https://www.virtualbox.org/) depuis un\n"
-"système d'exploitation Windows, Linux, ou Mac OS&nbsp;X..\n"
+"système d'exploitation Windows, Linux, ou macOS..\n"
#. type: Plain text
#, no-wrap
@@ -98,10 +98,13 @@ msgstr ""
"aux disques durs internes|encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked]]\n"
"depuis Tails avant d'utiliser cette fonctionnalité.</p>\n"
-#. type: Title =
-#, no-wrap
-msgid "Security considerations for Windows and Mac OS X\n"
-msgstr "Considérations de sécurité pour Windows et Mac OS X\n"
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "Security considerations for Windows and macOS\n"
+msgid ""
+"Security considerations for Windows and macOS\n"
+"================================================\n"
+msgstr "Considérations de sécurité pour Windows et macOS\n"
#. type: Plain text
msgid ""
@@ -115,14 +118,14 @@ msgstr ""
#. type: Plain text
msgid ""
-"Microsoft Windows and Mac OS X being proprietary software, they cannot be "
+"Microsoft Windows and macOS being proprietary software, they cannot be "
"considered trustworthy. Only run Tails in a virtual machine on Windows or OS "
"X for testing purposes and do not rely on it for security."
msgstr ""
-"Microsoft Windows et Mac OS X étant des logiciels propriétaires, ils ne "
-"peuvent pas être considérés de confiance. Utilisez seulement Tails dans une "
-"machine virtuelle hébergée par Windows ou OS X pour faire des tests et ne "
-"comptez pas dessus pour sa sécurité."
+"Microsoft Windows et macOS étant des logiciels propriétaires, ils ne peuvent "
+"pas être considérés de confiance. Utilisez seulement Tails dans une machine "
+"virtuelle hébergée par Windows ou OS X pour faire des tests et ne comptez "
+"pas dessus pour sa sécurité."
#. type: Title =
#, no-wrap
diff --git a/wiki/src/doc/advanced_topics/virtualization/virtualbox.it.po b/wiki/src/doc/advanced_topics/virtualization/virtualbox.it.po
index 70f2f6e..ffa6dd6 100644
--- a/wiki/src/doc/advanced_topics/virtualization/virtualbox.it.po
+++ b/wiki/src/doc/advanced_topics/virtualization/virtualbox.it.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-16 11:27+0100\n"
+"POT-Creation-Date: 2017-05-18 16:33-0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: ita <transitails@inventati.org>\n"
@@ -26,7 +26,7 @@ msgstr ""
msgid ""
"It is possible to run Tails in a virtual machine using [<span\n"
"class=\"application\">VirtualBox</span>](https://www.virtualbox.org/) from a\n"
-"Windows, Linux, or Mac OS&nbsp;X host operating system.\n"
+"Windows, Linux, or macOS host operating system.\n"
msgstr ""
#. type: Plain text
@@ -82,9 +82,11 @@ msgid ""
"from Tails before using this feature.</p>\n"
msgstr ""
-#. type: Title =
+#. type: Plain text
#, no-wrap
-msgid "Security considerations for Windows and Mac OS X\n"
+msgid ""
+"Security considerations for Windows and macOS\n"
+"================================================\n"
msgstr ""
#. type: Plain text
@@ -96,7 +98,7 @@ msgstr ""
#. type: Plain text
msgid ""
-"Microsoft Windows and Mac OS X being proprietary software, they cannot be "
+"Microsoft Windows and macOS being proprietary software, they cannot be "
"considered trustworthy. Only run Tails in a virtual machine on Windows or OS "
"X for testing purposes and do not rely on it for security."
msgstr ""
diff --git a/wiki/src/doc/advanced_topics/virtualization/virtualbox.mdwn b/wiki/src/doc/advanced_topics/virtualization/virtualbox.mdwn
index 5b418a1..5a48e4f 100644
--- a/wiki/src/doc/advanced_topics/virtualization/virtualbox.mdwn
+++ b/wiki/src/doc/advanced_topics/virtualization/virtualbox.mdwn
@@ -2,7 +2,7 @@
It is possible to run Tails in a virtual machine using [<span
class="application">VirtualBox</span>](https://www.virtualbox.org/) from a
-Windows, Linux, or Mac OS&nbsp;X host operating system.
+Windows, Linux, or macOS host operating system.
[[!inline pages="doc/advanced_topics/virtualization.caution" raw="yes" sort="age"]]
@@ -31,7 +31,7 @@ from Tails before using this feature.</p>
</div>
-Security considerations for Windows and Mac OS X
+Security considerations for Windows and macOS
================================================
In our [[security warnings about
@@ -40,7 +40,7 @@ a virtual machine only if the host operating system is trustworthy.
<div class="caution">
-Microsoft Windows and Mac OS X being proprietary software, they cannot be considered
+Microsoft Windows and macOS being proprietary software, they cannot be considered
trustworthy. Only run Tails in a virtual machine on Windows or OS X for testing
purposes and do not rely on it for security.
diff --git a/wiki/src/doc/advanced_topics/virtualization/virtualbox.pt.po b/wiki/src/doc/advanced_topics/virtualization/virtualbox.pt.po
index d1d10b1..bed35ea 100644
--- a/wiki/src/doc/advanced_topics/virtualization/virtualbox.pt.po
+++ b/wiki/src/doc/advanced_topics/virtualization/virtualbox.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-16 11:27+0100\n"
+"POT-Creation-Date: 2017-05-18 16:33-0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -26,7 +26,7 @@ msgstr ""
msgid ""
"It is possible to run Tails in a virtual machine using [<span\n"
"class=\"application\">VirtualBox</span>](https://www.virtualbox.org/) from a\n"
-"Windows, Linux, or Mac OS&nbsp;X host operating system.\n"
+"Windows, Linux, or macOS host operating system.\n"
msgstr ""
#. type: Plain text
@@ -82,9 +82,11 @@ msgid ""
"from Tails before using this feature.</p>\n"
msgstr ""
-#. type: Title =
+#. type: Plain text
#, no-wrap
-msgid "Security considerations for Windows and Mac OS X\n"
+msgid ""
+"Security considerations for Windows and macOS\n"
+"================================================\n"
msgstr ""
#. type: Plain text
@@ -96,7 +98,7 @@ msgstr ""
#. type: Plain text
msgid ""
-"Microsoft Windows and Mac OS X being proprietary software, they cannot be "
+"Microsoft Windows and macOS being proprietary software, they cannot be "
"considered trustworthy. Only run Tails in a virtual machine on Windows or OS "
"X for testing purposes and do not rely on it for security."
msgstr ""
diff --git a/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fr.po b/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fr.po
index bbe02e3..7481c1e 100644
--- a/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fr.po
+++ b/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fr.po
@@ -908,7 +908,7 @@ msgstr ""
#~ msgid ""
#~ "The graphical user interface used in Tails is called [GNOME](gnome.org) "
-#~ "and shares many fundamentals with that of Microsoft Windows, Mac OS X and "
+#~ "and shares many fundamentals with that of Microsoft Windows, macOS and "
#~ "most other modern operating systems, so if you have used any of them, "
#~ "getting used to GNOME will take no time. As this document is not intended "
#~ "as a complete guide for GNOME there are only a few things about it that "
diff --git a/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.it.po b/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.it.po
index e7ccdeb..616090a 100644
--- a/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.it.po
+++ b/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.it.po
@@ -1003,7 +1003,7 @@ msgstr ""
#~ msgid ""
#~ "The graphical user interface used in Tails is called [GNOME](gnome.org) "
-#~ "and shares many fundamentals with that of Microsoft Windows, Mac OS X and "
+#~ "and shares many fundamentals with that of Microsoft Windows, macOS and "
#~ "most other modern operating systems, so if you have used any of them, "
#~ "getting used to GNOME will take no time. As this document is not intended "
#~ "as a complete guide for GNOME there are only a few things about it that "
diff --git a/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.pt.po b/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.pt.po
index ef8c077..a7d4914 100644
--- a/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.pt.po
+++ b/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.pt.po
@@ -997,14 +997,14 @@ msgstr ""
#~ msgid ""
#~ "The graphical user interface used in Tails is called [GNOME](gnome.org) "
-#~ "and shares many fundamentals with that of Microsoft Windows, Mac OS X and "
+#~ "and shares many fundamentals with that of Microsoft Windows, macOS and "
#~ "most other modern operating systems, so if you have used any of them, "
#~ "getting used to GNOME will take no time. As this document is not intended "
#~ "as a complete guide for GNOME there are only a few things about it that "
#~ "we will mention here to spare you some time."
#~ msgstr ""
#~ "A interface gráfica de usuário usada no Tails é chamada [GNOME](gnome."
-#~ "org) e compartilha muitos fundamentos do Microsoft Windows, Mac OS X e a "
+#~ "org) e compartilha muitos fundamentos do Microsoft Windows, macOS e a "
#~ "maioria dos outros sistemas operacionais modernos e então, se você já "
#~ "tiver usado qualquer um deles, acostumar-se com o GNOME será fácil. Como "
#~ "este documento não pretende ser um guia completo de GNOME mencionaremos "
diff --git a/wiki/src/doc/first_steps/reset.de.po b/wiki/src/doc/first_steps/reset.de.po
index 5897632..6dbb1fa 100644
--- a/wiki/src/doc/first_steps/reset.de.po
+++ b/wiki/src/doc/first_steps/reset.de.po
@@ -37,5 +37,5 @@ msgid "[[Instructions for Windows|reset/windows]]"
msgstr ""
#. type: Bullet: ' - '
-msgid "[[Instructions for Mac OS X|reset/mac]]"
+msgid "[[Instructions for macOS|reset/mac]]"
msgstr ""
diff --git a/wiki/src/doc/first_steps/reset.fa.po b/wiki/src/doc/first_steps/reset.fa.po
index ad24e25..78aca61 100644
--- a/wiki/src/doc/first_steps/reset.fa.po
+++ b/wiki/src/doc/first_steps/reset.fa.po
@@ -44,5 +44,5 @@ msgstr "[[دستورالعمل‌های برای ویندوز|reset/windows]]"
#. type: Bullet: ' - '
#, fuzzy
#| msgid "[[Instructions for Windows|reset/windows]]"
-msgid "[[Instructions for Mac OS X|reset/mac]]"
+msgid "[[Instructions for macOS|reset/mac]]"
msgstr "[[دستورالعمل‌های برای ویندوز|reset/windows]]"
diff --git a/wiki/src/doc/first_steps/reset.fr.po b/wiki/src/doc/first_steps/reset.fr.po
index 71703d0..816698a 100644
--- a/wiki/src/doc/first_steps/reset.fr.po
+++ b/wiki/src/doc/first_steps/reset.fr.po
@@ -39,5 +39,5 @@ msgid "[[Instructions for Windows|reset/windows]]"
msgstr "[[Instructions pour Windows|reset/windows]]"
#. type: Bullet: ' - '
-msgid "[[Instructions for Mac OS X|reset/mac]]"
-msgstr "[[Instructions pour Mac OS X|reset/mac]]"
+msgid "[[Instructions for macOS|reset/mac]]"
+msgstr "[[Instructions pour macOS|reset/mac]]"
diff --git a/wiki/src/doc/first_steps/reset.it.po b/wiki/src/doc/first_steps/reset.it.po
index 809dcbb..b40e39c 100644
--- a/wiki/src/doc/first_steps/reset.it.po
+++ b/wiki/src/doc/first_steps/reset.it.po
@@ -39,5 +39,5 @@ msgid "[[Instructions for Windows|reset/windows]]"
msgstr "[[Istruzioni per Windows|reset/windows]]"
#. type: Bullet: ' - '
-msgid "[[Instructions for Mac OS X|reset/mac]]"
-msgstr "[[Istruzioni per Mac OS X|reset/mac]]"
+msgid "[[Instructions for macOS|reset/mac]]"
+msgstr "[[Istruzioni per macOS|reset/mac]]"
diff --git a/wiki/src/doc/first_steps/reset.mdwn b/wiki/src/doc/first_steps/reset.mdwn
index 3aaf280..8d0af34 100644
--- a/wiki/src/doc/first_steps/reset.mdwn
+++ b/wiki/src/doc/first_steps/reset.mdwn
@@ -4,4 +4,4 @@
- [[Instructions for Linux with GNOME: Ubuntu, Debian, Tails, etc.|reset/linux]]
- [[Instructions for Windows|reset/windows]]
- - [[Instructions for Mac OS X|reset/mac]]
+ - [[Instructions for macOS|reset/mac]]
diff --git a/wiki/src/doc/first_steps/reset.pt.po b/wiki/src/doc/first_steps/reset.pt.po
index 3b800a2..86f85d7 100644
--- a/wiki/src/doc/first_steps/reset.pt.po
+++ b/wiki/src/doc/first_steps/reset.pt.po
@@ -39,5 +39,5 @@ msgstr "[[Instruções para Windows|reset/windows]]"
#. type: Bullet: ' - '
#, fuzzy
#| msgid "[[Instructions for Windows|reset/windows]]"
-msgid "[[Instructions for Mac OS X|reset/mac]]"
+msgid "[[Instructions for macOS|reset/mac]]"
msgstr "[[Instruções para Windows|reset/windows]]"
diff --git a/wiki/src/doc/first_steps/reset/mac.de.po b/wiki/src/doc/first_steps/reset/mac.de.po
index 0c09c00..76b8c68 100644
--- a/wiki/src/doc/first_steps/reset/mac.de.po
+++ b/wiki/src/doc/first_steps/reset/mac.de.po
@@ -18,8 +18,8 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Resetting a USB stick or SD card using Mac OSX\"]]\n"
-msgstr "[[!meta title=\" Einen USB-Stick oder eine SD-Karte mit Mac OSX zurücksetzen\"]]\n"
+msgid "[[!meta title=\"Resetting a USB stick or SD card using macOS\"]]\n"
+msgstr "[[!meta title=\" Einen USB-Stick oder eine SD-Karte mit macOS zurücksetzen\"]]\n"
#. type: Plain text
#, no-wrap
diff --git a/wiki/src/doc/first_steps/reset/mac.fa.po b/wiki/src/doc/first_steps/reset/mac.fa.po
index 6b02b85..29e3ced 100644
--- a/wiki/src/doc/first_steps/reset/mac.fa.po
+++ b/wiki/src/doc/first_steps/reset/mac.fa.po
@@ -20,7 +20,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Resetting a USB stick or SD card using Mac OSX\"]]\n"
+msgid "[[!meta title=\"Resetting a USB stick or SD card using macOS\"]]\n"
msgstr "[[!meta title=\"تنظیم دوبارهٔ یک درایو یواس‌بی یا یک کارت حفظه با استفاده از مک اواس ده\"]]\n"
#. type: Plain text
diff --git a/wiki/src/doc/first_steps/reset/mac.fr.po b/wiki/src/doc/first_steps/reset/mac.fr.po
index 1702e7f..03b5f7f 100644
--- a/wiki/src/doc/first_steps/reset/mac.fr.po
+++ b/wiki/src/doc/first_steps/reset/mac.fr.po
@@ -18,8 +18,8 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Resetting a USB stick or SD card using Mac OSX\"]]\n"
-msgstr "[[!meta title=\"Réinitialiser une clé USB ou une carte SD, pour Mac OSX\"]]\n"
+msgid "[[!meta title=\"Resetting a USB stick or SD card using macOS\"]]\n"
+msgstr "[[!meta title=\"Réinitialiser une clé USB ou une carte SD, pour macOS\"]]\n"
#. type: Plain text
#, no-wrap
diff --git a/wiki/src/doc/first_steps/reset/mac.it.po b/wiki/src/doc/first_steps/reset/mac.it.po
index baaef38..6ea72dc 100644
--- a/wiki/src/doc/first_steps/reset/mac.it.po
+++ b/wiki/src/doc/first_steps/reset/mac.it.po
@@ -18,7 +18,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Resetting a USB stick or SD card using Mac OSX\"]]\n"
+msgid "[[!meta title=\"Resetting a USB stick or SD card using macOS\"]]\n"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/doc/first_steps/reset/mac.mdwn b/wiki/src/doc/first_steps/reset/mac.mdwn
index eb093a6..58b52b1 100644
--- a/wiki/src/doc/first_steps/reset/mac.mdwn
+++ b/wiki/src/doc/first_steps/reset/mac.mdwn
@@ -1,4 +1,4 @@
-[[!meta title="Resetting a USB stick or SD card using Mac OSX"]]
+[[!meta title="Resetting a USB stick or SD card using macOS"]]
[[!inline pages="doc/first_steps/reset.intro" raw="yes" sort="age"]]
diff --git a/wiki/src/doc/first_steps/reset/mac.pt.po b/wiki/src/doc/first_steps/reset/mac.pt.po
index 1435413..b1674a6 100644
--- a/wiki/src/doc/first_steps/reset/mac.pt.po
+++ b/wiki/src/doc/first_steps/reset/mac.pt.po
@@ -18,7 +18,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Resetting a USB stick or SD card using Mac OSX\"]]\n"
+msgid "[[!meta title=\"Resetting a USB stick or SD card using macOS\"]]\n"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/doc/first_steps/upgrade.de.po b/wiki/src/doc/first_steps/upgrade.de.po
index 89c8cfb..06e66f4 100644
--- a/wiki/src/doc/first_steps/upgrade.de.po
+++ b/wiki/src/doc/first_steps/upgrade.de.po
@@ -75,10 +75,10 @@ msgstr "<p>Wenn Sie Tails von einer DVD aus benutzen, ist es notwendig [[eine ne
#. type: Plain text
#, no-wrap
msgid ""
-"<p>If you use Tails from a USB stick installed from Mac OS X using the\n"
+"<p>If you use Tails from a USB stick installed from macOS using the\n"
"command line, you need to [[reinstall|install/mac/usb/overview]].</p>\n"
msgstr ""
-"<p>Wenn Sie Tails von einem USB-Stick aus benutzen, der unter Mac OS X unter Nutzung der\n"
+"<p>Wenn Sie Tails von einem USB-Stick aus benutzen, der unter macOS unter Nutzung der\n"
"Kommandozeile installiert wurde, ist es notwendig Tails [[neu zu installieren|install/mac/usb/overview]].</p>\n"
#. type: Plain text
diff --git a/wiki/src/doc/first_steps/upgrade.fa.po b/wiki/src/doc/first_steps/upgrade.fa.po
index f048c33..acf91a7 100644
--- a/wiki/src/doc/first_steps/upgrade.fa.po
+++ b/wiki/src/doc/first_steps/upgrade.fa.po
@@ -83,7 +83,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"<p>If you use Tails from a USB stick installed from Mac OS X using the\n"
+"<p>If you use Tails from a USB stick installed from macOS using the\n"
"command line, you need to [[reinstall|install/mac/usb/overview]].</p>\n"
msgstr ""
diff --git a/wiki/src/doc/first_steps/upgrade.fr.po b/wiki/src/doc/first_steps/upgrade.fr.po
index 32ecfdf..e4c3097 100644
--- a/wiki/src/doc/first_steps/upgrade.fr.po
+++ b/wiki/src/doc/first_steps/upgrade.fr.po
@@ -75,10 +75,10 @@ msgstr "<p>Si vous utilisez Tails depuis un DVD, vous devez [[graver un nouveau
#. type: Plain text
#, no-wrap
msgid ""
-"<p>If you use Tails from a USB stick installed from Mac OS X using the\n"
+"<p>If you use Tails from a USB stick installed from macOS using the\n"
"command line, you need to [[reinstall|install/mac/usb/overview]].</p>\n"
msgstr ""
-"<p>Si vous utilisez Tails depuis une clé USB installée depuis Mac OS X en utilisant la\n"
+"<p>Si vous utilisez Tails depuis une clé USB installée depuis macOS en utilisant la\n"
"ligne de commande, vous devez [[réinstaller|install/mac/usb/overview]].</p>\n"
#. type: Plain text
diff --git a/wiki/src/doc/first_steps/upgrade.it.po b/wiki/src/doc/first_steps/upgrade.it.po
index cfe8a6e..e322753 100644
--- a/wiki/src/doc/first_steps/upgrade.it.po
+++ b/wiki/src/doc/first_steps/upgrade.it.po
@@ -74,10 +74,10 @@ msgstr "<p>Se usi Tails da un DVD, devi [[masterizzare un nuovo DVD|install/dvd]
#. type: Plain text
#, no-wrap
msgid ""
-"<p>If you use Tails from a USB stick installed from Mac OS X using the\n"
+"<p>If you use Tails from a USB stick installed from macOS using the\n"
"command line, you need to [[reinstall|install/mac/usb/overview]].</p>\n"
msgstr ""
-"<p>Se usi Tails da una chiave USB installata da un Mac OS X usando\n"
+"<p>Se usi Tails da una chiave USB installata da un macOS usando\n"
" la linea di comando, devi [[reinstallare|install/mac/usb/overview]].</p>\n"
#. type: Plain text
diff --git a/wiki/src/doc/first_steps/upgrade.mdwn b/wiki/src/doc/first_steps/upgrade.mdwn
index 0723a26..64be597 100644
--- a/wiki/src/doc/first_steps/upgrade.mdwn
+++ b/wiki/src/doc/first_steps/upgrade.mdwn
@@ -19,7 +19,7 @@ persistent storage on the device will be preserved.**
<p>If you use Tails from a DVD, you need to [[burn a new DVD|install/dvd]].</p>
-<p>If you use Tails from a USB stick installed from Mac OS X using the
+<p>If you use Tails from a USB stick installed from macOS using the
command line, you need to [[reinstall|install/mac/usb/overview]].</p>
</div>
diff --git a/wiki/src/doc/first_steps/upgrade.pt.po b/wiki/src/doc/first_steps/upgrade.pt.po
index 691f974..c43fb18 100644
--- a/wiki/src/doc/first_steps/upgrade.pt.po
+++ b/wiki/src/doc/first_steps/upgrade.pt.po
@@ -81,7 +81,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"<p>If you use Tails from a USB stick installed from Mac OS X using the\n"
+"<p>If you use Tails from a USB stick installed from macOS using the\n"
"command line, you need to [[reinstall|install/mac/usb/overview]].</p>\n"
msgstr ""
diff --git a/wiki/src/install/download/openpgp.de.po b/wiki/src/install/download/openpgp.de.po
index 5a56185..672323b 100644
--- a/wiki/src/install/download/openpgp.de.po
+++ b/wiki/src/install/download/openpgp.de.po
@@ -140,10 +140,10 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
-"<a href=\"#mac\">In Mac OS X with <span class=\"application\">GPGTools</"
+"<a href=\"#mac\">In macOS with <span class=\"application\">GPGTools</"
"span></a>"
msgstr ""
-"<a href=\"#mac\">Unter Mac OS X mit <span class=\"application\">GPGTools</"
+"<a href=\"#mac\">Unter macOS mit <span class=\"application\">GPGTools</"
"span></a>"
#. type: Bullet: ' - '
@@ -236,8 +236,8 @@ msgstr "<a id=\"mac\"></a>\n"
#. type: Title ###
#, no-wrap
-msgid "In Mac OS X using <span class=\"application\">GPGTools</span>"
-msgstr "Unter Mac OS X mit <span class=\"application\">GPGTools</span>"
+msgid "In macOS using <span class=\"application\">GPGTools</span>"
+msgstr "Unter macOS mit <span class=\"application\">GPGTools</span>"
#. type: Bullet: '1. '
msgid ""
diff --git a/wiki/src/install/download/openpgp.fa.po b/wiki/src/install/download/openpgp.fa.po
index 8a27e6f..06cb102 100644
--- a/wiki/src/install/download/openpgp.fa.po
+++ b/wiki/src/install/download/openpgp.fa.po
@@ -130,7 +130,7 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
-"<a href=\"#mac\">In Mac OS X with <span class=\"application\">GPGTools</"
+"<a href=\"#mac\">In macOS with <span class=\"application\">GPGTools</"
"span></a>"
msgstr ""
@@ -208,7 +208,7 @@ msgstr ""
#. type: Title ###
#, no-wrap
-msgid "In Mac OS X using <span class=\"application\">GPGTools</span>"
+msgid "In macOS using <span class=\"application\">GPGTools</span>"
msgstr ""
#. type: Bullet: '1. '
diff --git a/wiki/src/install/download/openpgp.fr.po b/wiki/src/install/download/openpgp.fr.po
index 01c9a5b..1f1dc9d 100644
--- a/wiki/src/install/download/openpgp.fr.po
+++ b/wiki/src/install/download/openpgp.fr.po
@@ -140,10 +140,10 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
-"<a href=\"#mac\">In Mac OS X with <span class=\"application\">GPGTools</"
+"<a href=\"#mac\">In macOS with <span class=\"application\">GPGTools</"
"span></a>"
msgstr ""
-"<a href=\"#mac\">Pour Mac OS X avec <span class=\"application\">GPGTools</"
+"<a href=\"#mac\">Pour macOS avec <span class=\"application\">GPGTools</"
"span></a>"
#. type: Bullet: ' - '
@@ -236,8 +236,8 @@ msgstr "<a id=\"mac\"></a>\n"
#. type: Title ###
#, no-wrap
-msgid "In Mac OS X using <span class=\"application\">GPGTools</span>"
-msgstr "Pour Mac OS X en utilisant <span class=\"application\">GPGTools</span>"
+msgid "In macOS using <span class=\"application\">GPGTools</span>"
+msgstr "Pour macOS en utilisant <span class=\"application\">GPGTools</span>"
#. type: Bullet: '1. '
msgid ""
diff --git a/wiki/src/install/download/openpgp.it.po b/wiki/src/install/download/openpgp.it.po
index 8417b45..b630c8e 100644
--- a/wiki/src/install/download/openpgp.it.po
+++ b/wiki/src/install/download/openpgp.it.po
@@ -139,10 +139,10 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
-"<a href=\"#mac\">In Mac OS X with <span class=\"application\">GPGTools</"
+"<a href=\"#mac\">In macOS with <span class=\"application\">GPGTools</"
"span></a>"
msgstr ""
-"<a href=\"#mac\">In Mac OS X con <span class=\"application\">GPGTools</"
+"<a href=\"#mac\">In macOS con <span class=\"application\">GPGTools</"
"span></a>"
#. type: Bullet: ' - '
@@ -235,8 +235,8 @@ msgstr "<a id=\"mac\"></a>\n"
#. type: Title ###
#, no-wrap
-msgid "In Mac OS X using <span class=\"application\">GPGTools</span>"
-msgstr "In Mac OS X usando <span class=\"application\">GPGTools</span>"
+msgid "In macOS using <span class=\"application\">GPGTools</span>"
+msgstr "In macOS usando <span class=\"application\">GPGTools</span>"
#. type: Bullet: '1. '
msgid ""
diff --git a/wiki/src/install/download/openpgp.mdwn b/wiki/src/install/download/openpgp.mdwn
index 87a8d2e..ab86d60 100644
--- a/wiki/src/install/download/openpgp.mdwn
+++ b/wiki/src/install/download/openpgp.mdwn
@@ -47,7 +47,7 @@ Verify the ISO image
This section provides simplified instructions:
- <a href="#windows">In Windows with <span class="application">Gpg4win</span></a>
- - <a href="#mac">In Mac OS X with <span class="application">GPGTools</span></a>
+ - <a href="#mac">In macOS with <span class="application">GPGTools</span></a>
- <a href="#tails">In Tails</a>
- <a href="#command-line">Using the command line</span></a>
@@ -83,7 +83,7 @@ signing key through the OpenPGP Web of Trust</a>.
<a id="mac"></a>
-### In Mac OS X using <span class="application">GPGTools</span>
+### In macOS using <span class="application">GPGTools</span>
1. Open <span class="application">Finder</span> and navigate to the
folder where you saved the ISO image and the signature.
diff --git a/wiki/src/install/download/openpgp.pt.po b/wiki/src/install/download/openpgp.pt.po
index de13231..0c39e57 100644
--- a/wiki/src/install/download/openpgp.pt.po
+++ b/wiki/src/install/download/openpgp.pt.po
@@ -115,7 +115,7 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
-"<a href=\"#mac\">In Mac OS X with <span class=\"application\">GPGTools</"
+"<a href=\"#mac\">In macOS with <span class=\"application\">GPGTools</"
"span></a>"
msgstr ""
@@ -193,7 +193,7 @@ msgstr ""
#. type: Title ###
#, no-wrap
-msgid "In Mac OS X using <span class=\"application\">GPGTools</span>"
+msgid "In macOS using <span class=\"application\">GPGTools</span>"
msgstr ""
#. type: Bullet: '1. '
diff --git a/wiki/src/install/dvd.de.po b/wiki/src/install/dvd.de.po
index 504bd3f..7157edd 100644
--- a/wiki/src/install/dvd.de.po
+++ b/wiki/src/install/dvd.de.po
@@ -70,10 +70,10 @@ msgstr "Tails auf eine DVD brennen\n"
#. type: Plain text
msgid ""
"For detailed instructions on how to burn an ISO image on a DVD from Windows, "
-"Ubuntu, or Mac OS X, refer to the Ubuntu documentation:"
+"Ubuntu, or macOS, refer to the Ubuntu documentation:"
msgstr ""
"Für detailliertere Anweisungen, wie ein ISO-Image unter Windows, Ubuntu oder "
-"Mac OS X auf eine DVD gebrannt wird, schlagen Sie in der Dokumentation von "
+"macOS auf eine DVD gebrannt wird, schlagen Sie in der Dokumentation von "
"Ubuntu nach:"
#. type: Bullet: ' - '
@@ -92,6 +92,6 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
-"[Burning from Mac OS X](https://help.ubuntu.com/community/"
+"[Burning from macOS](https://help.ubuntu.com/community/"
"BurningIsoHowto#Burning_from_Mac_OS_X)"
-msgstr "[Von Mac OS X aus brennen](https://wiki.ubuntuusers.de/Ubuntu-CD/)"
+msgstr "[Von macOS aus brennen](https://wiki.ubuntuusers.de/Ubuntu-CD/)"
diff --git a/wiki/src/install/dvd.fa.po b/wiki/src/install/dvd.fa.po
index fc2e639..a5374a6 100644
--- a/wiki/src/install/dvd.fa.po
+++ b/wiki/src/install/dvd.fa.po
@@ -69,7 +69,7 @@ msgstr ""
#. type: Plain text
msgid ""
"For detailed instructions on how to burn an ISO image on a DVD from Windows, "
-"Ubuntu, or Mac OS X, refer to the Ubuntu documentation:"
+"Ubuntu, or macOS, refer to the Ubuntu documentation:"
msgstr ""
#. type: Bullet: ' - '
@@ -86,6 +86,6 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
-"[Burning from Mac OS X](https://help.ubuntu.com/community/"
+"[Burning from macOS](https://help.ubuntu.com/community/"
"BurningIsoHowto#Burning_from_Mac_OS_X)"
msgstr ""
diff --git a/wiki/src/install/dvd.fr.po b/wiki/src/install/dvd.fr.po
index 2e949c8..b3bb5e7 100644
--- a/wiki/src/install/dvd.fr.po
+++ b/wiki/src/install/dvd.fr.po
@@ -69,10 +69,10 @@ msgstr "Graver Tails sur un DVD\n"
#. type: Plain text
msgid ""
"For detailed instructions on how to burn an ISO image on a DVD from Windows, "
-"Ubuntu, or Mac OS X, refer to the Ubuntu documentation:"
+"Ubuntu, or macOS, refer to the Ubuntu documentation:"
msgstr ""
"Pour des instructions détaillées sur comment graver une image ISO sur un DVD "
-"depuis Windows, Ubuntu ou Mac OS X, se rapporter à la documentation d'Ubuntu "
+"depuis Windows, Ubuntu ou macOS, se rapporter à la documentation d'Ubuntu "
"(en anglais) :"
#. type: Bullet: ' - '
@@ -93,8 +93,8 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
-"[Burning from Mac OS X](https://help.ubuntu.com/community/"
+"[Burning from macOS](https://help.ubuntu.com/community/"
"BurningIsoHowto#Burning_from_Mac_OS_X)"
msgstr ""
-"[Graver depuis Mac OS X](https://help.ubuntu.com/community/"
+"[Graver depuis macOS](https://help.ubuntu.com/community/"
"BurningIsoHowto#Burning_from_Mac_OS_X)"
diff --git a/wiki/src/install/dvd.it.po b/wiki/src/install/dvd.it.po
index 50950c5..770a963 100644
--- a/wiki/src/install/dvd.it.po
+++ b/wiki/src/install/dvd.it.po
@@ -70,10 +70,10 @@ msgstr "Crea un DVD con Tails\n"
#. type: Plain text
msgid ""
"For detailed instructions on how to burn an ISO image on a DVD from Windows, "
-"Ubuntu, or Mac OS X, refer to the Ubuntu documentation:"
+"Ubuntu, or macOS, refer to the Ubuntu documentation:"
msgstr ""
"Per istruzioni dettagliate su come masterizzare una immagine ISO su un DVD "
-"da Windows, o Mac OS X, o Ubuntu, fai riferimento alla documentazione:"
+"da Windows, o macOS, o Ubuntu, fai riferimento alla documentazione:"
#. type: Bullet: ' - '
msgid ""
@@ -93,8 +93,8 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
-"[Burning from Mac OS X](https://help.ubuntu.com/community/"
+"[Burning from macOS](https://help.ubuntu.com/community/"
"BurningIsoHowto#Burning_from_Mac_OS_X)"
msgstr ""
-"[Masterizzare da Mac OS X](http://wiki.ubuntu-it.org/Hardware/"
+"[Masterizzare da macOS](http://wiki.ubuntu-it.org/Hardware/"
"DispositiviPartizioni/MasterizzareIso#Masterizzare_con_Mac_OS_X)"
diff --git a/wiki/src/install/dvd.mdwn b/wiki/src/install/dvd.mdwn
index b9db6c3..4f05c23 100644
--- a/wiki/src/install/dvd.mdwn
+++ b/wiki/src/install/dvd.mdwn
@@ -15,8 +15,8 @@ Burn a Tails DVD
================
For detailed instructions on how to burn an ISO image on a DVD from Windows,
-Ubuntu, or Mac OS X, refer to the Ubuntu documentation:
+Ubuntu, or macOS, refer to the Ubuntu documentation:
- [Burning from Windows](https://help.ubuntu.com/community/BurningIsoHowto#Burning_from_Windows)
- [Burning from Ubuntu](https://help.ubuntu.com/community/BurningIsoHowto#Burning_from_Ubuntu)
- - [Burning from Mac OS X](https://help.ubuntu.com/community/BurningIsoHowto#Burning_from_Mac_OS_X)
+ - [Burning from macOS](https://help.ubuntu.com/community/BurningIsoHowto#Burning_from_Mac_OS_X)
diff --git a/wiki/src/install/dvd.pt.po b/wiki/src/install/dvd.pt.po
index fc2e639..a5374a6 100644
--- a/wiki/src/install/dvd.pt.po
+++ b/wiki/src/install/dvd.pt.po
@@ -69,7 +69,7 @@ msgstr ""
#. type: Plain text
msgid ""
"For detailed instructions on how to burn an ISO image on a DVD from Windows, "
-"Ubuntu, or Mac OS X, refer to the Ubuntu documentation:"
+"Ubuntu, or macOS, refer to the Ubuntu documentation:"
msgstr ""
#. type: Bullet: ' - '
@@ -86,6 +86,6 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
-"[Burning from Mac OS X](https://help.ubuntu.com/community/"
+"[Burning from macOS](https://help.ubuntu.com/community/"
"BurningIsoHowto#Burning_from_Mac_OS_X)"
msgstr ""
diff --git a/wiki/src/install/inc/router/why_two.inline.de.po b/wiki/src/install/inc/router/why_two.inline.de.po
index a72d1a0..8a36f06 100644
--- a/wiki/src/install/inc/router/why_two.inline.de.po
+++ b/wiki/src/install/inc/router/why_two.inline.de.po
@@ -20,13 +20,13 @@ msgstr ""
msgid ""
"As it is currently impossible to install Tails directly from <span class="
"\"windows\">Windows,</span> <span class=\"linux\">Linux,</span> <span class="
-"\"mac\">Mac OS X,</span> this scenario requires creating an intermediary "
+"\"mac\">macOS,</span> this scenario requires creating an intermediary "
"Tails on a second USB stick. This intermediary Tails lacks important "
"security and usability features."
msgstr ""
"Da es derzeit nicht möglich ist, Tails direkt von <span class=\"windows"
"\">Windows,</span> <span class=\"linux\">Linux</span> <span class=\"mac"
-"\">Mac OS X,</span> aus zu installieren, benötigt diese Vorgehensweise ein "
+"\">macOS,</span> aus zu installieren, benötigt diese Vorgehensweise ein "
"zwischenzeitliches Tails auf einem zweiten USB-Stick. Diesem "
"zwischenzeitlichen Tails fehlen wichtige Sicherheits- und "
"Bedienungsfunktionen."
diff --git a/wiki/src/install/inc/router/why_two.inline.fa.po b/wiki/src/install/inc/router/why_two.inline.fa.po
index 07bf1a6..759323e 100644
--- a/wiki/src/install/inc/router/why_two.inline.fa.po
+++ b/wiki/src/install/inc/router/why_two.inline.fa.po
@@ -20,7 +20,7 @@ msgstr ""
msgid ""
"As it is currently impossible to install Tails directly from <span "
"class=\"windows\">Windows,</span> <span class=\"linux\">Linux,</span> <span "
-"class=\"mac\">Mac OS X,</span> this scenario requires creating an "
+"class=\"mac\">macOS,</span> this scenario requires creating an "
"intermediary Tails on a second USB stick. This intermediary Tails lacks "
"important security and usability features."
msgstr ""
diff --git a/wiki/src/install/inc/router/why_two.inline.fr.po b/wiki/src/install/inc/router/why_two.inline.fr.po
index 3b02348..b2d58a4 100644
--- a/wiki/src/install/inc/router/why_two.inline.fr.po
+++ b/wiki/src/install/inc/router/why_two.inline.fr.po
@@ -20,13 +20,13 @@ msgstr ""
msgid ""
"As it is currently impossible to install Tails directly from <span class="
"\"windows\">Windows,</span> <span class=\"linux\">Linux,</span> <span class="
-"\"mac\">Mac OS X,</span> this scenario requires creating an intermediary "
+"\"mac\">macOS,</span> this scenario requires creating an intermediary "
"Tails on a second USB stick. This intermediary Tails lacks important "
"security and usability features."
msgstr ""
"Étant donné qu'il est actuellement impossible d'installer Tails directement "
"depuis <span class=\"windows\">Windows,</span> <span class=\"linux\">Linux,</"
-"span> <span class=\"mac\">Mac OS X,</span> ce scénario requiert la création "
+"span> <span class=\"mac\">macOS,</span> ce scénario requiert la création "
"d'un Tails intermédiaire sur une seconde clé USB. Ce Tails intermédiaire ne "
"bénéficiera pas de fonctionnalités importantes et des protections de "
"sécurité de Tails."
diff --git a/wiki/src/install/inc/router/why_two.inline.html b/wiki/src/install/inc/router/why_two.inline.html
index d27a0c0..bdb959c 100644
--- a/wiki/src/install/inc/router/why_two.inline.html
+++ b/wiki/src/install/inc/router/why_two.inline.html
@@ -1,6 +1,6 @@
<p>As it is currently impossible to install Tails directly from
<span class="windows">Windows,</span>
<span class="linux">Linux,</span>
-<span class="mac">Mac OS X,</span>
+<span class="mac">macOS,</span>
this scenario requires creating an intermediary Tails on a second USB stick.
This intermediary Tails lacks important security and usability features.</p>
diff --git a/wiki/src/install/inc/router/why_two.inline.it.po b/wiki/src/install/inc/router/why_two.inline.it.po
index 94ac1c6..bfbeb7a 100644
--- a/wiki/src/install/inc/router/why_two.inline.it.po
+++ b/wiki/src/install/inc/router/why_two.inline.it.po
@@ -20,12 +20,12 @@ msgstr ""
msgid ""
"As it is currently impossible to install Tails directly from <span class="
"\"windows\">Windows,</span> <span class=\"linux\">Linux,</span> <span class="
-"\"mac\">Mac OS X,</span> this scenario requires creating an intermediary "
+"\"mac\">macOS,</span> this scenario requires creating an intermediary "
"Tails on a second USB stick. This intermediary Tails lacks important "
"security and usability features."
msgstr ""
"Al momento non è possibile installare una Tails direttamente da <span class="
"\"windows\">Windows,</span> <span class=\"linux\">Linux,</span> o <span "
-"class=\"mac\">Mac OS X,</span>: questa situazione richiede una Tails, su una "
+"class=\"mac\">macOS,</span>: questa situazione richiede una Tails, su una "
"seconda chiavetta USB o DVD, che faccia da intermediaria. Questa Tails di "
"intermediazione manca di importanti caratteristiche di sicurezza e usabilità."
diff --git a/wiki/src/install/inc/router/why_two.inline.pt.po b/wiki/src/install/inc/router/why_two.inline.pt.po
index 060eebc..376a2b9 100644
--- a/wiki/src/install/inc/router/why_two.inline.pt.po
+++ b/wiki/src/install/inc/router/why_two.inline.pt.po
@@ -20,12 +20,12 @@ msgstr ""
msgid ""
"As it is currently impossible to install Tails directly from <span class="
"\"windows\">Windows,</span> <span class=\"linux\">Linux,</span> <span class="
-"\"mac\">Mac OS X,</span> this scenario requires creating an intermediary "
+"\"mac\">macOS,</span> this scenario requires creating an intermediary "
"Tails on a second USB stick. This intermediary Tails lacks important "
"security and usability features."
msgstr ""
"Como é atualmente impossível instalar o Tails diretamente a partir do <span "
"class=\"windows\">Windows,</span> <span class=\"linux\">Linux,</span> <span "
-"class=\"mac\">Mac OS X,</span> este cenário requer criar um Tails "
+"class=\"mac\">macOS,</span> este cenário requer criar um Tails "
"intermediário em uma segunda unidade USB. Este Tails intermediário carece "
"de recursos de segurança e usabilidade importantes."
diff --git a/wiki/src/install/mac/dvd.de.po b/wiki/src/install/mac/dvd.de.po
index b8e69f7..f75a500 100644
--- a/wiki/src/install/mac/dvd.de.po
+++ b/wiki/src/install/mac/dvd.de.po
@@ -65,8 +65,8 @@ msgstr "<div class=\"step-image\">[[!img install/inc/infography/os-mac.png link=
#. type: Plain text
#, no-wrap
-msgid "<p class=\"start\">Start in Mac OS X.</p>\n"
-msgstr "<p class=\"start\">Starten Sie unter Mac OS X.</p>\n"
+msgid "<p class=\"start\">Start in macOS.</p>\n"
+msgstr "<p class=\"start\">Starten Sie unter macOS.</p>\n"
#. type: Plain text
#, no-wrap
diff --git a/wiki/src/install/mac/dvd.fa.po b/wiki/src/install/mac/dvd.fa.po
index dae7b5a..004a597 100644
--- a/wiki/src/install/mac/dvd.fa.po
+++ b/wiki/src/install/mac/dvd.fa.po
@@ -63,7 +63,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<p class=\"start\">Start in Mac OS X.</p>\n"
+msgid "<p class=\"start\">Start in macOS.</p>\n"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/install/mac/dvd.fr.po b/wiki/src/install/mac/dvd.fr.po
index 626a4c7..dacc381 100644
--- a/wiki/src/install/mac/dvd.fr.po
+++ b/wiki/src/install/mac/dvd.fr.po
@@ -63,8 +63,8 @@ msgstr "<div class=\"step-image\">[[!img install/inc/infography/os-mac.png link=
#. type: Plain text
#, no-wrap
-msgid "<p class=\"start\">Start in Mac OS X.</p>\n"
-msgstr "<p class=\"start\">Démarrez Mac OS X.</p>\n"
+msgid "<p class=\"start\">Start in macOS.</p>\n"
+msgstr "<p class=\"start\">Démarrez macOS.</p>\n"
#. type: Plain text
#, no-wrap
diff --git a/wiki/src/install/mac/dvd.it.po b/wiki/src/install/mac/dvd.it.po
index 7c8594a..276e0d2 100644
--- a/wiki/src/install/mac/dvd.it.po
+++ b/wiki/src/install/mac/dvd.it.po
@@ -64,8 +64,8 @@ msgstr "<div class=\"step-image\">[[!img install/inc/infography/os-mac.png link=
#. type: Plain text
#, no-wrap
-msgid "<p class=\"start\">Start in Mac OS X.</p>\n"
-msgstr "<p class=\"start\">Avviare in Mac OS X.</p>\n"
+msgid "<p class=\"start\">Start in macOS.</p>\n"
+msgstr "<p class=\"start\">Avviare in macOS.</p>\n"
#. type: Plain text
#, no-wrap
@@ -235,10 +235,10 @@ msgstr "[[!inline pages=\"install/inc/steps/create_persistence.inline\" raw=\"ye
#~ msgid ""
#~ "<div class=\"step-image\">[[!img install/inc/infography/os-mac.png link="
-#~ "\"no\" alt=\"Mac OS X\"]]</div>\n"
+#~ "\"no\" alt=\"macOS\"]]</div>\n"
#~ msgstr ""
#~ "class=\"step-image\">[[!img install/inc/infography/os-mac.png link=\"no\" "
-#~ "alt=\"Mac OS X\"]]</div>\n"
+#~ "alt=\"macOS\"]]</div>\n"
#~ msgid ""
#~ " <div class=\"step-image\">[[!img install/inc/infography/insert-dvd."
diff --git a/wiki/src/install/mac/dvd.mdwn b/wiki/src/install/mac/dvd.mdwn
index d4aeca1..3eea404 100644
--- a/wiki/src/install/mac/dvd.mdwn
+++ b/wiki/src/install/mac/dvd.mdwn
@@ -11,7 +11,7 @@
<div class="step-image">[[!img install/inc/infography/os-mac.png link="no" alt=""]]</div>
-<p class="start">Start in Mac OS X.</p>
+<p class="start">Start in macOS.</p>
[[!inline pages="install/inc/steps/download.inline" raw="yes" sort="age"]]
diff --git a/wiki/src/install/mac/dvd.pt.po b/wiki/src/install/mac/dvd.pt.po
index dae7b5a..004a597 100644
--- a/wiki/src/install/mac/dvd.pt.po
+++ b/wiki/src/install/mac/dvd.pt.po
@@ -63,7 +63,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<p class=\"start\">Start in Mac OS X.</p>\n"
+msgid "<p class=\"start\">Start in macOS.</p>\n"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/install/mac/usb.de.po b/wiki/src/install/mac/usb.de.po
index e9938fd..a35c1e5 100644
--- a/wiki/src/install/mac/usb.de.po
+++ b/wiki/src/install/mac/usb.de.po
@@ -60,8 +60,8 @@ msgstr "<div class=\"step-image\">[[!img install/inc/infography/os-mac.png link=
#. type: Plain text
#, no-wrap
-msgid "<p class=\"start\">Start in Mac OS X.</p>\n"
-msgstr "<p class=\"start\">Starten Sie unter Mac OS X.</p>\n"
+msgid "<p class=\"start\">Start in macOS.</p>\n"
+msgstr "<p class=\"start\">Starten Sie unter macOS.</p>\n"
#. type: Plain text
#, no-wrap
diff --git a/wiki/src/install/mac/usb.fa.po b/wiki/src/install/mac/usb.fa.po
index 3a7e9eb..3f810b2 100644
--- a/wiki/src/install/mac/usb.fa.po
+++ b/wiki/src/install/mac/usb.fa.po
@@ -58,7 +58,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<p class=\"start\">Start in Mac OS X.</p>\n"
+msgid "<p class=\"start\">Start in macOS.</p>\n"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/install/mac/usb.fr.po b/wiki/src/install/mac/usb.fr.po
index a15de10..8ba47e1 100644
--- a/wiki/src/install/mac/usb.fr.po
+++ b/wiki/src/install/mac/usb.fr.po
@@ -58,8 +58,8 @@ msgstr "<div class=\"step-image\">[[!img install/inc/infography/os-mac.png link=
#. type: Plain text
#, no-wrap
-msgid "<p class=\"start\">Start in Mac OS X.</p>\n"
-msgstr "<p class=\"start\">Démarrez Mac OS X.</p>\n"
+msgid "<p class=\"start\">Start in macOS.</p>\n"
+msgstr "<p class=\"start\">Démarrez macOS.</p>\n"
#. type: Plain text
#, no-wrap
diff --git a/wiki/src/install/mac/usb.it.po b/wiki/src/install/mac/usb.it.po
index f3b00e4..325746e 100644
--- a/wiki/src/install/mac/usb.it.po
+++ b/wiki/src/install/mac/usb.it.po
@@ -59,8 +59,8 @@ msgstr "<div class=\"step-image\">[[!img install/inc/infography/os-mac.png link=
#. type: Plain text
#, no-wrap
-msgid "<p class=\"start\">Start in Mac OS X.</p>\n"
-msgstr "<p class=\"start\">Avviare in Mac OS X.</p>\n"
+msgid "<p class=\"start\">Start in macOS.</p>\n"
+msgstr "<p class=\"start\">Avviare in macOS.</p>\n"
#. type: Plain text
#, no-wrap
@@ -360,10 +360,10 @@ msgstr "[[!inline pages=\"install/inc/steps/create_persistence.inline\" raw=\"ye
#~ msgid ""
#~ "<div class=\"step-image\">[[!img install/inc/infography/os-mac.png link="
-#~ "\"no\" alt=\"Mac OS X\"]]</div>\n"
+#~ "\"no\" alt=\"macOS\"]]</div>\n"
#~ msgstr ""
#~ "<div class=\"step-image\">[[!img install/inc/infography/os-mac.png link="
-#~ "\"no\" alt=\"Mac OS X\"]]</div>\n"
+#~ "\"no\" alt=\"macOS\"]]</div>\n"
#~ msgid ""
#~ " <div class=\"step-image\">[[!img install/inc/infography/plug-first-"
diff --git a/wiki/src/install/mac/usb.mdwn b/wiki/src/install/mac/usb.mdwn
index 81fbf2d..dba5872 100644
--- a/wiki/src/install/mac/usb.mdwn
+++ b/wiki/src/install/mac/usb.mdwn
@@ -9,7 +9,7 @@
<div class="step-image">[[!img install/inc/infography/os-mac.png link="no" alt=""]]</div>
-<p class="start">Start in Mac OS X.</p>
+<p class="start">Start in macOS.</p>
[[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes" sort="age"]]
diff --git a/wiki/src/install/mac/usb.pt.po b/wiki/src/install/mac/usb.pt.po
index 3a7e9eb..3f810b2 100644
--- a/wiki/src/install/mac/usb.pt.po
+++ b/wiki/src/install/mac/usb.pt.po
@@ -58,7 +58,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<p class=\"start\">Start in Mac OS X.</p>\n"
+msgid "<p class=\"start\">Start in macOS.</p>\n"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/install/os.de.po b/wiki/src/install/os.de.po
index 8a9294f..a6995c7 100644
--- a/wiki/src/install/os.de.po
+++ b/wiki/src/install/os.de.po
@@ -61,8 +61,8 @@ msgid "|install/win]]"
msgstr "|install/win]]"
#. type: Content of: <div><div><div><div><h3>
-msgid "Mac OS X"
-msgstr "Mac OS X"
+msgid "macOS"
+msgstr "macOS"
#. type: Content of: <div><div>
msgid "|install/mac]]"
diff --git a/wiki/src/install/os.fa.po b/wiki/src/install/os.fa.po
index 427777f..c8ab08f 100644
--- a/wiki/src/install/os.fa.po
+++ b/wiki/src/install/os.fa.po
@@ -46,7 +46,7 @@ msgid "|install/win]]"
msgstr ""
#. type: Content of: <div><div><div><div><h3>
-msgid "Mac OS X"
+msgid "macOS"
msgstr ""
#. type: Content of: <div><div>
diff --git a/wiki/src/install/os.fr.po b/wiki/src/install/os.fr.po
index fae7bc3..068a0d0 100644
--- a/wiki/src/install/os.fr.po
+++ b/wiki/src/install/os.fr.po
@@ -48,8 +48,8 @@ msgid "|install/win]]"
msgstr "|install/win]]"
#. type: Content of: <div><div><div><div><h3>
-msgid "Mac OS X"
-msgstr "Mac OS X"
+msgid "macOS"
+msgstr "macOS"
#. type: Content of: <div><div>
msgid "|install/mac]]"
diff --git a/wiki/src/install/os.html b/wiki/src/install/os.html
index 16bf217..114279c 100644
--- a/wiki/src/install/os.html
+++ b/wiki/src/install/os.html
@@ -23,7 +23,7 @@
[[
<div class="panel panel-primary">
<div class="panel-heading">
- <h3 class="panel-title">Mac OS X</h3>
+ <h3 class="panel-title">macOS</h3>
</div>
</div>
|install/mac]]
diff --git a/wiki/src/install/os.it.po b/wiki/src/install/os.it.po
index fb0c602..1480a01 100644
--- a/wiki/src/install/os.it.po
+++ b/wiki/src/install/os.it.po
@@ -60,8 +60,8 @@ msgid "|install/win]]"
msgstr "|install/win]]"
#. type: Content of: <div><div><div><div><h3>
-msgid "Mac OS X"
-msgstr "Mac OS X"
+msgid "macOS"
+msgstr "macOS"
#. type: Content of: <div><div>
msgid "|install/mac]]"
diff --git a/wiki/src/install/os.pt.po b/wiki/src/install/os.pt.po
index 427777f..c8ab08f 100644
--- a/wiki/src/install/os.pt.po
+++ b/wiki/src/install/os.pt.po
@@ -46,7 +46,7 @@ msgid "|install/win]]"
msgstr ""
#. type: Content of: <div><div><div><div><h3>
-msgid "Mac OS X"
+msgid "macOS"
msgstr ""
#. type: Content of: <div><div>
diff --git a/wiki/src/news/our_plans_for_2017.de.po b/wiki/src/news/our_plans_for_2017.de.po
index 2b2c238..3ca7323 100644
--- a/wiki/src/news/our_plans_for_2017.de.po
+++ b/wiki/src/news/our_plans_for_2017.de.po
@@ -47,9 +47,9 @@ msgid ""
" - **Rethink the installation and upgrade process**: take a step back and reflect\n"
" on the future of Tails Installer, the installation on Windows and\n"
" Mac, and automatic upgrades ([[!tails_ticket 11679]])\n"
-" - **Graphical installation method for Mac OS**: what would it take\n"
+" - **Graphical installation method for macOS**: what would it take\n"
" to document tools other than Tails Installer to do a graphical\n"
-" installation from Mac OS? ([[!tails_ticket 11682]])\n"
+" installation from macOS? ([[!tails_ticket 11682]])\n"
" - **Explain better what Tails is** and what makes it so awesome ([[!tails_ticket 9814]])\n"
msgstr ""
diff --git a/wiki/src/news/our_plans_for_2017.fa.po b/wiki/src/news/our_plans_for_2017.fa.po
index 2b2c238..3ca7323 100644
--- a/wiki/src/news/our_plans_for_2017.fa.po
+++ b/wiki/src/news/our_plans_for_2017.fa.po
@@ -47,9 +47,9 @@ msgid ""
" - **Rethink the installation and upgrade process**: take a step back and reflect\n"
" on the future of Tails Installer, the installation on Windows and\n"
" Mac, and automatic upgrades ([[!tails_ticket 11679]])\n"
-" - **Graphical installation method for Mac OS**: what would it take\n"
+" - **Graphical installation method for macOS**: what would it take\n"
" to document tools other than Tails Installer to do a graphical\n"
-" installation from Mac OS? ([[!tails_ticket 11682]])\n"
+" installation from macOS? ([[!tails_ticket 11682]])\n"
" - **Explain better what Tails is** and what makes it so awesome ([[!tails_ticket 9814]])\n"
msgstr ""
diff --git a/wiki/src/news/our_plans_for_2017.fr.po b/wiki/src/news/our_plans_for_2017.fr.po
index c9eed78..fd06eaa 100644
--- a/wiki/src/news/our_plans_for_2017.fr.po
+++ b/wiki/src/news/our_plans_for_2017.fr.po
@@ -51,9 +51,9 @@ msgid ""
" - **Rethink the installation and upgrade process**: take a step back and reflect\n"
" on the future of Tails Installer, the installation on Windows and\n"
" Mac, and automatic upgrades ([[!tails_ticket 11679]])\n"
-" - **Graphical installation method for Mac OS**: what would it take\n"
+" - **Graphical installation method for macOS**: what would it take\n"
" to document tools other than Tails Installer to do a graphical\n"
-" installation from Mac OS? ([[!tails_ticket 11682]])\n"
+" installation from macOS? ([[!tails_ticket 11682]])\n"
" - **Explain better what Tails is** and what makes it so awesome ([[!tails_ticket 9814]])\n"
msgstr ""
" - **Adoption plus facile**\n"
@@ -61,9 +61,9 @@ msgstr ""
" - **Repenser le processus d'installation et de mise à jour** : prendre du recul et réfléchir\n"
" au futur de l'Installeur de Tails, de l'installation sous Windows et\n"
" Mac et des mises à jour automatiques ([[!tails_ticket 11679]])\n"
-" - **Méthode d'installation graphique pour Mac OS** : qu'est-ce que cela demanderait\n"
+" - **Méthode d'installation graphique pour macOS** : qu'est-ce que cela demanderait\n"
" de documenter des outils autres que l'Installeur de Tails pour faire une installation\n"
-" graphique depuis Mac OS ? ([[!tails_ticket 11682]])\n"
+" graphique depuis macOS ? ([[!tails_ticket 11682]])\n"
" - **Mieux expliquer ce qu'est Tails** et ce qui le rend si génial ([[!tails_ticket 9814]])\n"
#. type: Plain text
diff --git a/wiki/src/news/our_plans_for_2017.it.po b/wiki/src/news/our_plans_for_2017.it.po
index 2b2c238..3ca7323 100644
--- a/wiki/src/news/our_plans_for_2017.it.po
+++ b/wiki/src/news/our_plans_for_2017.it.po
@@ -47,9 +47,9 @@ msgid ""
" - **Rethink the installation and upgrade process**: take a step back and reflect\n"
" on the future of Tails Installer, the installation on Windows and\n"
" Mac, and automatic upgrades ([[!tails_ticket 11679]])\n"
-" - **Graphical installation method for Mac OS**: what would it take\n"
+" - **Graphical installation method for macOS**: what would it take\n"
" to document tools other than Tails Installer to do a graphical\n"
-" installation from Mac OS? ([[!tails_ticket 11682]])\n"
+" installation from macOS? ([[!tails_ticket 11682]])\n"
" - **Explain better what Tails is** and what makes it so awesome ([[!tails_ticket 9814]])\n"
msgstr ""
diff --git a/wiki/src/news/our_plans_for_2017.mdwn b/wiki/src/news/our_plans_for_2017.mdwn
index 6a2b6e6..2eed652 100644
--- a/wiki/src/news/our_plans_for_2017.mdwn
+++ b/wiki/src/news/our_plans_for_2017.mdwn
@@ -11,9 +11,9 @@ sharing with you our plans for the next years:
- **Rethink the installation and upgrade process**: take a step back and reflect
on the future of Tails Installer, the installation on Windows and
Mac, and automatic upgrades ([[!tails_ticket 11679]])
- - **Graphical installation method for Mac OS**: what would it take
+ - **Graphical installation method for macOS**: what would it take
to document tools other than Tails Installer to do a graphical
- installation from Mac OS? ([[!tails_ticket 11682]])
+ installation from macOS? ([[!tails_ticket 11682]])
- **Explain better what Tails is** and what makes it so awesome ([[!tails_ticket 9814]])
- **Security hardening**
diff --git a/wiki/src/news/our_plans_for_2017.pt.po b/wiki/src/news/our_plans_for_2017.pt.po
index 2b2c238..3ca7323 100644
--- a/wiki/src/news/our_plans_for_2017.pt.po
+++ b/wiki/src/news/our_plans_for_2017.pt.po
@@ -47,9 +47,9 @@ msgid ""
" - **Rethink the installation and upgrade process**: take a step back and reflect\n"
" on the future of Tails Installer, the installation on Windows and\n"
" Mac, and automatic upgrades ([[!tails_ticket 11679]])\n"
-" - **Graphical installation method for Mac OS**: what would it take\n"
+" - **Graphical installation method for macOS**: what would it take\n"
" to document tools other than Tails Installer to do a graphical\n"
-" installation from Mac OS? ([[!tails_ticket 11682]])\n"
+" installation from macOS? ([[!tails_ticket 11682]])\n"
" - **Explain better what Tails is** and what makes it so awesome ([[!tails_ticket 9814]])\n"
msgstr ""
diff --git a/wiki/src/news/report_2011_05-06.mdwn b/wiki/src/news/report_2011_05-06.mdwn
index 91facda..c0c27d4 100644
--- a/wiki/src/news/report_2011_05-06.mdwn
+++ b/wiki/src/news/report_2011_05-06.mdwn
@@ -21,7 +21,7 @@ is now better structured and easier to read; it also looks a lot nicer.
Many efforts have been put in the [[install]] page that now provides
a much improved step by step explanation of how to get, verify, install and
-use Tails. Screenshots, Windows and Mac OS X instructions are included
+use Tails. Screenshots, Windows and macOS instructions are included
for even more awesomeness, along with dozens of other tiny little
layout and design improvements.
diff --git a/wiki/src/news/report_2015_07.mdwn b/wiki/src/news/report_2015_07.mdwn
index 752a21f..f868722 100644
--- a/wiki/src/news/report_2015_07.mdwn
+++ b/wiki/src/news/report_2015_07.mdwn
@@ -32,7 +32,7 @@ Code
Documentation and website
=========================
-* We documented how to [[reset a USB stick or SD card using Mac OS X|doc/first_steps/reset/mac]].
+* We documented how to [[reset a USB stick or SD card using macOS|doc/first_steps/reset/mac]].
* [[FAQ: Should I manually update add-ons included in Tor Browser?|support/faq#add-ons_update]]
diff --git a/wiki/src/news/report_2015_08.mdwn b/wiki/src/news/report_2015_08.mdwn
index e9b09b3..afdb4fc 100644
--- a/wiki/src/news/report_2015_08.mdwn
+++ b/wiki/src/news/report_2015_08.mdwn
@@ -105,7 +105,7 @@ On-going discussions
Press and testimonials
======================
-* 2015-08-04: [Cinq systèmes d’exploitation pour snober Windows 10 (et Mac OS)](http://www.lemonde.fr/pixels/article/2015/08/04/cinq-systemes-d-exploitation-pour-snober-windows-10-et-mac-os_4710726_4408996.html) by Damien Leloup in Le Monde (in French).
+* 2015-08-04: [Cinq systèmes d’exploitation pour snober Windows 10 (et macOS)](http://www.lemonde.fr/pixels/article/2015/08/04/cinq-systemes-d-exploitation-pour-snober-windows-10-et-mac-os_4710726_4408996.html) by Damien Leloup in Le Monde (in French).
* 2015-08-29: [Tails OS 1.5 Offers Out-of-the-Box Privacy Protection](http://www.greycoder.com/tails-os-1-5-offers-out-of-the-box-privacy-protection/) by Tracy Knauer on GreyCoder.
diff --git a/wiki/src/news/report_2016_03.mdwn b/wiki/src/news/report_2016_03.mdwn
index 2877782..ba2ba36 100644
--- a/wiki/src/news/report_2016_03.mdwn
+++ b/wiki/src/news/report_2016_03.mdwn
@@ -77,7 +77,7 @@ Documentation and website
* We improved the instructions for [[resetting a USB
stick|doc/first_steps/reset/mac]] and verifying the ISO
- image in Mac OS X.
+ image in macOS.
* We explained [[how to restart GNOME
Shell|support/known_issues#restart-shell]]. This is particularly
diff --git a/wiki/src/news/test_3.0-beta4.fr.po b/wiki/src/news/test_3.0-beta4.fr.po
index 209beed..fd3b97d 100644
--- a/wiki/src/news/test_3.0-beta4.fr.po
+++ b/wiki/src/news/test_3.0-beta4.fr.po
@@ -6,14 +6,14 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2017-04-19 22:57+0300\n"
+"POT-Creation-Date: 2017-05-18 16:33-0700\n"
"PO-Revision-Date: 2017-05-03 08:28+0200\n"
+"Last-Translator: \n"
+"Language-Team: Tails translators <tails@boum.org>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Last-Translator: \n"
-"Language-Team: Tails translators <tails@boum.org>\n"
"X-Generator: Poedit 1.6.10\n"
#. type: Plain text
@@ -35,7 +35,10 @@ msgstr "[[!tag announce]]\n"
msgid ""
"You can help Tails! The fourth beta for the upcoming version 3.0 is out. We "
"are very excited and cannot wait to hear what you think about it :)"
-msgstr "Vous pouvez aider Tails ! La quatrième bêta pour la future version 3.0 est disponible. Nous sommes très enthousiastes et impatients de savoir ce que vous en pensez :)"
+msgstr ""
+"Vous pouvez aider Tails ! La quatrième bêta pour la future version 3.0 est "
+"disponible. Nous sommes très enthousiastes et impatients de savoir ce que "
+"vous en pensez :)"
#. type: Plain text
#, no-wrap
diff --git a/wiki/src/news/version_2.12.de.po b/wiki/src/news/version_2.12.de.po
index 09a7d36..41f92c7 100644
--- a/wiki/src/news/version_2.12.de.po
+++ b/wiki/src/news/version_2.12.de.po
@@ -6,15 +6,15 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2017-04-19 18:43+0200\n"
+"POT-Creation-Date: 2017-05-18 16:33-0700\n"
"PO-Revision-Date: 2017-05-14 21:36+0100\n"
"Last-Translator: spriver <spriver@autistici.org>\n"
+"Language-Team: \n"
"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.6.10\n"
-"Language-Team: \n"
#. type: Plain text
#, no-wrap
diff --git a/wiki/src/press/media_appearances_2015.mdwn b/wiki/src/press/media_appearances_2015.mdwn
index 1b42168..56eba08 100644
--- a/wiki/src/press/media_appearances_2015.mdwn
+++ b/wiki/src/press/media_appearances_2015.mdwn
@@ -10,7 +10,7 @@
* 2015-10-17: [Tails: Gizlilik ve güvenlik](http://www.evrensel.net/yazi/75100/tails-gizlilik-ve-guvenlik) by İsmail Gökhan Bayram in Evrensel (in Turkish).
-* 2015-08-04: [Cinq systèmes d’exploitation pour snober Windows 10 (et Mac OS)](http://www.lemonde.fr/pixels/article/2015/08/04/cinq-systemes-d-exploitation-pour-snober-windows-10-et-mac-os_4710726_4408996.html) by Damien Leloup in Le Monde (in French).
+* 2015-08-04: [Cinq systèmes d’exploitation pour snober Windows 10 (et macOS)](http://www.lemonde.fr/pixels/article/2015/08/04/cinq-systemes-d-exploitation-pour-snober-windows-10-et-mac-os_4710726_4408996.html) by Damien Leloup in Le Monde (in French).
* 2015-07-29: [Gut geschützt im Internetcafé](http://www.zeit.de/digital/datenschutz/2015-07/urlaub-internetcafe-mail-facebook) by Johannes Wendt in Zeit (in German).
diff --git a/wiki/src/support/chat.de.po b/wiki/src/support/chat.de.po
index 33fab01..3e0d605 100644
--- a/wiki/src/support/chat.de.po
+++ b/wiki/src/support/chat.de.po
@@ -36,11 +36,11 @@ msgstr ""
#. type: Plain text
msgid ""
"Then configure your preferred instant messaging client, for example [[Pidgin|"
-"http://www.pidgin.im/]], which runs on Windows, GNU/Linux, and Mac OS X, to "
+"http://www.pidgin.im/]], which runs on Windows, GNU/Linux, and macOS, to "
"connect to:"
msgstr ""
"Konfigurieren Sie Ihren bevorzugten Instant-Messaging-Client, wie z.B. "
-"[[Pidgin|http://www.pidgin.im/]], welcher auf Windows, GNU/Linux und Mac OS "
+"[[Pidgin|http://www.pidgin.im/]], welcher auf Windows, GNU/Linux und macOS "
"X läuft, um sich zu verbinden mit:"
#. type: Bullet: '* '
diff --git a/wiki/src/support/chat.fa.po b/wiki/src/support/chat.fa.po
index 958dfb3..b644a40 100644
--- a/wiki/src/support/chat.fa.po
+++ b/wiki/src/support/chat.fa.po
@@ -38,10 +38,10 @@ msgstr ""
#, fuzzy
#| msgid ""
#| "To join it, use your preferred instant messaging client, e.g. [[Pidgin|"
-#| "http://www.pidgin.im/]], which runs on Windows, GNU/Linux and Mac OS X."
+#| "http://www.pidgin.im/]], which runs on Windows, GNU/Linux and macOS."
msgid ""
"Then configure your preferred instant messaging client, for example [[Pidgin|"
-"http://www.pidgin.im/]], which runs on Windows, GNU/Linux, and Mac OS X, to "
+"http://www.pidgin.im/]], which runs on Windows, GNU/Linux, and macOS, to "
"connect to:"
msgstr ""
"برای ملحق شدن به آن از کارخواه دلخواه پیغام‌رسانی خود، مانند [[پیجین|http://"
diff --git a/wiki/src/support/chat.fr.po b/wiki/src/support/chat.fr.po
index 3d3313f..15ccb14 100644
--- a/wiki/src/support/chat.fr.po
+++ b/wiki/src/support/chat.fr.po
@@ -37,12 +37,12 @@ msgstr ""
#. type: Plain text
msgid ""
"Then configure your preferred instant messaging client, for example [[Pidgin|"
-"http://www.pidgin.im/]], which runs on Windows, GNU/Linux, and Mac OS X, to "
+"http://www.pidgin.im/]], which runs on Windows, GNU/Linux, and macOS, to "
"connect to:"
msgstr ""
"Puis, configurez votre client de messagerie instantanée préféré, par exemple "
"[[Pidgin|http://www.pidgin.im]], qui fonctionne sur Windows, GNU/Linux, et "
-"Mac OS X, pour se connecter à :"
+"macOS, pour se connecter à :"
#. type: Bullet: '* '
msgid "server: `conference.riseup.net`"
diff --git a/wiki/src/support/chat.it.po b/wiki/src/support/chat.it.po
index 9534c91..4bc7884 100644
--- a/wiki/src/support/chat.it.po
+++ b/wiki/src/support/chat.it.po
@@ -34,7 +34,7 @@ msgstr ""
#. type: Plain text
msgid ""
"Then configure your preferred instant messaging client, for example [[Pidgin|"
-"http://www.pidgin.im/]], which runs on Windows, GNU/Linux, and Mac OS X, to "
+"http://www.pidgin.im/]], which runs on Windows, GNU/Linux, and macOS, to "
"connect to:"
msgstr ""
diff --git a/wiki/src/support/chat.mdwn b/wiki/src/support/chat.mdwn
index ebc01b7..3ec79f0 100644
--- a/wiki/src/support/chat.mdwn
+++ b/wiki/src/support/chat.mdwn
@@ -7,7 +7,7 @@ To do so, you need an XMPP account. Some emails providers, such as
Then configure your preferred instant messaging client, for example
[[Pidgin|http://www.pidgin.im/]], which runs on Windows, GNU/Linux, and
-Mac OS X, to connect to:
+macOS, to connect to:
* server: `conference.riseup.net`
* room: `tails`
diff --git a/wiki/src/support/chat.pt.po b/wiki/src/support/chat.pt.po
index 77f3b27..32bef19 100644
--- a/wiki/src/support/chat.pt.po
+++ b/wiki/src/support/chat.pt.po
@@ -34,15 +34,15 @@ msgstr ""
#, fuzzy
#| msgid ""
#| "To join it, use your preferred instant messaging client, e.g. [[Pidgin|"
-#| "http://www.pidgin.im/]], which runs on Windows, GNU/Linux and Mac OS X."
+#| "http://www.pidgin.im/]], which runs on Windows, GNU/Linux and macOS."
msgid ""
"Then configure your preferred instant messaging client, for example [[Pidgin|"
-"http://www.pidgin.im/]], which runs on Windows, GNU/Linux, and Mac OS X, to "
+"http://www.pidgin.im/]], which runs on Windows, GNU/Linux, and macOS, to "
"connect to:"
msgstr ""
"Para entrar nela, use seu cliente de mensagens instantâneas preferido, como "
"por exemplo o [[Pidgin|http://www.pidgin.im/]], que roda em Windows, GNU/"
-"Linux e Mac OS X."
+"Linux e macOS."
#. type: Bullet: '* '
#, fuzzy
diff --git a/wiki/src/support/talk.de.po b/wiki/src/support/talk.de.po
index c1fa6d8..6483762 100644
--- a/wiki/src/support/talk.de.po
+++ b/wiki/src/support/talk.de.po
@@ -105,9 +105,9 @@ msgstr ""
#~ msgid ""
#~ "If you are using Tails, read [[the chat documentation|doc/"
#~ "anonymous_internet/pidgin]]. Else, you can use [[Pidgin|http://www.pidgin."
-#~ "im/]], an Instant Messaging client for Windows, GNU/Linux and Mac OS X."
+#~ "im/]], an Instant Messaging client for Windows, GNU/Linux and macOS."
#~ msgstr ""
#~ "Sollten Sie Tails nutzen, lesen Sie bitte [[die Chat-Dokumentation|doc/"
#~ "anonymous_internet/pidgin]]. Anderenfalls können Sie [[Pidgin|http://www."
#~ "pidgin.im/]] nutzen, ein Programm zum Nachrichtensofortversand für "
-#~ "Windows, GNU/Linux und Mac OS X."
+#~ "Windows, GNU/Linux und macOS."
diff --git a/wiki/src/support/talk.fa.po b/wiki/src/support/talk.fa.po
index 2ae1619..dd31fa8 100644
--- a/wiki/src/support/talk.fa.po
+++ b/wiki/src/support/talk.fa.po
@@ -117,7 +117,7 @@ msgstr ""
#~ msgid ""
#~ "If you are using Tails, read [[the chat documentation|doc/"
#~ "anonymous_internet/pidgin]]. Else, you can use [[Pidgin|http://www.pidgin."
-#~ "im/]], an Instant Messaging client for Windows, GNU/Linux and Mac OS X."
+#~ "im/]], an Instant Messaging client for Windows, GNU/Linux and macOS."
#~ msgstr ""
#~ "اگر از تیلز استفاده می‌کنید [[سند گفتگو|doc/anonymous_internet/pidgin]] را "
#~ "بخوانید. در غیر این صورت می‌توانید از [[پیجین|http://www.pidgin.im/]]، یک "
diff --git a/wiki/src/support/talk.fr.po b/wiki/src/support/talk.fr.po
index 50f9582..01ef11c 100644
--- a/wiki/src/support/talk.fr.po
+++ b/wiki/src/support/talk.fr.po
@@ -106,9 +106,9 @@ msgstr ""
#~ msgid ""
#~ "If you are using Tails, read [[the chat documentation|doc/"
#~ "anonymous_internet/pidgin]]. Else, you can use [[Pidgin|http://www.pidgin."
-#~ "im/]], an Instant Messaging client for Windows, GNU/Linux and Mac OS X."
+#~ "im/]], an Instant Messaging client for Windows, GNU/Linux and macOS."
#~ msgstr ""
#~ "Si vous utilisez Tails, consultez la [[documentation sur la messagerie "
#~ "instantanée|doc/anonymous_internet/pidgin]]. Sinon, vous pouvez utiliser "
#~ "[[Pidgin|http://www.pidgin.im/]], un logiciel de messagerie instantanée "
-#~ "pour Windows, GNU/Linux et Mac OS X."
+#~ "pour Windows, GNU/Linux et macOS."
diff --git a/wiki/src/support/talk.pt.po b/wiki/src/support/talk.pt.po
index 972149e..95db703 100644
--- a/wiki/src/support/talk.pt.po
+++ b/wiki/src/support/talk.pt.po
@@ -123,12 +123,12 @@ msgstr ""
#~ msgid ""
#~ "If you are using Tails, read [[the chat documentation|doc/"
#~ "anonymous_internet/pidgin]]. Else, you can use [[Pidgin|http://www.pidgin."
-#~ "im/]], an Instant Messaging client for Windows, GNU/Linux and Mac OS X."
+#~ "im/]], an Instant Messaging client for Windows, GNU/Linux and macOS."
#~ msgstr ""
#~ "Se você está usando Tails, leia [[a documentação sobre bate-papo|doc/"
#~ "anonymous_internet/pidgin]]. Senão, você pode usar o [[Pidgin|http://www."
#~ "pidgin.im/]], um cliente de Mensagens Instantâneas para Windows, GNU/"
-#~ "Linux e Mac OS X."
+#~ "Linux e macOS."
#~ msgid "Forum"
#~ msgstr "Fórum"