aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Prévot <taffit>2011-12-14 20:50:12 +0000
committerDavid Prévot <taffit>2011-12-14 20:50:12 +0000
commit70cf45edbaeb4b8fc8f99d683f2f5c5c4435be92 (patch)
tree0a0eb22a299bb8bf464e153d9bc10172b83e9601
parentca076f09556114d408e7f5820883927adac6ba7b (diff)
s/MacOS/Mac OS/g and s/OSX/OS X/g
CVS version numbers bulgarian/intro/cn.wml: 1.28 -> 1.29 catalan/intro/cn.wml: 1.22 -> 1.23 catalan/ports/powerpc/history.wml: 1.4 -> 1.5 chinese/intro/cn.wml: 1.25 -> 1.26 croatian/ports/powerpc/history.wml: 1.7 -> 1.8 czech/News/weekly/2005/02/index.wml: 1.3 -> 1.4 danish/intro/cn.wml: 1.51 -> 1.52 danish/ports/powerpc/history.wml: 1.5 -> 1.6 danish/ports/powerpc/index.wml: 1.42 -> 1.43 danish/ports/powerpc/inst/install.wml: 1.7 -> 1.8 danish/releases/squeeze/debian-installer/index.wml: 1.5 -> 1.6 danish/users/edu/lyceemoliere.wml: 1.4 -> 1.5 dutch/intro/cn.wml: 1.33 -> 1.34 english/News/weekly/1999/12/mail.wml: 1.5 -> 1.6 english/News/weekly/2001/23/index.wml: 1.11 -> 1.12 english/News/weekly/2003/21/index.wml: 1.16 -> 1.17 english/News/weekly/2005/02/index.wml: 1.4 -> 1.5 english/News/weekly/2005/13/index.wml: 1.4 -> 1.5 english/consultants/clive_menzies.wml: 1.2 -> 1.3 english/consultants/velesys.wml: 1.1 -> 1.2 english/devel/debian-installer/errata.wml: 1.162 -> 1.163 english/intro/cn.wml: 1.84 -> 1.85 english/ports/powerpc/history.wml: 1.14 -> 1.15 english/ports/powerpc/index.wml: 1.74 -> 1.75 english/ports/powerpc/inst/install.wml: 1.22 -> 1.23 english/ports/powerpc/inst/yaboot-howto.sgml: 1.7 -> 1.8 english/releases/squeeze/debian-installer/index.wml: 1.6 -> 1.7 english/users/edu/lyceemoliere.wml: 1.3 -> 1.4 english/vote/1999/ben.wml: 1.5 -> 1.6 english/vote/2006/platforms/ajt.wml: 1.3 -> 1.4 finnish/intro/cn.wml: 1.58 -> 1.59 finnish/ports/powerpc/history.wml: 1.3 -> 1.4 finnish/ports/powerpc/index.wml: 1.27 -> 1.28 finnish/ports/powerpc/inst/install.wml: 1.7 -> 1.8 french/News/weekly/1999/12/mail.wml: 1.5 -> 1.6 french/News/weekly/2001/23/index.wml: 1.11 -> 1.12 french/News/weekly/2003/21/index.wml: 1.19 -> 1.20 french/News/weekly/2005/02/index.wml: 1.6 -> 1.7 french/News/weekly/2005/13/index.wml: 1.9 -> 1.10 french/consultants/clive_menzies.wml: 1.4 -> 1.5 french/consultants/velesys.wml: 1.2 -> 1.3 french/devel/debian-installer/errata.wml: 1.155 -> 1.156 french/intro/cn.wml: 1.52 -> 1.53 french/ports/powerpc/history.wml: 1.8 -> 1.9 french/ports/powerpc/index.wml: 1.38 -> 1.39 french/ports/powerpc/inst/install.wml: 1.8 -> 1.9 french/releases/squeeze/debian-installer/index.wml: 1.8 -> 1.9 french/users/edu/lyceemoliere.wml: 1.4 -> 1.5 french/vote/1999/ben.wml: 1.5 -> 1.6 german/News/weekly/2001/23/index.wml: 1.25 -> 1.26 german/News/weekly/2003/21/index.wml: 1.36 -> 1.37 german/News/weekly/2005/02/index.wml: 1.10 -> 1.11 german/News/weekly/2005/13/index.wml: 1.9 -> 1.10 german/consultants/clive_menzies.wml: 1.3 -> 1.4 german/consultants/velesys.wml: 1.2 -> 1.3 german/devel/debian-installer/errata.wml: 1.80 -> 1.81 german/intro/cn.wml: 1.70 -> 1.71 german/ports/powerpc/history.wml: 1.22 -> 1.23 german/ports/powerpc/index.wml: 1.90 -> 1.91 german/ports/powerpc/inst/install.wml: 1.20 -> 1.21 german/ports/powerpc/inst/yaboot-howto.sgml: 1.25 -> 1.26 german/releases/squeeze/debian-installer/index.wml: 1.7 -> 1.8 german/users/edu/lyceemoliere.wml: 1.7 -> 1.8 hungarian/intro/cn.wml: 1.37 -> 1.38 italian/News/weekly/2005/02/index.wml: 1.5 -> 1.6 italian/News/weekly/2005/13/index.wml: 1.4 -> 1.5 italian/consultants/clive_menzies.wml: 1.2 -> 1.3 italian/devel/debian-installer/errata.wml: 1.48 -> 1.49 italian/intro/cn.wml: 1.57 -> 1.58 italian/ports/powerpc/history.wml: 1.4 -> 1.5 italian/ports/powerpc/index.wml: 1.43 -> 1.44 italian/ports/powerpc/inst/install.wml: 1.6 -> 1.7 italian/releases/squeeze/debian-installer/index.wml: 1.5 -> 1.6 japanese/News/weekly/2003/21/index.wml: 1.13 -> 1.14 japanese/News/weekly/2005/02/index.wml: 1.3 -> 1.4 japanese/News/weekly/2005/13/index.wml: 1.4 -> 1.5 japanese/devel/debian-installer/errata.wml: 1.72 -> 1.73 japanese/intro/cn.wml: 1.43 -> 1.44 korean/News/weekly/2001/23/index.wml: 1.304 -> 1.305 korean/intro/cn.wml: 1.161 -> 1.162 norwegian/intro/cn.wml: 1.36 -> 1.37 polish/News/weekly/2001/23/index.wml: 1.15 -> 1.16 polish/News/weekly/2003/21/index.wml: 1.13 -> 1.14 polish/intro/cn.wml: 1.49 -> 1.50 polish/ports/powerpc/index.wml: 1.6 -> 1.7 portuguese/News/weekly/2001/23/index.wml: 1.7 -> 1.8 portuguese/News/weekly/2003/21/index.wml: 1.12 -> 1.13 portuguese/News/weekly/2005/02/index.wml: 1.4 -> 1.5 portuguese/News/weekly/2005/13/index.wml: 1.5 -> 1.6 portuguese/intro/cn.wml: 1.34 -> 1.35 portuguese/users/edu/lyceemoliere.wml: 1.4 -> 1.5 romanian/intro/cn.wml: 1.47 -> 1.48 russian/intro/cn.wml: 1.33 -> 1.34 russian/ports/powerpc/index.wml: 1.17 -> 1.18 slovak/intro/cn.wml: 1.6 -> 1.7 spanish/News/weekly/1999/12/mail.wml: 1.4 -> 1.5 spanish/News/weekly/2003/21/index.wml: 1.11 -> 1.12 spanish/News/weekly/2005/13/index.wml: 1.5 -> 1.6 spanish/intro/cn.wml: 1.32 -> 1.33 spanish/ports/powerpc/history.wml: 1.9 -> 1.10 spanish/ports/powerpc/inst/install.wml: 1.7 -> 1.8 swedish/News/weekly/2001/23/index.wml: 1.10 -> 1.11 swedish/News/weekly/2003/21/index.wml: 1.14 -> 1.15 swedish/News/weekly/2005/02/index.wml: 1.5 -> 1.6 swedish/News/weekly/2005/13/index.wml: 1.5 -> 1.6 swedish/intro/cn.wml: 1.63 -> 1.64 swedish/ports/powerpc/history.wml: 1.5 -> 1.6 swedish/ports/powerpc/index.wml: 1.44 -> 1.45 swedish/ports/powerpc/inst/install.wml: 1.11 -> 1.12 swedish/releases/squeeze/debian-installer/index.wml: 1.7 -> 1.8 swedish/users/edu/lyceemoliere.wml: 1.4 -> 1.5 ukrainian/intro/cn.wml: 1.9 -> 1.10
-rw-r--r--bulgarian/intro/cn.wml8
-rw-r--r--catalan/intro/cn.wml4
-rw-r--r--catalan/ports/powerpc/history.wml8
-rw-r--r--chinese/intro/cn.wml4
-rw-r--r--croatian/ports/powerpc/history.wml8
-rw-r--r--czech/News/weekly/2005/02/index.wml4
-rw-r--r--danish/intro/cn.wml8
-rw-r--r--danish/ports/powerpc/history.wml8
-rw-r--r--danish/ports/powerpc/index.wml6
-rw-r--r--danish/ports/powerpc/inst/install.wml2
-rw-r--r--danish/releases/squeeze/debian-installer/index.wml10
-rw-r--r--danish/users/edu/lyceemoliere.wml4
-rw-r--r--dutch/intro/cn.wml8
-rw-r--r--english/News/weekly/1999/12/mail.wml4
-rw-r--r--english/News/weekly/2001/23/index.wml4
-rw-r--r--english/News/weekly/2003/21/index.wml2
-rw-r--r--english/News/weekly/2005/02/index.wml2
-rw-r--r--english/News/weekly/2005/13/index.wml2
-rw-r--r--english/consultants/clive_menzies.wml2
-rw-r--r--english/consultants/velesys.wml2
-rw-r--r--english/devel/debian-installer/errata.wml8
-rw-r--r--english/intro/cn.wml6
-rw-r--r--english/ports/powerpc/history.wml6
-rw-r--r--english/ports/powerpc/index.wml4
-rw-r--r--english/ports/powerpc/inst/install.wml2
-rw-r--r--english/ports/powerpc/inst/yaboot-howto.sgml30
-rw-r--r--english/releases/squeeze/debian-installer/index.wml8
-rw-r--r--english/users/edu/lyceemoliere.wml2
-rw-r--r--english/vote/1999/ben.wml2
-rw-r--r--english/vote/2006/platforms/ajt.wml2
-rw-r--r--finnish/intro/cn.wml8
-rw-r--r--finnish/ports/powerpc/history.wml8
-rw-r--r--finnish/ports/powerpc/index.wml6
-rw-r--r--finnish/ports/powerpc/inst/install.wml4
-rw-r--r--french/News/weekly/1999/12/mail.wml6
-rw-r--r--french/News/weekly/2001/23/index.wml6
-rw-r--r--french/News/weekly/2003/21/index.wml6
-rw-r--r--french/News/weekly/2005/02/index.wml2
-rw-r--r--french/News/weekly/2005/13/index.wml2
-rw-r--r--french/consultants/clive_menzies.wml4
-rw-r--r--french/consultants/velesys.wml4
-rw-r--r--french/devel/debian-installer/errata.wml10
-rw-r--r--french/intro/cn.wml8
-rw-r--r--french/ports/powerpc/history.wml8
-rw-r--r--french/ports/powerpc/index.wml6
-rw-r--r--french/ports/powerpc/inst/install.wml4
-rw-r--r--french/releases/squeeze/debian-installer/index.wml10
-rw-r--r--french/users/edu/lyceemoliere.wml4
-rw-r--r--french/vote/1999/ben.wml4
-rw-r--r--german/News/weekly/2001/23/index.wml2
-rw-r--r--german/News/weekly/2003/21/index.wml2
-rw-r--r--german/News/weekly/2005/02/index.wml4
-rw-r--r--german/News/weekly/2005/13/index.wml4
-rw-r--r--german/consultants/clive_menzies.wml4
-rw-r--r--german/consultants/velesys.wml4
-rw-r--r--german/devel/debian-installer/errata.wml10
-rw-r--r--german/intro/cn.wml8
-rw-r--r--german/ports/powerpc/history.wml8
-rw-r--r--german/ports/powerpc/index.wml4
-rw-r--r--german/ports/powerpc/inst/install.wml4
-rw-r--r--german/ports/powerpc/inst/yaboot-howto.sgml24
-rw-r--r--german/releases/squeeze/debian-installer/index.wml10
-rw-r--r--german/users/edu/lyceemoliere.wml4
-rw-r--r--hungarian/intro/cn.wml8
-rw-r--r--italian/News/weekly/2005/02/index.wml4
-rw-r--r--italian/News/weekly/2005/13/index.wml4
-rw-r--r--italian/consultants/clive_menzies.wml4
-rw-r--r--italian/devel/debian-installer/errata.wml10
-rw-r--r--italian/intro/cn.wml8
-rw-r--r--italian/ports/powerpc/history.wml8
-rw-r--r--italian/ports/powerpc/index.wml6
-rw-r--r--italian/ports/powerpc/inst/install.wml4
-rw-r--r--italian/releases/squeeze/debian-installer/index.wml10
-rw-r--r--japanese/News/weekly/2003/21/index.wml6
-rw-r--r--japanese/News/weekly/2005/02/index.wml4
-rw-r--r--japanese/News/weekly/2005/13/index.wml4
-rw-r--r--japanese/devel/debian-installer/errata.wml12
-rw-r--r--japanese/intro/cn.wml8
-rw-r--r--korean/News/weekly/2001/23/index.wml6
-rw-r--r--korean/intro/cn.wml4
-rw-r--r--norwegian/intro/cn.wml8
-rw-r--r--polish/News/weekly/2001/23/index.wml6
-rw-r--r--polish/News/weekly/2003/21/index.wml4
-rw-r--r--polish/intro/cn.wml8
-rw-r--r--polish/ports/powerpc/index.wml6
-rw-r--r--portuguese/News/weekly/2001/23/index.wml6
-rw-r--r--portuguese/News/weekly/2003/21/index.wml4
-rw-r--r--portuguese/News/weekly/2005/02/index.wml4
-rw-r--r--portuguese/News/weekly/2005/13/index.wml4
-rw-r--r--portuguese/intro/cn.wml4
-rw-r--r--portuguese/users/edu/lyceemoliere.wml4
-rw-r--r--romanian/intro/cn.wml4
-rw-r--r--russian/intro/cn.wml8
-rw-r--r--russian/ports/powerpc/index.wml6
-rw-r--r--slovak/intro/cn.wml8
-rw-r--r--spanish/News/weekly/1999/12/mail.wml6
-rw-r--r--spanish/News/weekly/2003/21/index.wml4
-rw-r--r--spanish/News/weekly/2005/13/index.wml4
-rw-r--r--spanish/intro/cn.wml4
-rw-r--r--spanish/ports/powerpc/history.wml8
-rw-r--r--spanish/ports/powerpc/inst/install.wml4
-rw-r--r--swedish/News/weekly/2001/23/index.wml6
-rw-r--r--swedish/News/weekly/2003/21/index.wml4
-rw-r--r--swedish/News/weekly/2005/02/index.wml2
-rw-r--r--swedish/News/weekly/2005/13/index.wml4
-rw-r--r--swedish/intro/cn.wml4
-rw-r--r--swedish/ports/powerpc/history.wml8
-rw-r--r--swedish/ports/powerpc/index.wml4
-rw-r--r--swedish/ports/powerpc/inst/install.wml4
-rw-r--r--swedish/releases/squeeze/debian-installer/index.wml10
-rw-r--r--swedish/users/edu/lyceemoliere.wml4
-rw-r--r--ukrainian/intro/cn.wml4
112 files changed, 325 insertions, 325 deletions
diff --git a/bulgarian/intro/cn.wml b/bulgarian/intro/cn.wml
index 473fc898f72..9c969d0625e 100644
--- a/bulgarian/intro/cn.wml
+++ b/bulgarian/intro/cn.wml
@@ -1,6 +1,6 @@
#use wml::debian::template title="Сайта на Дебиан на различни езици" BARETITLE=true
#use wml::debian::toc
-#use wml::debian::translation-check translation="1.84"
+#use wml::debian::translation-check translation="1.85"
<define-tag toc-title-formatting endtag="required">%body</define-tag>
<define-tag toc-item-formatting endtag="required">[%body]</define-tag>
@@ -164,7 +164,7 @@ href="http://httpd.apache.org/docs/2.2/content-negotiation.html">докумен
Инструменти -&gt; Настройки -&gt; Общи -&gt; Езици -&gt; Избор
(Tools -&gt; Options -&gt; General -&gt; Languages -&gt; Choose)
</pre>
- MacOS:
+ Mac OS:
<pre>
Firefox -&gt; Preferences -&gt; Content -&gt; Languages -&gt; Choose...
</pre>
@@ -211,7 +211,7 @@ href="http://httpd.apache.org/docs/2.2/content-negotiation.html">докумен
</pre>
</dd>
- <dd>MacOS:
+ <dd>Mac OS:
<pre>
Edit -&gt; Preferences -&gt; Web Browser -&gt; Language/Fonts
</pre>
@@ -314,7 +314,7 @@ href="http://httpd.apache.org/docs/2.2/content-negotiation.html">докумен
</dd>
<dt><strong><toc-add-entry name="safari">Safari</toc-add-entry></strong></dt>
- <dd>Safari използва системните настройки на MacOS X за указване на
+ <dd>Safari използва системните настройки на Mac OS X за указване на
предпочитания език:
<pre>
System preferences -&gt; International -&gt; Language
diff --git a/catalan/intro/cn.wml b/catalan/intro/cn.wml
index e69232246fc..d103f12de94 100644
--- a/catalan/intro/cn.wml
+++ b/catalan/intro/cn.wml
@@ -212,7 +212,7 @@ de fer-ho depèn del navegador que esteu utilitzant.</p>
</pre>
</dd>
- <dd>MacOS:
+ <dd>Mac OS:
<pre>
Edit -&gt; Preferences -&gt; Web Browser -&gt; Language/Fonts
</pre>
@@ -312,7 +312,7 @@ de fer-ho depèn del navegador que esteu utilitzant.</p>
</dd>
<dt><strong><toc-add-entry name="safari">Safari</toc-add-entry></strong></dt>
- <dd>Safari fa servir les preferències del sistema de MacOS X per a determinar
+ <dd>Safari fa servir les preferències del sistema de Mac OS X per a determinar
el vostre idioma preferit:
<pre>
System preferences -&gt; International -&gt; Language
diff --git a/catalan/ports/powerpc/history.wml b/catalan/ports/powerpc/history.wml
index 7d5ba107d08..7e1255906cb 100644
--- a/catalan/ports/powerpc/history.wml
+++ b/catalan/ports/powerpc/history.wml
@@ -1,5 +1,5 @@
#use wml::debian::template title="Port a PowerPC -- Història" NOHEADER="yes"
-#use wml::debian::translation-check translation="1.14" maintainer="Jordi Mallach"
+#use wml::debian::translation-check translation="1.15" maintainer="Jordi Mallach"
#include "$(ENGLISHDIR)/ports/powerpc/menu.inc"
<br>
@@ -19,10 +19,10 @@
Afortunadament es varen trobar discs d'arrencada i discs arrel en
<a href="http://www.linuxppc.org/">LinuxPPC</a> i ja varem poder instal·lar
alguna cosa en la màquina. Per desgracia aquest mètode requeria d'alguns
- programes que sols funcionaven sota el MacOS. Pel que la única manera
- d'instal·lar fou aconseguint una altra màquina executant a MacOS que tingués
+ programes que sols funcionaven sota el Mac OS. Pel que la única manera
+ d'instal·lar fou aconseguint una altra màquina executant a Mac OS que tingués
aquells programes instal·lats. Donat que l'intercanvi de dades entre
- d'altres màquines no MacOS sols era possible amb disquets formatejats amb
+ d'altres màquines no Mac OS sols era possible amb disquets formatejats amb
msdos això es va convertir amb el problema de l'ou i la gallina.
</p>
diff --git a/chinese/intro/cn.wml b/chinese/intro/cn.wml
index 0511267833b..dd7d44d3667 100644
--- a/chinese/intro/cn.wml
+++ b/chinese/intro/cn.wml
@@ -200,7 +200,7 @@ Windows:
</pre>
</dd>
-<dd>MacOS:
+<dd>Mac OS:
<pre>
Edit -&gt; Preferences -&gt; Web Browser -&gt; Language/Fonts
</pre>
@@ -295,7 +295,7 @@ Windows:
</dd>
<dt><strong><toc-add-entry name="safari">Safari</toc-add-entry></strong></dt>
-<dd>Safari 是透過 MacOS X 系統的[CN:設置:][HKTW:設定:]來決定您選用的語言的:
+<dd>Safari 是透過 Mac OS X 系統的[CN:設置:][HKTW:設定:]來決定您選用的語言的:
<pre>
System preferences -&gt; International -&gt; Language
</pre>
diff --git a/croatian/ports/powerpc/history.wml b/croatian/ports/powerpc/history.wml
index 3af2e019bef..9c8244d38ae 100644
--- a/croatian/ports/powerpc/history.wml
+++ b/croatian/ports/powerpc/history.wml
@@ -1,6 +1,6 @@
#use wml::debian::template title="PowerPC port -- Povijest" NOHEADER="yes"
#include "$(ENGLISHDIR)/ports/powerpc/menu.inc"
-#use wml::debian::translation-check translation="1.14"
+#use wml::debian::translation-check translation="1.15"
<br>
<br>
@@ -19,9 +19,9 @@
Na sreću, radeće boot i root diskete su nađene kod <a
href="http://www.linuxppc.org/">LinuxPPC</a>-a i mogli smo pokušati
instalirati nešto na stroj. Na nesreću, to je zahtijevalo neke programe
- koji su radili samo pod MacOS-om. Jedini način da ih se instalira bio je
- nabaviti još jedan stroj pod MacOS-om, koji ih ima već instalirane. Pošto
- je razmjena podataka s drugim ne-MacOS strojevima bila moguća samo putem
+ koji su radili samo pod Mac OS-om. Jedini način da ih se instalira bio je
+ nabaviti još jedan stroj pod Mac OS-om, koji ih ima već instalirane. Pošto
+ je razmjena podataka s drugim ne-Mac OS strojevima bila moguća samo putem
MSDOS-formatiranih disketa, to je bio problem kokoši i jajeta.
</p>
diff --git a/czech/News/weekly/2005/02/index.wml b/czech/News/weekly/2005/02/index.wml
index 8528e640d2b..d57b16d861d 100644
--- a/czech/News/weekly/2005/02/index.wml
+++ b/czech/News/weekly/2005/02/index.wml
@@ -1,5 +1,5 @@
#use wml::debian::weeklynews::header PUBDATE="2005-01-11" SUMMARY="KDE, Archive, Java, Firmware, Packaging, Documentation, Security"
-#use wml::debian::translation-check translation="1.4" maintainer="Jan Hudec"
+#use wml::debian::translation-check translation="1.5" maintainer="Jan Hudec"
<p>Vtejte u&nbsp;letonho 2. vydn DWN, tdennho zpravodaje pro komunitu okolo
Debianu. <a
@@ -135,7 +135,7 @@ pidny do Debian unstable archvu, nebo obsahuj dleit aktualizace.</p>
<li><a href="http://packages.debian.org/unstable/text/itagalog">itagalog</a>
-- Tagalog slovnk pro Ispell.
<li><a href="http://packages.debian.org/unstable/x11/kxdocker">kxdocker</a>
- -- Inovativn dokovac aplikace pro KDE podobn Mac OSX Docker.
+ -- Inovativn dokovac aplikace pro KDE podobn Mac OS X Docker.
<li><a href="http://packages.debian.org/unstable/sound/mpegdemux">mpegdemux</a>
-- Demultiplexor MPEG1/2 proud.
<li><a href="http://packages.debian.org/unstable/utils/mypasswordsafe">mypasswordsafe</a>
diff --git a/danish/intro/cn.wml b/danish/intro/cn.wml
index 2ff2718571f..1233dda0ceb 100644
--- a/danish/intro/cn.wml
+++ b/danish/intro/cn.wml
@@ -1,5 +1,5 @@
#use wml::debian::template title="Debians websted på forskellige sprog" BARETITLE=true
-#use wml::debian::translation-check translation="1.84"
+#use wml::debian::translation-check translation="1.85"
#use wml::debian::toc
<define-tag toc-title-formatting endtag="required">%body</define-tag>
@@ -171,7 +171,7 @@ Windows:
<pre>
Tools -&gt; Options -&gt; Content -&gt; Languages -&gt; Choose...
</pre>
-MacOS:
+Mac OS:
<pre>
Firefox -&gt; Preferences -&gt; Content -&gt; Languages -&gt; Choose...
</pre>
@@ -214,7 +214,7 @@ I ældre versioner skulle man under <kbd>about:config</kbd> ændre værdien af
</pre>
</dd>
-<dd>MacOS:
+<dd>Mac OS:
<pre>
Edit -&gt; Preferences -&gt; Web Browser -&gt; Languages/Fonts
</pre>
@@ -314,7 +314,7 @@ eller brug custom-pakken (forudsætter URL-version p4.0pre.14):
</dd>
<dt><strong><toc-add-entry name="safari">Safari</toc-add-entry></strong></dt>
-<dd>Safari anvender MacOS Xs systemindstillinger for at afgøre hvad brugerens
+<dd>Safari anvender Mac OS Xs systemindstillinger for at afgøre hvad brugerens
foretrukne sprog er:
<pre>
System preferences -&gt; International -&gt; Language
diff --git a/danish/ports/powerpc/history.wml b/danish/ports/powerpc/history.wml
index df4bc4628c8..05ab8299143 100644
--- a/danish/ports/powerpc/history.wml
+++ b/danish/ports/powerpc/history.wml
@@ -1,5 +1,5 @@
#use wml::debian::template title="PowerPC-tilpasning -- historie" NOHEADER="yes"
-#use wml::debian::translation-check translation="1.14"
+#use wml::debian::translation-check translation="1.15"
#include "$(ENGLISHDIR)/ports/powerpc/menu.inc"
@@ -17,9 +17,9 @@ rådighed til udvikling.</p>
<p>Heldigvis blev der fundet fungerende start- og roddisketter på
<a href="http://www.linuxppc.org/">LinuxPPC</a> og vi kunne prøve at
installere noget på maskinen. Desværre krævede dette nogle programmer som kun
-kører under MacOS. Den eneste måde at installere dem på, var at få fat på en
-anden maskine som kørte MacOS, hvor de allerede var installeret. Da
-dataudveksling med andre ikke-MacOS-maskiner kun var muligt ved hjælp af
+kører under Mac OS. Den eneste måde at installere dem på, var at få fat på en
+anden maskine som kørte Mac OS, hvor de allerede var installeret. Da
+dataudveksling med andre ikke-Mac OS-maskiner kun var muligt ved hjælp af
MS-DOS-formatterede disketter var dette et hønen og ægget-problem.</p>
<p>På en eller anden måde lykkedes det at få tilsluttet en anden disk til
diff --git a/danish/ports/powerpc/index.wml b/danish/ports/powerpc/index.wml
index 65ac12f383a..e29f5d06d61 100644
--- a/danish/ports/powerpc/index.wml
+++ b/danish/ports/powerpc/index.wml
@@ -1,5 +1,5 @@
#use wml::debian::template title="PowerPC-tilpasning" NOHEADER="yes"
-#use wml::debian::translation-check translation="1.74"
+#use wml::debian::translation-check translation="1.75"
#include "$(ENGLISHDIR)/ports/powerpc/menu.inc"
<h1>Debian til PowerPC</h1>
@@ -49,7 +49,7 @@ installeringsvejledningen</a> for flere oplysninger.</p>
installering af Debian/PowerPC.</p>
<p>Der er nogle særheder, man skal være bekendt med, ved installering på en
-iBook, TiBook eller iBook2, særligt hvis man også vil kunne starte Mac OSX.
+iBook, TiBook eller iBook2, særligt hvis man også vil kunne starte Mac OS X.
Noget iBook2-hardware, specielt på nyligt introducerede modeller, er endnu ikke
særligt godt understøttet. For specifikke oplysninger om potentielle problemer
og løsninger dertil, kan man kigge nærmere på følgende websider:</p>
@@ -84,7 +84,7 @@ og løsninger dertil, kan man kigge nærmere på følgende websider:</p>
<p>Debian GNU/Linux understøtter ikke officielt NuBus PowerPC-maskiner som
6100, 7100, 8100 og det meste af Performa-serien. Dog er en MkLinux-baseret
-kerne tilgængelig, der kan startes fra en MacOS-bootloader. Et Debian-system
+kerne tilgængelig, der kan startes fra en Mac OS-bootloader. Et Debian-system
kan installeres ved hjælp af denne kerne, som er tilgængelig på
<url "http://nubus-pmac.sourceforge.net/">.
Der er en <a href="http://www.mipaginaweb.com.mx/moguelc/howtos/nubus.html">\
diff --git a/danish/ports/powerpc/inst/install.wml b/danish/ports/powerpc/inst/install.wml
index 21779e88b7c..53469247828 100644
--- a/danish/ports/powerpc/inst/install.wml
+++ b/danish/ports/powerpc/inst/install.wml
@@ -1,5 +1,5 @@
#use wml::debian::template title="PowerPC-tilpasning -- installering " NOHEADER="yes"
-#use wml::debian::translation-check translation="1.22"
+#use wml::debian::translation-check translation="1.23"
#include "$(ENGLISHDIR)/ports/powerpc/inst/menu.inc"
<h2>Installering af Debian GNU/Linux på PowerPC-maskiner</h2>
diff --git a/danish/releases/squeeze/debian-installer/index.wml b/danish/releases/squeeze/debian-installer/index.wml
index 7abf117f0e4..1cdf25c7b60 100644
--- a/danish/releases/squeeze/debian-installer/index.wml
+++ b/danish/releases/squeeze/debian-installer/index.wml
@@ -1,5 +1,5 @@
#use wml::debian::template title="Installeringsoplysninger om Debian &ldquo;squeeze&rdquo;" NOHEADER="true"
-#use wml::debian::translation-check translation="1.6"
+#use wml::debian::translation-check translation="1.7"
#include "$(ENGLISHDIR)/releases/info"
#include "$(ENGLISHDIR)/releases/squeeze/release.data"
@@ -231,13 +231,13 @@ for andre kendte problemer.</p>
er at køre update-grub.<br />
Se <a href="http://bugs.debian.org/608025">#608025</a>.</dd>
- <dt>Danner partitionstabel som er inkompatibel med MacOS 9</dt>
+ <dt>Danner partitionstabel som er inkompatibel med Mac OS 9</dt>
<dd>Der er modtaget en rapport om at partitioneringsværktøjet i
installeringsprogrammet danner en partitionstabel som ikke genkendes
- af MacOS 9, som ikke længere booter. Selv om HFS+-partitionerne er
- kompatible med Linux og MacOS X, anbefales det at tage alle
+ af Mac OS 9, som ikke længere booter. Selv om HFS+-partitionerne er
+ kompatible med Linux og Mac OS X, anbefales det at tage alle
sikkerhedsforanstaltninger når man installerer på en maskine med
- MacOS 9.<br />
+ Mac OS 9.<br />
Se <a href="http://bugs.debian.org/604134">#604134</a>.</dd>
<dt>Partitionering fejler på kFreeBSD</dt>
diff --git a/danish/users/edu/lyceemoliere.wml b/danish/users/edu/lyceemoliere.wml
index 5093e1ce4d4..0f1a180f365 100644
--- a/danish/users/edu/lyceemoliere.wml
+++ b/danish/users/edu/lyceemoliere.wml
@@ -4,7 +4,7 @@
<define-tag webpage>http://www.lycee-moliere.org/</define-tag>
#use wml::debian::users
-#use wml::debian::translation-check translation="1.3"
+#use wml::debian::translation-check translation="1.4"
<p>
Som en privat skole drager Lyc&eacute;e Moli&egrave;re ikke fordel af alle de statslige
@@ -15,7 +15,7 @@
<p>
Det det blev tid til at sørge for almindelige Internet-tjenester på
skolen, var en GNU/Linux-løsning naturlig for os. Vores netværk består af
- omkring 30 Macintosh Imac'er (som stadig kører MacOS, for øjeblikket i
+ omkring 30 Macintosh Imac'er (som stadig kører Mac OS, for øjeblikket i
hvert fald!) der fungerer som arbejdsmaskiner, samt en postserver (exim,
cyrus-IMAPd og squirrelMail), en webserver (apache), en DNS-server (bind9),
en filserver (netatalk) og en proxyserver (Squid + squidGuard), hvad angår
diff --git a/dutch/intro/cn.wml b/dutch/intro/cn.wml
index 307dfc91a96..1088ba9cdeb 100644
--- a/dutch/intro/cn.wml
+++ b/dutch/intro/cn.wml
@@ -1,5 +1,5 @@
#use wml::debian::template title="De Debian webpagina's in verschillende talen" BARETITLE=true
-#use wml::debian::translation-check translation="1.84"
+#use wml::debian::translation-check translation="1.85"
#use wml::debian::toc
<define-tag toc-title-formatting endtag="required">%body</define-tag>
@@ -187,7 +187,7 @@ Windows:
<pre>
Extra -&gt; Opties -&gt; Inhoud -&gt; Talen -&gt; Kiezen...
</pre>
-MacOS:
+Mac OS:
<pre>
Firefox -&gt; Voorkeuren -&gt; Inhoud -&gt; Talen -&gt; Kiezen...
</pre>
@@ -233,7 +233,7 @@ van <kbd>intl.accept_languages</kbd> wijzigen.
</pre>
</dd>
-<dd>MacOS:
+<dd>Mac OS:
<pre>
Edit -&gt; Preferences -&gt; Web Browser -&gt; Language/Fonts
</pre>
@@ -347,7 +347,7 @@ gebruikt):
</dd>
<dt><strong><toc-add-entry name="safari">Safari</toc-add-entry></strong></dt>
-<dd>Safari gebruikt de MacOS X systeem installingen om de taal van uw voorkeur
+<dd>Safari gebruikt de Mac OS X systeem installingen om de taal van uw voorkeur
te bepalen:
<pre>
System preferences -&gt; International -&gt; Language
diff --git a/english/News/weekly/1999/12/mail.wml b/english/News/weekly/1999/12/mail.wml
index 4fa8cb9d203..328e77e4ac0 100644
--- a/english/News/weekly/1999/12/mail.wml
+++ b/english/News/weekly/1999/12/mail.wml
@@ -67,11 +67,11 @@ conditions. It would be terribly ironic if a failed attempt at making
a free software license resulted in an effective extension of the
range of copyright power.
-Aside from this, we must remember that only part of MacOS is being
+Aside from this, we must remember that only part of Mac OS is being
released under the APSL. Even if the fatal flaws and practical
problems of the APSL were fixed, even if it were changed into a very
good free software license, that would do no good for the other parts
-of MacOS whose source code is not being released at all. We must
+of Mac OS whose source code is not being released at all. We must
not judge all of a company by just part of what they do.
Overall, I think that Apple's action is an example of the effects of
diff --git a/english/News/weekly/2001/23/index.wml b/english/News/weekly/2001/23/index.wml
index 7f1b2a0af71..e7bccef3d8d 100644
--- a/english/News/weekly/2001/23/index.wml
+++ b/english/News/weekly/2001/23/index.wml
@@ -10,12 +10,12 @@ here</a></p>
<p><strong>Using HFS+ with Linux.</strong> There has been a <a
href="http://lists.debian.org/debian-powerpc-0109/msg00315.html">discussion</a>
-about using HFS+ partitions with Linux. They are used on MacOS X for large
+about using HFS+ partitions with Linux. They are used on Mac OS X for large
partitions. A Linux driver is, however, unstable and abandoned. Several
people have experienced kernel panics when accessing HFS partitions. The only
way to access this filesystem with Linux is to use userspace HFS+ tools from
the <a href="http://packages.debian.org/hfsplus">hfsplus</a> package.
-Alternatively one could use UFS partitions which MacOS X supports and for
+Alternatively one could use UFS partitions which Mac OS X supports and for
which an experimental Linux driver is available.</p>
<p><strong>Using Mosix on Debian GNU/Linux.</strong> Viral Shah has written a
diff --git a/english/News/weekly/2003/21/index.wml b/english/News/weekly/2003/21/index.wml
index a5903ff4a0b..1cfad3212e8 100644
--- a/english/News/weekly/2003/21/index.wml
+++ b/english/News/weekly/2003/21/index.wml
@@ -37,7 +37,7 @@ href="http://www.osnews.com/story.php?news_id=3589">reported</a> that Debian
GNU/Linux comes preinstalled on <a href="http://www.pegasosppc.com/">\
Pegasos</a> machines which are based on the IBM/Motorola PowerPC G3 and G4
CPUs. Through the use of Mac-On-Linux the Debian systems allows you to run
-MacOS or OSX without requiring Apple hardware or a BIOS.</p>
+Mac OS or OS X without requiring Apple hardware or a BIOS.</p>
<p><strong>Interview with Andrew Tridgell.</strong> Alexander Antoniades was
lucky and <a href="http://www.newsforge.com/article.pl?sid=03/05/02/1316220">\
diff --git a/english/News/weekly/2005/02/index.wml b/english/News/weekly/2005/02/index.wml
index f432676a73d..ab25d1e3b81 100644
--- a/english/News/weekly/2005/02/index.wml
+++ b/english/News/weekly/2005/02/index.wml
@@ -137,7 +137,7 @@ important updates.</p>
<li><a href="http://packages.debian.org/unstable/text/itagalog">itagalog</a>
-- Tagalog dictionary for Ispell.
<li><a href="http://packages.debian.org/unstable/x11/kxdocker">kxdocker</a>
- -- Innovative docker for KDE that is like Mac OSX Docker.
+ -- Innovative docker for KDE that is like Mac OS X Docker.
<li><a href="http://packages.debian.org/unstable/sound/mpegdemux">mpegdemux</a>
-- MPEG1/2 system stream demultiplexer.
<li><a href="http://packages.debian.org/unstable/utils/mypasswordsafe">mypasswordsafe</a>
diff --git a/english/News/weekly/2005/13/index.wml b/english/News/weekly/2005/13/index.wml
index 4123692aeec..2f586b2c384 100644
--- a/english/News/weekly/2005/13/index.wml
+++ b/english/News/weekly/2005/13/index.wml
@@ -243,7 +243,7 @@ important updates.</p>
<li><a href="http://packages.debian.org/unstable/hamradio/sgcontrol">sgcontrol</a>
-- GUI to multiple communications receivers using the Hamlib library.
<li><a href="http://packages.debian.org/unstable/x11/skippy">skippy</a>
- -- Full-screen X11 task/window switcher, similar to OSX Expose.
+ -- Full-screen X11 task/window switcher, similar to OS X Expose.
<li><a href="http://packages.debian.org/unstable/admin/srg">srg</a>
-- Fast, Flexible and Detailed log analysis for the Squid Proxy.
<li><a href="http://packages.debian.org/unstable/devel/stress">stress</a>
diff --git a/english/consultants/clive_menzies.wml b/english/consultants/clive_menzies.wml
index 4fc5933d459..c354b5e4d30 100644
--- a/english/consultants/clive_menzies.wml
+++ b/english/consultants/clive_menzies.wml
@@ -4,7 +4,7 @@
We are a management consultancy specialising
in helping organisations make the most of information and communication
technology. Where appropriate, we deploy Debian GNU/Linux (the only
-Linux distribution, we support) alongside Windows and MacOSX and support
+Linux distribution, we support) alongside Windows and Mac OS X and support
the integrated systems. We favor gradual migration to Debian and
typically clients start with a Debian based file and print server;
thereafter we add additional functionality such as an IMAP mail server
diff --git a/english/consultants/velesys.wml b/english/consultants/velesys.wml
index 36f10a10d9e..9ea29bd4a60 100644
--- a/english/consultants/velesys.wml
+++ b/english/consultants/velesys.wml
@@ -3,7 +3,7 @@
<p>
Our prime experience is software development for Linux-enabled appliances, as
well as development of cross-platform applications targeted for Linux,
-Windows, and MacOS (Classic and OS X).
+Windows, and Mac OS (Classic and OS X).
</p>
<p>
Having more than five years of software development for network storage
diff --git a/english/devel/debian-installer/errata.wml b/english/devel/debian-installer/errata.wml
index 1ae2dcd1952..8e6feacc472 100644
--- a/english/devel/debian-installer/errata.wml
+++ b/english/devel/debian-installer/errata.wml
@@ -86,12 +86,12 @@ describing the problem.
See <a href="http://bugs.debian.org/608025">#608025</a>.
</dd>
- <dt>Makes incompatible partition table with MacOS 9</dt>
+ <dt>Makes incompatible partition table with Mac OS 9</dt>
<dd>It was reported that the partitioning tool in the installer makes
- the partition table unrecognizable by MacOS 9 which no longer boots.
- Although the HFS+ partitions are compatible with Linux and MacOS X it
+ the partition table unrecognizable by Mac OS 9 which no longer boots.
+ Although the HFS+ partitions are compatible with Linux and Mac OS X it
is advised to take all precautions when installing on a machine with
- MacOS 9.<br />
+ Mac OS 9.<br />
See <a href="http://bugs.debian.org/604134">#604134</a>.
</dd>
diff --git a/english/intro/cn.wml b/english/intro/cn.wml
index 03cb90b49ee..61ca2011c23 100644
--- a/english/intro/cn.wml
+++ b/english/intro/cn.wml
@@ -165,7 +165,7 @@ on the browser you are using.</p>
<pre>
Tools -&gt; Options -&gt; Content -&gt; Languages -&gt; Choose...
</pre>
- MacOS:
+ Mac OS:
<pre>
Firefox -&gt; Preferences -&gt; Content -&gt; Languages -&gt; Choose...
</pre>
@@ -210,7 +210,7 @@ on the browser you are using.</p>
</pre>
</dd>
- <dd>MacOS:
+ <dd>Mac OS:
<pre>
Edit -&gt; Preferences -&gt; Web Browser -&gt; Language/Fonts
</pre>
@@ -309,7 +309,7 @@ on the browser you are using.</p>
</dd>
<dt><strong><toc-add-entry name="safari">Safari</toc-add-entry></strong></dt>
- <dd>Safari uses the MacOS X system preferences to determine your
+ <dd>Safari uses the Mac OS X system preferences to determine your
preferred language:
<pre>
System preferences -&gt; International -&gt; Language
diff --git a/english/ports/powerpc/history.wml b/english/ports/powerpc/history.wml
index 839a66ca28c..a525f162f1c 100644
--- a/english/ports/powerpc/history.wml
+++ b/english/ports/powerpc/history.wml
@@ -18,9 +18,9 @@
Fortunately working boot- and rootdisks were found at <a
href="http://www.linuxppc.org/">LinuxPPC</a> and we could try to
install something on the machine. Unfortunately this required
- some programs that only run under MacOS. The only way to install
- them was to get another machine running MacOS who has them already
- installed. Since data exchange with other non-MacOS machines were
+ some programs that only run under Mac OS. The only way to install
+ them was to get another machine running Mac OS who has them already
+ installed. Since data exchange with other non-Mac OS machines were
only able through msdos-formatted floppies this was a chicken-and-egg
problem.
</p>
diff --git a/english/ports/powerpc/index.wml b/english/ports/powerpc/index.wml
index 35df1c4e0b0..23c51a8e724 100644
--- a/english/ports/powerpc/index.wml
+++ b/english/ports/powerpc/index.wml
@@ -59,7 +59,7 @@ installation manual</a> for further information.
<p>
There are some quirks you need to know about when installing on an
iBook, TiBook, or iBook2, especially when dual booting with Mac
- OSX. Some iBook2 hardware, especially on recently introduced models,
+ OS X. Some iBook2 hardware, especially on recently introduced models,
is not well supported as yet. For specific information on potential
problems and solutions, study these web pages:
</p>
@@ -96,7 +96,7 @@ installation manual</a> for further information.
Debian GNU/Linux does not officially support NuBus PowerPC
machines, such as the 6100, 7100, 8100 and most of the Performa
series. However, an MkLinux-based kernel is available, which can be
- launched from a MacOS boot loader. A Debian system can be installed
+ launched from a Mac OS boot loader. A Debian system can be installed
using this kernel, which is available at
<url "http://nubus-pmac.sourceforge.net/">. There is a
<a href="http://www.mipaginaweb.com.mx/moguelc/howtos/nubus.html">
diff --git a/english/ports/powerpc/inst/install.wml b/english/ports/powerpc/inst/install.wml
index 5a83a16fb41..2e95f50bdcb 100644
--- a/english/ports/powerpc/inst/install.wml
+++ b/english/ports/powerpc/inst/install.wml
@@ -76,7 +76,7 @@ OldWorld machines. The beige colored G3 systems are also OldWorld.
The so called NewWorld PowerMacs are any PowerMacs in translucent
colored plastic cases, all iMacs, iBooks, G4 and G5 systems. The
NewWorld PowerMacs are also known for using the `ROM in RAM' system
-for MacOS, and were manufactured from mid-1998 onwards.
+for Mac OS, and were manufactured from mid-1998 onwards.
<p>Here is a list of powerpc machines which should work with Debian.</p>
diff --git a/english/ports/powerpc/inst/yaboot-howto.sgml b/english/ports/powerpc/inst/yaboot-howto.sgml
index 17c03f21ea8..6a53821aaab 100644
--- a/english/ports/powerpc/inst/yaboot-howto.sgml
+++ b/english/ports/powerpc/inst/yaboot-howto.sgml
@@ -75,7 +75,7 @@ machines. The beige colored G3 systems are also OldWorld.
<p>
<em><prgn>yaboot</prgn> will not work on NuBus or OldWorld machines</em>,
-those will require <prgn>quik</prgn> or (for MacOS Pre-9.0.4 only)
+those will require <prgn>quik</prgn> or (for Mac OS Pre-9.0.4 only)
<prgn>BootX/miboot</prgn>.
<p>
@@ -99,9 +99,9 @@ does not change your boot configuration; you must use the included
You can also download <prgn>yaboot</prgn> directly from the
<prgn>yaboot</prgn> home page at <url
-id="http://penguinppc.org/projects/yaboot/">. If you download it using MacOS,
+id="http://penguinppc.org/projects/yaboot/">. If you download it using Mac OS,
be sure to download using <em>binary</em> (not text) format, and don't let
-Stuffit Expander or another utility expand the archive in MacOS.
+Stuffit Expander or another utility expand the archive in Mac OS.
<p>
@@ -250,7 +250,7 @@ Lines in the file beginning with <tt>#</tt> are interpreted as comments. Each
option or parameter must be specified on a separate line. Don't use
any extra spaces within or following parameter definitions. Also, the
file must have unix newlines; be sure to save as a unix type file
-if you create or edit it within MacOS.
+if you create or edit it within Mac OS.
<sect>Linux Style Device Paths
@@ -325,9 +325,9 @@ partition paths. Here are some examples illustrating the possibilities:
bsd=zip:1
</example>
-When using <tt>macosx=</tt>, if you have OSX installed on a UFS partition,
-then point the macosx to the OSX bootstrap partition, not the UFS root.
-Don't be tempted to use the OSX bootstrap partition for <prgn>ybin</prgn>,
+When using <tt>macosx=</tt>, if you have OS X installed on a UFS partition,
+then point the macosx to the OS X bootstrap partition, not the UFS root.
+Don't be tempted to use the OS X bootstrap partition for <prgn>ybin</prgn>,
however &mdash; you still need a separate Apple_Bootstrap partition.
<p>
@@ -402,7 +402,7 @@ kernel image section:
boot=/dev/hda2
# CHRP script spec
magicboot=/usr/lib/yaboot/ofboot
- # Dual boot with MacOS
+ # Dual boot with Mac OS
macos=hd:14
# How long to wait at the OS boot menu (seconds)
delay=5
@@ -517,11 +517,11 @@ command line.
The most common mistake made in the usage of <prgn>yaboot</prgn> is trying
to use it to boot from a mountable partition on a permanent basis. When a
PowerPC first starts up, the booting process is started by locating a
-so-called `blessed' folder. The MacOS places the blessing so that multiple
+so-called `blessed' folder. The Mac OS places the blessing so that multiple
system folders may exist on a partition, but only one of them will be valid
-for starting up. If the computer is set up to dual boot Linux and MacOS,
-when MacOS is booted it will unbless any folders which do not contain a
-valid MacOS system. Then the next time the machine boots, the partition
+for starting up. If the computer is set up to dual boot Linux and Mac OS,
+when Mac OS is booted it will unbless any folders which do not contain a
+valid Mac OS system. Then the next time the machine boots, the partition
containing the formerly blessed folder will not be bootable.
<p>
@@ -560,7 +560,7 @@ parameters to their factory defaults. Hold the keys until you hear the
startup chime two or three times. If the setup recommendations were
followed, the <prgn>yaboot</prgn> installation will be the first bootable
partition and OpenFirmware will boot it automatically. It should be noted
-that MacOS settings such as virtual memory, startup disk, and screen
+that Mac OS settings such as virtual memory, startup disk, and screen
resolution will also be reset to their defaults.
@@ -671,8 +671,8 @@ four lines:
</example>
<p>
-If you create <file>yaboot.conf</file> in the MacOS, you must convert
-it to use Unix newlines (linefeeds only). If you use MacOS newlines
+If you create <file>yaboot.conf</file> in the Mac OS, you must convert
+it to use Unix newlines (linefeeds only). If you use Mac OS newlines
(just carriage returns), <prgn>yaboot</prgn> will be unable to read the file.
<p>
diff --git a/english/releases/squeeze/debian-installer/index.wml b/english/releases/squeeze/debian-installer/index.wml
index 2350f5f5851..2b63c55be08 100644
--- a/english/releases/squeeze/debian-installer/index.wml
+++ b/english/releases/squeeze/debian-installer/index.wml
@@ -237,12 +237,12 @@ for other known problems.
See <a href="http://bugs.debian.org/608025">#608025</a>.
</dd>
- <dt>Makes incompatible partition table with MacOS 9</dt>
+ <dt>Makes incompatible partition table with Mac OS 9</dt>
<dd>It was reported that the partitioning tool in the installer makes
- the partition table unrecognizable by MacOS 9 which no longer boots.
- Although the HFS+ partitions are compatible with Linux and MacOS X it
+ the partition table unrecognizable by Mac OS 9 which no longer boots.
+ Although the HFS+ partitions are compatible with Linux and Mac OS X it
is advised to take all precautions when installing on a machine with
- MacOS 9.<br />
+ Mac OS 9.<br />
See <a href="http://bugs.debian.org/604134">#604134</a>.
</dd>
diff --git a/english/users/edu/lyceemoliere.wml b/english/users/edu/lyceemoliere.wml
index dd599911b8a..037f4309336 100644
--- a/english/users/edu/lyceemoliere.wml
+++ b/english/users/edu/lyceemoliere.wml
@@ -14,7 +14,7 @@
<p>
When it came to provide the common Internet services to the school, the
GNU/Linux solution became obvious to us. Our network is made of +/- 30
- Macintosh Imacs (still running MacOS, for the moment at least!) on the
+ Macintosh Imacs (still running Mac OS, for the moment at least!) on the
workstation side, and of 1 mail server (exim, cyrus-IMAPd and
squirrelMail), one web server (apache), one DNS server (bind9), one file
server (netatalk) and one proxy server (Squid + squidGuard), on the
diff --git a/english/vote/1999/ben.wml b/english/vote/1999/ben.wml
index 8170e6cb6a7..ba6294f47d1 100644
--- a/english/vote/1999/ben.wml
+++ b/english/vote/1999/ben.wml
@@ -174,7 +174,7 @@ being utilized as well as autobuild of some packages. This is still under
evaluation/development
Linux at NASA: Myself and a few other Linux advocates here at NASA are
-pushing for the evaluation of Linux as a replacement for Windows, MacOS,
+pushing for the evaluation of Linux as a replacement for Windows, Mac OS,
and Solaris as a desktop environment. We have just recently been given
some recognition by upper management as to the feasibility of this. A
pilot project is immanent in the near future.
diff --git a/english/vote/2006/platforms/ajt.wml b/english/vote/2006/platforms/ajt.wml
index 3dd1028ddaf..2b880e564ac 100644
--- a/english/vote/2006/platforms/ajt.wml
+++ b/english/vote/2006/platforms/ajt.wml
@@ -190,7 +190,7 @@ Wirzenius (piuparts) and Ian Jackson (autodebtest, paid for by Canonical).
<p> compiz is a compositing manager for X that I'm led to believe should
be available when Xorg 7.0 enters Debian; it lets you do cool stuff
- like MacOS X's Expose feature. Features like this are known in the
+ like Mac OS X's Expose feature. Features like this are known in the
Xorg technical community as "bling".
<p><b>Disclaimer:</b>
diff --git a/finnish/intro/cn.wml b/finnish/intro/cn.wml
index 0e4876f7c6f..2b85840e19f 100644
--- a/finnish/intro/cn.wml
+++ b/finnish/intro/cn.wml
@@ -2,7 +2,7 @@
# Updated by Antti-Juhani Kaijanaho on 1999-12-05
# Updated by Tommi Vainikainen on 2000-07-20
#use wml::debian::template title="Tietoa sivujen saatavuudesta useilla kielillä"
-#use wml::debian::translation-check translation="1.84"
+#use wml::debian::translation-check translation="1.85"
#use wml::debian::toc
<define-tag toc-title-formatting endtag="required">%body</define-tag>
@@ -176,7 +176,7 @@ Windows:
suomi: Työkalut -&gt; Asetukset -&gt; Sisältö -&gt; Kielet -&gt; Valitse..
englanti: Tools -&gt; Options -&gt; Content -&gt; Languages -&gt; Choose...
</pre>
- MacOS:
+ Mac OS:
<pre>
suomi: Firefox -&gt; Asetukset -&gt; Sisältö -&gt; Kielet -&gt; Valitse...
englanti: Firefox -&gt; Preferences -&gt; Content -&gt; Languages -&gt; Choose...
@@ -221,7 +221,7 @@ Vanhemmissa versioissa on mentävä sivulle <kbd>about:config</kbd> ja muutettav
</pre>
</dd>
-<dd>MacOS:
+<dd>Mac OS:
<pre>
Edit -&gt; Preferences -&gt; Web Browser -&gt; Language/Fonts
</pre>
@@ -322,7 +322,7 @@ tai käytä custom-pakettia (kuvattu URL-versiolle p4.0pre.14):
</dd>
<dt><strong><toc-add-entry name="safari">Safari</toc-add-entry></strong></dt>
-<dd>Safari käyttää MacOS X:n järjestelmäasetuksia päätellessään oletuskielen:
+<dd>Safari käyttää Mac OS X:n järjestelmäasetuksia päätellessään oletuskielen:
<pre>
System preferences -&gt; International -&gt; Language
</pre>
diff --git a/finnish/ports/powerpc/history.wml b/finnish/ports/powerpc/history.wml
index b3b0a573395..e4bb1794121 100644
--- a/finnish/ports/powerpc/history.wml
+++ b/finnish/ports/powerpc/history.wml
@@ -1,6 +1,6 @@
#use wml::debian::template title="PowerPC-siirros -- Historia" NOHEADER="yes"
#include "$(ENGLISHDIR)/ports/powerpc/menu.inc"
-#use wml::debian::translation-check translation="1.14"
+#use wml::debian::translation-check translation="1.15"
<br>
<br>
@@ -18,9 +18,9 @@
Onneksi toimivat käynnistys- ja root-levykkeet löydettiin <a href=
"http://www.linuxppc.org/">LinuxPPC</a>:ltä ja pystyimme kokeilemaan
joidenkin ohjelmien asennusta koneelle. Valitettavasti tähän tarvittiin
- ohjelmia jotka toimivat vain MacOS:illa. Ainoa keino niiden asentamiseen
- oli hankkia toinen MacOS-kone, jolla ne olivat jo asennettuna. Koska datan
- siirto muiden ei-MacOS-koneiden välillä oli mahdollista vain
+ ohjelmia jotka toimivat vain Mac OS:illa. Ainoa keino niiden asentamiseen
+ oli hankkia toinen Mac OS-kone, jolla ne olivat jo asennettuna. Koska datan
+ siirto muiden ei-Mac OS-koneiden välillä oli mahdollista vain
msdos-alustettujen levykkeiden kautta, tästä kehkeytyi kana-muna-ongelma.
</p>
diff --git a/finnish/ports/powerpc/index.wml b/finnish/ports/powerpc/index.wml
index 1b64f5513ad..b3cc0a63bbf 100644
--- a/finnish/ports/powerpc/index.wml
+++ b/finnish/ports/powerpc/index.wml
@@ -1,6 +1,6 @@
#use wml::debian::template title="PowerPC-siirros" NOHEADER="yes"
#include "$(ENGLISHDIR)/ports/powerpc/menu.inc"
-#use wml::debian::translation-check translation="1.74"
+#use wml::debian::translation-check translation="1.75"
<h1>Debian PowerPC:lle</h1>
@@ -57,7 +57,7 @@
<p>
On olemassa muutamia kikkoja, jotka sinun on hyvä tietää asennettaessa
iBook-, TiBook- tai iBook2-koneille, varsinkin käytettäessä
- kaksoiskäynnistystä Mac OSX:n kanssa. Jotkut iBook2-laitteet, erityisesti
+ kaksoiskäynnistystä Mac OS X:n kanssa. Jotkut iBook2-laitteet, erityisesti
hiljattain julkaistuissa malleissa, eivät ole vielä kovin hyvin tuettuja.
Tarkempia tietoja mahdollisista ongelmista ja niiden ratkaisuista löydät
näiltä sivuilta:
@@ -99,7 +99,7 @@ Debian-verkkoasennus IBM RS/6000 44P-170 (POWER3) HOWTO</a> kirjoittanut Rolf Br
<p>
Debian GNU/Linux ei tue virallisesti NuBus PowerPC -koneita, kuten 6100, 7100,
8100 ja useimmat Performa-sarjan koneet. Saatavilla on kuitenkin
- MkLinux-pohjainen ydin, jonka voi ladata MacOS-käynnistyslataajan avulla.
+ MkLinux-pohjainen ydin, jonka voi ladata Mac OS-käynnistyslataajan avulla.
Tätä ydintä käyttämällä on mahdollista asentaa Debian-järjestelmä, ydin
löytyy osoitteesta <url "http://nubus-pmac.sourceforge.net/">.
Myös <a href="http://www.mipaginaweb.com.mx/moguelc/howtos/nubus.html">\
diff --git a/finnish/ports/powerpc/inst/install.wml b/finnish/ports/powerpc/inst/install.wml
index bae02c799dd..a408a67fff4 100644
--- a/finnish/ports/powerpc/inst/install.wml
+++ b/finnish/ports/powerpc/inst/install.wml
@@ -1,6 +1,6 @@
#use wml::debian::template title="PowerPC-siirros -- Asennus" NOHEADER="yes"
#include "$(ENGLISHDIR)/ports/powerpc/inst/menu.inc"
-#use wml::debian::translation-check translation="1.22"
+#use wml::debian::translation-check translation="1.23"
<h2>Debian GNU/Linuxin asennus PowerPC-koneille</h2>
<p>
@@ -73,7 +73,7 @@ myös OldWorld-sarjaan.</p>
<p>
Niin kutsuttuja NewWorld PowerMacejä ovat kaikki läpikuultavissa värillisissä
muovikoteloissa olevat iMacit, iBookit sekä G4- ja G5-järjestelmät. NewWorld
-PowerMacit tunnetaan myös käyttämästään "ROM in RAM"-järjestelmästä MacOSille,
+PowerMacit tunnetaan myös käyttämästään "ROM in RAM"-järjestelmästä Mac OSille,
ja niitä on valmistettu vuoden 1998 puolivälistä alkaen.</p>
<p>Alla on luettelo powerpc-koneista, joiden pitäisi toimia Debianin kanssa.</p>
diff --git a/french/News/weekly/1999/12/mail.wml b/french/News/weekly/1999/12/mail.wml
index 2e607c87286..fa378948ce7 100644
--- a/french/News/weekly/1999/12/mail.wml
+++ b/french/News/weekly/1999/12/mail.wml
@@ -1,5 +1,5 @@
#use wml::debian::weeklynews::header PAGENAME="Courriel"
-#use wml::debian::translation-check translation="1.5" maintainer="Thomas Huriaux"
+#use wml::debian::translation-check translation="1.6" maintainer="Thomas Huriaux"
<a name="mail1"></a>
<pre>
@@ -73,9 +73,9 @@ une tentative ratée de faire une licence de logiciel libre résultait
en une extension réelle du champ du pouvoir des droits d'auteur.
En plus de cela, nous devons ne pas oublier que seulement une partie
-de MacOS est publiée sous l'ASPL. Même si les défauts fatals et les problèmes
+de Mac OS est publiée sous l'ASPL. Même si les défauts fatals et les problèmes
pratiques étaient corrigés, ce ne serait pas convenable pour les autres
-parties de MacOS dont le code source n'est pas publié du tout. Nous
+parties de Mac OS dont le code source n'est pas publié du tout. Nous
ne pouvons pas juger tout d'une entreprise uniquement en fonction d'une
partie de ce qu'elle fait.
diff --git a/french/News/weekly/2001/23/index.wml b/french/News/weekly/2001/23/index.wml
index 035055db643..87527dee15e 100644
--- a/french/News/weekly/2001/23/index.wml
+++ b/french/News/weekly/2001/23/index.wml
@@ -1,5 +1,5 @@
#use wml::debian::weeklynews::header PUBDATE="2001-09-25" SUMMARY="Xinerama, HFS+, sécurité, graphique des listes, polices X"
-#use wml::debian::translation-check translation="1.11" maintainer="Guillaume Estival"
+#use wml::debian::translation-check translation="1.12" maintainer="Guillaume Estival"
<p><strong>KDE 2.2.1 et Xinerama.</strong>Les paquets de KDE 2.2.1 faits
par Ivan Moore ont été compilés sans le support Xinerama pour des
@@ -13,13 +13,13 @@ href="http://lists.debian.org/debian-kde-0109/msg00258.html">ici</a></p>
<p><strong>Utiliser HFS+ avec Linux</strong> Il y a eu une <a
href="http://lists.debian.org/debian-powerpc-0109/msg00315.html">discussion</a>
à propos de l'utilisation de partitions HFS+ avec Linux. Celles ci sont
-utilisées par MacOS X pour les grandes partitions. Le pilote Linux est,
+utilisées par Mac OS X pour les grandes partitions. Le pilote Linux est,
cependant, instable et abandonné. Plusieurs personnes ont obtenu un
<em>Kernel Panic</em> quand elles accédaient à une partition HFS+. La
seule solution pour accéder à ce système de fichier est d'utiliser les
outils contenus dans le paquet <a
href="http://packages.debian.org/hfsplus">hfsplus</a>. L'autre solution
-est d'utiliser des partition UFS qui sont gérées par MacOS X et pour
+est d'utiliser des partition UFS qui sont gérées par Mac OS X et pour
lesquelles il existe un pilote Linux expérimental.</p>
<p><strong>Utiliser Mosix sur un système Debian</strong> Viral Shah a
diff --git a/french/News/weekly/2003/21/index.wml b/french/News/weekly/2003/21/index.wml
index e0b59fe16ba..3ff40f73464 100644
--- a/french/News/weekly/2003/21/index.wml
+++ b/french/News/weekly/2003/21/index.wml
@@ -1,5 +1,5 @@
#use wml::debian::weeklynews::header PUBDATE="2003-05-27" SUMMARY="Dons, I18n, GCC, Noyau, DebConf, Multimédia, Wiki, CD, Robots, Brevets, Marques, Signature de clés, BTS"
-#use wml::debian::translation-check translation="1.16" maintainer="Frédéric Bothamy"
+#use wml::debian::translation-check translation="1.17" maintainer="Frédéric Bothamy"
<p>Nous avons le plaisir de vous présenter la 21e <i>DWN</i> de l'année, la
lettre d'information hebdomadaire de la communauté Debian. Le projet GNOME a
@@ -40,8 +40,8 @@ Loli-Queru a <a href="http://www.osnews.com/story.php?news_id=3589">\
indiqué</a> que la distribution Debian GNU/Linux est livrée préinstallée sur
les machines <a href="http://www.pegasosppc.com/">Pegasos</a> qui sont basées
sur des processeurs PowerPC G3 et G4 d'IBM/Motorola. Grâce à l'utilisation de
-Mac-On-Linux, les systèmes Debian vous permettent de faire fonctionner MacOS
-ou OSX sans avoir besoin de matériel Apple ou d'un BIOS.</p>
+Mac-On-Linux, les systèmes Debian vous permettent de faire fonctionner Mac OS
+ou OS X sans avoir besoin de matériel Apple ou d'un BIOS.</p>
<p><strong>Interview avec Andrew Tridgell.</strong> Alexander Antoniades a eu
la chance de pouvoir <a
diff --git a/french/News/weekly/2005/02/index.wml b/french/News/weekly/2005/02/index.wml
index 41c5925162e..0b44b52abbe 100644
--- a/french/News/weekly/2005/02/index.wml
+++ b/french/News/weekly/2005/02/index.wml
@@ -1,5 +1,5 @@
#use wml::debian::weeklynews::header PUBDATE="2005-01-11" SUMMARY="KDE, Archive, Java, Microcode, Empaquetage, Documentation, Sécurité"
-#use wml::debian::translation-check translation="1.4" maintainer="Frédéric Bothamy"
+#use wml::debian::translation-check translation="1.5" maintainer="Frédéric Bothamy"
<p>Nous avons le plaisir de vous présenter la 2e&nbsp;<em>DWN</em> de l'année,
la lettre d'information hebdomadaire de la communauté Debian. <a
diff --git a/french/News/weekly/2005/13/index.wml b/french/News/weekly/2005/13/index.wml
index fb28edfad0c..126d573f9ca 100644
--- a/french/News/weekly/2005/13/index.wml
+++ b/french/News/weekly/2005/13/index.wml
@@ -1,5 +1,5 @@
#use wml::debian::weeklynews::header PUBDATE="2005-03-29" SUMMARY="Installateur, Listes, Élection, Empaquetage, Assurance Qualité, Licences, CD/DVD, Hurd/L4"
-#use wml::debian::translation-check translation="1.4" maintainer="Frédéric Bothamy"
+#use wml::debian::translation-check translation="1.5" maintainer="Frédéric Bothamy"
<p>Nous avons le plaisir de vous présenter la 13e&nbsp;<em>DWN</em> de
l'année, la lettre d'information hebdomadaire de la communauté Debian. James
diff --git a/french/consultants/clive_menzies.wml b/french/consultants/clive_menzies.wml
index 66bcb9dcedc..c1ab70249c9 100644
--- a/french/consultants/clive_menzies.wml
+++ b/french/consultants/clive_menzies.wml
@@ -1,11 +1,11 @@
#use wml::debian::consultant name="Clive Menzies &amp; Associates Limited"
-#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
+#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
<p>
Nous sommes conseillers de gestion spécialisés pour aider les organisations à
tirer le meilleur profit des technologies de l'information et de la
communication. Lorsque c'est à propos, nous déployons Debian GNU/Linux (la
-seule distribution Linux que nous supportions) aux côtés de Windows et MacOSX
+seule distribution Linux que nous supportions) aux côtés de Windows et Mac OS X
et nous apportons de l'aide sur ces systèmes intégrés. Nous favorisons une
migration graduelle vers Debian et en général nos clients débutent avec un
serveur de fichiers et d'impression Debian&nbsp;; après quoi nous ajoutons des
diff --git a/french/consultants/velesys.wml b/french/consultants/velesys.wml
index adedd588644..b90bbbcffca 100644
--- a/french/consultants/velesys.wml
+++ b/french/consultants/velesys.wml
@@ -1,10 +1,10 @@
#use wml::debian::consultant name="Velesys"
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
<p>
Notre expérience initiale est le développement logiciel pour des appareils
fonctionnant avec Linux, ainsi que le développement d'applications
-interplate-forme pour Linux, Windows, et MacOS (Classic et OS X).
+interplate-forme pour Linux, Windows, et Mac OS (Classic et OS X).
</p>
<p>
diff --git a/french/devel/debian-installer/errata.wml b/french/devel/debian-installer/errata.wml
index eb0e37552a3..d761f78bf5c 100644
--- a/french/devel/debian-installer/errata.wml
+++ b/french/devel/debian-installer/errata.wml
@@ -1,6 +1,6 @@
#use wml::debian::template title="Errata pour l'installateur Debian"
#use wml::debian::recent_list
-#use wml::debian::translation-check translation="1.162" maintainer="David Prévot"
+#use wml::debian::translation-check translation="1.163" maintainer="David Prévot"
# Translators:
# Nicolas Bertolissio, 2003-2008
@@ -148,15 +148,15 @@ Consultez le bogue <a href="http://bugs.debian.org/608025">nº 608025</a>.
</dd>
<dt>
-Table de partitions incompatible avec MacOS 9
+Table de partitions incompatible avec Mac OS 9
</dt>
<dd>
Il a été signalé que l'outil de partitionnement rend la table de
-partition non reconnaissable par MacOS 9, qui ne peut plus démarrer.
+partition non reconnaissable par Mac OS 9, qui ne peut plus démarrer.
Bien que les partitions HFS+ soient compatibles avec Linux et
-MacOS X, il est recommandé de prendre toutes les précautions
-nécessaires lors de l'installation d'une machine avec MacOS 9.
+Mac OS X, il est recommandé de prendre toutes les précautions
+nécessaires lors de l'installation d'une machine avec Mac OS 9.
<br/>
Consultez le bogue <a href="http://bugs.debian.org/604134">nº 604134</a>.
</dd>
diff --git a/french/intro/cn.wml b/french/intro/cn.wml
index 6e95a8e99e2..31b8907371c 100644
--- a/french/intro/cn.wml
+++ b/french/intro/cn.wml
@@ -1,6 +1,6 @@
#use wml::debian::template title="Site web Debian dans différentes langues" BARETITLE=true
#use wml::debian::toc
-#use wml::debian::translation-check translation="1.84" maintainer="David Prévot"
+#use wml::debian::translation-check translation="1.85" maintainer="David Prévot"
# Translators:
# Christian Couder, 1999-2006.
@@ -226,7 +226,7 @@ navigateur que vous utilisez.
<pre>
Outils -&gt; Options -&gt; Contenu -&gt; Langues -&gt; Choisir...
</pre>
- MacOS :
+ Mac OS :
<pre>
Firefox -&gt; Préférences -&gt; Contenu -&gt; Langues -&gt; Choisir...
</pre>
@@ -272,7 +272,7 @@ navigateur que vous utilisez.
</pre>
</dd>
<dd>
- MacOS&nbsp;:
+ Mac OS&nbsp;:
<pre>
Édition -&gt; Préférences -&gt; Navigateur Web -&gt; Langue/Polices
</pre>
@@ -388,7 +388,7 @@ navigateur que vous utilisez.
<dt><strong><toc-add-entry name="safari">Safari</toc-add-entry></strong></dt>
<dd>
- Safari utilise les préférences systèmes de MacOS&nbsp;X pour déterminer la
+ Safari utilise les préférences systèmes de Mac OS&nbsp;X pour déterminer la
langue préférée&nbsp;:
<pre>
Préférences système -&gt; International -&gt; Langue
diff --git a/french/ports/powerpc/history.wml b/french/ports/powerpc/history.wml
index 7a804837b83..44c880c431a 100644
--- a/french/ports/powerpc/history.wml
+++ b/french/ports/powerpc/history.wml
@@ -1,6 +1,6 @@
#use wml::debian::template title="Portage pour PowerPC -- Historique" NOHEADER="yes"
#include "$(ENGLISHDIR)/ports/powerpc/menu.inc"
-#use wml::debian::translation-check translation="1.14" maintainer="Thomas Marteau"
+#use wml::debian::translation-check translation="1.15" maintainer="Thomas Marteau"
<br>
<br>
@@ -17,10 +17,10 @@
Heureusement, des disquettes de démarrage opérationnelles étaient disponibles
à <a href="http://www.linuxppc.org/">LinuxPPC</a> et nous avons pu essayer
d'installer quelque chose sur cette machine. Malheureusement, cela demandait
- des programmes qui fonctionnaient sous MacOS. La seule manière de les
- installer était d'avoir une autre machine, utilisant MacOS, où ils seraient
+ des programmes qui fonctionnaient sous Mac OS. La seule manière de les
+ installer était d'avoir une autre machine, utilisant Mac OS, où ils seraient
déjà installés. Vu que l'échange de données avec les autres machines
- non-MacOS est possible seulement par des disquettes formatées
+ non-Mac OS est possible seulement par des disquettes formatées
msdos, c'était le problème de la poule et de l'œuf.
</p>
diff --git a/french/ports/powerpc/index.wml b/french/ports/powerpc/index.wml
index c0d44cc596c..9d2ac67d7f8 100644
--- a/french/ports/powerpc/index.wml
+++ b/french/ports/powerpc/index.wml
@@ -1,6 +1,6 @@
#use wml::debian::template title="Portage pour PowerPC" NOHEADER="yes"
#include "$(ENGLISHDIR)/ports/powerpc/menu.inc"
-#use wml::debian::translation-check translation="1.74" maintainer="David Prévot"
+#use wml::debian::translation-check translation="1.75" maintainer="David Prévot"
# Translators:
# Thomas Marteau, 2001, 2005
@@ -63,7 +63,7 @@ pour des informations spécifiques à propos de l'installation de Debian-PowerPC
sur votre système.</p>
<p>Il existe des astuces à connaître pour installer sur un iBook, un TiBook
-ou un iBook2 surtout si vous désirez avoir le choix à l'amorçage avec Mac&nbsp;OSX.
+ou un iBook2 surtout si vous désirez avoir le choix à l'amorçage avec Mac&nbsp;OS X.
Certains matériels pour iBook2, surtout ceux récemment introduits, ne sont pas
encore bien gérés. Pour une information plus spécifique sur les problèmes
potentiels et leurs solutions, allez voir ces pages&nbsp;:</p>
@@ -100,7 +100,7 @@ potentiels et leurs solutions, allez voir ces pages&nbsp;:</p>
<p>Debian GNU/Linux ne fonctionne pas officiellement sur les machines NuBus
PowerPC, comme les 6100, 7100, 8100 et la plupart des Performa.
Cependant, un noyau basé sur un noyau MkLinux est disponible. Il peut être
-démarré par le gestionnaire d'amorce de MacOS. Un système Debian peut être
+démarré par le gestionnaire d'amorce de Mac OS. Un système Debian peut être
installé en utilisant ce noyau se trouvant sur
<url "http://nubus-pmac.sourceforge.net/">. Il donne une
<a href="http://www.mipaginaweb.com.mx/moguelc/howtos/nubus.html">\
diff --git a/french/ports/powerpc/inst/install.wml b/french/ports/powerpc/inst/install.wml
index ab318c94c1c..2bf24fd1cee 100644
--- a/french/ports/powerpc/inst/install.wml
+++ b/french/ports/powerpc/inst/install.wml
@@ -1,6 +1,6 @@
#use wml::debian::template title="Portage pour PowerPC -- Installation" NOHEADER="yes"
#include "$(ENGLISHDIR)/ports/powerpc/inst/menu.inc"
-#use wml::debian::translation-check translation="1.22" maintainer="Thomas Marteau"
+#use wml::debian::translation-check translation="1.23" maintainer="Thomas Marteau"
<h2>Installation de Debian GNU/Linux pour les machines PowerPC</h2>
@@ -74,7 +74,7 @@ est aussi <i>OldWorld</i>.</p>
<p>Les PowerMacs appelés <i>NewWorld</i> sont tous les PowerMacs avec une tour
en plastique de couleur translucide comme tous les iMacs, iBooks ou bien les
G4 et G5. Les PowerMacs <i>NewWorld</i> sont
-aussi connus pour utiliser le système <i>ROM in RAM</i> pour MacOS et
+aussi connus pour utiliser le système <i>ROM in RAM</i> pour Mac OS et
ils sont fabriqués depuis le milieu de l'année 1998.</p>
<p>Voici une liste de machines powerpc qui devraient fonctionner avec Debian.</p>
diff --git a/french/releases/squeeze/debian-installer/index.wml b/french/releases/squeeze/debian-installer/index.wml
index 189ec1bcaee..6cfb61ad387 100644
--- a/french/releases/squeeze/debian-installer/index.wml
+++ b/french/releases/squeeze/debian-installer/index.wml
@@ -1,7 +1,7 @@
#use wml::debian::template title="Debian Squeeze : informations pour l'installation" NOHEADER="true"
#include "$(ENGLISHDIR)/releases/info"
#include "$(ENGLISHDIR)/releases/squeeze/release.data"
-#use wml::debian::translation-check translation="1.6" maintainer="David Prévot"
+#use wml::debian::translation-check translation="1.7" maintainer="David Prévot"
<h1>Installer Debian <current_release_squeeze></h1>
@@ -303,15 +303,15 @@ Consultez le bogue <a href="http://bugs.debian.org/608025">nº 608025</a>.
</dd>
<dt>
-Table de partitions incompatible avec MacOS 9
+Table de partitions incompatible avec Mac OS 9
</dt>
<dd>
Il a été signalé que l'outil de partitionnement rend la table de
-partition non reconnaissable par MacOS 9, qui ne peut plus démarrer.
+partition non reconnaissable par Mac OS 9, qui ne peut plus démarrer.
Bien que les partitions HFS+ soient compatibles avec Linux et
-MacOS X, il est recommandé de prendre toutes les précautions
-nécessaires lors de l'installation d'une machine avec MacOS 9.
+Mac OS X, il est recommandé de prendre toutes les précautions
+nécessaires lors de l'installation d'une machine avec Mac OS 9.
<br/>
Consultez le bogue <a href="http://bugs.debian.org/604134">nº 604134</a>.
</dd>
diff --git a/french/users/edu/lyceemoliere.wml b/french/users/edu/lyceemoliere.wml
index dd503fe7cbd..a5200e77e5b 100644
--- a/french/users/edu/lyceemoliere.wml
+++ b/french/users/edu/lyceemoliere.wml
@@ -4,7 +4,7 @@
<define-tag webpage>http://www.lycee-moliere.org/</define-tag>
#use wml::debian::users
-#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
+#use wml::debian::translation-check translation="1.4" maintainer="Nicolas Bertolissio"
<p>
En tant qu'école privée, le Lycée Molière ne bénéficie pas de tous les
@@ -15,7 +15,7 @@ parfois un défi important.
<p>
Quand il a fallu fournir des services internet communs à l'école, la solution
GNU/Linux nous est apparue naturelle. Notre réseau est fait de plus ou moins
-trente Macintosh Imacs (qui fonctionnent toujours avec MacOS, du moins pour
+trente Macintosh Imacs (qui fonctionnent toujours avec Mac OS, du moins pour
le moment&nbsp;!) du côté des stations de travail, et d'un serveur de
courriels (exim, cyrus-IMAPd squirrelMail), d'un serveur web (apache), d'un
serveur DNS (bind9), d'un serveur de fichiers (netatalk) et d'un serveur
diff --git a/french/vote/1999/ben.wml b/french/vote/1999/ben.wml
index cb5570fc722..aee6675b619 100644
--- a/french/vote/1999/ben.wml
+++ b/french/vote/1999/ben.wml
@@ -1,5 +1,5 @@
#use wml::debian::template title="Programme de responsable du projet de Ben Collins"
-#use wml::debian::translation-check translation="1.5" maintainer="Nicolas Bertolissio"
+#use wml::debian::translation-check translation="1.6" maintainer="Nicolas Bertolissio"
<pre>
Ceci est l'annonce officielle de ma candidature au poste de responsable du
@@ -195,7 +195,7 @@ cours d'évaluation et de développement.
Linux à la NASA : quelques autres défenseurs de Linux ici à la NASA et
moi-même poussons pour que soit menée une évaluation de Linux comme
-remplaçant de Windows, MacOS et Solaris en tant qu'environnement de
+remplaçant de Windows, Mac OS et Solaris en tant qu'environnement de
bureau. Nous avons récemment reçu un peu de reconnaissance par des
gestionnaires sur la faisabilité. Un projet pilote est imminent.
diff --git a/german/News/weekly/2001/23/index.wml b/german/News/weekly/2001/23/index.wml
index 434f69446c8..ad330f6c8f4 100644
--- a/german/News/weekly/2001/23/index.wml
+++ b/german/News/weekly/2001/23/index.wml
@@ -1,5 +1,5 @@
#use wml::debian::weeklynews::header PUBDATE="2001-09-25" SUMMARY="Xinerama, HFS+, Security, Listen-Graphen, X-Schriften"
-#use wml::debian::translation-check translation="1.11"
+#use wml::debian::translation-check translation="1.12"
# $Id$
<p><strong>KDE 2.2.1 und Xinerama.</strong> Ivan Moores KDE 2.2.1-Pakete sind
diff --git a/german/News/weekly/2003/21/index.wml b/german/News/weekly/2003/21/index.wml
index 5f46910e85e..2febfdf3cee 100644
--- a/german/News/weekly/2003/21/index.wml
+++ b/german/News/weekly/2003/21/index.wml
@@ -1,5 +1,5 @@
#use wml::debian::weeklynews::header PUBDATE="2003-05-27" SUMMARY="Spenden, I18n, GCC, Kernel, DebConf, Multimedia, Wiki, CDs, Roboter, Patente, Tags, Schlüssel signieren, BTS"
-#use wml::debian::translation-check translation="1.16"
+#use wml::debian::translation-check translation="1.17"
# $Id$
<p>Willkommen zur 21. Ausgabe der DWN in diesem Jahr, dem wöchentlichen
diff --git a/german/News/weekly/2005/02/index.wml b/german/News/weekly/2005/02/index.wml
index 3c6f148837d..7cab5c57338 100644
--- a/german/News/weekly/2005/02/index.wml
+++ b/german/News/weekly/2005/02/index.wml
@@ -1,5 +1,5 @@
#use wml::debian::weeklynews::header PUBDATE="2005-01-11" SUMMARY="KDE, Archiv, Java, Firmware, Paketierung, Dokumentation, Sicherheit"
-#use wml::debian::translation-check translation="1.4"
+#use wml::debian::translation-check translation="1.5"
# $Id$
<p>Willkommen zur 2. Ausgabe der DWN in diesem Jahr, dem wöchentlichen
@@ -156,7 +156,7 @@ oder enthalten wichtige Aktualisierungen.</p>
<li><a href="http://packages.debian.org/unstable/text/itagalog">itagalog</a>
-- Tagalog-Wörterbuch für Ispell.
<li><a href="http://packages.debian.org/unstable/x11/kxdocker">kxdocker</a>
- -- Innovativer Docker für KDE (ähnlich Mac OSX Docker).
+ -- Innovativer Docker für KDE (ähnlich Mac OS X Docker).
<li><a href="http://packages.debian.org/unstable/sound/mpegdemux">mpegdemux</a>
-- MPEG1/2-System-Strom-Demultiplexer.
<li><a href="http://packages.debian.org/unstable/utils/mypasswordsafe">mypasswordsafe</a>
diff --git a/german/News/weekly/2005/13/index.wml b/german/News/weekly/2005/13/index.wml
index 392ce181401..cbb01615792 100644
--- a/german/News/weekly/2005/13/index.wml
+++ b/german/News/weekly/2005/13/index.wml
@@ -1,5 +1,5 @@
#use wml::debian::weeklynews::header PUBDATE="2005-03-29" SUMMARY="Installer, Listen, Wahl, Paketierung, QA, Lizenzen, CDs/DVDs, Hurd/L4"
-#use wml::debian::translation-check translation="1.4"
+#use wml::debian::translation-check translation="1.5"
# $Id$
<p>Willkommen zur 13. Ausgabe der DWN in diesem Jahr, dem wöchentlichen
@@ -262,7 +262,7 @@ oder enthalten wichtige Aktualisierungen.</p>
<li><a href="http://packages.debian.org/unstable/hamradio/sgcontrol">sgcontrol</a>
&mdash; GUI to multiple communications receivers using the Hamlib library.</li>
<li><a href="http://packages.debian.org/unstable/x11/skippy">skippy</a>
- &mdash; Full-screen X11 task/window switcher, similar to OSX Expose.</li>
+ &mdash; Full-screen X11 task/window switcher, similar to OS X Expose.</li>
<li><a href="http://packages.debian.org/unstable/admin/srg">srg</a>
&mdash; Fast, Flexible and Detailed log analysis for the Squid Proxy.</li>
<li><a href="http://packages.debian.org/unstable/devel/stress">stress</a>
diff --git a/german/consultants/clive_menzies.wml b/german/consultants/clive_menzies.wml
index 4865c078d1f..6897d72d233 100644
--- a/german/consultants/clive_menzies.wml
+++ b/german/consultants/clive_menzies.wml
@@ -1,5 +1,5 @@
#use wml::debian::consultant name="Clive Menzies &amp; Associates Limited"
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::translation-check translation="1.3"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-10-16
# $Id$
@@ -8,7 +8,7 @@ Wir sind eine Management-Beratungsfirma die sich drauf spezialisiert,
Organisationen zu helfen, das meiste aus ihrer Informations- und
Kommunikationstechnik zu machen. Wo angebracht, setzen wir Debian GNU/Linux
ein (die einzige Linux-Distribution, die wir unterstützen), parallel zu
-Windows und MacOSX und unterstützen die integrierten Systeme. Wir bevorzugen
+Windows und Mac OS X und unterstützen die integrierten Systeme. Wir bevorzugen
graduelle Migrationen auf Debian und typische Kunden beginnen mit einem
Debian-basierten Datei- und Druck-Server; danach ergänzen wir zusätzliche
Funktionalität wie IMAP-E-Mail-Server und Web-basierte (Intranet-)Anwendungen
diff --git a/german/consultants/velesys.wml b/german/consultants/velesys.wml
index 8b9c2658d9a..b36d8106c31 100644
--- a/german/consultants/velesys.wml
+++ b/german/consultants/velesys.wml
@@ -1,12 +1,12 @@
#use wml::debian::consultant name="Velesys"
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, debian@helgefjell.de, 2007-03-10
# $Id$
<p>
Unsere primäre Erfahrung liegt in der Software-Entwicklung für
Linux-befähigte Geräte (<q>Appliances</q>), sowie in der Entwicklung von
- plattformübergreifenden Anwendungen für Linux, Windows und MacOS
+ plattformübergreifenden Anwendungen für Linux, Windows und Mac OS
(klassisch und OS X).
</p>
<p>
diff --git a/german/devel/debian-installer/errata.wml b/german/devel/debian-installer/errata.wml
index b7a2fca6bed..3c7b09f539a 100644
--- a/german/devel/debian-installer/errata.wml
+++ b/german/devel/debian-installer/errata.wml
@@ -1,6 +1,6 @@
#use wml::debian::template title="Debian-Installer-Errata"
#use wml::debian::recent_list
-#use wml::debian::translation-check translation="1.162"
+#use wml::debian::translation-check translation="1.163"
# $Id$
# Original-Translator: Frank Lichtenheld <frank@lichtenheld.de>, 2003-11-11
# Translator: Helge Kreutzmann <debian@helgefjell.de>, 2005-11-12 ff.
@@ -94,13 +94,13 @@ Installationsbericht</a>, der das Problem beschreibt.
der Installation <q>update-grub</q> aus.<br />
Lesen Sie <a href="http://bugs.debian.org/608025">#608025</a>.</dd>
- <dt>Erstellt zu MacOS 9 inkompatible Partitionstabelle</dt>
+ <dt>Erstellt zu Mac OS 9 inkompatible Partitionstabelle</dt>
<dd>
Es wurde berichtet, dass das Partitionierungswerkzeug des Installers die
- Partitionstabelle so verändert, dass MacOS 9 sie nicht mehr erkennt und
- nicht mehr startet. Obwohl die HFS+-Partitionen zu Linux und MacOS X
+ Partitionstabelle so verändert, dass Mac OS 9 sie nicht mehr erkennt und
+ nicht mehr startet. Obwohl die HFS+-Partitionen zu Linux und Mac OS X
kompatibel sind, werden Ihnen alle Vorsichtsmaßnahmen empfohlen, wenn Sie
- auf einer Maschine mit MacOS 9 installieren.<br />
+ auf einer Maschine mit Mac OS 9 installieren.<br />
Lesen Sie <a href="http://bugs.debian.org/604134">#604134</a>.</dd>
<dt>Partitionierung schlägt auf kFreeBSD fehl</dt>
diff --git a/german/intro/cn.wml b/german/intro/cn.wml
index 29f1d5e6a1b..0f7cf9cfa01 100644
--- a/german/intro/cn.wml
+++ b/german/intro/cn.wml
@@ -1,5 +1,5 @@
#use wml::debian::template title="Debian-Webseiten in verschiedenen Sprachen"
-#use wml::debian::translation-check translation="1.84"
+#use wml::debian::translation-check translation="1.85"
#use wml::debian::toc
# $Id$
# Translator: Philipp Frauenfelder <pfrauenf@debian.org>
@@ -191,7 +191,7 @@ Windows:
<pre>
Tools -&gt; Options -&gt; Content -&gt; Languages -&gt; Choose ...
</pre>
-MacOS:
+Mac OS:
<pre>
Firefox -&gt; Preferences -&gt; Content -&gt; Languages -&gt; Choose...
</pre>
@@ -234,7 +234,7 @@ Bei älteren Versionen müssen Sie <kbd>about:config</kbd> aufrufen und den Wert
Tools oder View oder Extras -&gt; Internet Options -&gt; (General) Languages
</pre></dd>
-<dd>MacOS:
+<dd>Mac OS:
<pre>
Edit -&gt; Preferences -&gt; Web Browser -&gt; Language/Fonts
</pre></dd>
@@ -328,7 +328,7 @@ vorausgesetzt):
</pre></dd>
<dt><strong><toc-add-entry name="safari">Safari</toc-add-entry></strong></dt>
-<dd>Safari benutzt die MacOS-X-Systemeinstellungen, um die bevorzugte
+<dd>Safari benutzt die Mac OS-X-Systemeinstellungen, um die bevorzugte
Sprache festzulegen:
<pre>
System preferences -&gt; International -&gt; Language
diff --git a/german/ports/powerpc/history.wml b/german/ports/powerpc/history.wml
index 39b13c82738..88270b6686a 100644
--- a/german/ports/powerpc/history.wml
+++ b/german/ports/powerpc/history.wml
@@ -1,6 +1,6 @@
#use wml::debian::template title="PowerPC-Portierung -- Historie" NOHEADER="yes"
#include "$(ENGLISHDIR)/ports/powerpc/menu.inc"
-#use wml::debian::translation-check translation="1.14"
+#use wml::debian::translation-check translation="1.15"
# Translator: Gerfried Fuchs <alfie@debian.org> 2001-10-29
# $Id$
@@ -21,10 +21,10 @@
Glücklicherweise wurden funktionierende Boot- und Root-Disks auf
<a href="http://www.linuxppc.org/">LinuxPPC</a> gefunden und wir konnten
daher versuchen, etwas auf dem Rechner zu installieren. Unglücklicherweise
- benötigte das einige Programme, die nur auf MacOS liefen. Der einzige Weg,
+ benötigte das einige Programme, die nur auf Mac OS liefen. Der einzige Weg,
diese zu installieren, war es, einen anderen Rechner zu bekommen, auf dem
- MacOS lief, der diese bereits installiert hatte. Da der Datenaustausch mit
- nicht MacOS-Rechnern nur über MS-Dos-formatierte Disketten möglich war, war
+ Mac OS lief, der diese bereits installiert hatte. Da der Datenaustausch mit
+ nicht Mac OS-Rechnern nur über MS-Dos-formatierte Disketten möglich war, war
dies ein Henne-und-Ei Problem.
</p>
diff --git a/german/ports/powerpc/index.wml b/german/ports/powerpc/index.wml
index 30d1089cea0..e350ecdc655 100644
--- a/german/ports/powerpc/index.wml
+++ b/german/ports/powerpc/index.wml
@@ -1,6 +1,6 @@
#use wml::debian::template title="PowerPC-Portierung" NOHEADER="yes"
#include "$(ENGLISHDIR)/ports/powerpc/menu.inc"
-#use wml::debian::translation-check translation="1.74"
+#use wml::debian::translation-check translation="1.75"
# $Id$
# Translator: Martin Schulze <joey@debian.org>
@@ -102,7 +102,7 @@
<p>
Debian GNU/Linux unterstützt NuBus-PowerPC-Rechner nicht offiziell, wie den
6100, 7100, 8100 und die meisten der Performa-Serie. Jedoch ist ein
- MkLinux-basierender Kernel verfügbar, der von einem MacOS-Bootloader aus
+ MkLinux-basierender Kernel verfügbar, der von einem Mac OS-Bootloader aus
gestartet werden kann. Ein Debian-System kann durch die Verwendung dieses
Kernels installiert werden, der auf
<url "http://nubus-pmac.sourceforge.net/"> verfügbar ist. Es gibt eine
diff --git a/german/ports/powerpc/inst/install.wml b/german/ports/powerpc/inst/install.wml
index 8ee7e2c9b5a..5e2ecf75f5c 100644
--- a/german/ports/powerpc/inst/install.wml
+++ b/german/ports/powerpc/inst/install.wml
@@ -1,6 +1,6 @@
#use wml::debian::template title="PowerPC-Portierung -- Installation" NOHEADER="yes"
#include "$(ENGLISHDIR)/ports/powerpc/inst/menu.inc"
-#use wml::debian::translation-check translation="1.22"
+#use wml::debian::translation-check translation="1.23"
# $Id$
<h2>Installation von Debian GNU/Linux auf PowerPC-Maschinen</h2>
@@ -81,7 +81,7 @@ ebenfalls OldWorld.</p>
<p>Die so genannten NewWorld PowerMacs sind alle PowerMacs in durchsichtigen
farbigen Plastik-Gehäusen, alle iMacs, iBooks, G4- und G5-Systeme. Die
NewWorld PowerMacs sind auch dafür bekannt, das »ROM in RAM«-System für
-MacOS zu verwenden, und werden seit Mitte 1998 produziert.</p>
+Mac OS zu verwenden, und werden seit Mitte 1998 produziert.</p>
<p>Hier ist eine Liste von PowerPC-Maschinen, die mit Debian funktionieren
sollten.</p>
diff --git a/german/ports/powerpc/inst/yaboot-howto.sgml b/german/ports/powerpc/inst/yaboot-howto.sgml
index d8e86e62dd2..a0cd9f29034 100644
--- a/german/ports/powerpc/inst/yaboot-howto.sgml
+++ b/german/ports/powerpc/inst/yaboot-howto.sgml
@@ -45,7 +45,7 @@ Marktfähigkeit oder der Tauglichkeit für einen bestimmten Zweck. Lesen Sie die
GNU General Public Licence für weitere Details.
<p>
Eine Kopie der GNU General Public Licence ist als
-<code>/usr/share/common-licenses/GPL</code> in der Debian GNU/Linux
+<file>/usr/share/common-licenses/GPL</file> in der Debian GNU/Linux
Distribution oder im World-Wide-Web auf der
<url id="http://www.gnu.org/copyleft/gpl.html" name="GNU Website">
verfügbar. Sie können Sie ebenfalls erhalten, indem Sie an die Free Software
@@ -79,7 +79,7 @@ beige-farbenen G3-Systeme sind auch OldWorld.
<p>
<em><prgn>yaboot</prgn> wird nicht auf NuBus oder OldWorld Rechnern
-funktionieren</em>, diese benötigen <prgn>quik</prgn> oder (nur für MacOS
+funktionieren</em>, diese benötigen <prgn>quik</prgn> oder (nur für Mac OS
Pre-9.0.4) <prgn>BootX/miboot</prgn>.
<p>
@@ -103,9 +103,9 @@ müssen dafür das inkludierte <prgn>ybin</prgn> Werkzeug verwenden.
Sie können <prgn>yaboot</prgn> auch direkt von der Home-Page von
<prgn>yaboot</prgn> unter <url id="http://penguinppc.org/projects/yaboot/">
-herunterladen. Wenn Sie es mit MacOS herunterladen, vergewissern Sie sich, dass
+herunterladen. Wenn Sie es mit Mac OS herunterladen, vergewissern Sie sich, dass
sie das <em>binary</em> (nicht text) Format verwenden, und lassen Sie weder
-Stuffit Expander noch ein anderes Werkzeut das Archiv in MacOS expandieren.
+Stuffit Expander noch ein anderes Werkzeut das Archiv in Mac OS expandieren.
<p>
@@ -267,7 +267,7 @@ angesehen. Jede Option oder Parameter muss in einer eigenen Zeile angegeben
sein. Verwenden Sie keine zusätzlichen Leerzeichen in den folgenden
Parameter-Definitionen. Ebenfalls muss die Datei Unix-Zeilenumbrüche enthalten;
vergewissern Sie sich, dass Sie die Datei im Unix-Typ speichern, wenn Sie sie
-in MacOS erstellen oder editieren.
+in Mac OS erstellen oder editieren.
<sect>Linux-Style Geräte-Pfade
@@ -430,7 +430,7 @@ mit einer Kernel-Image Sektion:
boot=/dev/hda2
# CHRP-Skript Spezifizierung
magicboot=/usr/lib/yaboot/ofboot
- # Dual-Boot mit MacOS
+ # Dual-Boot mit Mac OS
macos=hd:14
# Wartezeit im Betriebssystem Boot-Menü (Sekunden)
delay=5
@@ -551,11 +551,11 @@ der Kommandozeile.
Die häufigsten Fehler, die bei der Verwendung von <prgn>yaboot</prgn> gemacht
werden, ist es zu versuchen, es permanent von einer einbindbaren Partition zu
booten. Wenn ein PowerPC erst hochfährt, wird der Boot-Prozess gestartet mit
-der Suche nach einem so genannten `blessed' (gesegneten) Verzeichnis. Das MacOS
+der Suche nach einem so genannten `blessed' (gesegneten) Verzeichnis. Das Mac OS
platziert die Segnung so, dass mehrere System-Verzeichnisse auf einer Partition
existieren können, aber nur einer davon gültig zum Starten ist. Wenn der
-Computer für ein Dual-Boot mit Linux und MacOS aufgesetzt wird, wird MacOS beim
-booten alle Verzeichnisse entsegnen, die nicht ein gültiges MacOS System
+Computer für ein Dual-Boot mit Linux und Mac OS aufgesetzt wird, wird Mac OS beim
+booten alle Verzeichnisse entsegnen, die nicht ein gültiges Mac OS System
beinhalten. Dann, wenn der Rechner das nächste Mal bootet, wird die Partition,
die das vormals gesegnete Verzeichnis enthielt, nicht mehr bootfähig sein.
@@ -597,7 +597,7 @@ alle nvram Parameter auf ihre Werkseinstellungen zurückzusetzen. Halten Sie die
Tasten, bis Sie den Startup-Ton zwei- oder dreimal hören. Wenn die
Setup-Vorschläge befolgt wurden, wird die <prgn>yaboot</prgn> Installation die
erste bootfähige Partition sein, und OpenFirmware wird sie automatisch booten. Es
-muss beachtet werden, dass MacOS-Einstellungen wie virtueller Speicher,
+muss beachtet werden, dass Mac OS-Einstellungen wie virtueller Speicher,
Startup-Platte und die Bildschirmauflösung auch auf ihre Werkseinstellungen
zurückgesetzt werden.
@@ -713,9 +713,9 @@ Die <file>yaboot.conf</file> Datei für diesen Zweck beinhaltet nur vier Zeilen:
</example>
<p>
-Wenn Sie <file>yaboot.conf</file> im MacOS erstellen, müssen Sie es auf
+Wenn Sie <file>yaboot.conf</file> im Mac OS erstellen, müssen Sie es auf
Unix-Zeilenumbrüche (nur Zeilenvorschübe) umkonvertieren. Wenn Sie
-MacOS-Zeilenumbrücke (nur Wagenrückläufe) verwenden, kann <prgn>yaboot</prgn>
+Mac OS-Zeilenumbrücke (nur Wagenrückläufe) verwenden, kann <prgn>yaboot</prgn>
die Datei nicht lesen.
<p>
diff --git a/german/releases/squeeze/debian-installer/index.wml b/german/releases/squeeze/debian-installer/index.wml
index 93103191927..f964878a7ed 100644
--- a/german/releases/squeeze/debian-installer/index.wml
+++ b/german/releases/squeeze/debian-installer/index.wml
@@ -1,7 +1,7 @@
#use wml::debian::template title="Debian <q>Squeeze</q> Installationsinformationen" NOHEADER="true"
#include "$(ENGLISHDIR)/releases/info"
#include "$(ENGLISHDIR)/releases/squeeze/release.data"
-#use wml::debian::translation-check translation="1.6"
+#use wml::debian::translation-check translation="1.7"
# $Id$
# Translator: Holger Wansing <linux@wansing-online.de>, 2011
@@ -250,13 +250,13 @@ nach anderen bekannten Problemen.
der Installation <q>update-grub</q> aus.<br />
Siehe <a href="http://bugs.debian.org/608025">#608025</a>.</dd>
- <dt>Erstellt zu MacOS 9 inkompatible Partitionstabelle</dt>
+ <dt>Erstellt zu Mac OS 9 inkompatible Partitionstabelle</dt>
<dd>
Es wurde berichtet, dass das Partitionierungswerkzeug des Installers die
- Partitionstabelle so verändert, dass MacOS 9 sie nicht mehr erkennt und
- nicht mehr startet. Obwohl die HFS+-Partitionen zu Linux und MacOS X
+ Partitionstabelle so verändert, dass Mac OS 9 sie nicht mehr erkennt und
+ nicht mehr startet. Obwohl die HFS+-Partitionen zu Linux und Mac OS X
kompatibel sind, werden Ihnen alle Vorsichtsmaßnahmen empfohlen, wenn Sie
- auf einer Maschine mit MacOS 9 installieren.<br />
+ auf einer Maschine mit Mac OS 9 installieren.<br />
Siehe <a href="http://bugs.debian.org/604134">#604134</a>.</dd>
<dt>Partitionierung schlägt auf kFreeBSD fehl</dt>
diff --git a/german/users/edu/lyceemoliere.wml b/german/users/edu/lyceemoliere.wml
index a8553083ff8..f159431a6a0 100644
--- a/german/users/edu/lyceemoliere.wml
+++ b/german/users/edu/lyceemoliere.wml
@@ -1,5 +1,5 @@
# From: "Patrick LEMMERS" <p.lemmers@lycee-moliere.org>
-#use wml::debian::translation-check translation="1.3"
+#use wml::debian::translation-check translation="1.4"
# Translation: Helge Kreutzmann <debian@helgefjell.de> 2005-10-16
<define-tag pagetitle>Lycée Molière, Belgien</define-tag>
@@ -16,7 +16,7 @@
<p>
Als es dazu kam, die allgemeinen Internet-Dienste der Schule bereitzustellen,
wurde die GNU/Linux-Lösung offensichtlich für uns. Unser Netz besteht aus
- +/- 30 Macintosh Imacs (noch unter MacOS, zumindest derzeit!) auf der
+ +/- 30 Macintosh Imacs (noch unter Mac OS, zumindest derzeit!) auf der
Workstation-Seite, und aus einem E-Mail-Server (Exim, Cyrus-IMAPd und
SquirrelMail), einem Web-Server (Apache), einem DNS-Server (bind9),
einem Datei-Server (netatalk) und einem Proxy-Server (Squid + squidGuard)
diff --git a/hungarian/intro/cn.wml b/hungarian/intro/cn.wml
index e34a6e1a795..abb0442b900 100644
--- a/hungarian/intro/cn.wml
+++ b/hungarian/intro/cn.wml
@@ -1,5 +1,5 @@
#use wml::debian::template title="Többnyelvű oldalak" BARETITLE=true
-#use wml::debian::translation-check translation="1.84"
+#use wml::debian::translation-check translation="1.85"
#use wml::debian::toc
<define-tag toc-title-formatting endtag="required">%body</define-tag>
@@ -181,7 +181,7 @@ Windows:
Tools -&gt; Options -&gt; General -&gt; Languages
</pre>
-MacOS:
+Mac OS:
<pre>
Firefox -&gt; Preferences -&gt; Content -&gt; Languages -&gt; Choose...
</pre>
@@ -215,7 +215,7 @@ Explorer</toc-add-entry></strong></dt>
</pre>
</dd>
-<dd>MacOS-en:
+<dd>Mac OS-en:
<pre>
Edit -&gt; Preferences -&gt; Web Browser -&gt; Language/Fonts
</pre>
@@ -316,7 +316,7 @@ vagy a testreszabó csomag használatával (URL p4.0pre.14 verziót feltételezv
<dt><strong><toc-add-entry name="safari">Safari</toc-add-entry></strong></dt>
-<dd>A Safari a MacOS X rendszerbeállításaiból állapítja meg a preferált
+<dd>A Safari a Mac OS X rendszerbeállításaiból állapítja meg a preferált
nyelvet:
<pre>
System preferences -&gt; International -&gt; Language
diff --git a/italian/News/weekly/2005/02/index.wml b/italian/News/weekly/2005/02/index.wml
index ad6f8c55efa..576d1389792 100644
--- a/italian/News/weekly/2005/02/index.wml
+++ b/italian/News/weekly/2005/02/index.wml
@@ -1,5 +1,5 @@
#use wml::debian::weeklynews::header PUBDATE="2005-01-11" SUMMARY="KDE, Archivi, Java, Firmware, Pacchettizzazione, Documentazione, Sicurezza"
-#use wml::debian::translation-check translation="1.4" maintainer="Daniele Venzano"
+#use wml::debian::translation-check translation="1.5" maintainer="Daniele Venzano"
<p>Benvenuti a questo secondo numero di DWN, il notiziario settimanale per la
comunità Debian. <a
@@ -138,7 +138,7 @@ agli archivi unstable Debian o contengono importanti aggiornamenti.</p>
<li><a href="http://packages.debian.org/unstable/text/itagalog">itagalog</a>
-- Dizionario Tagalog per Ispell.
<li><a href="http://packages.debian.org/unstable/x11/kxdocker">kxdocker</a>
- -- Innovativo docker per KDE simile allo Mac OSX Docker.
+ -- Innovativo docker per KDE simile allo Mac OS X Docker.
<li><a href="http://packages.debian.org/unstable/sound/mpegdemux">mpegdemux</a>
-- Demultiplexer di stream per sistemi MPEG1/2.
<li><a href="http://packages.debian.org/unstable/utils/mypasswordsafe">mypasswordsafe</a>
diff --git a/italian/News/weekly/2005/13/index.wml b/italian/News/weekly/2005/13/index.wml
index d294e3894b4..1c199d62a91 100644
--- a/italian/News/weekly/2005/13/index.wml
+++ b/italian/News/weekly/2005/13/index.wml
@@ -1,5 +1,5 @@
#use wml::debian::weeklynews::header PUBDATE="2005-03-29" SUMMARY="Installer, Liste, Elezioni, Pacchettizzazione, QA, Licenze, CD/DVD, Hurd/L4"
-#use wml::debian::translation-check translation="1.4" maintainer="Daniele Venzano"
+#use wml::debian::translation-check translation="1.5" maintainer="Daniele Venzano"
<p>Benvenuti a questo tredicesimo numero dell'anno di DWN, il notiziario settimanale
per la comunità Debian. James Troup ha <a
@@ -252,7 +252,7 @@ macchina su macchine x86-64.
-- Interfaccia per ricevitori a comunicazioni multiple che impiega la
libreria Hamlib.
<li><a href="http://packages.debian.org/unstable/x11/skippy">skippy</a>
- -- Commutatore di compito o di finestra come Expose di OSX.
+ -- Commutatore di compito o di finestra come Expose di OS X.
<li><a href="http://packages.debian.org/unstable/admin/srg">srg</a>
-- Analisi dei log veloce, flessibile e dettagliata per il proxy Squid.
<li><a href="http://packages.debian.org/unstable/devel/stress">stress</a>
diff --git a/italian/consultants/clive_menzies.wml b/italian/consultants/clive_menzies.wml
index 3c4cb26bdcc..29b2fc59309 100644
--- a/italian/consultants/clive_menzies.wml
+++ b/italian/consultants/clive_menzies.wml
@@ -1,12 +1,12 @@
#use wml::debian::consultant name="Clive Menzies &amp; Associates Limited"
-#use wml::debian::translation-check translation="1.2" maintainer="skizzhg"
+#use wml::debian::translation-check translation="1.3" maintainer="skizzhg"
<p>
Siamo una società di consulenza specializzata nell'aiutare le
organizzazioni a sfruttare al meglio le tecnologie dell'informazione e
della comunicazione.
Dove opportuno, allestiamo Debian GNU/Linux (l'unica distribuzione Linux
-che sosteniamo) insieme a Windows e MacOSX e supportiamo i sistemi
+che sosteniamo) insieme a Windows e Mac OS X e supportiamo i sistemi
integrati. Siamo a favore di una migrazione graduale a Debian e di solito
i nostri clienti iniziano con un server di file e di stampa basato su
Debian, dopodiché si aggiungono caratteristiche come server IMAP e
diff --git a/italian/devel/debian-installer/errata.wml b/italian/devel/debian-installer/errata.wml
index 9bbd8d5207c..80c3f811d0e 100644
--- a/italian/devel/debian-installer/errata.wml
+++ b/italian/devel/debian-installer/errata.wml
@@ -1,6 +1,6 @@
#use wml::debian::template title="Errata corrige dell'Istallatore Debian"
#use wml::debian::recent_list
-#use wml::debian::translation-check translation="1.162" maintainer="Luca Monducci"
+#use wml::debian::translation-check translation="1.163" maintainer="Luca Monducci"
<h1 id="squeeze-beta2">Errata per il rilascio squeeze release candidate 2</h1>
@@ -100,13 +100,13 @@ dell'installazione</a> in cui si descrive il proprio problema.
Si veda <a href="http://bugs.debian.org/608025">#608025</a>.
</dd>
- <dt>Tabella delle partizioni incompatibile con MacOS 9</dt>
+ <dt>Tabella delle partizioni incompatibile con Mac OS 9</dt>
<dd>
È stato riportato che il programma di partizionamento dell'installatore
- rende la tabella delle partizioni non riconoscibile da MacOS 9 e quindi
+ rende la tabella delle partizioni non riconoscibile da Mac OS 9 e quindi
ne impedisce l'avvio. Nonostante che le partizioni HFS+ sono compatibili
- con Linux e MacOS X si consiglia di prendere tutte le precauzioni
- necessarie durante l'installazione su macchine con MacOS 9.<br />
+ con Linux e Mac OS X si consiglia di prendere tutte le precauzioni
+ necessarie durante l'installazione su macchine con Mac OS 9.<br />
Si veda <a href="http://bugs.debian.org/604134">#604134</a>.
</dd>
diff --git a/italian/intro/cn.wml b/italian/intro/cn.wml
index ce77054f721..a45af5cb72a 100644
--- a/italian/intro/cn.wml
+++ b/italian/intro/cn.wml
@@ -1,6 +1,6 @@
#use wml::debian::template title="Sito web Debian in altre lingue" BARETITLE=true
#use wml::debian::toc
-#use wml::debian::translation-check translation="1.84" maintainer="skizzhg"
+#use wml::debian::translation-check translation="1.85" maintainer="skizzhg"
<define-tag toc-title-formatting endtag="required">%body</define-tag>
<define-tag toc-item-formatting endtag="required">[%body]</define-tag>
<define-tag toc-display-begin><p></define-tag>
@@ -165,7 +165,7 @@ con cui ciò è ottenibile dipende dal browser che si sta utilizzando.</p>
<pre>
Tools -&gt; Options -&gt; Content -&gt; Languages -&gt; Choose...
</pre>
- MacOS:
+ Mac OS:
<pre>
Firefox -&gt; Preferences -&gt; Content -&gt; Languages -&gt; Choose...
</pre>
@@ -210,7 +210,7 @@ con cui ciò è ottenibile dipende dal browser che si sta utilizzando.</p>
</pre>
</dd>
- <dd>MacOS:
+ <dd>Mac OS:
<pre>
Edit -&gt; Preferences -&gt; Web Browser -&gt; Language/Fonts
</pre>
@@ -309,7 +309,7 @@ con cui ciò è ottenibile dipende dal browser che si sta utilizzando.</p>
</dd>
<dt><strong><toc-add-entry name="safari">Safari</toc-add-entry></strong></dt>
- <dd>Safari usa le preferenze di sistema di MacOS X per determinare la
+ <dd>Safari usa le preferenze di sistema di Mac OS X per determinare la
lingua preferita:
<pre>
System preferences -&gt; International -&gt; Language
diff --git a/italian/ports/powerpc/history.wml b/italian/ports/powerpc/history.wml
index e7abd8ff793..d512c18e9e1 100644
--- a/italian/ports/powerpc/history.wml
+++ b/italian/ports/powerpc/history.wml
@@ -1,6 +1,6 @@
#use wml::debian::template title="Port su PowerPC -- Storia" NOHEADER="yes"
#include "$(ENGLISHDIR)/ports/powerpc/menu.inc"
-#use wml::debian::translation-check translation="1.14" maintainer="Luca Monducci"
+#use wml::debian::translation-check translation="1.15" maintainer="Luca Monducci"
<h1>Storia di Debian/PowerPC</h1>
@@ -13,10 +13,10 @@ con l'obiettivo di sviluppare del software.</p>
<p>Fortunatamente il lavoro sui bootdisk e i rootdisk era già disponibile
su <a href="http://www.linuxppc.org/">LinuxPPC</a> e quindi era possibile
provare a installare qualche programma sulla macchina. Sfortunatamente
-erano necessari anche alcuni programmi che funzionavano solo sotto MacOS e
-l'unico modo per installarli era usare un'altra macchina con MacOS in
+erano necessari anche alcuni programmi che funzionavano solo sotto Mac OS e
+l'unico modo per installarli era usare un'altra macchina con Mac OS in
esecuzione su cui fossero già installati. Ma dato che lo scambio di dati con
-le altre macchine non-MacOS poteva essere fatto solo con dei dischetti
+le altre macchine non-Mac OS poteva essere fatto solo con dei dischetti
formattati MSDOS, eravamo di fronte il classico problema dell'uovo e della
gallina.</p>
diff --git a/italian/ports/powerpc/index.wml b/italian/ports/powerpc/index.wml
index a8a4d428b8a..3bc414f20a3 100644
--- a/italian/ports/powerpc/index.wml
+++ b/italian/ports/powerpc/index.wml
@@ -1,6 +1,6 @@
#use wml::debian::template title="Port su PowerPC" NOHEADER="yes"
#include "$(ENGLISHDIR)/ports/powerpc/menu.inc"
-#use wml::debian::translation-check translation="1.74" maintainer="Luca Monducci"
+#use wml::debian::translation-check translation="1.75" maintainer="Luca Monducci"
<h1>Debian per PowerPC</h1>
@@ -54,7 +54,7 @@ di Debian/PowerPC sul tuo sistema.</p>
<p>Esistono alcune peculiarità da tenere in considerazione durante
l'installazione su iBook, TiBook o iBook2, specialmente su sistemi in
-"dual boot" con OSX. Alcuni hardware iBook2, specialmente quelli
+"dual boot" con OS X. Alcuni hardware iBook2, specialmente quelli
introdotti con gli ultimi modelli, non sono ancora perfettamente supportati.
Per informazioni specifiche sui potenziali problemi e relative soluzioni, si
leggano le seguenti pagine:</p>
@@ -102,7 +102,7 @@ Rolf Brudeseth</li>
Debian GNU/Linux non supporta ufficialmente macchine NuBus PowerPC,
come i modelli 6100, 7100, 8100 e la maggior parte dei Performa.
Ciononostante è disponibile il kernel MkLinux-based che può essere
- lanciato da un caricatore di avvio di MacOS. Un sistema Debian può
+ lanciato da un caricatore di avvio di Mac OS. Un sistema Debian può
essere utilizzato usando questo kernel che è disponibile su
<url "http://nubus-pmac.sourceforge.net/">. C'è una
<a href="http://www.mipaginaweb.com.mx/moguelc/howtos/nubus.html">\
diff --git a/italian/ports/powerpc/inst/install.wml b/italian/ports/powerpc/inst/install.wml
index 85e36efd807..10f110d74d5 100644
--- a/italian/ports/powerpc/inst/install.wml
+++ b/italian/ports/powerpc/inst/install.wml
@@ -1,6 +1,6 @@
#use wml::debian::template title="Port su PowerPC &mdash; Installazione " NOHEADER="yes"
#include "$(ENGLISHDIR)/ports/powerpc/inst/menu.inc"
-#use wml::debian::translation-check translation="1.22" maintainer="Luca Monducci"
+#use wml::debian::translation-check translation="1.23" maintainer="Luca Monducci"
<h2>Installazione di Debian GNU/Linux su macchine PowerPC</h2>
@@ -70,7 +70,7 @@ beige sono OldWorld.</p>
<p>I PowerMac chiamati NewWorld sono tutti i PowerMac con case in plastica
semitrasparente, tutti gli iMac, iBook e i sistemi G4 e G5. I PowerMac
NewWorld sono noti anche per l'uso del sistema &rdquo;ROM in RAM&ldquo; di
-MacOS e sono stati costruiti dalla metà del 1998 in poi.</p>
+Mac OS e sono stati costruiti dalla metà del 1998 in poi.</p>
<p>Questo è un elenco delle macchine PowerPC su cui Debian dovrebbe
funzionare.</p>
diff --git a/italian/releases/squeeze/debian-installer/index.wml b/italian/releases/squeeze/debian-installer/index.wml
index d4ca068f90d..4259ba76cd6 100644
--- a/italian/releases/squeeze/debian-installer/index.wml
+++ b/italian/releases/squeeze/debian-installer/index.wml
@@ -1,7 +1,7 @@
#use wml::debian::template title="Installazione di Debian &ldquo;squeeze&rdquo;" NOHEADER="true"
#include "$(ENGLISHDIR)/releases/info"
#include "$(ENGLISHDIR)/releases/squeeze/release.data"
-#use wml::debian::translation-check translation="1.6" maintainer="Luca Monducci"
+#use wml::debian::translation-check translation="1.7" maintainer="Luca Monducci"
<h1>Installazione di Debian <current_release_squeeze/></h1>
@@ -266,13 +266,13 @@ verificare che non sia già presente
Si veda <a href="http://bugs.debian.org/608025">#608025</a>.
</dd>
- <dt>Tabella delle partizioni incompatibile con MacOS 9</dt>
+ <dt>Tabella delle partizioni incompatibile con Mac OS 9</dt>
<dd>
È stato riportato che il programma di partizionamento dell'installatore
- rende la tabella delle partizioni non riconoscibile da MacOS 9 e quindi
+ rende la tabella delle partizioni non riconoscibile da Mac OS 9 e quindi
ne impedisce l'avvio. Nonostante che le partizioni HFS+ sono compatibili
- con Linux e MacOS X si consiglia di prendere tutte le precauzioni
- necessarie durante l'installazione su macchine con MacOS 9.<br />
+ con Linux e Mac OS X si consiglia di prendere tutte le precauzioni
+ necessarie durante l'installazione su macchine con Mac OS 9.<br />
Si veda <a href="http://bugs.debian.org/604134">#604134</a>.
</dd>
diff --git a/japanese/News/weekly/2003/21/index.wml b/japanese/News/weekly/2003/21/index.wml
index 4e1bbbbf5cf..cf38b2c8fef 100644
--- a/japanese/News/weekly/2003/21/index.wml
+++ b/japanese/News/weekly/2003/21/index.wml
@@ -1,5 +1,5 @@
#use wml::debian::weeklynews::header PUBDATE="2003-05-27" SUMMARY="寄付, I18n, GCC, カーネル, DebConf, マルチメディア, Wiki, CD, ロボット, 特許, タグ, 鍵署名, BTS"
-#use wml::debian::translation-check translation="1.16"
+#use wml::debian::translation-check translation="1.17"
<p>Debian コミュニティのための週刊ニュースレター、Debian
ウィークリーニュースの今年の第 21 号へようこそ。GNOME
@@ -39,8 +39,8 @@ Eugenia Loli-Queru さんは、
Pegasos</a> マシンに Debian GNU/Linux がプレインストールされていると<a
href="http://www.osnews.com/story.php?news_id=3589">報告しました</a>。
これらは、IBM/Motorola PowerPC G3 と G4 CPU をベースにしています。Mac-On-Linux
-を使えば、Apple のハードウェアや BIOS を使わずに、Debian システムで MacOS
-や OSX を起動することができます。</p>
+を使えば、Apple のハードウェアや BIOS を使わずに、Debian システムで Mac OS
+や OS X を起動することができます。</p>
<p><strong>Andrew Tridgell さんのインタビュー</strong>。
Alexander Antoniades さんは、幸運にも Andrew Tridgell さんと、Samba
diff --git a/japanese/News/weekly/2005/02/index.wml b/japanese/News/weekly/2005/02/index.wml
index 963b5e7f75c..ef60a5fb85c 100644
--- a/japanese/News/weekly/2005/02/index.wml
+++ b/japanese/News/weekly/2005/02/index.wml
@@ -1,5 +1,5 @@
#use wml::debian::weeklynews::header PUBDATE="2005-01-11" SUMMARY="KDE, アーカイブ, Java, ファームウェア, パッケージング, ドキュメンテーション, セキュリティ"
-#use wml::debian::translation-check translation="1.4"
+#use wml::debian::translation-check translation="1.5"
<p>Debian コミュニティのための週刊ニュースレター、Debian
ウィークリーニュースの今年の第 2 号へようこそ。<a
@@ -146,7 +146,7 @@ href="http://merkel.debian.org/~joeyh/testing-security.html">\
<li><a href="http://packages.debian.org/unstable/text/itagalog">itagalog</a>
-- Ispell 用の Tagalog 語辞書。
<li><a href="http://packages.debian.org/unstable/x11/kxdocker">kxdocker</a>
- -- KDE 用の、Mac OSX の Docker のような画期的な docker。
+ -- KDE 用の、Mac OS X の Docker のような画期的な docker。
<li><a href="http://packages.debian.org/unstable/sound/mpegdemux">mpegdemux</a>
-- MPEG1/2 システムのストリームデマルチプレクサ。
<li><a href="http://packages.debian.org/unstable/utils/mypasswordsafe">mypasswordsafe</a>
diff --git a/japanese/News/weekly/2005/13/index.wml b/japanese/News/weekly/2005/13/index.wml
index ad1dc7b15d8..3595863c0bf 100644
--- a/japanese/News/weekly/2005/13/index.wml
+++ b/japanese/News/weekly/2005/13/index.wml
@@ -1,5 +1,5 @@
#use wml::debian::weeklynews::header PUBDATE="2005-03-29" SUMMARY="インストーラ, メーリングリスト, 選挙, パッケージング, 品質保証, ライセンス, CD/DVD, Hurd/L4"
-#use wml::debian::translation-check translation="1.4"
+#use wml::debian::translation-check translation="1.5"
<p>Debian コミュニティのための週刊ニュースレター、Debian
ウィークリーニュースの今年の第 13 号へようこそ。James Troup さんが、ftpmaster
@@ -250,7 +250,7 @@ href="http://portal.wikinerds.org/gnu-hurd-l4-first-program">実行</a>できる
<li><a href="http://packages.debian.org/unstable/hamradio/sgcontrol">sgcontrol</a>
-- Hamlib ライブラリを使った、複数の通信受信機を操作する GUI。
<li><a href="http://packages.debian.org/unstable/x11/skippy">skippy</a>
- -- OSX Expose のような、フルスクリーンの X11 タスク/ウィンドウ切替器。
+ -- OS X Expose のような、フルスクリーンの X11 タスク/ウィンドウ切替器。
<li><a href="http://packages.debian.org/unstable/admin/srg">srg</a>
-- Squid プロキシ用の高速・柔軟かつ詳細なログ解析プログラム。
<li><a href="http://packages.debian.org/unstable/devel/stress">stress</a>
diff --git a/japanese/devel/debian-installer/errata.wml b/japanese/devel/debian-installer/errata.wml
index 7da717c71db..8ba38b8a21d 100644
--- a/japanese/devel/debian-installer/errata.wml
+++ b/japanese/devel/debian-installer/errata.wml
@@ -1,6 +1,6 @@
#use wml::debian::template title="Debian-Installer 正誤表"
#use wml::debian::recent_list
-#use wml::debian::translation-check translation="1.162"
+#use wml::debian::translation-check translation="1.163"
<h1 id="squeeze-rc2">squeeze リリース候補 2 の正誤表</h1>
@@ -86,12 +86,12 @@ href="$(HOME)/releases/stable/i386/ch05s04.html#submit-bug">インストール
<a href="http://bugs.debian.org/608025">#608025</a> を見てください。
</dd>
-<dt>MacOS 9 と互換性のないパーティションテーブルを作成する</dt>
+<dt>Mac OS 9 と互換性のないパーティションテーブルを作成する</dt>
<dd>インストーラに含まれるパーティション作業ツールが、
-MacOS 9 から認識できないパーティションテーブルを作成し、
-MacOS 9 が起動しなくなるという報告が出ています。
-HFS+ パーティションは Linux と MacOS X の間で互換性がありますが、
-MacOS 9 が入っているマシンへのインストールには事前に細心の注意が求められます。<br />
+Mac OS 9 から認識できないパーティションテーブルを作成し、
+Mac OS 9 が起動しなくなるという報告が出ています。
+HFS+ パーティションは Linux と Mac OS X の間で互換性がありますが、
+Mac OS 9 が入っているマシンへのインストールには事前に細心の注意が求められます。<br />
<a href="http://bugs.debian.org/604134">#604134</a> を見てください。
</dd>
diff --git a/japanese/intro/cn.wml b/japanese/intro/cn.wml
index d32f1cd87b4..6fba777969d 100644
--- a/japanese/intro/cn.wml
+++ b/japanese/intro/cn.wml
@@ -1,5 +1,5 @@
#use wml::debian::template title="別言語での Debian ウェブサイト" BARETITLE=true
-#use wml::debian::translation-check translation="1.84"
+#use wml::debian::translation-check translation="1.85"
#use wml::debian::toc
<define-tag toc-title-formatting endtag="required">%body</define-tag>
@@ -185,7 +185,7 @@ negotiation (内容交渉) に関する Apache のドキュメント</a>を
<pre>
ツール -&gt; オプション -&gt; コンテンツ -&gt; 言語 -&gt; 言語設定...
</pre>
- MacOS:
+ Mac OS:
<pre>
Firefox -&gt; Preferences -&gt; Content -&gt; Languages -&gt; Choose...
</pre>
@@ -230,7 +230,7 @@ negotiation (内容交渉) に関する Apache のドキュメント</a>を
</pre>
</dd>
- <dd>MacOS:
+ <dd>Mac OS:
<pre>
Edit -&gt; Preferences -&gt; Web Browser -&gt; Language/Fonts
</pre>
@@ -326,7 +326,7 @@ negotiation (内容交渉) に関する Apache のドキュメント</a>を
</dd>
<dt><strong><toc-add-entry name="safari">Safari</toc-add-entry></strong></dt>
- <dd>Safari は、MacOS X のシステム環境設定を利用して、
+ <dd>Safari は、Mac OS X のシステム環境設定を利用して、
あなたの好みの言語を決定しています。
<pre>
システム環境設定 -&gt; 言語環境 -&gt; 言語
diff --git a/korean/News/weekly/2001/23/index.wml b/korean/News/weekly/2001/23/index.wml
index 26dfbd22583..d2c898db90d 100644
--- a/korean/News/weekly/2001/23/index.wml
+++ b/korean/News/weekly/2001/23/index.wml
@@ -1,5 +1,5 @@
#use wml::debian::weeklynews::header PUBDATE="2001-09-25" SUMMARY="Xinerama, HFS+, Security, Lists Graphs, X Fonts"
-#use wml::debian::translation-check translation="1.11"
+#use wml::debian::translation-check translation="1.12"
<p><strong>KDE 2.2.1 Xinerama.</strong> Ivan Moore KDE 2.2.1
Ű <a href="http://lists.debian.org/debian-kde/2001/debian-kde-200109/msg00246.html">Xinerama
@@ -10,10 +10,10 @@ Bishop <a href="http://lists.debian.org/debian-kde-0109/msg00258.html"></a>
<p><strong> HFS+ ϱ.</strong> HFS+ Ƽ
̿ϴ Ϳ <a href="http://lists.debian.org/debian-powerpc-0109/msg00315.html"></a>
-־. HFS+ MacOS X ϴ Ƽ̴. ̹
+־. HFS+ Mac OS X ϴ Ƽ̴. ̹
Ҿϴ. HFS Ƽǿ ϴٰ Ŀ д
ߴ. Ͻýۿ ϴ <a href="http://packages.debian.org/hfsplus">hfsplus</a> Ű HFS+
- ϴ ̴. ٸ δ MacOS X ϰ
+ ϴ ̴. ٸ δ Mac OS X ϰ
̹ ִ UFS Ƽ ϴ ̴.</p>
<p><strong> GNU/ Mosix ϱ.</strong> Viral Shah
diff --git a/korean/intro/cn.wml b/korean/intro/cn.wml
index e9890603209..2f37e4246d1 100644
--- a/korean/intro/cn.wml
+++ b/korean/intro/cn.wml
@@ -178,7 +178,7 @@ fr' ؾ մϴ. ׷ ̷ ϸ 'en' û
</pre>
</dd>
-<dd>MacOS:
+<dd>Mac OS:
<pre>
Edit -&gt; Preferences -&gt; Web Browser -&gt; Language/Fonts
</pre>
@@ -273,7 +273,7 @@ preferred_language=fr; q=1.0, en; q=0.5
</dd>
<dt><strong><toc-add-entry name="safari">ĸ(Safari)</toc-add-entry></strong></dt>
-<dd>ĸ ϴ  ϱ MacOS X ý ȯ漳 մϴ.
+<dd>ĸ ϴ  ϱ Mac OS X ý ȯ漳 մϴ.
<pre>
ý ȯ漳 -&gt; ٱ -&gt;
</pre>
diff --git a/norwegian/intro/cn.wml b/norwegian/intro/cn.wml
index 93b2ccfa804..1a89d489b51 100644
--- a/norwegian/intro/cn.wml
+++ b/norwegian/intro/cn.wml
@@ -1,6 +1,6 @@
#use wml::debian::template title="Debians nettsider på flere språk" BARETITLE=true
#use wml::debian::toc
-#use wml::debian::translation-check translation="1.84" maintainer="Hans F. Nordhaug"
+#use wml::debian::translation-check translation="1.85" maintainer="Hans F. Nordhaug"
# Oversatt til norsk av Tor Slettnes <tor@slett.net>
# Vesentlig oppdatert av Hans F. Nordhaug <hansfn@gmail.com>, 2008.
# Oppdatert av Hans F. Nordhaug <hansfn@gmail.com>, 2010-2011.
@@ -212,7 +212,7 @@ nettleseren din, som beskrevet nedenfor.</p>
<pre>
Verktøy -&gt; Innstillinger -&gt; Innhold -&gt; Språk -&gt; Velg ...
</pre>
- MacOS:
+ Mac OS:
<pre>
Firefox -&gt; Innstillinger -&gt; Innhold -&gt; Språk -&gt; Velg ...
</pre>
@@ -256,7 +256,7 @@ nettleseren din, som beskrevet nedenfor.</p>
</pre>
</dd>
- <dd>MacOS:
+ <dd>Mac OS:
<pre>
Edit -&gt; Preferences -&gt; Web Browser -&gt; Language/Fonts
</pre>
@@ -369,7 +369,7 @@ nettleseren din, som beskrevet nedenfor.</p>
</dd>
<dt><strong><toc-add-entry name="safari">Safari</toc-add-entry></strong></dt>
- <dd>Safari bruker MacOS X sine systeminnstillinger for å avgjøre ditt
+ <dd>Safari bruker Mac OS X sine systeminnstillinger for å avgjøre ditt
foretrukne språk:
<pre>
System preferences -&gt; International -&gt; Language
diff --git a/polish/News/weekly/2001/23/index.wml b/polish/News/weekly/2001/23/index.wml
index d365fcce083..7811d87987e 100644
--- a/polish/News/weekly/2001/23/index.wml
+++ b/polish/News/weekly/2001/23/index.wml
@@ -1,5 +1,5 @@
#use wml::debian::weeklynews::header PUBDATE="2001-09-25" SUMMARY="Xinerama, HFS+, Bezpieczeństwo, Grafiki list dyskusyjnych, Fonty Xów"
-#use wml::debian::translation-check translation="1.11"
+#use wml::debian::translation-check translation="1.12"
# $Id$
<p><strong>KDE 2.2.1 i Xinerama.</strong> Pakiety KDE 2.2.1 autorstwa Ivana Moore'a są
@@ -13,7 +13,7 @@ i umieścił kilka
<p><strong>Użycie HFS+ w Linuksie.</strong> Miała miejsce
<a href="http://lists.debian.org/debian-powerpc-0109/msg00315.html">
dyskusja</a> na temat używania
-partycji HFS+ w Linuksie. Ten typ partycji jest używany w MacOS X
+partycji HFS+ w Linuksie. Ten typ partycji jest używany w Mac OS X
do dużych partycji. Jednakże sterownik Linuksa jest niestabilny i
nierozwijany. Kilkoro ludzi zgłaszało występowanie <q>kernel panic</q>
podczas dostępu do partycji HFS+. Jedyną drogą dostępu do tych
@@ -21,7 +21,7 @@ partycji jest użycie narzędzi spoza jądra, znajdujących się w
pakiecie
<a href="http://packages.debian.org/hfsplus">hfsplus</a>.
Można także używać partycji UFS, które także
-są wspierane przez MacOS X, a dla których istnieje eksperymentalny
+są wspierane przez Mac OS X, a dla których istnieje eksperymentalny
sterownik w jądrze Linuksa.
</p>
diff --git a/polish/News/weekly/2003/21/index.wml b/polish/News/weekly/2003/21/index.wml
index e1edebda4c3..6fc7d7cd5e0 100644
--- a/polish/News/weekly/2003/21/index.wml
+++ b/polish/News/weekly/2003/21/index.wml
@@ -1,5 +1,5 @@
#use wml::debian::weeklynews::header PUBDATE="2003-05-27" SUMMARY="Dotacje, I18n, GCC, Jądro, DebConf, Multimedia, Wiki, CD, Roboty, Patenty, Znaczniki, Podpisywanie kluczy, BTS"
-#use wml::debian::translation-check translation="1.16"
+#use wml::debian::translation-check translation="1.17"
<p>Witaj w dwudziestym pierwszym w tym roku numerze DWN, tygodniku dla osób
zainteresowanych i związanych z Debianem. Projekt GNOME <a
@@ -38,7 +38,7 @@ href="http://www.osnews.com/story.php?news_id=3589">poinformował</a>,
że komputery <a href="http://www.pegasosppc.com/">Pegasos</a> z procesorami
IBM Motorola PowerPC G3 i G4 są dostarczane w preinstalowanym systemem
Debian GNU/Linux. Poprzez użycie Mac-On-Linux, można na Debianie uruchomić
-system MacOS lub OSX bez użycia sprzętu lub BIOSu Apple.</p>
+system Mac OS lub OS X bez użycia sprzętu lub BIOSu Apple.</p>
<p><strong>Wywiad z Andrew Tridgellem.</strong> Alexander Antoniades miał to
szczęście i <a href="http://www.newsforge.com/article.pl?sid=03/05/02/1316220">\
diff --git a/polish/intro/cn.wml b/polish/intro/cn.wml
index 751fb6ed01d..338de3f42a5 100644
--- a/polish/intro/cn.wml
+++ b/polish/intro/cn.wml
@@ -1,6 +1,6 @@
#use wml::debian::template title="Witryna Debiana w różnych językach" BARETITLE=true
#use wml::debian::toc
-#use wml::debian::translation-check translation="1.84"
+#use wml::debian::translation-check translation="1.85"
<define-tag toc-title-formatting endtag="required">%body</define-tag>
<define-tag toc-item-formatting endtag="required">[%body]</define-tag>
@@ -166,7 +166,7 @@ używasz.</p>
<pre>
Narzędzia -&gt; Opcje -&gt; Treść -&gt; Języki -&gt; Wybierz
</pre>
- MacOS:
+ Mac OS:
<pre>
Firefox -&gt; Preferencje -&gt; Treść -&gt; Języki -&gt; Wybierz
</pre>
@@ -210,7 +210,7 @@ używasz.</p>
</pre>
</dd>
- <dd>MacOS:
+ <dd>Mac OS:
<pre>
Edit -&gt; Preferences -&gt; Web Browser -&gt; Language/Fonts
</pre>
@@ -308,7 +308,7 @@ używasz.</p>
<dt><strong><toc-add-entry name="safari">Safari</toc-add-entry></strong></dt>
<dd>W celu określenia preferowanego języka Safari używa systemu preferencji
- w MacOS X:
+ w Mac OS X:
<pre>
Preferencje systemowe -&gt; Międzynarodowe -&gt; Język
</pre>
diff --git a/polish/ports/powerpc/index.wml b/polish/ports/powerpc/index.wml
index 8e5893e85ab..dd5df278a7c 100644
--- a/polish/ports/powerpc/index.wml
+++ b/polish/ports/powerpc/index.wml
@@ -1,6 +1,6 @@
#use wml::debian::template title="Port PowerPC" NOHEADER="yes"
#include "$(ENGLISHDIR)/ports/powerpc/menu.inc"
-#use wml::debian::translation-check translation="1.74"
+#use wml::debian::translation-check translation="1.75"
<h1>Debian na PowerPC</h1>
@@ -58,7 +58,7 @@
<p>
Jeśli chcesz zainstalować Debiana na maszynie iBook, TiBook lub iBook2,
powinieneś wiedzieć o paru dziwactwach, zwłaszcza jeśli planujesz
- ko-instalację z Mac OSX. Niektóre komputery iBook2, zwłaszcza nowsze modele,
+ ko-instalację z Mac OS X. Niektóre komputery iBook2, zwłaszcza nowsze modele,
nie są jeszcze zbyt dobrze obsługiwane. Konkretne informacje na temat
potencjalnych problemów i rozwiązań można znaleźć na następujących stronach:
</p>
@@ -95,7 +95,7 @@
Debian GNU/Linux nie wspiera oficjalnie maszyn NuBus PowerPC takich jak
6100, 7100, 8100 lub większość serii Performa. Pod adresem <url
"http://nubus-pmac.sourceforge.net/"> dostępne jest jednak jądro oparte na
- MkLinux, które można uruchomić z programu rozruchowego MacOS.
+ MkLinux, które można uruchomić z programu rozruchowego Mac OS.
Używając tego jądra można zainstalować system Debian.
Dostępny jest (w języku hiszpańskim)
<a href="http://www.mipaginaweb.com.mx/moguelc/howtos/nubus.html">
diff --git a/portuguese/News/weekly/2001/23/index.wml b/portuguese/News/weekly/2001/23/index.wml
index f26b1439bc2..d1fb7a445aa 100644
--- a/portuguese/News/weekly/2001/23/index.wml
+++ b/portuguese/News/weekly/2001/23/index.wml
@@ -1,5 +1,5 @@
#use wml::debian::weeklynews::header PUBDATE="2001-09-25" SUMMARY="Xinerama, HFS+, Segurança, Gráficos das Listas, Fontes X"
-#use wml::debian::translation-check translation="1.11"
+#use wml::debian::translation-check translation="1.12"
<p><strong>KDE 2.2.1 e Xinerama.</strong> Os pacotes do KDE 2.2.1 do Ivan
Moore foram compilados sem suporte a Xinerama por razões <a
@@ -11,13 +11,13 @@ aqui</a></p>
<p><strong>Usando HFS+ com Linux.</strong> Houve uma <a
href="http://lists.debian.org/debian-powerpc-0109/msg00315.html">discussão</a>
-sobre usar partições HFS+ com Linux. Elas são usadas no MacOS X para partições
+sobre usar partições HFS+ com Linux. Elas são usadas no Mac OS X para partições
grandes. Um driver existente para Linux é, no entanto, instável e abandonado.
Várias pessoas experimentaram kernel panics enquando acessavam partições
HFS. A única maneira de acessar esse sistema de arquivos com o Linux é usar
ferramentas de espaço de usuário para HFS+ que vêm no pacote
<a href="http://packages.debian.org/hfsplus">hfsplus</a>. Alternativamente,
-pode-se usar partições UFS, que o MacOS X suporta e para as quais está
+pode-se usar partições UFS, que o Mac OS X suporta e para as quais está
disponível um driver experimental para Linux.</p>
<p><strong>Usando o Mosix no Debian GNU/Linux.</strong> Viral Shah escreveu
diff --git a/portuguese/News/weekly/2003/21/index.wml b/portuguese/News/weekly/2003/21/index.wml
index 134110e827c..b49afbc89a4 100644
--- a/portuguese/News/weekly/2003/21/index.wml
+++ b/portuguese/News/weekly/2003/21/index.wml
@@ -1,5 +1,5 @@
#use wml::debian::weeklynews::header PUBDATE="2003-05-27" SUMMARY="Doações, I18n, GCC, Kernel, DebConf, Multimídia, Wiki, CDs, Robôs, Patentes, Tags, Assinatura de Chaves, BTS"
-#use wml::debian::translation-check translation="1.16"
+#use wml::debian::translation-check translation="1.17"
<p>Bem-vindo à vigésima primeira edição da DWN, o periódico semanal para a
comunidade Debian. O projeto GNOME <a
@@ -36,7 +36,7 @@ que impedem o funcionamento da tradução.</p>
href="http://www.osnews.com/story.php?news_id=3589">relatou</a> que o Debian
GNU/Linux vem pré-instalado nas máquinas <a href="http://www.pegasosppc.com/">\
Pegasos</a> que são baseadas nas CPUs IBM/Motorola PowerPC G3 e G4. Através do
-uso do Mac-On-Linux o sistema Debian permite que você rode o MacOS ou OSX
+uso do Mac-On-Linux o sistema Debian permite que você rode o Mac OS ou OS X
sem a necessidade de hardware ou BIOS da Apple.</p>
<p><strong>Entrevista com Andrew Tridgell.</strong> Alexander Antoniades foi
diff --git a/portuguese/News/weekly/2005/02/index.wml b/portuguese/News/weekly/2005/02/index.wml
index c1553abf42b..4def64757cf 100644
--- a/portuguese/News/weekly/2005/02/index.wml
+++ b/portuguese/News/weekly/2005/02/index.wml
@@ -1,5 +1,5 @@
#use wml::debian::weeklynews::header PUBDATE="2005-01-11" SUMMARY="KDE, Repositório, Java, Firmware, Epacotamento, Documentação, Segurança"
-#use wml::debian::translation-check translation="1.4" translation_maintainer="Gustavo Rezende Montesino"
+#use wml::debian::translation-check translation="1.5" translation_maintainer="Gustavo Rezende Montesino"
<p>Bem-vindo à segunda edição deste ano da DWN, o periódico semanal para
a comunidade Debian. <a
@@ -151,7 +151,7 @@ contêm atualizações importantes.</p>
<li><a href="http://packages.debian.org/unstable/text/itagalog">itagalog</a>
-- Dicionário Tagalog para Ispell.
<li><a href="http://packages.debian.org/unstable/x11/kxdocker">kxdocker</a>
- -- Docker inovativo para KDE que é como o Docker do Mac OSX.
+ -- Docker inovativo para KDE que é como o Docker do Mac OS X.
<li><a href="http://packages.debian.org/unstable/sound/mpegdemux">mpegdemux</a>
-- Demultiplexer para stream de sistema MPEG1/2.
<li><a href="http://packages.debian.org/unstable/utils/mypasswordsafe">mypasswordsafe</a>
diff --git a/portuguese/News/weekly/2005/13/index.wml b/portuguese/News/weekly/2005/13/index.wml
index 2f595a1948b..04d2ef01de8 100644
--- a/portuguese/News/weekly/2005/13/index.wml
+++ b/portuguese/News/weekly/2005/13/index.wml
@@ -1,5 +1,5 @@
#use wml::debian::weeklynews::header PUBDATE="2005-03-29" SUMMARY="Instalador, Listas, Eleição, Empacotamento, QA, Licenças, CDs/DVDs, Hurd/L4"
-#use wml::debian::translation-check translation="1.4" translation_maintainer="Gustavo Rezende Montesino"
+#use wml::debian::translation-check translation="1.5" translation_maintainer="Gustavo Rezende Montesino"
<p>Bem vindo a décima terceira edição deste ano da DWN, o periódico
semanal para a comunidade Debian. James Troup <a
@@ -255,7 +255,7 @@ contêm atualizações importantes.</p>
<li><a href="http://packages.debian.org/unstable/hamradio/sgcontrol">sgcontrol</a>
-- GUI para vários receptores de comunicação usando a biblioteca Hamlib.
<li><a href="http://packages.debian.org/unstable/x11/skippy">skippy</a>
- -- Alterador de tarefa/janela X11 em tela cheia, similar ao Expose do OSX.
+ -- Alterador de tarefa/janela X11 em tela cheia, similar ao Expose do OS X.
<li><a href="http://packages.debian.org/unstable/admin/srg">srg</a>
-- Análises detalhadas, rápidas e flexíveis de log para o Proxy Squid.
<li><a href="http://packages.debian.org/unstable/devel/stress">stress</a>
diff --git a/portuguese/intro/cn.wml b/portuguese/intro/cn.wml
index 888cfe94972..bc5ecb303a4 100644
--- a/portuguese/intro/cn.wml
+++ b/portuguese/intro/cn.wml
@@ -197,7 +197,7 @@ do navegador que você está usando.</p>
</pre>
</dd>
- <dd>MacOS:
+ <dd>Mac OS:
<pre>
Edit -&gt; Preferences -&gt; Web Browser -&gt; Language/Fonts
</pre>
@@ -296,7 +296,7 @@ do navegador que você está usando.</p>
</dd>
<dt><strong><toc-add-entry name="safari">Safari</toc-add-entry></strong></dt>
- <dd>O Safari usa o sistema de preferências do MacOS X para determinar seu
+ <dd>O Safari usa o sistema de preferências do Mac OS X para determinar seu
idioma preferido:
<pre>
Preferências de sistema -&gt; Internacional -&gt; Idioma
diff --git a/portuguese/users/edu/lyceemoliere.wml b/portuguese/users/edu/lyceemoliere.wml
index c95879df46c..a09b7d664f2 100644
--- a/portuguese/users/edu/lyceemoliere.wml
+++ b/portuguese/users/edu/lyceemoliere.wml
@@ -4,7 +4,7 @@
<define-tag webpage>http://www.lycee-moliere.org/</define-tag>
#use wml::debian::users
-#use wml::debian::translation-check translation="1.3"
+#use wml::debian::translation-check translation="1.4"
<p>
Sendo uma escola particular, a Lycée Molière não têm os benefícios
@@ -15,7 +15,7 @@
<p>
Quando falamos em prover os serviços comuns de Internet para a escola, a
solução GNU/Linux tornou-se óbvia para nós. Nossa rede é feita de
- +/- 30 Macintosh Imacs (ainda rodando MacOS, pelo menos por enquanto!)
+ +/- 30 Macintosh Imacs (ainda rodando Mac OS, pelo menos por enquanto!)
no lado das estações de trabalho, e 1 servidor de email (exim,
cyrus-IMAPd e squirrelMail), um servidor web (apache), um servidor DNS
(bind9), um servidor de arquivos (netatalk) e um servidor proxy (Squid
diff --git a/romanian/intro/cn.wml b/romanian/intro/cn.wml
index 6be610b70f6..ff0c680b564 100644
--- a/romanian/intro/cn.wml
+++ b/romanian/intro/cn.wml
@@ -201,7 +201,7 @@ valoarea <kbd>intl.accept_languages</kbd>.
Tools sau View sau Extras -&gt; Internet Options -&gt; (General) Languages
</pre>
-<dd>MacOS:
+<dd>Mac OS:
<pre>
Edit -&gt; Preferences -&gt; Web Browser -&gt; Language/Fonts
</pre>
@@ -293,7 +293,7 @@ sau folosind pachete speciale (dacă aveți versiunea URL p4.0pre.14):
</pre>
<dt><strong><toc-add-entry name="safari">Safari</toc-add-entry></strong></dt>
-<dd>Safari folosește preferințele sistemului X MacOS pentru a determina
+<dd>Safari folosește preferințele sistemului X Mac OS pentru a determina
limba preferată:
<pre>
System preferences -&gt; International -&gt; Language
diff --git a/russian/intro/cn.wml b/russian/intro/cn.wml
index 49546932c9d..072a91152fa 100644
--- a/russian/intro/cn.wml
+++ b/russian/intro/cn.wml
@@ -1,6 +1,6 @@
#use wml::debian::template title="Web-сайт Debian на разных языках" BARETITLE=true
#use wml::debian::toc
-#use wml::debian::translation-check translation="1.84"
+#use wml::debian::translation-check translation="1.85"
<define-tag toc-title-formatting endtag="required">%body</define-tag>
<define-tag toc-item-formatting endtag="required">[%body]</define-tag>
@@ -175,7 +175,7 @@ Apache по согласованию содержания</a>.</p>
<pre>
Tools -&gt; Options -&gt; General -&gt; Languages -&gt; Choose...
</pre>
- MacOS:
+ Mac OS:
<pre>
Firefox -&gt; Preferences -&gt; Content -&gt; Languages -&gt; Choose...
</pre>
@@ -220,7 +220,7 @@ Apache по согласованию содержания</a>.</p>
</pre>
</dd>
- <dd>MacOS:
+ <dd>Mac OS:
<pre>
Edit -&gt; Preferences -&gt; Web Browser -&gt; Language/Fonts
</pre>
@@ -317,7 +317,7 @@ Apache по согласованию содержания</a>.</p>
<dt><strong><toc-add-entry name="safari">Safari</toc-add-entry></strong></dt>
<dd>Safari использует для определения предпочтительного языка настройки
- системы MacOS X:
+ системы Mac OS X:
<pre>
System preferences -&gt; International -&gt; Language
</pre>
diff --git a/russian/ports/powerpc/index.wml b/russian/ports/powerpc/index.wml
index bbcccbb494f..1437774255d 100644
--- a/russian/ports/powerpc/index.wml
+++ b/russian/ports/powerpc/index.wml
@@ -1,5 +1,5 @@
#use wml::debian::template title="Перенос на платформу PowerPC" NOHEADER="yes"
-#use wml::debian::translation-check translation="1.74" maintainer="Alexander Reshetov"
+#use wml::debian::translation-check translation="1.75" maintainer="Alexander Reshetov"
#include "$(ENGLISHDIR)/ports/powerpc/menu.inc"
<h1>Debian на платформе PowerPC</h1>
@@ -58,7 +58,7 @@ GNU/Linux 2.2 (<q>Potato</q>) и сохранил этот статус до с
<p>
Есть некоторые особенности, о которых вы должны знать при установке на iBook,
- TiBook или iBook2, особенно, когда есть двойная загрузка с Mac OSX. Некоторые
+ TiBook или iBook2, особенно, когда есть двойная загрузка с Mac OS X. Некоторые
машины iBook2, особенно новые модели, пока ещё не очень хорошо поддерживаются.
Конкретную информацию о возможных проблемах и способах их решения см. на
следующих страницах:
@@ -95,7 +95,7 @@ GNU/Linux 2.2 (<q>Potato</q>) и сохранил этот статус до с
<p>
Debian GNU/Linux официально не поддерживает машины NuBus PowerPC, типа 6100,
7100, 8100 и большинство серий Performa. Однако, существует ядро на основе
- MkLinux, которое может быть запущено из загрузчика MacOS. Система Debian может
+ MkLinux, которое может быть запущено из загрузчика Mac OS. Система Debian может
быть установлена с использованием этого ядра, которое доступно на <url
"http://nubus-pmac.sourceforge.net/">. Есть <a
href="http://www.mipaginaweb.com.mx/moguelc/howtos/nubus.html">описание на
diff --git a/slovak/intro/cn.wml b/slovak/intro/cn.wml
index 158a613dbaa..c182eaa6ac0 100644
--- a/slovak/intro/cn.wml
+++ b/slovak/intro/cn.wml
@@ -1,6 +1,6 @@
#use wml::debian::template title="Webová stránka Debianu v rôznych jazykoch" BARETITLE=true
#use wml::debian::toc
-#use wml::debian::translation-check translation="1.84" maintainer="Slavko"
+#use wml::debian::translation-check translation="1.85" maintainer="Slavko"
<define-tag toc-title-formatting endtag="required">%body</define-tag>
<define-tag toc-item-formatting endtag="required">[%body]</define-tag>
@@ -165,7 +165,7 @@ na prehliadači, ktorý používate.</p>
<pre>
Upraviť -&gt; Možnosti -&gt; Obsah -&gt; Jazyky -&gt; Vybrať...
</pre>
- MacOS:
+ Mac OS:
<pre>
Firefox -&gt; Možnosti -&gt; Obsah -&gt; Jazyky -&gt; Vybrať...
</pre>
@@ -210,7 +210,7 @@ na prehliadači, ktorý používate.</p>
</pre>
</dd>
- <dd>MacOS:
+ <dd>Mac OS:
<pre>
Edit -&gt; Preferences -&gt; Web Browser -&gt; Language/Fonts
</pre>
@@ -310,7 +310,7 @@ na prehliadači, ktorý používate.</p>
<dt><strong><toc-add-entry name="safari">Safari</toc-add-entry></strong></dt>
<dd>Safari používa na určenie zvoleného jazyka systémové nastavenia
- MacOS X:
+ Mac OS X:
<pre>
System preferences -&gt; International -&gt; Language
</pre>
diff --git a/spanish/News/weekly/1999/12/mail.wml b/spanish/News/weekly/1999/12/mail.wml
index d1596c10284..f962c8e5e4c 100644
--- a/spanish/News/weekly/1999/12/mail.wml
+++ b/spanish/News/weekly/1999/12/mail.wml
@@ -1,5 +1,5 @@
#use wml::debian::weeklynews::header PAGENAME="email"
-#use wml::debian::translation-check translation="1.5"
+#use wml::debian::translation-check translation="1.6"
<a name="mail1"></a>
<pre>
@@ -73,11 +73,11 @@ las condiciones. Sería terriblemente irónico que un intento fallido de
hacer una licencia de software libre resultara ser una extensión efectiva
de la parcela de poder del copyright.
-Aparte de esto, debemos recordar que sólo una parte de MacOS está siendo
+Aparte de esto, debemos recordar que sólo una parte de Mac OS está siendo
liberada bajo la APSL. Incluso si los defectos fatales y los problemas
prácticos de la APSL se arreglaran, incluso si se convirtiera en una muy
buena licencia de software libre, eso no sería bueno para las otras partes
-de MacOS donde el código fuente no se libera de ninguna forma. No debemos
+de Mac OS donde el código fuente no se libera de ninguna forma. No debemos
juzgar el todo de una empresa sino sólo parte de lo que hacen.
En resumen, pienso que la acción de Apple es un ejemplo de los efectos del
diff --git a/spanish/News/weekly/2003/21/index.wml b/spanish/News/weekly/2003/21/index.wml
index 3b333362719..bb1049272c7 100644
--- a/spanish/News/weekly/2003/21/index.wml
+++ b/spanish/News/weekly/2003/21/index.wml
@@ -1,5 +1,5 @@
#use wml::debian::weeklynews::header PUBDATE="2003-05-27" SUMMARY="Donaciones, I18n, GCC, Núcleo, DebConf, Multimedia, Wiki, CDs, Robots, Patentes, Etiquetas, Firmado de claves, BTS"
-#use wml::debian::translation-check translation="1.16"
+#use wml::debian::translation-check translation="1.17"
<p>Bienvenidos a la edición número 21 de las DWN, el boletín semanal de la
comunidad Debian. El proyecto GNOME <a
@@ -38,7 +38,7 @@ href="http://www.osnews.com/story.php?news_id=3589">informó</a> que Debian
GNU/Linux viene preinstalado en maquinas <a href="http://www.pegasosppc.com/">\
Pegasos</a> las cuales están basadas en los procesadores IBM/Motorola PowerPC
G3 y G4. A través del uso de Mac-On-Linux los sistemas Debian permiten ejecutar
-MacOS u OSX sin requerir hardware de Apple o un BIOS.</p>
+Mac OS u OS X sin requerir hardware de Apple o un BIOS.</p>
<p><strong>Entrevista con Andrew Tridgell.</strong> Alexander Antoniades tuvo
la suerte de <a href="http://www.newsforge.com/article.pl?sid=03/05/02/1316220">\
diff --git a/spanish/News/weekly/2005/13/index.wml b/spanish/News/weekly/2005/13/index.wml
index 084359195aa..d7fab365e2b 100644
--- a/spanish/News/weekly/2005/13/index.wml
+++ b/spanish/News/weekly/2005/13/index.wml
@@ -1,5 +1,5 @@
#use wml::debian::weeklynews::header PUBDATE="2005-03-29" SUMMARY="Instalador, listas, elección, empaquetado, aseguramiento de calidad, licencias, CDs/DVDs, Hurd/L4"
-#use wml::debian::translation-check translation="1.4"
+#use wml::debian::translation-check translation="1.5"
<p>Bienvenidos a la décimo tercera edición de este año de las DWN, el boletín
semanal de la comunidad de Debian. James Troup ha <a
@@ -260,7 +260,7 @@ contienen actualizaciones importantes.</p>
<li><a href="http://packages.debian.org/unstable/hamradio/sgcontrol">sgcontrol</a>
-- GUI to multiple communications receivers using the Hamlib library.
<li><a href="http://packages.debian.org/unstable/x11/skippy">skippy</a>
- -- Full-screen X11 task/window switcher, similar to OSX Expose.
+ -- Full-screen X11 task/window switcher, similar to OS X Expose.
<li><a href="http://packages.debian.org/unstable/admin/srg">srg</a>
-- Fast, Flexible and Detailed log analysis for the Squid Proxy.
<li><a href="http://packages.debian.org/unstable/devel/stress">stress</a>
diff --git a/spanish/intro/cn.wml b/spanish/intro/cn.wml
index f63a51111f8..4f6ea61d48f 100644
--- a/spanish/intro/cn.wml
+++ b/spanish/intro/cn.wml
@@ -218,7 +218,7 @@ establecer la variable que se le pasa al servidor web. La forma en que se realiz
</pre>
</dd>
- <dd>MacOS:
+ <dd>Mac OS:
<pre>
Editar -&gt; Preferencias -&gt; Navegador Web -&gt; Idioma/Fuentes
</pre>
@@ -314,7 +314,7 @@ establecer la variable que se le pasa al servidor web. La forma en que se realiz
</pre>
<dt><strong><toc-add-entry name="safari">Safari</toc-add-entry></strong></dt>
- <dd>Safari usa el sistema de preferencias de MacOS X para determinar su
+ <dd>Safari usa el sistema de preferencias de Mac OS X para determinar su
idioma preferido:
<pre>
Preferencias del Sistema -&gt; Internacional -&gt; Idioma
diff --git a/spanish/ports/powerpc/history.wml b/spanish/ports/powerpc/history.wml
index 497655d5224..fe49e00945f 100644
--- a/spanish/ports/powerpc/history.wml
+++ b/spanish/ports/powerpc/history.wml
@@ -1,5 +1,5 @@
#use wml::debian::template title="Adaptación a PowerPC (Historia)" NOHEADER="yes"
-#use wml::debian::translation-check translation="1.14"
+#use wml::debian::translation-check translation="1.15"
#include "$(ENGLISHDIR)/ports/powerpc/menu.inc"
<br>
@@ -18,10 +18,10 @@
Afortunadamente se encontraron discos de arranque y raiz en
<a href="http://www.linuxppc.org/">LinuxPPC</a> y pudimos intentar instalar
algo en la máquina. Por desgracia esto requería algunos
- programas que sólo corren bajo MacOS. La única forma de
- instalarlos fue conseguir otra máquina funcionando con MacOS que ya
+ programas que sólo corren bajo Mac OS. La única forma de
+ instalarlos fue conseguir otra máquina funcionando con Mac OS que ya
los tuviera instalados. Dado que el intercambio de datos con otras
- máquinas que no sean MacOS sólo era posible a través de
+ máquinas que no sean Mac OS sólo era posible a través de
discos con formato ms-dos esto se convertía en el problema de la
gallina y el huevo.
</p>
diff --git a/spanish/ports/powerpc/inst/install.wml b/spanish/ports/powerpc/inst/install.wml
index cb5c26756bb..0e15ff89a8a 100644
--- a/spanish/ports/powerpc/inst/install.wml
+++ b/spanish/ports/powerpc/inst/install.wml
@@ -1,6 +1,6 @@
#use wml::debian::template title="Migración a PowerPC -- Instalación " NOHEADER="yes"
#include "$(ENGLISHDIR)/ports/powerpc/inst/menu.inc"
-#use wml::debian::translation-check translation="1.22" maintainer="Fernando Cerezal"
+#use wml::debian::translation-check translation="1.23" maintainer="Fernando Cerezal"
<h2> Instalación de Debian GNU/Linux en máquinas PowerPC </h2>
<p>
@@ -73,7 +73,7 @@ máquinas OldWorld. Los sistemas G3 de color beige también son OldWorld.
<p>
Los llamados PowerMac NewWorld son cualquier PowerMac con cubiertas de
plástico con colores translúcidos, todos los sistemas iMacs, iBooks, G4 y G5. Los PowerMac NewWorld también son conocidos
-por usar el sistema "ROM en RAM" para MacOS, y se manufacturaron desde
+por usar el sistema "ROM en RAM" para Mac OS, y se manufacturaron desde
mediados de 1998 en adelante.
<p>Aquí tiene una lista de máquinas powerpc en las que debería funcionar
diff --git a/swedish/News/weekly/2001/23/index.wml b/swedish/News/weekly/2001/23/index.wml
index 00bcb011de4..a4f1d324a72 100644
--- a/swedish/News/weekly/2001/23/index.wml
+++ b/swedish/News/weekly/2001/23/index.wml
@@ -1,5 +1,5 @@
#use wml::debian::weeklynews::header PUBDATE="2001-09-25" SUMMARY="Xinerama, HFS+, säkerhet, Listgrafer, X-teckensnitt"
-#use wml::debian::translation-check translation="1.11"
+#use wml::debian::translation-check translation="1.12"
<p><strong>KDE 2.2.1 och Xinerama.</strong>
Ivan Moores KDE 2.2.1-paket kompileras utan Xineramastöd av orsaker
@@ -14,13 +14,13 @@ här</a>.</p>
Det förekom en
<a href="http://lists.debian.org/debian-powerpc-0109/msg00315.html">
diskussion</a> om att använda HFS+-partitioner på Linux, vilka
-används på MacOS X för stora partitioner.
+används på Mac OS X för stora partitioner.
Linuxdrivrutinen är dock instabil och övergiven, och flera personer har fått
&rdquo;<span lang=en>kernel panics</span>&rdquo; när de läst HFS-partitioner.
Det enda sättet att läsa detta filsystem från Linux är att använda
användarrymds-HFS+-verktygen från
<a href="http://packages.debian.org/hfsplus">hfsplus</a>paketet.
-Alternativt kan man använda UFS-partitioner, vilket MacOS X stöder, och för
+Alternativt kan man använda UFS-partitioner, vilket Mac OS X stöder, och för
vilket en experimentell Linuxdrivrutin är tillgänglig.</p>
<p><strong>Använda Mosix på Debian GNU/Linux.</strong>
diff --git a/swedish/News/weekly/2003/21/index.wml b/swedish/News/weekly/2003/21/index.wml
index d4a27d6de5b..8318f506520 100644
--- a/swedish/News/weekly/2003/21/index.wml
+++ b/swedish/News/weekly/2003/21/index.wml
@@ -1,5 +1,5 @@
#use wml::debian::weeklynews::header PUBDATE="2003-05-27" SUMMARY="Donationer, i18n, GCC, kärna, DebConf, multimedia, Wiki, cd, robotar, patent, märken, nyckelsignering, BTS"
-#use wml::debian::translation-check translation="1.16"
+#use wml::debian::translation-check translation="1.17"
<p>
Välkommen till årets 21:a utgåva av DWN, veckonyhetsbrevet för Debianfolk.
@@ -48,7 +48,7 @@ Eugenia Loli-Queru
Debian GNU/Linux kommer förinstallerat på
<a href="http://www.pegasosppc.com/">Pegasosmaskiner</a> som är baserade på
processorerna IBM/Motorola PowerPC G3 och G4.
-Genom att använda Mac-på-Linux låter Debiansystemen dig att köra MacOS eller OSX
+Genom att använda Mac-på-Linux låter Debiansystemen dig att köra Mac OS eller OS X
utan att behöva Applemaskinvara eller ett BIOS.
</p>
diff --git a/swedish/News/weekly/2005/02/index.wml b/swedish/News/weekly/2005/02/index.wml
index 03fc0305834..4358d490e32 100644
--- a/swedish/News/weekly/2005/02/index.wml
+++ b/swedish/News/weekly/2005/02/index.wml
@@ -1,5 +1,5 @@
#use wml::debian::weeklynews::header PUBDATE="2005-01-11" SUMMARY="KDE, arkiv, Java, fastprogram, paketering, dokumentation, säkerhet"
-#use wml::debian::translation-check translation="1.4"
+#use wml::debian::translation-check translation="1.5"
<p>Välkommen till årets andra utgåva av DWN, veckonyhetsbrevet för Debianfolk.
<a href="http://www.pjls16812.pwp.blueyonder.co.uk/knowing-knoppix/index.html">Knowing Knoppix</a>
diff --git a/swedish/News/weekly/2005/13/index.wml b/swedish/News/weekly/2005/13/index.wml
index 0af95560372..89ee5faaefa 100644
--- a/swedish/News/weekly/2005/13/index.wml
+++ b/swedish/News/weekly/2005/13/index.wml
@@ -1,5 +1,5 @@
#use wml::debian::weeklynews::header PUBDATE="2005-03-29" SUMMARY="Installationsprogram, listor, val, paketering, QA, licenser, cd/dvd, Hurd/L4"
-#use wml::debian::translation-check translation="1.4"
+#use wml::debian::translation-check translation="1.5"
<p>Välkommen till årets trettonde utgåva av DWN, veckonyhetsbrevet för Debianfolk.
James Troup
@@ -284,7 +284,7 @@ lagts till det instabila Debianarkivet eller innehåller viktiga uppdateringar.
&ndash; Grafiskt gränssnitt till flera kommunikationsmottagningsprogram med
Hamlibbiblioteket.
<li><a href="http://packages.debian.org/unstable/x11/skippy">skippy</a>
- &ndash; Fullskärms X11-programväxlare, liknande OSX Expose.
+ &ndash; Fullskärms X11-programväxlare, liknande OS X Expose.
<li><a href="http://packages.debian.org/unstable/admin/srg">srg</a>
&ndash; Snabb, flexibel och detaljerad logganalyserare för Squid Proxy.
<li><a href="http://packages.debian.org/unstable/devel/stress">stress</a>
diff --git a/swedish/intro/cn.wml b/swedish/intro/cn.wml
index 6e7bafe8c84..90d26571780 100644
--- a/swedish/intro/cn.wml
+++ b/swedish/intro/cn.wml
@@ -265,7 +265,7 @@ I äldre versioner måste du gå till <kbd>about:config</kbd> och ändra värdet
</pre>
</dd>
-<dd>MacOS:
+<dd>Mac OS:
<pre>
Edit -&gt; Preferences -&gt; Web Browser -&gt; Language/Fonts
</pre>
@@ -365,7 +365,7 @@ eller använd custom-paketet (beskrivet för URL version p4.0pre.14):
</dd>
<dt><strong><toc-add-entry name="safari">Safari</toc-add-entry></strong></dt>
-<dd>Safari använder MacOS X systeminställningar för att välja ditt önskade
+<dd>Safari använder Mac OS X systeminställningar för att välja ditt önskade
språk:
<pre>
Systeminställningar (System preferences) -&gt; Internationellt (International) -&gt;
diff --git a/swedish/ports/powerpc/history.wml b/swedish/ports/powerpc/history.wml
index bc02fa8a04d..eada93f5d6c 100644
--- a/swedish/ports/powerpc/history.wml
+++ b/swedish/ports/powerpc/history.wml
@@ -1,6 +1,6 @@
#use wml::debian::template title="PowerPC-anpassning -- Historia" NOHEADER="yes"
#include "$(ENGLISHDIR)/ports/powerpc/menu.inc"
-#use wml::debian::translation-check translation="1.14"
+#use wml::debian::translation-check translation="1.15"
<br>
<br>
@@ -16,9 +16,9 @@ för utvecklingsarbete.
<p> Som tur var hittade vi fungerande root- och bootdisketter på <a
href="http://www.linuxppc.org/">LinuxPPC</a> och vi kunde börja
försöka installera något. Tyvärr krävde detta några program som bara
-kunde köras under MacOS. Det enda sättet att installera dem var att
-ha en annan maskin med MacOS som redan hade dem installerade.
-Eftersom datautbyte med icke-MacOS maskiner bara var möjligt med
+kunde köras under Mac OS. Det enda sättet att installera dem var att
+ha en annan maskin med Mac OS som redan hade dem installerade.
+Eftersom datautbyte med icke-Mac OS maskiner bara var möjligt med
msdos-formatterade floppydiskar, var detta ett
hönan-och-ägget-problem.
diff --git a/swedish/ports/powerpc/index.wml b/swedish/ports/powerpc/index.wml
index 20adb5d133a..1f10716cac0 100644
--- a/swedish/ports/powerpc/index.wml
+++ b/swedish/ports/powerpc/index.wml
@@ -64,7 +64,7 @@
<p>
Det finns en del problem du bör känna till när du installerar på en iBook,
- TiBook eller iBook2, speciellt när du även har Mac OSX installerat.
+ TiBook eller iBook2, speciellt när du även har Mac OS X installerat.
Viss iBook2-maskinvara, speciellt nyare modeller, stöds inte så väl ännu.
För specifik information om möjliga problem och deras lösningar, se dessa
webbsidor:
@@ -124,7 +124,7 @@
Debian GNU/Linux stöder inte officiellt NuBus-PowerPC-maskiner, som
6100, 7100, 8100 och de flesta datorerna i Performaserien.
En MkLinux-baserad kärna är dock tillgänglig, vilken kan startas från
- en MacOS-starthanterare.
+ en Mac OS-starthanterare.
Det går att installera ett Debiansystem med denna kärna, vilken kan hämtas
från <url "http://nubus-pmac.sourceforge.net/">.
Det finns en
diff --git a/swedish/ports/powerpc/inst/install.wml b/swedish/ports/powerpc/inst/install.wml
index eb650893c1e..3b448035bc9 100644
--- a/swedish/ports/powerpc/inst/install.wml
+++ b/swedish/ports/powerpc/inst/install.wml
@@ -1,6 +1,6 @@
#use wml::debian::template title="PowerPC-anpassning -- Installation " NOHEADER="yes"
#include "$(ENGLISHDIR)/ports/powerpc/inst/menu.inc"
-#use wml::debian::translation-check translation="1.22"
+#use wml::debian::translation-check translation="1.23"
<h2> Installation av Debian GNU/Linux på PowerPC-maskiner </h2>
<p>
@@ -85,7 +85,7 @@ beiga G3or.
<p>
Så kallade Nya Världens PowerMac-ar är alla PowerMac-ar med
transparenta plastskal. Nya Världens PowerMac-ar använder också "ROM
-i RAM"-systemet för MacOS och tillverkas från mitten av 1998 och
+i RAM"-systemet för Mac OS och tillverkas från mitten av 1998 och
framåt.
</p>
<p>Här är en lista på PowerMac-maskiner som bör fungera med Debian.</p>
diff --git a/swedish/releases/squeeze/debian-installer/index.wml b/swedish/releases/squeeze/debian-installer/index.wml
index 3d14f42732c..b2e0c3e4fe1 100644
--- a/swedish/releases/squeeze/debian-installer/index.wml
+++ b/swedish/releases/squeeze/debian-installer/index.wml
@@ -1,7 +1,7 @@
#use wml::debian::template title="Installationsinformation för Debian &rdquo;Squeeze&rdquo;" NOHEADER="true"
#include "$(ENGLISHDIR)/releases/info"
#include "$(ENGLISHDIR)/releases/squeeze/release.data"
-#use wml::debian::translation-check translation="1.6"
+#use wml::debian::translation-check translation="1.7"
<h1>Installera Debian <current_release_squeeze></h1>
@@ -248,12 +248,12 @@ för andra kända problem.
See <a href="http://bugs.debian.org/608025">#608025</a>.
</dd>
- <dt>Makes incompatible partition table with MacOS 9</dt>
+ <dt>Makes incompatible partition table with Mac OS 9</dt>
<dd>It was reported that the partitioning tool in the installer makes
- the partition table unrecognizable by MacOS 9 which no longer boots.
- Although the HFS+ partitions are compatible with Linux and MacOS X it
+ the partition table unrecognizable by Mac OS 9 which no longer boots.
+ Although the HFS+ partitions are compatible with Linux and Mac OS X it
is advised to take all precautions when installing on a machine with
- MacOS 9.<br />
+ Mac OS 9.<br />
See <a href="http://bugs.debian.org/604134">#604134</a>.
</dd>
diff --git a/swedish/users/edu/lyceemoliere.wml b/swedish/users/edu/lyceemoliere.wml
index 86cb862f029..aca78512c77 100644
--- a/swedish/users/edu/lyceemoliere.wml
+++ b/swedish/users/edu/lyceemoliere.wml
@@ -4,7 +4,7 @@
<define-tag webpage>http://www.lycee-moliere.org/</define-tag>
#use wml::debian::users
-#use wml::debian::translation-check translation="1.3"
+#use wml::debian::translation-check translation="1.4"
<p>
Eftersom vi är en privat skola erhåller inte Lycée Molière alla de
@@ -15,7 +15,7 @@
<p>
När det blev dags att tillhandahålla de vanligaste Internettjänsterna till
skolan blev GNU/Linux-lösningen självklar för oss.
- Vårt nätverk är uppbyggt av ±30 Macintosh Imac (vilka fortfarande kör MacOS,
+ Vårt nätverk är uppbyggt av ±30 Macintosh Imac (vilka fortfarande kör Mac OS,
åtminstone för tillfället!) på arbetsstationssidan, och av en e-postserver
(exim, cyrus-IMAPd och squirrelMail), en webbserver (apache), en DNS-server
(bind9), en filserver (netatalk) och en mellanserver (Squid + squidGuard),
diff --git a/ukrainian/intro/cn.wml b/ukrainian/intro/cn.wml
index 7a76307a334..2eb69c78acc 100644
--- a/ukrainian/intro/cn.wml
+++ b/ukrainian/intro/cn.wml
@@ -219,7 +219,7 @@ Windows:
</pre>
</dd>
-<dd>MacOS:
+<dd>Mac OS:
<pre>
Edit -&gt; Preferences -&gt; Web Browser -&gt; Language/Fonts
</pre>
@@ -319,7 +319,7 @@ preferred_language=uk; q=1.0, en; q=0.5
</dd>
<dt><strong><toc-add-entry name="safari">Safari</toc-add-entry></strong></dt>
-<dd>Safari використовує системні налаштування MacOS, щоб визначити
+<dd>Safari використовує системні налаштування Mac OS, щоб визначити
ваші вподобання щодо мови:
<pre>
System preferences -&gt; International -&gt; Language

© 2014-2024 Faster IT GmbH | imprint | privacy policy