Replace occurrences of "Mac OS X" and "Mac OS" with "macOS"

HACKING.mdwn

-wiki/src/contribute/how/code/HACKING.mdwn
\ No newline at end of file

HACKING.mdwn

+[[!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!

wiki/src/blueprint/Port_Tails_Installer_to_OS_X.mdwn

 # 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
 

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.
-
-
-
-
-
-

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

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

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.
 

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:
 

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**

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]]"

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: '  - '

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: '  - '

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]]"

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]]

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: '  - '

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 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 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 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 "

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 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 X."
+"software exist for Linux, Windows, and macOS."
 msgstr ""
 "برای اجرای تیلز در یک ماشین مجازی باید یک نرم‌افزار مجازی‌سازی روی سیستم‌"
 "عامل میزبان نصب کرده باشید.  نرم‌افزارهای مجازی‌سازی مختلفی برای لینوکس، "

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 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 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 "