gnucash-docs master: Multiple changes pushed

[Frank H.Ellenberger]

Updated	 via  https://github.com/Gnucash/gnucash-docs/commit/4e9072d6 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/b7850d37 (commit)
	from  https://github.com/Gnucash/gnucash-docs/commit/d553796f (commit)



commit 4e9072d60b0ecfb735a289d18b848a4ea4acc6ea
Merge: d553796 b7850d3
Author: fell <frank.h.ellenberger at gmail.com>
Date:   Thu Mar 15 12:28:53 2018 +0100

    Merge branch 'maint'


commit b7850d3769eae39099e2d95dfff50aa6176e6437
Author: fell <frank.h.ellenberger at gmail.com>
Date:   Thu Mar 15 12:24:55 2018 +0100

    Apple stopped calling MacOS 'Mac OS X' at 10.12
    
    applied to all docs except the po based it.

diff --git a/guide/C/ch_basics.xml b/guide/C/ch_basics.xml
index fb65158..a8527ef 100644
--- a/guide/C/ch_basics.xml
+++ b/guide/C/ch_basics.xml
@@ -781,7 +781,7 @@
         <application>&app;</application> is able to automatically save the opened file every a certain amount of time.
         This interval can be set in the <guilabel>General</guilabel> tab under
         <menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice>
-        (<menuchoice><guimenu>GnuCash</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice> on Mac OS X).
+        (<menuchoice><guimenu>GnuCash</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice> on MacOS).
         Keep in mind that this option is relevant only if you are saving in <acronym>XML</acronym> format.
         If you are working with a database, the <guibutton>Save</guibutton> button and the <guimenuitem>Save</guimenuitem>
         menu entry will be grayed out because changes are stored right away.</para>
@@ -954,7 +954,7 @@
         backup files that are older than 30 days. You can change this behavior in the <application>&app;</application>
         preferences in the <guilabel>General</guilabel> tab under <menuchoice><guimenu>Edit</guimenu>
         <guimenuitem>Preferences</guimenuitem></menuchoice>
-        (<menuchoice><guimenu>GnuCash</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice> on Mac OS X).</para>
+        (<menuchoice><guimenu>GnuCash</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice> on MacOS).</para>
       </note>
 
     </sect2>
diff --git a/guide/C/ch_bus_features.xml b/guide/C/ch_bus_features.xml
index 216e1c3..cf8f694 100644
--- a/guide/C/ch_bus_features.xml
+++ b/guide/C/ch_bus_features.xml
@@ -264,7 +264,7 @@ Basic A/R and A/P Account Hierarchy:
       <title>Setting Business Preferences</title>
       <para>Set options on the Business tab of the <application>&app;</application> preferences, which is
         accessed via <menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice>
-    (<menuchoice><guimenu>GnuCash</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice> on Mac OS X).
+    (<menuchoice><guimenu>GnuCash</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice> on MacOS).
         See Help manual chapter 10.3.3 Business Book Options Tab.
       </para>
 
diff --git a/guide/C/ch_currency.xml b/guide/C/ch_currency.xml
index b9831f5..71008a8 100644
--- a/guide/C/ch_currency.xml
+++ b/guide/C/ch_currency.xml
@@ -49,7 +49,7 @@
 
     <para>Your default account currency is set in the <guilabel>Account</guilabel> tab
     under <menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice>
-    (<menuchoice><guimenu>&app;</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice> on Mac OS X).</para>
+    (<menuchoice><guimenu>&app;</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice> on MacOS).</para>
 
     <para>Similarly, <application>&app;</application> offers an option to
     set your preferred currency for displaying reports (like the balance
diff --git a/guide/C/ch_invest.xml b/guide/C/ch_invest.xml
index ecbaec6..0934f37 100644
--- a/guide/C/ch_invest.xml
+++ b/guide/C/ch_invest.xml
@@ -1344,8 +1344,8 @@ Income
 	</itemizedlist>
         </para>
 
-	<para><emphasis role="strong">Mac OS X:</emphasis> You need to
-	have XCode installed. XCode is an optional item from your OS X
+	<para><emphasis role="strong">MacOS:</emphasis> You need to
+	have XCode installed. XCode is an optional item from your MacOS
 	distribution DVD. Run the <emphasis role="strong">Update
 	Finance Quote</emphasis> app in the
 	<application>&app;</application> dmg. You can run it from the
diff --git a/guide/C/ch_oview.xml b/guide/C/ch_oview.xml
index 8e9ab47..38f1ed7 100644
--- a/guide/C/ch_oview.xml
+++ b/guide/C/ch_oview.xml
@@ -156,7 +156,7 @@
           supported on a variety of platforms and operating systems. The list
           of fully supported operating systems (and platforms) for <application>&app;</application>
           &vers-stable; is: GNU/Linux (x86, x86_64, Sparc, PPC), FreeBSD (x86, x86_64), OpenBSD
-          (x86, x86_64), Solaris (Sparc), and MacOS X (Intel, PPC). Previous versions of
+          (x86, x86_64), Solaris (Sparc), and MacOS (Intel, PPC). Previous versions of
           <application>&app;</application> have been known to work with, SGI IRIX (MIPS), IBM AIX 4.1.5
           (RS/6000), Unixware 7 (Intel), and SCO OpenServer 5.0.4 (Intel), but
           their current status is unknown.</para>
diff --git a/guide/C/gnc-glossary.xml b/guide/C/gnc-glossary.xml
index 28f1aac..043538a 100644
--- a/guide/C/gnc-glossary.xml
+++ b/guide/C/gnc-glossary.xml
@@ -181,7 +181,7 @@
         <listitem><para>DConf since Gnome 3.0 dropped GConf</para></listitem>
       </varlistentry>
       <varlistentry>
-        <term><emphasis>Mac OS X</emphasis></term>
+        <term><emphasis>MacOS</emphasis></term>
         <listitem><para>Defaults. Use the command-line defaults(1) to modify 
         prefs when GnuCash isn't running.</para></listitem>
       </varlistentry>
diff --git a/guide/de/ch_basics.xml b/guide/de/ch_basics.xml
index ba8266a..53f5ee1 100644
--- a/guide/de/ch_basics.xml
+++ b/guide/de/ch_basics.xml
@@ -822,7 +822,7 @@
         <application>&app;</application> die geöffnete Datei automatisch in bestimmten Zeitabständen speichern.
         Dieser Zeitabstand kann in dem Reiter <guilabel>Allgemein</guilabel> unter 
         <menuchoice><guimenu>Bearbeiten</guimenu><guimenuitem>Einstellungen</guimenuitem></menuchoice>
-        (<menuchoice><guimenu>GnuCash</guimenu><guimenuitem>Einstellungen</guimenuitem></menuchoice> unter Mac OS X)eingestellt werden.
+        (<menuchoice><guimenu>GnuCash</guimenu><guimenuitem>Einstellungen</guimenuitem></menuchoice> unter MacOS)eingestellt werden.
         Berücksichtigen Sie bitte, dass diese Möglichkeit nur beim Speichern im <acronym>XML</acronym>-Format relevant ist.
         Wenn Sie mit einer Datenbank arbeiten, ist das <guibutton>Speichern</guibutton>-Symbol und der Menüeintrag <guimenuitem>Speichern</guimenuitem> ausgegraut, weil die Änderungen direkt gespeichert werden.</para>
     </note>
@@ -1003,7 +1003,7 @@ gcashdata.gnucash.7f0982.12093.LNK gcashdata.gnucash.LCK
         die älter als 30 Tage sind. Sie können dieses Verhalten in den
         <application>&app;</application> Einstellungen in dem Reiter <guilabel>Allgemeines</guilabel> unter <menuchoice><guimenu>Bearbeiten</guimenu>
         <guimenuitem>Einstellungen</guimenuitem></menuchoice>
-        (<menuchoice><guimenu>GnuCash</guimenu><guimenuitem>Einstellungen</guimenuitem></menuchoice> unter Mac OS X).</para>
+        (<menuchoice><guimenu>GnuCash</guimenu><guimenuitem>Einstellungen</guimenuitem></menuchoice> unter MacOS).</para>
       </note>
     </sect2>
   </sect1>
diff --git a/guide/de/ch_bus_setup.xml b/guide/de/ch_bus_setup.xml
index 070a83c..daf71a3 100644
--- a/guide/de/ch_bus_setup.xml
+++ b/guide/de/ch_bus_setup.xml
@@ -279,7 +279,7 @@ Basis Kontenhierarchie für Debitoren- und Kreditorenbuchhaltung:
       <application>&app;</application> Einstellungen ein, auf welche Sie 
       unter <menuchoice><guimenu>Bearbeiten</guimenu><guimenuitem>Einstellungen</guimenuitem></menuchoice>
     (<menuchoice><guimenu>GnuCash</guimenu><guimenuitem>Einstellungen</guimenuitem></menuchoice> 
-    unter Mac OS X).
+    unter MacOS).
     <!--
         See Help manual chapter 10.3.3 Business Book Options Tab.
         -->
diff --git a/guide/de/ch_currency.xml b/guide/de/ch_currency.xml
index e0986a0..30dcd2e 100644
--- a/guide/de/ch_currency.xml
+++ b/guide/de/ch_currency.xml
@@ -48,7 +48,7 @@
 
     <para>Ihre Standardkontenwährung wird im Reiter <guilabel>Konten</guilabel>  
     unter <menuchoice><guimenu>Bearbeiten</guimenu><guimenuitem>Einstellungen</guimenuitem></menuchoice>
-    (unter Mac OS X unter <menuchoice><guimenu>&app;</guimenu><guimenuitem>Einstellungen</guimenuitem></menuchoice>)  eingestellt.
+    (unter MacOS unter <menuchoice><guimenu>&app;</guimenu><guimenuitem>Einstellungen</guimenuitem></menuchoice>)  eingestellt.
     Sie sollten diesen Parameter korrekt einstellen. Dies spart Ihnen viel Zeit bei der Erstellung Ihrer Kontenhierarchie.</para>
 
     <para>In gleicher Weise bietet <application>&app;</application> Ihnen eine Option, Ihre bevorzugte Währung für die Anzeige der Berichte einzurichten (wie Bilanz 
diff --git a/guide/de/ch_invest.xml b/guide/de/ch_invest.xml
index 33fd949..2d80cce 100644
--- a/guide/de/ch_invest.xml
+++ b/guide/de/ch_invest.xml
@@ -1199,8 +1199,8 @@ Einnahmen
         </itemizedlist>
         </para>
 
-        <para><emphasis role="strong">Mac OS X:</emphasis> Sie müssen XCode 
-        installiert haben. XCode ist ein zusätzliches Element auf Ihrer OS X
+        <para><emphasis role="strong">MacOS:</emphasis> Sie müssen XCode 
+        installiert haben. XCode ist ein zusätzliches Element auf Ihrer MacOS
         Distributions-DVD. Starten Sie die <emphasis role="strong">Finance Quote 
         aktualisieren </emphasis> App in <application>&app;</application>.dmg. 
         Sie können es von dem *.dmg starten oder kopieren es in den gleichen 
diff --git a/guide/de/ch_oview.xml b/guide/de/ch_oview.xml
index accd978..933b5e1 100644
--- a/guide/de/ch_oview.xml
+++ b/guide/de/ch_oview.xml
@@ -156,7 +156,7 @@
           <para>
             <emphasis>Verfügbarkeit auf mehreren Plattformen: </emphasis>
             <application>&app;</application> ist für eine Vielzahl von Plattformen und Betriebssysteme verfügbar. 
-            Für <application>&app;</application> &vers-stable; sind dies: GNU/Linux (x86, x86_64, Sparc, PPC), FreeBSD (x86, x86_64), OpenBSD (x86, x86_64), Solaris (Sparc), und MacOS X (Intel und PPC). 
+            Für <application>&app;</application> &vers-stable; sind dies: GNU/Linux (x86, x86_64, Sparc, PPC), FreeBSD (x86, x86_64), OpenBSD (x86, x86_64), Solaris (Sparc), und MacOS (Intel und PPC). 
             Ältere Versionen von <application>&app;</application> liefen bereits auf SGI IRIX (MIPS), IBM AIX 4.1.5 (RS/6000), Unixware 7 (Intel), und SCO OpenServer 5.0.4 (Intel), aber ihr gegenwärtiger Status ist nicht bekannt.
           </para>
         </listitem>
diff --git a/guide/ja/ch_basics.xml b/guide/ja/ch_basics.xml
index a97ef9f..4271b9a 100644
--- a/guide/ja/ch_basics.xml
+++ b/guide/ja/ch_basics.xml
@@ -550,7 +550,7 @@ Marchi"></imagedata> </imageobject>
   <note>
         <para>ä½•ã‚‰ã‹ã®ç†ç”±ã§ãƒ‡ãƒ¼ã‚¿ãŒç´›å¤±ã™ã‚‹ã“ã¨ã‚’é¿ã‘ã‚‹ãŸã‚ã«ã€é »ç¹ã«ãƒ‡ãƒ¼ã‚¿ã‚’ä¿å­˜ã™ã‚‹ã“ã¨ãŒé‡è¦ã§ã™ã€‚ã“ã®ãŸã‚ã€<application>&app;</application>はある一定の間隔で開いているファイルを自動保存することができます。
 この間隔は<menuchoice><guimenu>編集</guimenu><guimenuitem>設定</guimenuitem></menuchoice>
-(Mac OS X では
+(MacOS では
 <menuchoice><guimenu>&app;</guimenu><guimenuitem>設定</guimenuitem></menuchoice>)
 配下にある<guilabel>全般</guilabel>タブで設定できます。
 <acronym>XML</acronym>å½¢å¼ã§ä¿å­˜ã—ã¦ã„ã‚‹å ´åˆã«ã ã‘ã“ã®ã‚ªãƒ—ã‚·ãƒ§ãƒ³ãŒé–¢é€£ã™ã‚‹ã“ã¨ã‚’è¦šãˆã¦ãŠã„ã¦ãã ã•ã„ã€‚
@@ -681,7 +681,7 @@ Marchi"></imagedata> </imageobject>
       <note>
         <para>デフォルトでは、<application>&app;</application>は31日以上前の<filename>.log</filename>と<filename>.YYYYMMDDHHMMSS.gnucash</filename>バックアップファイルを自動的にすべて削除します。
 <menuchoice><guimenu>編集</guimenu><guimenuitem>設定</guimenuitem></menuchoice>
-(Mac OS X では
+(MacOS では
 <menuchoice><guimenu>&app;</guimenu><guimenuitem>設定</guimenuitem></menuchoice>)にある<guilabel>全般</guilabel>タブで<application>&app;</application>のこの動作を変えることができます。</para>
       </note>
       
diff --git a/guide/ja/ch_bus_ar.xml b/guide/ja/ch_bus_ar.xml
index dfd6a39..4f7d5cd 100644
--- a/guide/ja/ch_bus_ar.xml
+++ b/guide/ja/ch_bus_ar.xml
@@ -658,7 +658,7 @@ format="PNG" srccredit="Patrick Schweiger" /> </imageobject>
         <para><application>&app;</application>はファイルをオプションで圧縮します。
 ファイルを編集する前に、圧縮を無効にして保存します。
 圧縮を有効または無効にするためには、<menuchoice>
-<guimenu>編集</guimenu><guimenuitem>設定</guimenuitem></menuchoice> (Mac OS X
+<guimenu>編集</guimenu><guimenuitem>設定</guimenuitem></menuchoice> (MacOS
 ã®å ´åˆã¯<menuchoice><guimenu>&app;</guimenu><guimenuitem>設定</guimenuitem></menuchoice>)
 を使用して、<guilabel>全般</guilabel>タブに移動します。そして、<guilabel>ファイルを圧縮</guilabel>するチェックボックスで有効または無効にします。</para>
       </note>
diff --git a/guide/ja/ch_invest.xml b/guide/ja/ch_invest.xml
index c159baa..806eb02 100644
--- a/guide/ja/ch_invest.xml
+++ b/guide/ja/ch_invest.xml
@@ -792,9 +792,9 @@ role="strong">ã‚ªãƒ³ãƒ©ã‚¤ãƒ³ç›¸å ´è¡¨å–å¾—ãƒ„ãƒ¼ãƒ«ã‚’ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«</emph
 	</itemizedlist>
         </para>
 
-	<para><emphasis role="strong">Mac OS Xã®å ´åˆ:</emphasis>
+	<para><emphasis role="strong">MacOSã®å ´åˆ:</emphasis>
 XCodeがインストールされている必要があります。
-XCodeはOS XディストリビューションDVDã®ã‚ªãƒ—ã‚·ãƒ§ãƒ³é …ç›®ã§ã™ã€‚
+XCodeはMacOSディストリビューションDVDã®ã‚ªãƒ—ã‚·ãƒ§ãƒ³é …ç›®ã§ã™ã€‚
 <application>&app;</application> dmg 内にある<emphasis role="strong">Update
 Finance Quote</emphasis>を実行してください。
 dmgまたは<application>&app;</application>をコピーしたのと同じフォルダーにコピーされたものから実行できます。
diff --git a/guide/ja/ch_oview.xml b/guide/ja/ch_oview.xml
index d837990..cad8901 100644
--- a/guide/ja/ch_oview.xml
+++ b/guide/ja/ch_oview.xml
@@ -135,7 +135,7 @@ Exchangeプロトコルをサポートする最初のフリーソフトです。
 <application>&app;</application>はさまざまなプラットフォームとオペレーティングシステムでサポートされます。
 <application>&app;</application> &vers-stable; が完全にサポートされるオペレーティングシステム
 (およびプラットフォーム) のリストは次の通りです。GNU/Linux (x86、 Sparc、 PPC)、 FreeBSD (x86)、
-OpenBSD (x86)、 Solaris (Sparc)、およびMac OS X (PPC)。
+OpenBSD (x86)、 Solaris (Sparc)、およびMacOS (PPC)。
 <application>&app;</application>の以前のバージョンは、SGI IRIX(MIPS)と、IBM
 AIX4.1.5(RS/6000)と、Unixware7(Intel)と、SCO
 OpenServer5.0.4(Intel)で動作すると知られていますが、それらの現在の状況は不明です。</para>
diff --git a/guide/pt/ch_basics.xml b/guide/pt/ch_basics.xml
index 1c0047c..7520384 100644
--- a/guide/pt/ch_basics.xml
+++ b/guide/pt/ch_basics.xml
@@ -659,7 +659,7 @@
         <application>&app;</application> pode gravar automaticamente o ficheiro aberto em determinados períodos de tempo.
         Este intervalo pode ser definido no separador <guilabel>Geral</guilabel> indo a 
         <menuchoice><guimenu>Editar</guimenu><guimenuitem>Preferências</guimenuitem></menuchoice>
-        (<menuchoice><guimenu>GnuCash</guimenu><guimenuitem>Preferências</guimenuitem></menuchoice> em Mac OS X).
+        (<menuchoice><guimenu>GnuCash</guimenu><guimenuitem>Preferências</guimenuitem></menuchoice> em MacOS).
         Lembre-se que esta opção só é relevante se estiver a gravar em formato <acronym>XML</acronym>. Se trabalha com uma base 
         de dados, o botão <guibutton>Gravar</guibutton> e o item de menu <guimenuitem>Gravar</guimenuitem> estarão em cinzento,
         dado que as alterações são imediatamente gravadas.</para>
@@ -817,7 +817,7 @@ todos na mesma pasta que o seu ficheiro primário de dados. O que cada um destes
         e <filename>.AAAAMMDDHHMMSS.gnucash</filename> com mais de 30 dias. Pode alterar este comportamento nas preferências do 
         <application>&app;</application>. Vá a <menuchoice><guimenu>Editar</guimenu><guimenuitem>Preferências</guimenuitem></menuchoice>, 
         separador <guilabel>Geral</guilabel> (<menuchoice><guimenu>GnuCash</guimenu><guimenuitem>Preferências</guimenuitem></menuchoice> 
-        em Mac OS X).</para>
+        em MacOS).</para>
       </note>
       
     </sect2>
diff --git a/guide/pt/ch_bus_setup.xml b/guide/pt/ch_bus_setup.xml
index de895fd..d02b9b4 100644
--- a/guide/pt/ch_bus_setup.xml
+++ b/guide/pt/ch_bus_setup.xml
@@ -254,7 +254,7 @@ Basic A/R and A/P Account Hierarchy:
       <title>Business Preferences</title>
       <para>Set options on the Business tab of the <application>&app;</application> preferences, which is
         accessed via <menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice>
-    (<menuchoice><guimenu>GnuCash</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice> on Mac OS X).
+    (<menuchoice><guimenu>GnuCash</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice> on MacOS).
         See Help manual chapter 10.3.3 Business Book Options Tab.
       </para>
           
diff --git a/guide/pt/ch_currency.xml b/guide/pt/ch_currency.xml
index 3c42f67..47049da 100644
--- a/guide/pt/ch_currency.xml
+++ b/guide/pt/ch_currency.xml
@@ -47,7 +47,7 @@
 
     <para>A sua moeda predefinida é configurada no separador <guilabel>Contas</guilabel> sob 
     <menuchoice><guimenu>Editar</guimenu><guimenuitem>Preferências</guimenuitem></menuchoice>
-    (<menuchoice><guimenu>&app;</guimenu><guimenuitem>Preferências</guimenuitem></menuchoice> em Mac OS X).
+    (<menuchoice><guimenu>&app;</guimenu><guimenuitem>Preferências</guimenuitem></menuchoice> em MacOS).
     Defina este parâmetro corretamente, dado que lhe poupará muito tempo ao criar o plano de contas.</para>
 
     <para>De igual forma, o <application>&app;</application> oferece uma opção para predefinir a sua 
@@ -882,7 +882,7 @@ Compra de ações
       vá a <menuchoice><guimenu>Ficheiro</guimenu><guimenuitem>Novo ficheiro</guimenuitem></menuchoice>, 
       e edite as preferências(<menuchoice><guimenu>Editar</guimenu><guimenuitem>Preferências</guimenuitem>
       </menuchoice>, <menuchoice><guimenu>&app;</guimenu><guimenuitem>Preferências</guimenuitem></menuchoice> 
-      em Mac OS X) para escolher AUD como moeda predefinida. Uma vez que decidiu controlar o maior número 
+      em MacOS) para escolher AUD como moeda predefinida. Uma vez que decidiu controlar o maior número 
       de detalhes de receitas e despesas, pode usar a seguinte hierarquia de contas:</para>
 
       <literallayout>
diff --git a/guide/pt/ch_invest.xml b/guide/pt/ch_invest.xml
index fc4ac6a..91bcba4 100644
--- a/guide/pt/ch_invest.xml
+++ b/guide/pt/ch_invest.xml
@@ -1079,8 +1079,8 @@ Receita
 	</itemizedlist>
         </para>
 
-	<para><emphasis role="strong">Mac OS X:</emphasis> tem de ter o XCode instalado. O XCode é 
-        um item opcional do DVD da sua distribuição  do OS X. Execute <emphasis role="strong">Update
+	<para><emphasis role="strong">MacOS:</emphasis> tem de ter o XCode instalado. O XCode é 
+        um item opcional do DVD da sua distribuição  do MacOS. Execute <emphasis role="strong">Update
 	Finance Quote</emphasis> no dmg do <application>&app;</application>. Pode executá-lo a partir 
         do dmg ou copiá-lo para a mesma pasta para onde copiou o <application>&app;</application>. 
         Vai abrir um terminal e executar um script que lhe fará muitas perguntas. Aceite as predefinições 
diff --git a/guide/pt/ch_oview.xml b/guide/pt/ch_oview.xml
index 8817d49..297ac80 100644
--- a/guide/pt/ch_oview.xml
+++ b/guide/pt/ch_oview.xml
@@ -138,7 +138,7 @@
           <para><emphasis>Compatibilidade multi-plataforma</emphasis>: o <application>&app;</application> é 
           suportado numa variedade de plataformas e sistemas operativos. A lista de sistemas operativos (e plataformas) 
           para o <application>&app;</application> &vers-stable; é: GNU/Linux (x86, x86_64, Sparc, PPC), FreeBSD (x86, x86_64), OpenBSD
-          (x86, x86_64), Solaris (Sparc), e MacOS X (Intel, PPC). Sabe-se que versões prévias do <application>&app;</application> 
+          (x86, x86_64), Solaris (Sparc), e MacOS (Intel, PPC). Sabe-se que versões prévias do <application>&app;</application> 
           trabalharam com SGI IRIX (MIPS), IBM AIX 4.1.5, (RS/6000), Unixware 7 (Intel), e SCO OpenServer 5.0.4 (Intel), mas 
           atualmente desconhece-se o seu estado. E claro que inclui o Windows.</para>
         </listitem>
diff --git a/guide/ru/ch_basics.xml b/guide/ru/ch_basics.xml
index 1186bd8..d1a3d1e 100644
--- a/guide/ru/ch_basics.xml
+++ b/guide/ru/ch_basics.xml
@@ -850,7 +850,7 @@
         может автоматически сохранять открытый файл через определенные промежутки
         времени. Этот интервал можно установить на вкладке <guilabel>Основные</guilabel> 
         в разделе меню <menuchoice><guimenu>Правка</guimenu><guimenuitem>Настройки</guimenuitem></menuchoice>
-        (<menuchoice><guimenu>GnuCash</guimenu><guimenuitem>Настройки</guimenuitem></menuchoice> в Mac OS X).
+        (<menuchoice><guimenu>GnuCash</guimenu><guimenuitem>Настройки</guimenuitem></menuchoice> в MacOS).
         Имейте в виду, что этот параметр имеет значение только в том случае, 
         если вы сохраняете данные в формате <acronym>XML</acronym>. 
         Если вы работаете с базой данных, кнопка <guibutton>Сохранить</guibutton> 
@@ -1050,7 +1050,7 @@
         Вы можете изменить это в настройках <application>&app;</application> на 
         вкладке <guilabel>Основные</guilabel> 
         в разделе меню <menuchoice><guimenu>Правка</guimenu><guimenuitem>Настройки</guimenuitem></menuchoice>
-        (<menuchoice><guimenu>GnuCash</guimenu><guimenuitem>Настройки</guimenuitem></menuchoice> в Mac OS X).</para>
+        (<menuchoice><guimenu>GnuCash</guimenu><guimenuitem>Настройки</guimenuitem></menuchoice> в MacOS).</para>
       </note>
 
     </sect2>
diff --git a/guide/ru/ch_bus_features.xml b/guide/ru/ch_bus_features.xml
index ff54042..db35b19 100644
--- a/guide/ru/ch_bus_features.xml
+++ b/guide/ru/ch_bus_features.xml
@@ -275,7 +275,7 @@ Basic A/R and A/P Account Hierarchy:
       <title>Setting Business Preferences</title>
       <para>Set options on the Business tab of the <application>&app;</application> preferences, which is
         accessed via <menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice>
-    (<menuchoice><guimenu>GnuCash</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice> on Mac OS X).
+    (<menuchoice><guimenu>GnuCash</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice> on MacOS).
         See Help manual chapter 10.3.3 Business Book Options Tab.
       </para>
 
diff --git a/guide/ru/ch_currency.xml b/guide/ru/ch_currency.xml
index eed7dc1..7d9ebbd 100644
--- a/guide/ru/ch_currency.xml
+++ b/guide/ru/ch_currency.xml
@@ -49,7 +49,7 @@
 
     <para>Your default account currency is set in the <guilabel>Account</guilabel> tab
     under <menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice>
-    (<menuchoice><guimenu>&app;</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice> on Mac OS X).</para>
+    (<menuchoice><guimenu>&app;</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice> on MacOS).</para>
 
     <para>Similarly, <application>&app;</application> offers an option to
     set your preferred currency for displaying reports (like the balance
diff --git a/guide/ru/ch_invest.xml b/guide/ru/ch_invest.xml
index 2fda155..fcd400d 100644
--- a/guide/ru/ch_invest.xml
+++ b/guide/ru/ch_invest.xml
@@ -1344,8 +1344,8 @@ Income
 	</itemizedlist>
         </para>
 
-	<para><emphasis role="strong">Mac OS X:</emphasis> You need to
-	have XCode installed. XCode is an optional item from your OS X
+	<para><emphasis role="strong">MacOS:</emphasis> You need to
+	have XCode installed. XCode is an optional item from your MacOS
 	distribution DVD. Run the <emphasis role="strong">Update
 	Finance Quote</emphasis> app in the
 	<application>&app;</application> dmg. You can run it from the
diff --git a/guide/ru/ch_oview.xml b/guide/ru/ch_oview.xml
index 37a2eaf..4f53db6 100644
--- a/guide/ru/ch_oview.xml
+++ b/guide/ru/ch_oview.xml
@@ -145,7 +145,7 @@
         <listitem>
           <para><emphasis>Мультиплатформенная совместимость</emphasis>: <application>&app;</application> поддерживает множество платформ и операционных систем. 
           Список полностью поддерживаемых операционных систем (и платформ) для <application>&app;</application> &vers-stable; следующий: 
-          GNU/Linux (x86, x86_64, Sparc, PPC), FreeBSD (x86, x86_64), OpenBSD (x86, x86_64), Solaris (Sparc) и MacOS X (Intel, PPC). 
+          GNU/Linux (x86, x86_64, Sparc, PPC), FreeBSD (x86, x86_64), OpenBSD (x86, x86_64), Solaris (Sparc) и MacOS (Intel, PPC). 
           Предыдущие версии <application>&app;</application>, насколько известно, работали с  SGI IRIX (MIPS), IBM AIX 4.1.5
           (RS/6000), Unixware 7 (Intel) и SCO OpenServer 5.0.4 (Intel), но сейчас их текущее состояние не известно.</para>
         </listitem>
diff --git a/guide/ru/gnc-glossary.xml b/guide/ru/gnc-glossary.xml
index 28f1aac..043538a 100644
--- a/guide/ru/gnc-glossary.xml
+++ b/guide/ru/gnc-glossary.xml
@@ -181,7 +181,7 @@
         <listitem><para>DConf since Gnome 3.0 dropped GConf</para></listitem>
       </varlistentry>
       <varlistentry>
-        <term><emphasis>Mac OS X</emphasis></term>
+        <term><emphasis>MacOS</emphasis></term>
         <listitem><para>Defaults. Use the command-line defaults(1) to modify 
         prefs when GnuCash isn't running.</para></listitem>
       </varlistentry>
diff --git a/help/C/Help_ch_Account-Actions.xml b/help/C/Help_ch_Account-Actions.xml
index a9f85db..c66b425 100644
--- a/help/C/Help_ch_Account-Actions.xml
+++ b/help/C/Help_ch_Account-Actions.xml
@@ -456,7 +456,7 @@
               install <application>Finance::Quote</application> for you. You can find it in the Start Menu under the <application>&app;</application>
               group and is called <quote>Install Online Price Retrieval</quote>.</para></listitem>
 
-             <listitem><para><systemitem class="osname">Mac OS X</systemitem>: If you have installed <application>&app;</application>
+             <listitem><para><systemitem class="osname">MacOS</systemitem>: If you have installed <application>&app;</application>
               from the installer found on the <application>&app;</application> home page, <application>Finance::Quote</application> is already
               installed for you.</para></listitem>
 
diff --git a/help/C/Help_ch_Business.xml b/help/C/Help_ch_Business.xml
index 62ef13a..95e1de2 100644
--- a/help/C/Help_ch_Business.xml
+++ b/help/C/Help_ch_Business.xml
@@ -164,7 +164,7 @@
       <title>Business Preferences</title>
       <para>Set options on the Business tab of the <application>&app;</application> preferences, which is
         accessed via <menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice>
-        (<menuchoice><guimenu>GnuCash</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice> on Mac OS X).
+        (<menuchoice><guimenu>GnuCash</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice> on MacOS).
         See <xref linkend="prefs-biz" />.
       </para>
     </sect2>
@@ -435,7 +435,7 @@
                 made in the global preferences accessible through
                 <menuchoice><guimenu>Edit</guimenu>
                 <guimenuitem>Preferences</guimenuitem></menuchoice>
-                (<menuchoice><guimenu>Gnucash</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice> on Mac OS X).</para>
+                (<menuchoice><guimenu>Gnucash</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice> on MacOS).</para>
               </listitem>
             </itemizedlist></para>
         </listitem>
@@ -1362,7 +1362,7 @@ ________________________________________________________________________________
               <menuchoice><guimenu>Edit</guimenu>
               <guimenuitem>Preferences</guimenuitem></menuchoice>
               (<menuchoice><guimenu>Gnucash</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice>
-              on Mac OS X).</para>
+              on MacOS).</para>
             </listitem>
           </itemizedlist>
         </listitem>
diff --git a/help/C/Help_ch_Customize.xml b/help/C/Help_ch_Customize.xml
index b999884..5f0e760 100644
--- a/help/C/Help_ch_Customize.xml
+++ b/help/C/Help_ch_Customize.xml
@@ -52,7 +52,7 @@
     <para>The <guilabel>&app; Preferences</guilabel> window allows you to customize your <application>&app;</application>
     session by setting several options. From the <application>&app;</application> menu
     select <menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice>
-    (<menuchoice><guimenu>GnuCash</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice> on Mac OS X).
+    (<menuchoice><guimenu>GnuCash</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice> on MacOS).
     The <guilabel>&app; Preferences</guilabel> window will open.
     Using the tabs on the left make your desired changes. The settings in
     this dialog are set per user and not stored with the file. This is
diff --git a/help/C/Help_ch_GUIMenus.xml b/help/C/Help_ch_GUIMenus.xml
index 2bcd98e..d6625cd 100644
--- a/help/C/Help_ch_GUIMenus.xml
+++ b/help/C/Help_ch_GUIMenus.xml
@@ -609,7 +609,7 @@
 
               <row>
                 <entry><para><guimenuitem>Preferences</guimenuitem>
-                (<menuchoice><guimenu>GnuCash</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice> on Mac OS X).</para></entry>
+                (<menuchoice><guimenu>GnuCash</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice> on MacOS).</para></entry>
 
                 <entry>
                   <para>Customize <application>&app;</application> for location, style, and numerous other preferences.
@@ -2454,7 +2454,7 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-guide/txns-register
 
                 <row>
                   <entry><para><guimenuitem>Preferences</guimenuitem>
-                  (<menuchoice><guimenu>GnuCash</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice> on Mac OS X).</para></entry>
+                  (<menuchoice><guimenu>GnuCash</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice> on MacOS).</para></entry>
 
                   <entry>
                     <para>Customize <application>&app;</application> for location, style, and numerous other preferences.
@@ -3750,7 +3750,7 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-guide/txns-register
 
                 <row>
                   <entry><para><guimenuitem>Preferences</guimenuitem>
-                  (<menuchoice><guimenu>GnuCash</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice> on Mac OS X).</para></entry>
+                  (<menuchoice><guimenu>GnuCash</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice> on MacOS).</para></entry>
 
                   <entry>
                     <para>Customize <application>&app;</application> for location, style, and numerous other preferences.
diff --git a/help/pt/Help_ch_Account-Actions.xml b/help/pt/Help_ch_Account-Actions.xml
index a3931d7..a842f74 100644
--- a/help/pt/Help_ch_Account-Actions.xml
+++ b/help/pt/Help_ch_Account-Actions.xml
@@ -505,7 +505,7 @@
               Pode encontrá-lo no menu Iniciar, na pasta do <application>&app;</application>
               e chama-se <quote>Install Online Price Retrieval</quote>.</para></listitem>
 
-             <listitem><para><guilabel>Mac OS X:</guilabel> se instalou o <application>&app;</application>
+             <listitem><para><guilabel>MacOS:</guilabel> se instalou o <application>&app;</application>
               com o instalador encontrado na página do <application>&app;</application>, 
               o <application>Finance::Quote</application> já está instalado.</para></listitem>
 
diff --git a/help/pt/Help_ch_Business.xml b/help/pt/Help_ch_Business.xml
index 62e4f7d..9797a49 100644
--- a/help/pt/Help_ch_Business.xml
+++ b/help/pt/Help_ch_Business.xml
@@ -159,7 +159,7 @@
       <title>Business Preferences</title>
       <para>Set options on the Business tab of the <application>&app;</application> preferences, which is
         accessed via <menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice>
-        (<menuchoice><guimenu>GnuCash</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice> on Mac OS X).
+        (<menuchoice><guimenu>GnuCash</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice> on MacOS).
         See <xref linkend="prefs-biz" />.
       </para>     
     </sect2>
@@ -430,7 +430,7 @@
                 made in the global preferences accessible through
                 <menuchoice><guimenu>Edit</guimenu>
                 <guimenuitem>Preferences</guimenuitem></menuchoice>
-                (<menuchoice><guimenu>Gnucash</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice> on Mac OS X).</para>
+                (<menuchoice><guimenu>Gnucash</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice> on MacOS).</para>
               </listitem>
             </itemizedlist></para>
         </listitem>
@@ -1207,7 +1207,7 @@
               <menuchoice><guimenu>Edit</guimenu>
               <guimenuitem>Preferences</guimenuitem></menuchoice>
               (<menuchoice><guimenu>Gnucash</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice> 
-              on Mac OS X).</para>
+              on MacOS).</para>
             </listitem>
           </itemizedlist>
         </listitem>
diff --git a/help/pt/Help_ch_Customize.xml b/help/pt/Help_ch_Customize.xml
index 7691ad9..aff0e7b 100644
--- a/help/pt/Help_ch_Customize.xml
+++ b/help/pt/Help_ch_Customize.xml
@@ -48,7 +48,7 @@
     <para>A janela de <guilabel>preferências do &app;</guilabel> permite-lhe personalizar a sua sessão no 
     <application>&app;</application> definindo várias opções. No menu do <application>&app;</application> 
     selecione <menuchoice><guimenu>Editar</guimenu><guimenuitem>Preferências</guimenuitem></menuchoice>
-    (em Mac OS X <menuchoice><guimenu>GnuCash</guimenu><guimenuitem>Preferências</guimenuitem></menuchoice>).
+    (em MacOS <menuchoice><guimenu>GnuCash</guimenu><guimenuitem>Preferências</guimenuitem></menuchoice>).
     Abre-se o diálogo <guilabel>Preferências do &app;</guilabel>. Use os separadores à esquerda para fazer as alterações 
     desejadas. As definições neste diálogo são feitas por utilizador e não são armazanadas no ficheiro. Isto contrasta com as 
     definições descritas em <xref linkend="book-options"/>, que são armazenadas no ficheiro (livro) e fazem parte dele, 
diff --git a/help/pt/Help_ch_GUIMenus.xml b/help/pt/Help_ch_GUIMenus.xml
index da0d3be..dd37dbb 100644
--- a/help/pt/Help_ch_GUIMenus.xml
+++ b/help/pt/Help_ch_GUIMenus.xml
@@ -623,7 +623,7 @@
               <row>
                 <entry><para><guimenuitem>Preferências</guimenuitem>
                 (<menuchoice><guimenu>GnuCash</guimenu><guimenuitem>Preferências</guimenuitem></menuchoice> 
-                em Mac OS X).</para></entry>
+                em MacOS).</para></entry>
 
                 <entry>
                   <para>Personalizar o <application>&app;</application> na localização, estilo e 
@@ -2488,7 +2488,7 @@
               <row>
                 <entry><para><guimenuitem>Preferências</guimenuitem>
                 (<menuchoice><guimenu>GnuCash</guimenu><guimenuitem>Preferências</guimenuitem></menuchoice> 
-                em Mac OS X).</para></entry>
+                em MacOS).</para></entry>
 
                 <entry>
                   <para>Personalizar o <application>&app;</application> na localização, estilo e 
@@ -3775,7 +3775,7 @@
               <row>
                 <entry><para><guimenuitem>Preferências</guimenuitem>
                 (<menuchoice><guimenu>GnuCash</guimenu><guimenuitem>Preferências</guimenuitem></menuchoice> 
-                em Mac OS X).</para></entry>
+                em MacOS).</para></entry>
 
                 <entry>
                   <para>Personalizar o <application>&app;</application> na localização, estilo e 



Summary of changes:
 guide/C/ch_basics.xml               | 4 ++--
 guide/C/ch_bus_features.xml         | 2 +-
 guide/C/ch_currency.xml             | 2 +-
 guide/C/ch_invest.xml               | 4 ++--
 guide/C/ch_oview.xml                | 2 +-
 guide/C/gnc-glossary.xml            | 2 +-
 guide/de/ch_basics.xml              | 4 ++--
 guide/de/ch_bus_setup.xml           | 2 +-
 guide/de/ch_currency.xml            | 2 +-
 guide/de/ch_invest.xml              | 4 ++--
 guide/de/ch_oview.xml               | 2 +-
 guide/ja/ch_basics.xml              | 4 ++--
 guide/ja/ch_bus_ar.xml              | 2 +-
 guide/ja/ch_invest.xml              | 4 ++--
 guide/ja/ch_oview.xml               | 2 +-
 guide/pt/ch_basics.xml              | 4 ++--
 guide/pt/ch_bus_setup.xml           | 2 +-
 guide/pt/ch_currency.xml            | 4 ++--
 guide/pt/ch_invest.xml              | 4 ++--
 guide/pt/ch_oview.xml               | 2 +-
 guide/ru/ch_basics.xml              | 4 ++--
 guide/ru/ch_bus_features.xml        | 2 +-
 guide/ru/ch_currency.xml            | 2 +-
 guide/ru/ch_invest.xml              | 4 ++--
 guide/ru/ch_oview.xml               | 2 +-
 guide/ru/gnc-glossary.xml           | 2 +-
 help/C/Help_ch_Account-Actions.xml  | 2 +-
 help/C/Help_ch_Business.xml         | 6 +++---
 help/C/Help_ch_Customize.xml        | 2 +-
 help/C/Help_ch_GUIMenus.xml         | 6 +++---
 help/pt/Help_ch_Account-Actions.xml | 2 +-
 help/pt/Help_ch_Business.xml        | 6 +++---
 help/pt/Help_ch_Customize.xml       | 2 +-
 help/pt/Help_ch_GUIMenus.xml        | 6 +++---
 34 files changed, 53 insertions(+), 53 deletions(-)