www/philosophy fs-translations.html

[Jo?rg Kohn?]

CVSROOT:        /web/www
Module name:    www
Changes by:     Jo?rg Kohn? <joeko>     14/02/23 23:13:47

Modified files:
        philosophy     : fs-translations.html 

Log message:
        Add more detailed German description of Free Software and
        Gratis Software as well as style for table
        
        (css) add style; table breaks with a description, but without CSS
        (table, th) adjacent columns spanned
        (Free Software,
        Gratis Software,
        Comment) add more detailed German description

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/fs-translations.html?cvsroot=www&r1=1.112&r2=1.113

Patches:
Index: fs-translations.html
===================================================================
RCS file: /web/www/www/philosophy/fs-translations.html,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -b -r1.112 -r1.113
--- fs-translations.html        21 Feb 2014 15:15:09 -0000      1.112
+++ fs-translations.html        23 Feb 2014 23:13:46 -0000      1.113
@@ -2,6 +2,32 @@
 <!-- Parent-Version: 1.75 -->
 <title>Translations of the term &ldquo;free software&rdquo;
 - GNU Project - Free Software Foundation</title>
+<style type="text/css" media="all">
+/* Uniform format of table */
+ol {
+ list-style: lower-latin;
+}
+table, th, td {
+ border-collapse: collapse;
+ border: 1px solid #000;
+ font-size: 90%;
+ overflow: hidden;
+ vertical-align: text-top;
+ width: 95%;
+}
+th, td {
+ padding: 5px;
+}
+table.fixed {
+ table-layout: fixed;
+}
+th.col1 {
+ width: 70%;
+}
+th.col3 th.col4 th.col5 {
+ width: 100%;
+}
+</style>
 <!--#include virtual="/philosophy/po/fs-translations.translist" -->
 <!--#include virtual="/server/banner.html" -->
 <h2>Translations of the term &ldquo;free software&rdquo;</h2>
@@ -23,9 +49,15 @@
 are transliterations (with vowels added where relevant).  Please send
 any corrections or additions to those, too.</p>
 
-<table border="1">
-<tr><th>Language Code</th><th>Language Name</th>
-<th>Free Software</th><th>Gratis Software</th><th>Comment</th></tr>
+<table class="fixed">
+<tr>
+<!-- WEBMASTERS: Alternative instead of colspan but breaks the line.
+<th style="width:12%">Language Code</th>
+<th style="width:50%">Language Name</th> -->
+<th colspan="2" class="col1">Language</th>
+<th class="col3">Free Software</th>
+<th class="col4">Gratis Software</th>
+<th class="col5">Comment</th></tr>
 <tr>
 <td>af</td><td>Afrikaans</td>
 <td lang="af" xml:lang="af">
@@ -93,10 +125,30 @@
 <tr>
 <td>de</td><td>German</td>
 <td lang="de" xml:lang="de">
-freie Software</td>
+<ol>
+<li>Freie Software</li>
+<li>freie Software</li>
+</ol>
+</td>
 <td lang="de" xml:lang="de">
-Gratis-Software / Kostenlose Software</td>
-<td>&nbsp;</td>
+<p><strong><span xml:lang="en" lang="en">Synonyms to</span>
+<em>frei</em></strong> <var>{<span title="adjective">adj</span>}</var><br />
+gebührenfrei, geschenkt, gratis, kostenlos, umsonst, unentgeltlich,
+vergütungsfrei, zum Nulltarif; <span xml:lang="en" lang=
+"en"><i>(colloquial)</i></span> gratis, franko, für lau, für nass;
+<span xml:lang="en" lang="en"><i>(legal language)</i></span> kostenfrei</p>
+<p><strong><span xml:lang="en" lang="en">Synonyms to</span>
+<em>Software</em></strong> <var>{<span title="substantive">subst</span>
+<span title="feminine gender">f</span>}</var><br />
+Anwendung, Applikation, Programm</p>
+</td>
+<td>The term is commonly used when referring to
+<ol>
+<li>&ldquo;free software&rdquo; as a proper name.</li>
+<li>the adjective &ldquo;free&rdquo; in &ldquo;free software&rdquo; such as
+<cite>&ldquo;free, or nonfree software, that is the 
question.&rdquo;</cite></li>
+</ol>
+</td>
 </tr>
 <tr>
 <td>el</td><td>Greek</td>
@@ -479,7 +531,7 @@
      Information document, www.gnu.org/prep/maintain. -->
 
 <p>Copyright &copy; 1999, 2000, 2004, 2006, 2007, 2008, 2009, 2010,
-2011, 2012, 2013 Free Software Foundation, Inc.</p>
+2011, 2012, 2013, 2014 Free Software Foundation, Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative
@@ -489,7 +541,7 @@
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2014/02/21 15:15:09 $
+$Date: 2014/02/23 23:13:46 $
 <!-- timestamp end -->
 </p>
 </div>