aboutsummaryrefslogtreecommitdiff
path: root/it_IT.ISO8859-15/share/sgml/trademarks.ent
diff options
context:
space:
mode:
authorAlex Dupre <ale@FreeBSD.org>2005-08-29 13:25:44 +0000
committerAlex Dupre <ale@FreeBSD.org>2005-08-29 13:25:44 +0000
commita7e4530f5b97d32fff325fbe6697fe92158f6264 (patch)
tree9261ade5134b4da433396edc8c83eb893f15393b /it_IT.ISO8859-15/share/sgml/trademarks.ent
parent581d756b2a2ffb13ea96712899a325bbb8253d1b (diff)
downloaddoc-a7e4530f5b97d32fff325fbe6697fe92158f6264.tar.gz
doc-a7e4530f5b97d32fff325fbe6697fe92158f6264.zip
Update of the Italian translations before 6.0-RELEASE:
articles/committers-guide/article.sgml 1.207 -> 1.219 articles/euro/article.sgml 1.10 -> 1.11 articles/explaining-bsd/article.sgml 1.13 -> 1.20 books/handbook/Makefile 1.90 -> 1.95 books/handbook/book.sgml 1.156 -> 1.162 books/handbook/chapters.ent 1.28 -> 1.32 books/handbook/colophon.sgml 1.8 -> 1.9 books/handbook/basics/chapter.sgml 1.126 -> 1.137 books/handbook/bibliography/chapter.sgml 1.65 -> 1.76 books/handbook/boot/chapter.sgml 1.56 -> 1.59 books/handbook/desktop/chapter.sgml 1.40 -> 1.56 books/handbook/eresources/chapter.sgml 1.148 -> 1.174 books/handbook/introduction/chapter.sgml 1.102 -> 1.109 books/handbook/l10n/chapter.sgml 1.100 -> 1.111 books/handbook/mail/chapter.sgml 1.120 -> 1.129 books/handbook/mirrors/chapter.sgml 1.351 -> 1.386 books/handbook/multimedia/chapter.sgml 1.85 -> 1.110 books/handbook/pgpkeys/chapter.sgml 1.240 -> 1.270 books/handbook/ports/chapter.sgml 1.226 -> 1.243 books/handbook/preface/preface.sgml 1.24 -> 1.29 books/handbook/security/chapter.sgml 1.207 -> 1.281 (partial) books/handbook/serialcomms/chapter.sgml 1.94 -> 1.100 books/handbook/vinum/chapter.sgml 1.32 -> 1.37 flyer/flyer.tex 1.5 -> 1.10 share/sgml/mailing-lists.ent 1.36 -> 1.48 share/sgml/trademarks.ent 1.23 -> 1.25 share/sgml/trademarks.sgml 1.5 -> 1.6 share/sgml/glossary/freebsd-glossary.sgml 1.17 -> 1.20 New translated handbook chapters: - install - kernelconfig - linuxemu - network-servers New handbook chapter skeletons: - audit - geom - firewalls Obtained from: The FreeBSD Italian Documentation Project CVS
Notes
Notes: svn path=/head/; revision=25504
Diffstat (limited to 'it_IT.ISO8859-15/share/sgml/trademarks.ent')
-rw-r--r--it_IT.ISO8859-15/share/sgml/trademarks.ent6
1 files changed, 3 insertions, 3 deletions
diff --git a/it_IT.ISO8859-15/share/sgml/trademarks.ent b/it_IT.ISO8859-15/share/sgml/trademarks.ent
index a2f98f1d4f..cfc3b588d7 100644
--- a/it_IT.ISO8859-15/share/sgml/trademarks.ent
+++ b/it_IT.ISO8859-15/share/sgml/trademarks.ent
@@ -7,7 +7,7 @@
aziende che vengono nominate nella documentazione di FreeBSD.
$FreeBSD$
- Original revision: 1.23
+ Original revision: 1.25
-->
<!ENTITY tm-attrib.3com "<para>3Com e HomeConnect sono marchi registrati
@@ -65,7 +65,7 @@
della Seiko Epson Corporation.</para>">
<!ENTITY tm-attrib.freebsd "<para>FreeBSD &egrave; un marchio registrato della
- Wind River Systems, Inc. &Egrave; previsto che cambi a breve.</para>">
+ FreeBSD Foundation.</para>">
<!ENTITY tm-attrib.heidelberger "<para>Heidelberg, Helvetica,
Palatino, e Times Roman sono marchi o marchi registrati della
@@ -106,7 +106,7 @@
marchi o marchi registrati della Macromedia, Inc. negli Stati Uniti e/o
in altri paesi.</para>">
-<!ENTITY tm-attrib.microsoft "<para>Microsoft, FrontPage, IntelliMouse,
+<!ENTITY tm-attrib.microsoft "<para>Microsoft, IntelliMouse,
MS-DOS, Outlook, Windows, Windows Media e Windows NT sono marchi o marchi
registrati della Microsoft Corporation negli Stati Uniti e/o in altri
paesi.</para>">