Merge pull request #146 from jschwender/master

notices in localized index pages adjusted
OpenPrinting · Mar 16, 2021 · 2e209e1 · 2e209e1
2 parents f93f12a + b3e8811
commit 2e209e1
Show file tree

Hide file tree

Showing 7 changed files with 68 additions and 22 deletions.
diff --git a/doc/da/index.html.in b/doc/da/index.html.in
@@ -12,7 +12,7 @@
   <body>
     <div class="header">
       <ul>
-	<li><a href="http://www.cups.org/" target="_blank">CUPS.org</a></li>
+	<li><a href="https://openprinting.github.io/cups/" target="_blank">OpenPrinting CUPS</a></li>
 	<li><a class="active" href="/">Hjem</a></li>
 	<li><a href="/admin">Administration</a></li>
 	<li><a href="/classes/">Klasser</a></li>
@@ -24,14 +24,13 @@
     <div class="body">
       <div class="row">
 	<h1>CUPS @CUPS_VERSION@</h1>
-	<p>CUPS er det standardbaseret, open source-udskrivningssystem som er udviklet af <a href="http://www.apple.com/">Apple Inc.</a> til macOS<sup>&reg;</sup> og andre UNIX<sup>&reg;</sup>-lignende styresystemer.</p>
+	<p>CUPS er det standardbaseret, open source-udskrivningssystem som er udviklet af <a class="jumbolink" href="https://openprinting.github.io/" target="_blank">OpenPrinting</a> til Linux® og andre UNIX<sup>&reg;</sup>-lignende styresystemer. CUPS uses <a href="https://www.pwg.org/ipp/everywhere.html" target="_blank">IPP Everywhere™</a> to support printing to local and network printers</p>
       </div>
       <div class="row">
 	<div class="thirds">
 	  <h2>CUPS for brugere</h2>
 	  <p><a href="help/overview.html">Overblik over CUPS</a></p>
 	  <p><a href="help/options.html">Kommandolinjeudskrivning og tilvalg</a></p>
-	  <p><a href="http://www.cups.org/lists.php?LIST=cups">Brugerforum</a></p>
 	</div>
 	<div class="thirds">
 	  <h2>CUPS for administratorer</h2>
@@ -45,10 +44,9 @@
 	  <h2>CUPS for udviklere</h2>
 	  <p><a href="help/cupspm.html">CUPS-programmeringsmanual</a></p>
 	  <p><a href="help/api-filter.html">Filter- og backendprogrammering</a></p>
-	  <p><a href="http://www.cups.org/lists.php?LIST=cups-devel">Udviklerforum</a></p>
 	</div>
       </div>
     </div>
-    <div class="footer">CUPS og CUPS-logoet er varemærker som tilhører <a href="http://www.apple.com">Apple Inc.</a> Ophavsret &copy; 2007-2019 Apple Inc. Alle rettigheder forbeholdt.</div>
+    <div class="footer">Ophavsret &copy; 2021 OpenPrinting. Alle rettigheder forbeholdt.</div>
   </body>
 </html>
diff --git a/doc/de/index.html.in b/doc/de/index.html.in
@@ -12,7 +12,7 @@
   <body>
     <div class="header">
       <ul>
-	<li><a href="http://www.cups.org/" target="_blank">CUPS.org</a></li>
+	<li><a href="https://openprinting.github.io/cups/" target="_blank">OpenPrinting CUPS</a></li>
 	<li><a class="active" href="/">Startseite</a></li>
 	<li><a href="/admin">Verwaltung</a></li>
 	<li><a href="/classes/">Klassen</a></li>
@@ -23,15 +23,14 @@
     </div>
     <div class="body">
       <div class="row">
-	<h1>CUPS @CUPS_VERSION@</h1>
-	<p>CUPS basiert auf Standards, Open Source Drucksystem entwickelt durch <a href="http://www.apple.com/">Apple Inc.</a> für macOS<sup>&reg;</sup> und andere UNIX<sup>&reg;</sup>-artige Betriebssysteme.</p>
+	<h1>OpenPrinting CUPS @CUPS_VERSION@</h1>
+	<p>CUPS basiert auf Standards, Open Source Drucksystem entwickelt durch <a class="jumbolink" href="https://openprinting.github.io/" target="_blank">OpenPrinting</a> für Linux® und andere UNIX®-artige Betriebssysteme. CUPS benutzt <a href="https://www.pwg.org/ipp/everywhere.html" target="_blank">IPP Everywhere™</a> zur Unterstützung lokaler und Netzwerkdrucker.</p>
       </div>
       <div class="row">
 	<div class="thirds">
 	  <h2>CUPS für Benutzer</h2>
 	  <p><a href="help/overview.html">Überblick über CUPS</a></p>
 	  <p><a href="help/options.html">Befehlszeilen-Druck und Optionen</a></p>
-	  <p><a href="http://www.cups.org/lists.php?LIST=cups">Benutzerforum</a></p>
 	</div>
 	<div class="thirds">
 	  <h2>CUPS für Administratoren</h2>
@@ -45,10 +44,9 @@
 	  <h2>CUPS für Entwickler</h2>
 	  <p><a href="help/cupspm.html">CUPS Programming Manual</a></p>
 	  <p><a href="help/api-filter.html">Filter und Backend Programmierung</a></p>
-	  <p><a href="http://www.cups.org/lists.php?LIST=cups-devel">Entwicklerforum</a></p>
 	</div>
       </div>
     </div>
-    <div class="footer">CUPS und das CUPS Logo sind Warenzeichen der <a href="http://www.apple.com">Apple Inc.</a> Copyright &copy; 2007-2019 Apple Inc. Alle Rechte vorbehalten.</div>
+    <div class="footer">Copyright &copy; 2021 OpenPrinting. Alle Rechte vorbehalten.</div>
   </body>
 </html>
diff --git a/doc/es/index.html.in b/doc/es/index.html.in
@@ -12,7 +12,7 @@
   <body>
     <div class="header">
       <ul>
-	<li><a href="http://www.cups.org/" target="_blank">CUPS.org</a></li>
+	<li><a href="https://openprinting.github.io/cups/" target="_blank">OpenPrinting CUPS</a></li>
 	<li><a class="active" href="/">Inicio</a></li>
 	<li><a href="/admin">Administraci&oacute;n</a></li>
 	<li><a href="/classes/">Clases</a></li>
@@ -24,14 +24,13 @@
     <div class="body">
       <div class="row">
 	<h1>CUPS @CUPS_VERSION@</h1>
-	<p>CUPS es el sistema de impresi&oacute;n de c&oacute;digo abierto basado en est&aacute;ndares desarrollado por <a href="http://www.apple.com/">Apple Inc.</a> para macOS<sup>&reg;</sup> y otros sistemas operativos tipo UNIX<sup>&reg;</sup>.</p>
+	<p>CUPS es el sistema de impresi&oacute;n de c&oacute;digo abierto basado en est&aacute;ndares desarrollado por <a class="jumbolink" href="https://openprinting.github.io/" target="_blank">OpenPrinting</a> para macOS<sup>&reg;</sup> y otros sistemas operativos tipo UNIX<sup>&reg;</sup>. CUPS uses <a href="https://www.pwg.org/ipp/everywhere.html" target="_blank">IPP Everywhere™</a> to support printing to local and network printers.</p>
       </div>
       <div class="row">
 	<div class="thirds">
 	  <h2>CUPS para usuarios</h2>
 	  <p><a href="help/overview.html">Descripci&oacute;n de CUPS</a></p>
 	  <p><a href="help/options.html">Impresi&oacute;n desde la l&iacute;nea de comandos y opciones</a></p>
-	  <p><a href="http://www.cups.org/lists.php?LIST=cups">Foro de usuarios</a></p>
 	</div>
 	<div class="thirds">
 	  <h2>CUPS para administradores</h2>
@@ -45,10 +44,9 @@
 	  <h2>CUPS para desarrolladores</h2>
 	  <p><a href="help/cupspm.html">CUPS Programming Manual</a></p>
 	  <p><a href="help/api-filter.html">Programaci&oacute;n de filtros y programas de conexi&oacute;n</a></p>
-	  <p><a href="http://www.cups.org/lists.php?LIST=cups-devel">Foro de desarrollo</a></p>
 	</div>
       </div>
     </div>
-    <div class="footer">CUPS y el logo de CUPS son marcas registradas de <a href="http://www.apple.com">Apple Inc.</a> Derechos de autor &copy; 2007-2019 Apple Inc. Todos los derechos reservados.</div>
+    <div class="footer">Derechos de autor &copy; 2021 OpenPrinting. Todos los derechos reservados.</div>
   </body>
 </html>
diff --git a/doc/fr/index.html.in b/doc/fr/index.html.in
@@ -0,0 +1,52 @@
+<!DOCTYPE HTML>
+<html>
+  <head>
+    <link rel="stylesheet" href="/cups.css" type="text/css">
+    <link rel="shortcut icon" href="/apple-touch-icon.png" type="image/png">
+    <meta charset="utf-8">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=9">
+    <meta name="viewport" content="width=device-width">
+    <title>Home - CUPS @CUPS_VERSION@</title>
+  </head>
+  <body>
+    <div class="header">
+      <ul>
+	<li><a href="https://openprinting.github.io/cups/" target="_blank">OpenPrinting CUPS</a></li>
+	<li><a class="active" href="/">Home</a></li>
+	<li><a href="/admin">Administration</a></li>
+	<li><a href="/classes/">Classes</a></li>
+	<li><a href="/help/">Aide</a></li>
+	<li><a href="/jobs/">Ordres</a></li>
+	<li><a href="/printers/">Imprimantes</a></li>
+      </ul>
+    </div>
+    <div class="body">
+      <div class="row">
+	<h1>OpenPrinting CUPS @CUPS_VERSION@</h1>
+	<p>Le système d'impression open source basé sur des normes, développé par <a class="jumbolink" href="https://openprinting.github.io/" target="_blank">OpenPrinting</a> for Linux® and other Unix®-like operating systems. CUPS uses <a href="https://www.pwg.org/ipp/everywhere.html" target="_blank">IPP Everywhere™</a> pour prendre en charge l'impression vers des imprimantes locales et de réseau.</p>
+      </div>
+      <div class="row">
+	<div class="thirds">
+	  <h2>CUPS pour les utilisateurs</h2>
+	  <p><a href="help/overview.html">Overview of CUPS</a></p>
+	  <p><a href="help/options.html">Command-Line Printing and Options</a></p>
+	</div>
+	<div class="thirds">
+	  <h2>CUPS pour les administrateurs</h2>
+	  <p><a href="help/admin.html">Adding Printers and Classes</a></p>
+	  <p><a href="help/policies.html">Managing Operation Policies</a></p>
+	  <p><a href="help/network.html">Using Network Printers</a></p>
+	  <p><a href="help/firewalls.html">Firewalls</a></p>
+	  <p><a href="help/man-cupsd.conf.html">cupsd.conf Reference</a></p>
+	</div>
+	<div class="thirds">
+	  <h2>CUPS pour les développeurs</h2>
+	  <p><a href="help/cupspm.html">Manuel de programmation CUPS</a></p>
+	  <p><a href="help/api-filter.html">Filter and Backend Programming</a></p>
+	</div>
+      </div>
+    </div>
+    <div class="footer">Copyright &copy; 2021 OpenPrinting. All rights reserved.</div>
+  </body>
+</html>
diff --git a/doc/ja/index.html.in b/doc/ja/index.html.in
@@ -47,6 +47,6 @@
 	</div>
       </div>
     </div>
-    <div class="footer">CUPS and the CUPS logo are trademarks of <a href="http://www.apple.com">Apple Inc.</a> Copyright &copy; 2021 OpenPrinting. All rights reserved.</div>
+    <div class="footer">Copyright &copy; 2021 OpenPrinting. All rights reserved.</div>
   </body>
 </html>
diff --git a/doc/pt_BR/index.html.in b/doc/pt_BR/index.html.in
@@ -24,7 +24,7 @@
     <div class="body">
       <div class="row">
 	<h1>CUPS @CUPS_VERSION@</h1>
-	<p>CUPS &eacute; o sistema de impress&atilde;o baseado em padr&otilde;es e de c&oacute;digo aberto desenvolvido pela <a href="http://www.apple.com/">Apple Inc.</a> para macOS<sup>&reg;</sup> e outros sistemas operacionais similares ao UNIX<sup>&reg;</sup>.</p>
+	<p>CUPS &eacute; o sistema de impress&atilde;o baseado em padr&otilde;es e de c&oacute;digo aberto desenvolvido pela <a class="jumbolink" href="https://openprinting.github.io/" target="_blank">OpenPrinting</a> para Linux® e outros sistemas operacionais similares ao UNIX<sup>&reg;</sup>. CUPS uses <a href="https://www.pwg.org/ipp/everywhere.html" target="_blank">IPP Everywhere™</a> to support printing to local and network printers.</p>
       </div>
       <div class="row">
 	<div class="thirds">
@@ -47,6 +47,6 @@
 	</div>
       </div>
     </div>
-    <div class="footer">CUPS e o logo do CUPS s&atilde;o marcas registradas da <a href="http://www.apple.com">Apple Inc.</a> Copyright &copy; 2021 OpenPrinting. Todos os direitos reservados.</div>
+    <div class="footer">Copyright &copy; 2021 OpenPrinting. Todos os direitos reservados.</div>
   </body>
 </html>
diff --git a/doc/ru/index.html.in b/doc/ru/index.html.in
@@ -23,8 +23,8 @@
     </div>
     <div class="body">
       <div class="row">
-	<h1>CUPS @CUPS_VERSION@</h1>
-	<P>CUPS — поддерживающая большинство стандартов, свободная подсистема печати, разрабатываемая компанией <A HREF="http://www.apple.com/">Apple Inc.</A> для операционной системы macOS<SUP>&reg;</SUP> и других UNIX<SUP>&reg;</SUP>-подобных операционных систем.</P>
+	<h1>OpenPrinting CUPS @CUPS_VERSION@</h1>
+	<P>CUPS — поддерживающая большинство стандартов, свободная подсистема печати, разрабатываемая компанией <a class="jumbolink" href="https://openprinting.github.io/" target="_blank">OpenPrinting</a> для операционной системы Linux® и других UNIX<SUP>&reg;</SUP>-подобных операционных систем. CUPS uses <a href="https://www.pwg.org/ipp/everywhere.html" target="_blank">IPP Everywhere™</a> to support printing to local and network printers</P>
       </div>
       <div class="row">
 	<div class="thirds">
@@ -47,6 +47,6 @@
 </div>
       </div>
     </div>
-    <div class="footer">CUPS а также логотип CUPS являются зарегистрированными торговыми марками <A HREF="http://www.apple.com">Apple Inc.</A> Авторские права на CUPS принадлежат (2921) компании OpenPrinting Все права защищены.</div>
+    <div class="footer"> Авторские права на CUPS принадлежат (2021) компании OpenPrinting Все права защищены.</div>
   </body>
 </html>