[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www home.zh-cn.html po/home.zh-cn-en.html po/ho...
|
From: |
GNUN |
|
Subject: |
www home.zh-cn.html po/home.zh-cn-en.html po/ho... |
|
Date: |
Wed, 11 Jul 2018 09:28:37 -0400 (EDT) |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 18/07/11 09:28:37
Modified files:
. : home.zh-cn.html
po : home.zh-cn-en.html home.zh-cn.po
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/home.zh-cn.html?cvsroot=www&r1=1.200&r2=1.201
http://web.cvs.savannah.gnu.org/viewcvs/www/po/home.zh-cn-en.html?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/po/home.zh-cn.po?cvsroot=www&r1=1.295&r2=1.296
Patches:
Index: home.zh-cn.html
===================================================================
RCS file: /web/www/www/home.zh-cn.html,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -b -r1.200 -r1.201
--- home.zh-cn.html 11 Jul 2018 10:01:28 -0000 1.200
+++ home.zh-cn.html 11 Jul 2018 13:28:37 -0000 1.201
@@ -206,7 +206,7 @@
href="#More-GNU">æ´å¤å
³äº GNU</a>ã</p>
<p class="button left">
- <a href="/distros/free-distros.html">Try GNU/Linux</a></p>
+ <a href="/distros/free-distros.html">è¯ç¨GNU/Linux</a></p>
<div style="clear: left"></div>
<div id="gnu-linux">
@@ -214,45 +214,44 @@
<div class="screenshot">
<a href="/distros/screenshots/trisquel8-mate.jpg"><img
src="/distros/screenshots/trisquel8-mate-medium.jpg"
- alt=" [Screenshot of Trisquel 8 with MATE desktop] " /></a>
+
alt=" [带MATEæ¡é¢çTrisquel 8 GNU/Linuxåè¡çæªå¾] "
/></a>
</div>
-<p><small><a href="https://trisquel.info";>Trisquel 8</a> with <a
-href="https://mate-desktop.org/";>MATE</a> desktop, Abrowser web browser, and
-Inkscape vector graphics editor</small></p>
+<p><small><a
+href="https://trisquel.info";>Trisquel 8 GNU/Linuxåè¡ç</a>ï¼å¸¦æ<a
+href="https://mate-desktop.org/";>MATE</a>æ¡é¢ãAbrowseræµè§å¨åInkscapeç¢éå¾å½¢ç¼è¾å¨</small></p>
<!--#endif
-->
<!--#if expr="$DISTRO = guix" -->
<div class="screenshot">
<a href="/distros/screenshots/guixSD-gnome3.jpg"><img
src="/distros/screenshots/guixSD-gnome3-medium.jpg"
- alt=" [Screenshot of GuixSD with GNOME 3 desktop] " /></a>
+ alt=" [带æGNOME 3 æ¡é¢çGuixSDåè¡çæªå¾] "
/></a>
</div>
-<p><small><a href="/software/guix/">GuixSD</a> with <a
-href="https://www.gnome.org/";>GNOME 3</a> desktop, Epiphany web
-browser, Totem video player, and GNOME terminal emulator</small></p>
+<p><small><a href="/software/guix/">GuixSDåè¡ç</a>ï¼å¸¦æ<a
+href="https://www.gnome.org/";>GNOME 3 </a>æ¡é¢ãEpiphanyæµè§å¨ãTotemè§é¢ææ¾å¨åGNOMEç»ç«¯æ¨¡æå¨</small></p>
<!--#endif
-->
<!--#if expr="$DISTRO = gnome3" -->
<div class="screenshot">
<a href="/distros/screenshots/gnome3-medium.jpg"><img
src="/distros/screenshots/gnome3-medium.jpg"
- alt=" [Screenshot of GNOME 3 desktop] " /></a>
+ alt=" [GNOME 3 æ¡é¢æªå¾] " /></a>
</div>
-<p><small><a href="https://www.gnome.org/";>GNOME 3</a> desktop with IceCat
-web browser, and Gimp image editor</small></p>
+<p><small><a
+href="https://www.gnome.org/";>GNOME 3 </a>æ¡é¢ï¼å¸¦æIceCatæµè§å¨åGimpå¾åç¼è¾å¨</small></p>
<!--#endif -->
<table class="thumbs">
<tr class="image">
<td><a href="/home.html.html?distro=trisquel8#gnu-linux"><img
src="/distros/screenshots/trisquel8-mate-thumb.jpg"
- alt=" [Screenshot of Trisquel 7 with Gnome Classic
desktop] " /></a></td>
+ alt=" [带Gnome
Classicæ¡é¢çTrisquel 7 GNU/Linuxåè¡çæªå¾] "
/></a></td>
<td><a href="/home.html.html?distro=guix#gnu-linux"><img
src="/distros/screenshots/guixSD-gnome3-thumb.jpg"
- alt=" [Screenshot of GuixSD with GNOME 3 desktop] "
/></a></td>
+ alt=" [带æGNOME 3 æ¡é¢çGuixSDåè¡çæªå¾] "
/></a></td>
<td><a href="/home.html?distro=gnome3#gnu-linux"><img
src="/distros/screenshots/gnome3-thumb.jpg"
- alt=" [Screenshot of GNOME 3 desktop] " /></a></td>
+ alt=" [GNOME 3 æ¡é¢æªå¾] " /></a></td>
</tr>
<tr class="caption">
<td><small>Trisquel 8 & MATE</small></td>
@@ -263,9 +262,8 @@
</div>
<p class="button right">
- ... or <a
-href="https://directory.fsf.org/wiki/Free_Software_Directory:Free_software_replacements";>
-Try parts of GNU</a></p>
+ ...æè
<a
+href="https://directory.fsf.org/wiki/Free_Software_Directory:Free_software_replacements";>è¯ç¨GNUç»ä»¶</a></p>
<div style="clear: right"></div>
<h2>ä»ä¹æ¯èªç±è½¯ä»¶è¿å¨ï¼</h2>
@@ -464,7 +462,7 @@
<p class="unprintable"><!-- timestamp start -->
æåæ´æ°ï¼
-$Date: 2018/07/11 10:01:28 $
+$Date: 2018/07/11 13:28:37 $
<!-- timestamp end -->
</p>
Index: po/home.zh-cn-en.html
===================================================================
RCS file: /web/www/www/po/home.zh-cn-en.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- po/home.zh-cn-en.html 30 Apr 2018 00:28:37 -0000 1.10
+++ po/home.zh-cn-en.html 11 Jul 2018 13:28:37 -0000 1.11
@@ -1,6 +1,9 @@
<!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.84 -->
-
+<!-- Parent-Version: 1.85 -->
+ <!--#if expr="$QUERY_STRING = /distro=([^&#]+)/"
+--><!--#set var="DISTRO" value="$1"
+--><!--#else --><!--#set var="DISTRO" value="guix"
+--><!--#endif -->
<title>The GNU Operating System and the Free Software Movement</title>
<meta http-equiv="Keywords" content="GNU, FSF, Free Software Foundation,
Linux, Emacs, GCC, Unix, Free Software, Libre Software, Operating System, GNU
Kernel, GNU Hurd" />
@@ -13,7 +16,7 @@
margin: 0;
}
.first-column, .second-column {
- width: 40em; max-width: 100%;
+ width: 46em; max-width: 100%;
margin: auto;
}
@@ -24,26 +27,74 @@
h2.first {
margin-top: 1em;
}
-#gnu-linux {
- width: 30em; max-width: 100%;
+
+#gnu-linux, .thumbs {
text-align: center;
- margin: 0 auto 1em;
+ font-style: italic;
+ margin: 1em auto;
+}
+#gnu-linux {
+ width: 32em;
+ max-width: 100%;
+ margin: .5em auto;
+}
+.screenshot, .thumbs .image td {
+ line-height: .8em;
+ background: #444;
+ padding: .2em;
}
-#gnu-linux img {
+.screenshot a, .thumbs .image td a {
+ color: white;
+}
+.screenshot img {
width: 100%;
}
-.button {
- font-size: 1.8em;
- margin: 1.7em 0;
+#gnu-linux p {
+ line-height: 1.2em;
+ margin: .2em 0 0;
+}
+.thumbs {
+ width: 100%;
+ display: block;
+ overflow: auto;
+ padding-bottom: .2em;
+}
+.thumbs td {
+ width: 33.3%;
+ vertical-align: top;
+ padding: .1em;
+ border: 0;
+ border-left: .5em solid white;
+}
+.thumbs td:first-child {
+ border: 0;
+}
+.thumbs .caption td {
+ line-height: 1em;
+}
+.thumbs img {
+ width: 10em;
+ max-width: 100%;
+ min-width: 8em;
+}
+.button.left {
+ float: left;
+ margin: .7em 0;
+}
+.button.right {
+ float: right;
+ margin: 0 0 .3em;
}
.button a, .button a:visited {
+ font-size: 1.6em;
padding: .4em .6em;
- color: #a42e2b;
- background: #eee;
- border: .1em solid #ccc;
+ color: #b02500;
+ border: .1em solid #b02500;
+ margin: .3em 0;
}
.button a:hover {
color: #777;
+ border-color: #777;
}
.first-column p.back {
margin-bottom: 0;
@@ -56,6 +107,9 @@
.second-column .emph-box.white {
background: white;
}
+.second-column .emph-box.beige {
+ background: #faf8ed;
+}
.second-column .emph-box .back {
margin-top: 1em;
}
@@ -107,14 +161,14 @@
margin: 0 3% 2em;
}
address@hidden (min-width: 57em) {
address@hidden (min-width: 60em) {
.first-column {
- width: 61%;
+ width: 65%;
float: left;
margin: 0;
}
.second-column {
- width: 33%;
+ width: 30%;
float: right;
margin: 0;
}
@@ -146,16 +200,62 @@
are entirely free software. <a href="#More-GNU">More about GNU
below</a>.</p>
-<div id="gnu-linux">
-<p class="button"><a
- href="/distros/free-distros.html">Try GNU/Linux!</a></p>
-<p class="button"><a
-
href="https://directory.fsf.org/wiki/Free_Software_Directory:Free_software_replacements";>
- Try parts of GNU</a></p>
-<a href="/distros/screenshot.html"><img
- src="/distros/screenshots/trisquel-medium.jpg"
- alt="Screenshot of GNU"/></a>
+<p class="button left">
+ <a href="/distros/free-distros.html">Try GNU/Linux</a></p>
+<div style="clear: left"></div>
+
+<div id="gnu-linux"><!--#if expr="$DISTRO = trisquel8" -->
+<div class="screenshot">
+ <a href="/distros/screenshots/trisquel8-mate.jpg"><img
+ src="/distros/screenshots/trisquel8-mate-medium.jpg"
+ alt=" [Screenshot of Trisquel 8 with MATE desktop] " /></a>
</div>
+<p><small><a href="https://trisquel.info";>Trisquel 8</a> with <a
+href="https://mate-desktop.org/";>MATE</a> desktop, Abrowser web browser,
+and Inkscape vector graphics editor</small></p><!--#endif
+--><!--#if expr="$DISTRO = guix" -->
+<div class="screenshot">
+ <a href="/distros/screenshots/guixSD-gnome3.jpg"><img
+ src="/distros/screenshots/guixSD-gnome3-medium.jpg"
+ alt=" [Screenshot of GuixSD with GNOME 3 desktop] " /></a>
+</div>
+<p><small><a href="/software/guix/">GuixSD</a> with <a
+href="https://www.gnome.org/";>GNOME 3</a> desktop, Epiphany web
+browser, Totem video player, and GNOME terminal emulator</small></p><!--#endif
+--><!--#if expr="$DISTRO = gnome3" -->
+<div class="screenshot">
+ <a href="/distros/screenshots/gnome3-medium.jpg"><img
+ src="/distros/screenshots/gnome3-medium.jpg"
+ alt=" [Screenshot of GNOME 3 desktop] " /></a>
+</div>
+<p><small><a href="https://www.gnome.org/";>GNOME 3</a> desktop with
+IceCat web browser, and Gimp image editor</small></p><!--#endif -->
+
+<table class="thumbs">
+ <tr class="image">
+ <td><a href="/home.html.html?distro=trisquel8#gnu-linux"><img
+ src="/distros/screenshots/trisquel8-mate-thumb.jpg"
+ alt=" [Screenshot of Trisquel 7 with Gnome Classic
desktop] " /></a></td>
+ <td><a href="/home.html.html?distro=guix#gnu-linux"><img
+ src="/distros/screenshots/guixSD-gnome3-thumb.jpg"
+ alt=" [Screenshot of GuixSD with GNOME 3 desktop] "
/></a></td>
+ <td><a href="/home.html?distro=gnome3#gnu-linux"><img
+ src="/distros/screenshots/gnome3-thumb.jpg"
+ alt=" [Screenshot of GNOME 3 desktop] " /></a></td>
+ </tr>
+ <tr class="caption">
+ <td><small>Trisquel 8 & MATE</small></td>
+ <td><small>GuixSD & GNOME 3</small></td>
+ <td><small>GNOME 3</small></td>
+ </tr>
+</table>
+</div>
+
+<p class="button right">
+ ... or <a
+href="https://directory.fsf.org/wiki/Free_Software_Directory:Free_software_replacements";>
+Try parts of GNU</a></p>
+<div style="clear: right"></div>
<h2>What is the Free Software Movement?</h2>
@@ -235,7 +335,8 @@
<div id="Flashes" class="emph-box white">
<h3><a href="http://planet.gnu.org/";>Planet GNU</a>
-<a href="http://planet.gnu.org/rss20.xml";><img src="/feed-icon-10x10.png"
alt="RSS Feed" /></a></h3>
+<a href="http://planet.gnu.org/rss20.xml";><img src="/feed-icon-10x10.png"
+alt="RSS Feed" /></a></h3>
<div class="ltr">
<!--#include virtual="/planetfeeds.html" -->
</div>
@@ -244,7 +345,7 @@
releases</a>.</p>
</div>
-<div id="Action" class="emph-box">
+<div id="Action" class="emph-box beige">
<h3>Take Action</h3>
<ul>
@@ -270,7 +371,7 @@
<p class="back"><a href="/server/takeaction.html">More action items</a></p>
</div>
-<div id="unmaint" class="emph-box">
+<div id="unmaint" class="emph-box beige">
<ul>
<li><strong>Can you contribute to any of
these <a href="//www.fsf.org/campaigns/priority-projects/">High
@@ -372,8 +473,7 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016,
2017, 2018 <a
+<p>Copyright © 1996-2018 <a
href="http://www.fsf.org";>Free Software Foundation</a>, Inc.</p>
<p>This page is licensed under a <a rel="license"
@@ -384,7 +484,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2018/04/30 00:28:37 $
+$Date: 2018/07/11 13:28:37 $
<!-- timestamp end -->
</p>
</div>
Index: po/home.zh-cn.po
===================================================================
RCS file: /web/www/www/po/home.zh-cn.po,v
retrieving revision 1.295
retrieving revision 1.296
diff -u -b -r1.295 -r1.296
--- po/home.zh-cn.po 11 Jul 2018 13:14:24 -0000 1.295
+++ po/home.zh-cn.po 11 Jul 2018 13:28:37 -0000 1.296
@@ -16,7 +16,6 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2018-07-09 21:56+0000\n"
#. type: Content of: <title>
msgid "The GNU Operating System and the Free Software Movement"
- www home.zh-cn.html po/home.zh-cn-en.html po/ho...,
GNUN <=