[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www home.zh-tw.html distros/common-distros.zh-t...
|
From: |
GNUN |
|
Subject: |
www home.zh-tw.html distros/common-distros.zh-t... |
|
Date: |
Sun, 2 Sep 2018 05:28:07 -0400 (EDT) |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 18/09/02 05:28:07
Modified files:
. : home.zh-tw.html
distros : common-distros.zh-tw.html
distros/po : common-distros.zh-tw-en.html
common-distros.zh-tw.po
gnu : thegnuproject.zh-tw.html
gnu/po : thegnuproject.zh-tw-en.html
thegnuproject.zh-tw.po
po : home.zh-tw-en.html home.zh-tw.po
server : bottom-notes.zh-tw.html footer-text.zh-tw.html
server/gnun/compendia: compendium.zh-tw.po
server/po : bottom-notes.zh-tw.po footer-text.zh-tw.po
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/home.zh-tw.html?cvsroot=www&r1=1.32&r2=1.33
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/common-distros.zh-tw.html?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.zh-tw-en.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.zh-tw.po?cvsroot=www&r1=1.22&r2=1.23
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/thegnuproject.zh-tw.html?cvsroot=www&r1=1.19&r2=1.20
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/thegnuproject.zh-tw-en.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/thegnuproject.zh-tw.po?cvsroot=www&r1=1.35&r2=1.36
http://web.cvs.savannah.gnu.org/viewcvs/www/po/home.zh-tw-en.html?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/po/home.zh-tw.po?cvsroot=www&r1=1.38&r2=1.39
http://web.cvs.savannah.gnu.org/viewcvs/www/server/bottom-notes.zh-tw.html?cvsroot=www&r1=1.14&r2=1.15
http://web.cvs.savannah.gnu.org/viewcvs/www/server/footer-text.zh-tw.html?cvsroot=www&r1=1.18&r2=1.19
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.zh-tw.po?cvsroot=www&r1=1.84&r2=1.85
http://web.cvs.savannah.gnu.org/viewcvs/www/server/po/bottom-notes.zh-tw.po?cvsroot=www&r1=1.14&r2=1.15
http://web.cvs.savannah.gnu.org/viewcvs/www/server/po/footer-text.zh-tw.po?cvsroot=www&r1=1.24&r2=1.25
Patches:
Index: home.zh-tw.html
===================================================================
RCS file: /web/www/www/home.zh-tw.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- home.zh-tw.html 14 Jul 2018 10:33:03 -0000 1.32
+++ home.zh-tw.html 2 Sep 2018 09:28:04 -0000 1.33
@@ -200,18 +200,14 @@
<h2 class="first">GNU æ¯ä»éº¼ï¼</h2>
-<p>GNU is an operating system that is <a href="/philosophy/free-sw.html">free
-software</a>—that is, it respects users' freedom. The GNU operating
-system consists of GNU packages (programs specifically released by the GNU
-Project) as well as free software released by third parties. The
-development of GNU made it possible to use a computer without software that
-would trample your freedom.</p>
+<p>GNU æ¯å<a
href="/philosophy/free-sw.html">èªç±è»é«</a>ä½æ¥ç³»çµ±ââä¹å°±æ¯èªªï¼å®å°é使ç¨è
çèªç±ãGNU
+ä½æ¥ç³»çµ±ç± GNU è»é«å
æ§æï¼æ稱 GNU
å°æ¡æç¼è¡çç¨å¼ï¼ãæäº GNU çéç¼ï¼äººåå¾ä»¥ä½¿ç¨é»è
¦èä¸å¿
å¿åè¸è¸ä½ èªç±çè»é«ã</p>
<p>æåæ¨è¦å®å
¨ç±èªç±è»é«çµæç<a
href="/distros/free-distros.html">å¯å®è£ GNU çæ¬</a>ï¼æ´ç²¾ç¢ºä¾è¬æ¯
GNU/Linux æ£å¸çï¼ã<a 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">
@@ -219,59 +215,59 @@
<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=" [Trisquel 8 æé
MATE æ¡é¢çç«é¢å¿«ç
§] " /></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</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 0.15 with GNOME 3
desktop] " /></a>
+ alt=" [GuixSD 0.15 æé
GNOME 3 æ¡é¢çç«é¢å¿«ç
§] " /></a>
</div>
-<p><small><a href="/software/guix/">GuixSD 0.15</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 0.15</a> æé
<a
+href="https://www.gnome.org/";>GNOME 3</a> æ¡é¢ãEpiphany 網é
ç覽å¨ãTotem
+å½±çææ¾å¨ãGNOME çµç«¯æ¨¡æ¬å¨</small></p>
<!--#endif
-->
<!--#if expr="$DISTRO = pureos8" -->
<div class="screenshot">
<a href="/distros/screenshots/pureos8-gnome3.jpg"><img
src="/distros/screenshots/gnome3-medium.jpg"
- alt=" [Screenshot of PureOS 8 with GNOME 3 desktop] "
/></a>
+ alt=" [PureOS 8 æé
GNOME 3 æ¡é¢çç«é¢å¿«ç
§] "
/></a>
</div>
-<p><small><a href="https://www.pureos.net/";>PureOS 8</a> with <a
-href="https://www.gnome.org/";>GNOME 3</a> desktop, PureBrowser (web
-browser), and Gimp (image editor)</small></p>
+<p><small><a href="https://www.pureos.net/";>PureOS 8</a> æé
<a
+href="https://www.gnome.org/";>GNOME 3</a>
+æ¡é¢ãPureBrowserï¼ç¶²é
ç覽å¨ï¼ãGimpï¼å½±å編輯å¨ï¼</small></p>
<!--#endif -->
<table class="thumbs">
<tr class="image">
<td><a href="/home.html?distro=trisquel8#gnu-linux"><img
src="/distros/screenshots/trisquel8-mate-thumb.jpg"
- alt=" [Screenshot of Trisquel 8 with MATE desktop] "
/></a></td>
+ alt=" [Trisquel 8 æé
MATE æ¡é¢çç«é¢å¿«ç
§] "
/></a></td>
<td><a href="/home.html?distro=guix#gnu-linux"><img
src="/distros/screenshots/guixSD-gnome3-thumb.jpg"
- alt=" [Screenshot of GuixSD 0.15 with GNOME 3
desktop] " /></a></td>
+ alt=" [GuixSD 0.15 æé
GNOME 3 æ¡é¢çç«é¢å¿«ç
§] " /></a></td>
<td><a href="/home.html?distro=pureos8#gnu-linux"><img
src="/distros/screenshots/gnome3-thumb.jpg"
- alt=" [Screenshot of PureOS 8 with GNOME 3 desktop] "
/></a></td>
+ alt=" [PureOS 8 æé
GNOME 3 æ¡é¢çç«é¢å¿«ç
§] "
/></a></td>
</tr>
<tr class="caption">
- <td><small>Trisquel 8 & MATE</small></td>
- <td><small>GuixSD & GNOME 3</small></td>
- <td><small>PureOS 8 & GNOME 3</small></td>
+ <td><small>Trisquel 8 å MATE</small></td>
+ <td><small>GuixSD å GNOME 3</small></td>
+ <td><small>PureOS 8 å 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>
+ â¦æ<a
+href="https://directory.fsf.org/wiki/Free_Software_Directory:Free_software_replacements";>試試é¨åç
+GNU</a></p>
<div style="clear: right"></div>
<h2>èªç±è»é«éåæ¯ä»éº¼ï¼</h2>
@@ -478,7 +474,7 @@
<p class="unprintable"><!-- timestamp start -->
æ´æ°æé︰
-$Date: 2018/07/14 10:33:03 $
+$Date: 2018/09/02 09:28:04 $
<!-- timestamp end -->
</p>
Index: distros/common-distros.zh-tw.html
===================================================================
RCS file: /web/www/www/distros/common-distros.zh-tw.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- distros/common-distros.zh-tw.html 27 Mar 2018 09:31:30 -0000 1.10
+++ distros/common-distros.zh-tw.html 2 Sep 2018 09:28:06 -0000 1.11
@@ -42,6 +42,9 @@
<p>Arch æ常è¦çå
©ååé¡ï¼æ²ææ¸
æ¥çæ¿ç表æå¯ä»¥å
å«æ樣çè»é«ï¼èä¸å®åçå
§æ ¸å¿ Linux ä¸æè¼éèªç±ç
blobãArch
ä¹æ²ææ¿ç表示ä¸ééå
¶ä¸è¬é »éæ£å¸éèªç±è»é«ã</p>
+<p>è«æ¹ç¨ <a href="/distros/free-distros.html#for-pc">Parabola</a>
+ä¾å代éå¥éèªç±çæ£å¸çãParabola æ¯ä»¥ Arch
åæçèªç±æ£å¸çã</p>
+
<h3 id="Canaima">Canaima</h3>
<p>Canaima GNU/Linux æ¯åå§å
§çææ¿åºè£½ä½ç¨ä»¥åç¼é»è
¦ç
GNU/Linuxãéç¶æ´é«è¨ç«ä»¤äººæ¬½ä½©ï¼Canaima
@@ -72,6 +75,10 @@
<p>Debian ç wiki é é¢ä¸è¼æå®è£éèªç±éé«çç¸éè³è¨ã</p>
<!-- https://wiki.debian.org/ATIProprietary -->
+<p>è«æ¹ç¨å
¶ä»ä»¥ Debian
åæçèªç±æ£å¸çï¼ä¾å代éå¥éèªç±çæ£å¸çï¼<a
+href="/distros/free-distros.html#for-pc">gNewSense</a> æ <a
+href="/distros/free-distros.html#for-pc">PureOS</a>ã</p>
+
<h3 id="Fedora">Fedora</h3>
<p>Fedora
@@ -143,6 +150,11 @@
href="/philosophy/not-ipr.html">ãæºæ
§è²¡ç¢æ¬ã</a>è©èªæ£ææ··æ·ï¼è©²è©èªé¯èª¤åå®åæ¨æ³ãå°å©æ³å許å¤å
¶ä»æ³å¾é½è½å¨ååå®ä¸æ¦å¿µæ§æ¡æ¶ä¸ã該è©èªç使ç¨é
æå·å®³ï¼æ¯«ç¡ä¾å¤ï¼æ以å¨å¼ç¨å
¶ä»äººå¦ä½ä½¿ç¨è©²è©èªä¹å¤ï¼æåèªèº«å¿
ç¶æçµä½¿ç¨ãä¸éï¼å°
Ubuntu ä½çº GNU/Linux
æ£å¸çé件äºèè¨ï¼é£ä¸¦é實質çé大åé¡ã</p>
+<p>è«æ¹ç¨å
¶ä»ä»¥ Ubuntu
åæçèªç±æ£å¸çï¼ä¾å代éå¥éèªç±çæ£å¸çï¼<a
+href="/distros/free-distros.html#for-pc">Dyne:bolic</a>ã<a
+href="/distros/free-distros.html#for-pc">Trisquel</a>ã<a
+href="/distros/free-distros.html#for-pc">Ututo S</a>ã</p>
+
<h2>ä¸äºå
¶ä»æ£å¸ç</h2>
<p>é裡æåè¨è«ä¸äºèåæéè¦çé GNU/Linux
系統æ£å¸çï¼å®åä¹ä¸å±¬æ¼èªç±ä¹åã</p>
@@ -254,7 +266,7 @@
<p class="unprintable"><!-- timestamp start -->
æ´æ°æé︰
-$Date: 2018/03/27 09:31:30 $
+$Date: 2018/09/02 09:28:06 $
<!-- timestamp end -->
</p>
Index: distros/po/common-distros.zh-tw-en.html
===================================================================
RCS file: /web/www/www/distros/po/common-distros.zh-tw-en.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- distros/po/common-distros.zh-tw-en.html 27 Mar 2018 09:31:30 -0000
1.4
+++ distros/po/common-distros.zh-tw-en.html 2 Sep 2018 09:28:06 -0000
1.5
@@ -58,6 +58,10 @@
their kernel, Linux. Arch also has no policy about not distributing
nonfree software through their normal channels.</p>
+<p>Instead of this nonfree distribution, use <a
+href="/distros/free-distros.html#for-pc">Parabola</a>, the free distro
+which is made from it.</p>
+
<h3 id="Canaima">Canaima</h3>
<p>Canaima GNU/Linux is a distribution made by Venezuela's government
@@ -104,6 +108,11 @@
<p>Debian's wiki includes pages about installing nonfree firmware.</p>
<!-- https://wiki.debian.org/ATIProprietary -->
+<p>Instead of this nonfree distribution, use one of the free distros
+which are made from it: <a
+href="/distros/free-distros.html#for-pc">gNewSense</a>, and <a
+href="/distros/free-distros.html#for-pc">PureOS</a>.</p>
+
<h3 id="Fedora">Fedora</h3>
<p>Fedora does have a clear policy about what can be included in the
@@ -213,6 +222,12 @@
it. However, that is not a substantive issue about Ubuntu as a
GNU/Linux distribution.</p>
+<p>Instead of this nonfree distribution, use one of the free distros
+which are made from it: <a
+href="/distros/free-distros.html#for-pc">Dyne:bolic</a>, <a
+href="/distros/free-distros.html#for-pc">Trisquel</a>, and <a
+href="/distros/free-distros.html#for-pc">Ututo S</a>.</p>
+
<h2>Some Other Distros</h2>
<p>Here we discuss some well-known or significant non-GNU/Linux system
@@ -324,7 +339,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2018/03/27 09:31:30 $
+$Date: 2018/09/02 09:28:06 $
<!-- timestamp end -->
</p>
</div>
Index: distros/po/common-distros.zh-tw.po
===================================================================
RCS file: /web/www/www/distros/po/common-distros.zh-tw.po,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- distros/po/common-distros.zh-tw.po 2 Sep 2018 09:20:55 -0000 1.22
+++ distros/po/common-distros.zh-tw.po 2 Sep 2018 09:28:06 -0000 1.23
@@ -14,7 +14,6 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2018-08-31 08:26+0000\n"
"X-Generator: Poedit 2.1.1\n"
"Plural-Forms: nplurals=1; plural=0;\n"
Index: gnu/thegnuproject.zh-tw.html
===================================================================
RCS file: /web/www/www/gnu/thegnuproject.zh-tw.html,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- gnu/thegnuproject.zh-tw.html 30 May 2018 00:59:13 -0000 1.19
+++ gnu/thegnuproject.zh-tw.html 2 Sep 2018 09:28:06 -0000 1.20
@@ -1,9 +1,4 @@
-<!--#set var="PO_FILE"
- value='<a href="/gnu/po/thegnuproject.zh-tw.po">
- https://www.gnu.org/gnu/po/thegnuproject.zh-tw.po</a>'
- --><!--#set var="ORIGINAL_FILE" value="/gnu/thegnuproject.html"
- --><!--#set var="DIFF_FILE" value="/gnu/po/thegnuproject.zh-tw-diff.html"
- --><!--#set var="OUTDATED_SINCE" value="2018-03-31" --><!--#set
var="ENGLISH_PAGE" value="/gnu/thegnuproject.en.html" -->
+<!--#set var="ENGLISH_PAGE" value="/gnu/thegnuproject.en.html" -->
<!--#include virtual="/server/header.zh-tw.html" -->
<!-- Parent-Version: 1.84 -->
@@ -15,7 +10,6 @@
<!--#include virtual="/gnu/po/thegnuproject.translist" -->
<!--#include virtual="/server/banner.zh-tw.html" -->
-<!--#include virtual="/server/outdated.zh-tw.html" -->
<h2>GNU å°æ¡</h2>
<p>
@@ -469,7 +463,9 @@
æåæé¢å°çæå¯æå¨è
ä¾èªè»é«å°å©ãè»é«å°å©è½éå¶èªç±è»é«ä¸è½å¯¦ä½æäºæ¼ç®æ³ååè½ï¼æéé·é
20 å¹´ä¹ä¹
ãLZW
å£ç¸®æ¼ç®æ³æ¼1983å¹´ç³è«å°å°å©ï¼ä½æåä»ç¶ä¸è½ç¼è¡å¯è£½ä½é©ç¶å£ç¸®ç
<acronym title="Graphics Interchange
Format">GIF</acronym>
åçæªçèªç±è»é«ã[ç´å°2009å¹´ææç¸éå°å©æå
¨æ¸éæã]
å¨1998å¹´æï¼æåè½è£½ä½ <acronym
-title="MPEG-1 Audio Layer 3">MP3</acronym> å£ç¸®é³è¨çèªç±ç¨å¼å
çºåå°å°å©è¨´è¨å¨è
èå¾æ£å¸çä¸ç§»é¤ã</p>
+title="MPEG-1 Audio Layer 3">MP3</acronym>
+å£ç¸®é³è¨çèªç±ç¨å¼å çºåå°å°å©è¨´è¨å¨è
èå¾æ£å¸çä¸ç§»é¤ã[ç´å°2017å¹´ï¼éäºå°å©æå
¨æ¸éæï¼çæåå°åºçäºå¤ä¹
ã]
+</p>
<p>
æä¸äºè¾¦æ³å¯ä»¥èçå°å©ï¼æåå¯ä»¥æå°å°å©ç¡æçèæï¼æåä¹å¯ä»¥æ¹å°æ±å
¶ä»æ¹å¼ä¾å®æå件äºæ
ãä½æ¯éäºæ¹æ³ä¸è¦å¾æ¯æ¬¡é½ç®¡ç¨ï¼æäºæåéå
©ç¨®æ¹æ³é½è¾¦ä¸å°ï¼å°å©å¯è¿«ä½¿ææèªç±è»é«é½æ¬
缺æäºä½¿ç¨è
æ³è¦çåè½ãå¨é·æéçå¾
å¾ï¼å°å©çµæ¼éæï¼MP3
å°å©ç¾¤é è¨å¨2018å¹´æå
¨æ¸éæï¼ï¼ä½é£æåæåè½åäºä»éº¼ï¼</p>
@@ -598,7 +594,7 @@
<p class="unprintable"><!-- timestamp start -->
æ´æ°æé︰
-$Date: 2018/05/30 00:59:13 $
+$Date: 2018/09/02 09:28:06 $
<!-- timestamp end -->
</p>
Index: gnu/po/thegnuproject.zh-tw-en.html
===================================================================
RCS file: /web/www/www/gnu/po/thegnuproject.zh-tw-en.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gnu/po/thegnuproject.zh-tw-en.html 27 Mar 2018 09:31:30 -0000 1.3
+++ gnu/po/thegnuproject.zh-tw-en.html 2 Sep 2018 09:28:06 -0000 1.4
@@ -851,7 +851,9 @@
compressed <acronym title="Graphics Interchange Format">GIF</acronym>s.
[As of 2009 they have expired.] In 1998, a free program to produce
<acronym title="MPEG-1 Audio Layer 3">MP3</acronym> compressed audio
-was removed from distribution under threat of a patent suit.</p>
+was removed from distribution under threat of a patent suit. [As of
+2017, these patents have expired. Look how long we had to wait.]
+</p>
<p>
There are ways to cope with patents: we can search for evidence that a
patent is invalid, and we can look for alternative ways to do a job.
@@ -1058,7 +1060,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2018/03/27 09:31:30 $
+$Date: 2018/09/02 09:28:06 $
<!-- timestamp end -->
</p>
</div>
Index: gnu/po/thegnuproject.zh-tw.po
===================================================================
RCS file: /web/www/www/gnu/po/thegnuproject.zh-tw.po,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- gnu/po/thegnuproject.zh-tw.po 2 Sep 2018 09:20:55 -0000 1.35
+++ gnu/po/thegnuproject.zh-tw.po 2 Sep 2018 09:28:06 -0000 1.36
@@ -14,7 +14,6 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2018-03-31 00:56+0000\n"
"X-Generator: Poedit 2.1.1\n"
"Plural-Forms: nplurals=1; plural=0;\n"
@@ -47,10 +46,10 @@
"that the ideas of the free software movement would not be entirely absent "
"from that book."
msgstr ""
-"æç« åè¼æ¼ <em>Open Sources</em> ä¸æ¸ä¸ãçæ¥ã»å²ææ¼å
ç
(Richard "
-"Stallman)<a href=\"/philosophy/open-source-misses-the-point.html\">
å¾ä¾ä¸æ¯"
-"ãéæºãæãOpen Sourceãçæ¯æè
</a>ï¼ä½åºæ¼ä¸é¡è®èªç±è»é«éåçæ³æ³å¨è©²æ¸ä¸"
-"å®å
¨ç¼ºå¸è寫ä¸æ¬æã"
+"æç« åè¼æ¼ <em>Open Sources</em> ä¸æ¸ä¸ãçæ¥ã»å²ææ¼å
ç
(Richard Stallman)"
+"<a href=\"/philosophy/open-source-misses-the-point.html\">
å¾ä¾ä¸æ¯ãéæºãæ"
+"ãOpen Sourceãçæ¯æè
</a>ï¼ä½åºæ¼ä¸é¡è®èªç±è»é«éåçæ³æ³å¨è©²æ¸ä¸å®å
¨ç¼ºå¸è"
+"寫ä¸æ¬æã"
#. type: Content of: <blockquote><p>
msgid ""
@@ -1785,9 +1784,8 @@
"developed such practical advantages that users are flocking to it for purely "
"practical reasons."
msgstr ""
-"ä»æ¥ä¼°è¨ç´æä¸åè¬äººä½¿ç¨ GNU/Linux 系統ï¼ä¾å¦ Debian
GNU/Linux å Red "
-"HatãLinuxããèªç±è»é«å·²ç¼å±åºå¯¦åä¸çåªå¢ï¼è®ä½¿ç¨è
åç´ç²¹åºæ¼å¯¦åå ç´ ç¾¤éè³"
-"æ¤ã"
+"ä»æ¥ä¼°è¨ç´æä¸åè¬äººä½¿ç¨ GNU/Linux 系統ï¼ä¾å¦ Debian
GNU/Linux å Red Hat"
+"ãLinuxããèªç±è»é«å·²ç¼å±åºå¯¦åä¸çåªå¢ï¼è®ä½¿ç¨è
åç´ç²¹åºæ¼å¯¦åå ç´ ç¾¤éè³æ¤ã"
#. type: Content of: <p>
msgid ""
Index: po/home.zh-tw-en.html
===================================================================
RCS file: /web/www/www/po/home.zh-tw-en.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- po/home.zh-tw-en.html 27 Mar 2018 09:31:31 -0000 1.7
+++ po/home.zh-tw-en.html 2 Sep 2018 09:28:06 -0000 1.8
@@ -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="pureos8"
+--><!--#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;
+}
+.screenshot a, .thumbs .image td a {
+ color: white;
+}
+.screenshot img {
+ width: 100%;
+}
+#gnu-linux p {
+ line-height: 1.2em;
+ margin: .2em 0 0;
}
-#gnu-linux img {
+.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 {
- font-size: 1.8em;
- margin: 1.7em 0;
+.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;
}
@@ -138,24 +192,74 @@
<p>GNU is an operating system that
is <a href="/philosophy/free-sw.html">free software</a>—that is,
-it respects users' freedom. The development of GNU made it possible
-to use a computer without software that would trample your freedom.</p>
+it respects users' freedom. The GNU operating system consists of GNU
+packages (programs specifically released by the GNU Project) as well
+as free software released by third parties. The development of GNU
+made it possible to use a computer without software that would trample
+your freedom.</p>
<p>We recommend <a href="/distros/free-distros.html">installable
versions of GNU</a> (more precisely, GNU/Linux distributions) which
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="#parts-of-gnu">Try parts of GNU</a></p>
-
-<a href="/distros/screenshot-gnewsense.html"><img
- src="/distros/screenshots/gnewsense2-medium.jpg"
- alt="Screenshot of GNU"/></a>
-</div>
+<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 0.15 with GNOME 3
desktop] " /></a>
+</div>
+<p><small><a href="/software/guix/">GuixSD 0.15</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 = pureos8" -->
+<div class="screenshot">
+ <a href="/distros/screenshots/pureos8-gnome3.jpg"><img
+ src="/distros/screenshots/gnome3-medium.jpg"
+ alt=" [Screenshot of PureOS 8 with GNOME 3 desktop] "
/></a>
+</div>
+<p><small><a href="https://www.pureos.net/";>PureOS 8</a> with <a
+href="https://www.gnome.org/";>GNOME 3</a> desktop,
+PureBrowser (web browser), and Gimp (image editor)</small></p><!--#endif -->
+
+<table class="thumbs">
+ <tr class="image">
+ <td><a href="/home.html?distro=trisquel8#gnu-linux"><img
+ src="/distros/screenshots/trisquel8-mate-thumb.jpg"
+ alt=" [Screenshot of Trisquel 8 with MATE desktop] "
/></a></td>
+ <td><a href="/home.html?distro=guix#gnu-linux"><img
+ src="/distros/screenshots/guixSD-gnome3-thumb.jpg"
+ alt=" [Screenshot of GuixSD 0.15 with GNOME 3
desktop] " /></a></td>
+ <td><a href="/home.html?distro=pureos8#gnu-linux"><img
+ src="/distros/screenshots/gnome3-thumb.jpg"
+ alt=" [Screenshot of PureOS 8 with 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>PureOS 8 & 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 +339,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 +349,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 +375,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
@@ -313,16 +418,6 @@
</div>
</div>
-<div id="parts-of-gnu" class="emph-box">
- <h3>Try some parts of GNU</h3>
- <p>Do you use Windows or iOS? Take a first step towards freedom by
installing some
- free software on your current operating system:</p>
- <ul>
- <li><a href="/software/for-windows.html">Free Software for Windows</a></li>
- <li><a href="/software/for-ios.html">Free Software for iOS</a></li>
- </ul>
-</div>
-
</div><!-- /second-column -->
</div><!-- /home -->
<div class="clear"></div>
@@ -382,8 +477,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"
@@ -394,7 +488,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2018/03/27 09:31:31 $
+$Date: 2018/09/02 09:28:06 $
<!-- timestamp end -->
</p>
</div>
Index: po/home.zh-tw.po
===================================================================
RCS file: /web/www/www/po/home.zh-tw.po,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- po/home.zh-tw.po 2 Sep 2018 09:20:55 -0000 1.38
+++ po/home.zh-tw.po 2 Sep 2018 09:28:06 -0000 1.39
@@ -14,7 +14,6 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2018-04-17 08:56+0000\n"
"X-Generator: Poedit 2.1.1\n"
"Plural-Forms: nplurals=1; plural=0;\n"
@@ -84,7 +83,6 @@
msgstr "<a href=\"/distros/free-distros.html\">試試 GNU/Linux</a>"
#. type: Content of: <div><div><div><div><a>
-#| msgid "<a href=\"/distros/screenshot-gnewsense.html\">"
msgid "<a href=\"/distros/screenshots/trisquel8-mate.jpg\">"
msgstr "<a href=\"/distros/screenshots/trisquel8-mate.jpg\">"
@@ -103,11 +101,10 @@
"Inkscape (vector graphics editor)</small>"
msgstr ""
"<small><a href=\"https://trisquel.info\";>Trisquel 8</a> æé
<a href="
-"\"https://mate-desktop.org/\";>MATE</a> æ¡é¢ãAbrowserï¼ç¶²é
ç覽å¨ï¼ã"
-"Inkscapeï¼åéå編輯å¨ï¼</small>"
+"\"https://mate-desktop.org/\";>MATE</a> æ¡é¢ãAbrowserï¼ç¶²é
ç覽å¨ï¼ãInkscape"
+"ï¼åéå編輯å¨ï¼</small>"
#. type: Content of: <div><div><div><div><a>
-#| msgid "<a href=\"/distros/screenshot-gnewsense.html\">"
msgid "<a href=\"/distros/screenshots/guixSD-gnome3.jpg\">"
msgstr "<a href=\"/distros/screenshots/guixSD-gnome3.jpg\">"
@@ -126,7 +123,6 @@
"å½±çææ¾å¨ãGNOME çµç«¯æ¨¡æ¬å¨</small>"
#. type: Content of: <div><div><div><div><a>
-#| msgid "<a href=\"/distros/screenshot-gnewsense.html\">"
msgid "<a href=\"/distros/screenshots/pureos8-gnome3.jpg\">"
msgstr "<a href=\"/distros/screenshots/pureos8-gnome3.jpg\">"
@@ -527,7 +523,6 @@
"README</a> ä¾ç解å調åæ交æåç網é ç¿»è¯ç¸éäºå®ã"
#. type: Content of: <div><p>
-#| msgid "Copyright © 2014 Free Software Foundation, Inc."
msgid ""
"Copyright © 1996-2018 <a href=\"http://www.fsf.org\";>Free Software "
"Foundation</a>, Inc."
Index: server/bottom-notes.zh-tw.html
===================================================================
RCS file: /web/www/www/server/bottom-notes.zh-tw.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- server/bottom-notes.zh-tw.html 21 Nov 2017 13:59:12 -0000 1.14
+++ server/bottom-notes.zh-tw.html 2 Sep 2018 09:28:06 -0000 1.15
@@ -1,7 +1,7 @@
<!-- start of server/bottom-notes.html -->
<div id="bottom-notes" class="unprintable">
-<p><a href="//www.fsf.org/about/dmca-notice">èä½æ¬ä¾µç¯éç¥</a></p>
+<p><a
href="//www.fsf.org/about/dmca-notice">æåºèä½æ¬ä¾µç¯éç¥</a></p>
<div id="generic">
<!--#include virtual="/server/generic.zh-tw.html" -->
Index: server/footer-text.zh-tw.html
===================================================================
RCS file: /web/www/www/server/footer-text.zh-tw.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- server/footer-text.zh-tw.html 10 May 2018 09:59:52 -0000 1.18
+++ server/footer-text.zh-tw.html 2 Sep 2018 09:28:06 -0000 1.19
@@ -24,12 +24,11 @@
</blockquote>
<p style="direction:ltr; text-align:left">
-The <a href="//www.fsf.org">Free Software Foundation</a> is the principal
-organizational sponsor of the GNU Operating System. <strong>Support GNU and
-the FSF</strong> by <a href="//shop.fsf.org/">buying manuals and gear</a>,
-<a href="https://my.fsf.org/associate/support_freedom?referrer=4052";>
-<strong>joining the FSF</strong></a> as an associate member, or <a
-href="//donate.fsf.org/"><strong>making a donation</strong></a>.</p>
+<a href="//www.fsf.org">èªç±è»é«åºéæ (FSF) </a>æ¯ GNU
ä½æ¥ç³»çµ±ç主è¦ç±åè´å©è
ãæ¨å¯ä»¥<a
+href="//shop.fsf.org/">購買使ç¨æååç©å</a>ã<a
+href="https://my.fsf.org/associate/support_freedom?referrer=4052";><strong>å å
¥
+FSF æå¡</strong></a>ã<a
href="//donate.fsf.org/">ç´æ¥<strong>æ款</strong>給
+FSF</a>çä¾<strong>æ¯æ GNU è FSF</strong>ã</p>
</div>
Index: server/gnun/compendia/compendium.zh-tw.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.zh-tw.po,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -b -r1.84 -r1.85
Index: server/po/bottom-notes.zh-tw.po
===================================================================
RCS file: /web/www/www/server/po/bottom-notes.zh-tw.po,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- server/po/bottom-notes.zh-tw.po 2 Sep 2018 09:20:55 -0000 1.14
+++ server/po/bottom-notes.zh-tw.po 2 Sep 2018 09:28:06 -0000 1.15
@@ -21,5 +21,4 @@
msgid ""
"<a href=\"//www.fsf.org/about/dmca-notice\">Copyright Infringement "
"Notification</a>"
-msgstr ""
-"<a href=\"//www.fsf.org/about/dmca-notice\">æåºèä½æ¬ä¾µç¯éç¥</a>"
+msgstr "<a
href=\"//www.fsf.org/about/dmca-notice\">æåºèä½æ¬ä¾µç¯éç¥</a>"
Index: server/po/footer-text.zh-tw.po
===================================================================
RCS file: /web/www/www/server/po/footer-text.zh-tw.po,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- server/po/footer-text.zh-tw.po 2 Sep 2018 09:20:55 -0000 1.24
+++ server/po/footer-text.zh-tw.po 2 Sep 2018 09:28:06 -0000 1.25
@@ -15,7 +15,6 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2018-05-10 09:56+0000\n"
"X-Generator: Poedit 2.1.1\n"
# type: Content of: <div><p>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- www home.zh-tw.html distros/common-distros.zh-t...,
GNUN <=