Merge trademark/logo changes from CUPS 1.4svn-r8418.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1283 a1ca3aef-8c08-0410-bb20-df032aa958be

5 files changed, 11 insertions, 12 deletions

diff --git a/templates/es/trailer.tmpl b/templates/es/trailer.tmpl
index 448f65fc5..4e99fb61c 100644
--- a/templates/es/trailer.tmpl
+++ b/templates/es/trailer.tmpl
@@ -1,9 +1,8 @@
 </TD></TR>
 <TR><TD>&nbsp;</TD></TR>
-<TR><TD CLASS="trailer">Common UNIX Printing System, CUPS, y el logo de CUPS son
-marcas registradas de <A HREF="http://www.apple.com">Apple, Inc.</A> Los
-derechos de copia de CUPS 2007-2009 son de Apple Inc.
-Todos los derechos reservados.</TD></TR>
+<TR><TD CLASS="trailer">CUPS y el logo de CUPS son marcas registradas de
+<A HREF="http://www.apple.com">Apple, Inc.</A> Los derechos de copia de CUPS
+2007-2009 son de Apple Inc. Todos los derechos reservados.</TD></TR>
 </TABLE>
 </BODY>
 </HTML>
diff --git a/templates/ja/trailer.tmpl b/templates/ja/trailer.tmpl
index 9c98c5459..d46b6646c 100644
--- a/templates/ja/trailer.tmpl
+++ b/templates/ja/trailer.tmpl
@@ -1,8 +1,8 @@
 </TD></TR>
 <TR><TD>&nbsp;</TD></TR>
-<TR><TD CLASS="trailer">The Common UNIX Printing System, CUPS, and the CUPS
-logo are trademarks of <A HREF="http://www.apple.com">Apple Inc.</A> CUPS is
-copyright 2007-2009 Apple Inc. All rights reserved.</TD></TR>
+<TR><TD CLASS="trailer">CUPS and the CUPS logo are trademarks of
+<A HREF="http://www.apple.com">Apple Inc.</A> CUPS is copyright 2007-2009 Apple
+Inc. All rights reserved.</TD></TR>
 </TABLE>
 </BODY>
 </HTML>
diff --git a/templates/pl/trailer.tmpl b/templates/pl/trailer.tmpl
index 4d59f7ee4..dc214e47f 100644
--- a/templates/pl/trailer.tmpl
+++ b/templates/pl/trailer.tmpl
@@ -1,6 +1,6 @@
 </TD></TR>
 <TR><TD>&nbsp;</TD></TR>
-<TR><TD CLASS="trailer">Wspólny uniksowy system drukowania, CUPS i logo CUPS
+<TR><TD CLASS="trailer">CUPS i logo CUPS
 są znakami handlowymi <A HREF="http://www.apple.com">Apple Inc.</A> CUPS
 copyright 2007-2009 Apple Inc. Wszystkie prawa zastrzeżone.</TD></TR>
 </TABLE>
diff --git a/templates/ru/trailer.tmpl b/templates/ru/trailer.tmpl
index 75bd9c7d1..7bfc8b29d 100644
--- a/templates/ru/trailer.tmpl
+++ b/templates/ru/trailer.tmpl
@@ -1,6 +1,6 @@
 </TD></TR>
 <TR><TD>&nbsp;</TD></TR>
-<TR><TD CLASS="trailer">The Common UNIX Printing System, CUPS, а также логотип CUPS являются зарегистрированными торговыми марками <A HREF="http://www.apple.com">Apple Inc.</A> Авторские права на CUPS принадлежат (2007-2009) компании Apple Inc. Все права защищены.</TD></TR>
+<TR><TD CLASS="trailer">CUPS а также логотип CUPS являются зарегистрированными торговыми марками <A HREF="http://www.apple.com">Apple Inc.</A> Авторские права на CUPS принадлежат (2007-2009) компании Apple Inc. Все права защищены.</TD></TR>
 </TABLE>
 </BODY>
 </HTML>
diff --git a/templates/trailer.tmpl b/templates/trailer.tmpl
index 9c98c5459..d46b6646c 100644
--- a/templates/trailer.tmpl
+++ b/templates/trailer.tmpl
@@ -1,8 +1,8 @@
 </TD></TR>
 <TR><TD>&nbsp;</TD></TR>
-<TR><TD CLASS="trailer">The Common UNIX Printing System, CUPS, and the CUPS
-logo are trademarks of <A HREF="http://www.apple.com">Apple Inc.</A> CUPS is
-copyright 2007-2009 Apple Inc. All rights reserved.</TD></TR>
+<TR><TD CLASS="trailer">CUPS and the CUPS logo are trademarks of
+<A HREF="http://www.apple.com">Apple Inc.</A> CUPS is copyright 2007-2009 Apple
+Inc. All rights reserved.</TD></TR>
 </TABLE>
 </BODY>
 </HTML>