[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/philosophy amazon.ko.html po/amazon.ko-en.h...
|
From: |
GNUN |
|
Subject: |
www/philosophy amazon.ko.html po/amazon.ko-en.h... |
|
Date: |
Tue, 9 May 2017 16:28:28 -0400 (EDT) |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 17/05/09 16:28:28
Modified files:
philosophy : amazon.ko.html
philosophy/po : amazon.ko-en.html amazon.ko.po
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/amazon.ko.html?cvsroot=www&r1=1.22&r2=1.23
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/amazon.ko-en.html?cvsroot=www&r1=1.14&r2=1.15
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/amazon.ko.po?cvsroot=www&r1=1.25&r2=1.26
Patches:
Index: amazon.ko.html
===================================================================
RCS file: /web/www/www/philosophy/amazon.ko.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- amazon.ko.html 9 May 2017 15:28:17 -0000 1.22
+++ amazon.ko.html 9 May 2017 20:28:26 -0000 1.23
@@ -1,32 +1,20 @@
-<!--#set var="PO_FILE"
- value='<a href="/philosophy/po/amazon.ko.po">
- https://www.gnu.org/philosophy/po/amazon.ko.po</a>'
- --><!--#set var="ORIGINAL_FILE" value="/philosophy/amazon.html"
- --><!--#set var="DIFF_FILE" value="/philosophy/po/amazon.ko-diff.html"
- --><!--#set var="OUTDATED_SINCE" value="2013-01-11" -->
+<!--#set var="ENGLISH_PAGE" value="/philosophy/amazon.en.html" -->
+
<!--#include virtual="/server/header.ko.html" -->
+<!-- Parent-Version: 1.77 -->
<!-- This file is automatically generated by GNUnited Nations! -->
-<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
- <!--#set var="ENGLISH_PAGE" value="/philosophy/amazon.en.html" -->
-
<title>(ì´ì ì) ìë§ì¡´ì ëí ë¶ë§¤ì´ëì ë²ì
ìë¤! - GNU
íë¡ì í¸ - ìì ìíí¸ì¨ì´ ì¬ë¨ (FSF)</title>
-<!-- Fixed by hand on April 16, 2014:
- - disable top addendum,
- - translist before banner.
--->
<!--#include virtual="/philosophy/po/amazon.translist" -->
<!--#include virtual="/server/banner.ko.html" -->
-<!--#include virtual="/server/outdated.ko.html" -->
-
-<h2>ìë§ì¡´ì ëí ë¶ë§¤ì´ëì ë²ì
ìë¤!</h2>
+<h2>(ì´ì ì) ìë§ì¡´ì ëí ë¶ë§¤ì´ëì ë²ì
ìë¤!</h2>
<blockquote>
<p>
FSFë ìë§ì¡´ì ëí ë¶ë§¤ì´ëì ì¢
ê²°íê¸°ë¡ 2002ë
9ìì
ê²°ì íìµëë¤. (ê·¸ë¬ë ê·¸ ë¹ììë ì´ íì´ì§ë¥¼ í¸ì§íë
ê²ì ìê³
ìììµëë¤.) ìë§ì¡´ê³¼ ë°ì¤ì¤ë
¸ë¸ì ìì¡ ê²°ê³¼ë¥¼ ì°ë¦¬ê°
ì íí ì ìë ìì§ë§ í¼ê³ ìê² ë§ì´ í´ë¡ì ì ê² ê°ì§ë
ììµëë¤. ëí
-ìë§ì¡´ì ì´ë¤ ì¬ëë ë¤ì 공격íì§ ìììµëë¤.</p>
+ìë§ì¡´ì ë구 ë¤ì 공격íì§ ìììµëë¤.</p>
<p>
ìë§ì¡´ì ê·¸ë ì´íë¡ ìíì ì¸ ë¤ë¥¸ í¹íë¤ì ë§ì´ ê°ê²
ëìì§ë§, ìì§ê¹ì§ë 공격ì ì¼ë¡ ì¬ì©íê³ ìì§ ììµëë¤.
ë§ì½ ê·¸ë° íëì íë¤ë©´
ì°ë¦¬ë ê·¸ê²ì ì´ë»ê² ë¬¼ë¦¬ì¹ ì§ ê²í í ê²ì
ëë¤.</p>
@@ -67,10 +55,8 @@
ìí¥ì 미ì¹ë ê²ì
ëë¤.</p>
<p>
ì´ë¬í 문ì ì ëí ìëª»ì´ ìë§ì¡´ìë§ ìë ê²ì
ìëëë¤. ì ê¸í íë¨ ê¸°ì¤ì ê°ê³ ìë ë¯¸êµ í¹íì²ê³¼
ê·¸ë¤ì ì¹í¸íê³ ìë ë²ì ëí
-ë¹ëë°ìì¼ í©ëë¤. ì ë³´ ì¡°ì 기ì ê³¼ íµì ííì í¹í를
ì¸ì íê³ ìë 미êµì í¹íë² ëí ë¹ëë°ìì¼ í©ëë¤.
ì´ë¬í ì ì±
ì ì¼ë°ì ì¼ë¡
-ì í´í ê²ì
ëë¤.(<a
href="http://progfree.org/Patents/patents.html";>ìíí¸ì¨ì´ í¹í</a>ì
-ëí ì¢ë ë§ì 문ì ì ëí´ìë <a
href="http://progfree.org";>http://progfree.org/</a>
-ì¬ì´í¸ë¥¼ ì°¸ê³ íì기 ë°ëëë¤.)</p>
+ë¹ë ë°ìì¼ í©ëë¤. ì ë³´ ì¡°ì 기ì ê³¼ íµì ííì í¹í를
ì¸ì íê³ ìë 미êµì í¹íë² ëí ë¹ë ë°ìì¼ í©ëë¤.
ì´ë¬í ì ì±
ì
+ì¼ë°ì ì¼ë¡ ì í´í ê²ì
ëë¤.</p>
<p>
ì´ë¦¬ìì ì ë¶ì ì ì±
ì´ ìë§ì¡´ìê² ê¸°í를 주ììµëë¤.
ê·¸ë¬ë ì´ê²ì´ ë³ëª
ì´ ë ìë ììµëë¤. ìë§ì¡´ì
ì¤ì¤ë¡ì ì íì ìí´ í¹í를
@@ -134,8 +120,8 @@
<h3 id="whyContinue">ìì¡ì´ ëë¬ëë°ë ì ë¶ë§¤ì´ëì ê³ì
íëê°</h3>
<p>
-Amazon.comì 2002ë
3ì, ì¤ë«ëì ì§ìë ë°ì¤ì¤ë
¸ë¸ê³¼ì
1-Click ì²´í¬ ìì ìì¤í
ì ëí í¹í ì¹¨í´ ìì¡ì íí´ê°
-ì±ë¦½ëìë¤ê³ ë°ííìµëë¤. ìì¬ê° 맺ì ìì¸í íí´
ë´ì©ì ê³µê°ëì§ ìììµëë¤.</p>
+Amazon.comì 2002ë
3ì, ì¤ë«ëì ì§ìë ë°ì¤ì¤ë
¸ë¸ê³¼ì
1-Click ê²°ì ìì¤í
ì ëí í¹í ì¹¨í´ ìì¡ì íí´ê°
+ì±ë¦½ëìë¤ê³ ë°ííìµëë¤. ì ì¬ê° 맺ì ìì¸í íí´
ë´ì©ì ê³µê°ëì§ ìììµëë¤.</p>
<p>
íí´ ì¡°ê±´ì´ ê³µê°ëì§ ìì기 ë문ì, ìì¡ ì¢
ë£ê°
ë¶ë§¤ì´ëì ëë´ë ê²ì ì ë¹ííë ìë§ì¡´ì ëí
ì¹ë¦¬ì¸ì§ ì¬ë¶ë¥¼ ì°ë¦¬ê° ì ë°©ë²ì
@@ -169,19 +155,14 @@
<p>
ìë§ì¡´ì ë¤ë¥¸ ë²ì ìì <a
-href="http://www.salon.com/tech/log/1999/10/28/amazon/index.html";>ëë¤ë¥¸
ë¹ëë°ì
-ë§í ì¼</a>ì íê³ ììµëë¤.</p>
-
-<!-- This link is dead, sinuhe 20030830
-<p>
+href="https://web.archive.org/web/20140610154715/http://www.salon.com/1999/10/28/amazon_3/";>ëë¤ë¥¸
+ë¹ëë°ì ë§í ì¼</a>ì íê³ ììµëë¤.</p>
-The FTC has also made several <a
-href="http://www.gomez.com/features/article.asp?topcat_id=0&col=16&id=7690";>questionable
-decisions regarding Amazon and consumer privacy</a>.</p>
--->
<p>
-<a href="http://progfree.org/Patents/patents.html";>ìíí¸ì¨ì´
í¹í</a>ì ëí ì¢ë ë§ì
-문ì ì ëí´ìë <a href="http://progfree.org";>http://progfree.org/</a>
ì¬ì´í¸ë¥¼ ì°¸ê³ íì기
+<a
+href="https://web.archive.org/web/20150329143651/http://progfree.org/Patents/patents.html";>ìíí¸ì¨ì´
+í¹í</a>ì ëí ì¢ ë ë§ì 문ì ì ëí´ìë <a
+href="http://endsoftpatents.orgl";>http://endsoftpatents.org</a> ì¬ì´í¸ë¥¼
ì°¸ê³ íì기
ë°ëëë¤.</p>
<p>
@@ -189,50 +170,74 @@
href="http://web.archive.org/web/20010430183216/http://www.cpsr.org/links/bookstore/";>ìë§ì¡´ê³¼ì
ì í´ë¥¼ ì¤ë¨</a>íìµëë¤.</p>
-
-<div style="font-size: small;">
+<div class="translators-notes">
<!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
</div>
</div>
+<!-- for id="content", starts in the include above -->
<!--#include virtual="/server/footer.ko.html" -->
<div id="footer">
+<div class="unprintable">
-<p>
-FSFì GNUì ëí 문ìë <a
href="mailto:address@hidden";><address@hidden></a> ìì¼ë¡ ë³´ë´
-주ì¸ì. FSFì ëí <a href="/contact/">ë¤ë¥¸ ì°ë½ ë°©ë²</a>ë
ììµëë¤.
-<br />
-ëì´ì§ ë§í¬ë ë¤ë¥¸ ìì ì¬í ëë ì ìì <a
-href="mailto:address@hidden";><address@hidden></a> ìì¼ë¡ ë³´ë´
주ì¸ì.
-</p>
+<p>FSFì GNUì ëí 문ìë <a
href="mailto:address@hidden";><address@hidden></a> ìì¼ë¡ ë³´ë´
+주ì¸ì. FSFì ëí <a href="/contact/">ë¤ë¥¸ ì°ë½ ë°©ë²</a>ë
ììµëë¤. ëì´ì§ ë§í¬ë ë¤ë¥¸ ìì ì¬í ëë ì ìì
+<a href="mailto:address@hidden";><address@hidden></a> ìì¼ë¡ ë³´ë´
+주ì¸ì.</p>
<p>
+<!-- TRANSLATORS: Ignore the original text in this paragraph,
+ replace it with the translation of these two:
+
+ We work hard and do our best to provide accurate, good quality
+ translations. However, we are not exempt from imperfection.
+ Please send your comments and general suggestions in this regard
+ to <a href="mailto:address@hidden";>
+
+ <address@hidden></a>.</p>
+
+ <p>For information on coordinating and submitting translations of
+ our web pages, see <a
+ href="/server/standards/README.translations.html">Translations
+ README</a>. -->
ì´ ê¸ì ë¤ë¥¸ ì¸ì´ ë²ì문 ìì±ì´ë ì ì¶ì ëí ì ë³´ë <a
-href="/server/standards/README.translations.html">ë²ì ìë´</a>를 ì°¸ê³
í´ ì£¼ì¸ì.
-</p>
+href="/server/standards/README.translations.html">ë²ì ìë´</a>를 ì°¸ê³
í´ ì£¼ì¸ì.</p>
+</div>
-<p>
-Copyright © 1999, 2001, 2007, 2008 Free Software Foundation, Inc.,
-</p>
-<address> </address>
-<p>ì´ íì´ì§ë <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/deed.ko";>í¬ë¦¬ìì´í°ë¸
커먼ì¤
-ì ììíì-ë³ê²½ê¸ì§ 3.0 ë¯¸êµ ì´ì©íë½ì</a>ì ë°ë¼ ì´ì©í
ì ììµëë¤.
-</p>
+<!-- Regarding copyright, in general, standalone pages (as opposed to
+ files generated as part of manuals) on the GNU web server should
+ be under CC BY-ND 4.0. Please do NOT change or remove this
+ without talking with the webmasters or licensing team first.
+ Please make sure the copyright date is consistent with the
+ document. For web pages, it is ok to list just the latest year the
+ document was modified, or published.
+
+ If you wish to list earlier years, that is ok too.
+ Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+ years, as long as each year in the range is in fact a copyrightable
+ year, i.e., a year in which the document was published (including
+ being publicly visible on the web or in a revision control system).
+
+ There is more detail about copyright years in the GNU Maintainers
+ Information document, www.gnu.org/prep/maintain. -->
+<p>Copyright © 1999, 2001, 2007, 2008, 2013, 2014, 2015 Free Software
+Foundation, Inc.</p>
+<p>ì´ íì´ì§ë <a rel="license"
+href="http://creativecommons.org/licenses/by-nd/4.0/deed.ko";>í¬ë¦¬ìì´í°ë¸
커먼ì¤
+ì ììíì-ë³ê²½ê¸ì§ 4.0 êµì ì´ì©íë½ì</a>ì ë°ë¼ ì´ì©í
ì ììµëë¤.</p>
+<!--#include virtual="/server/bottom-notes.ko.html" -->
<div class="translators-credits">
<!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
</div>
-
- <p>
-<!-- timestamp start -->
+<p class="unprintable"><!-- timestamp start -->
ìµì¢
ìì ì¼:
-$Date: 2017/05/09 15:28:17 $
+$Date: 2017/05/09 20:28:26 $
<!-- timestamp end -->
</p>
Index: po/amazon.ko-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/amazon.ko-en.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- po/amazon.ko-en.html 27 Sep 2012 16:54:47 -0000 1.14
+++ po/amazon.ko-en.html 9 May 2017 20:28:27 -0000 1.15
@@ -1,15 +1,16 @@
<!--#include virtual="/server/header.html" -->
-<title>(Formerly) Boycott Amazon! - GNU Project - Free Software Foundation
(FSF)</title>
-<!--#include virtual="/server/banner.html" -->
+<!-- Parent-Version: 1.77 -->
+<title>(Formerly) Boycott Amazon! - GNU Project - Free Software
Foundation</title>
<!--#include virtual="/philosophy/po/amazon.translist" -->
-<h2>Boycott Amazon!</h2>
+<!--#include virtual="/server/banner.html" -->
+<h2>(Formerly) Boycott Amazon!</h2>
<blockquote>
<p>
The FSF decided to end its boycott of Amazon in September 2002. (We
forgot to edit this page at the time.) We could not tell the precise
-result of the lawsuit against Barnes and Noble, but it did not seem to
-be very harmful to the defendent. And Amazon had not attacked anyone
+result of the lawsuit against Barnes & Noble, but it did not seem to
+be very harmful to the defendant. And Amazon had not attacked anyone
else.</p>
<p>
Amazon has got a number of other menacing patents since then, but has
@@ -63,10 +64,7 @@
Office is to blame for having very low standards, and US courts are to
blame for endorsing them. And US patent law is to blame for
authorizing patents on information-manipulating techniques and
-patterns of communication—a policy that is harmful in general. (See
-<a href="http://progfree.org";>http://progfree.org/</a> for more
-information about the broader issue of
-<a href="http://progfree.org/Patents/patents.html";>software patents</a>.)</p>
+patterns of communication—a policy that is harmful in general.</p>
<p>
Foolish government policies gave Amazon the opportunity—but an
@@ -158,7 +156,7 @@
<p>
Amazon.com reported in March 2002 that it had settled its long-running
-patent-infringement suit against Barnes and Noble over its 1-Click
+patent-infringement suit against Barnes & Noble over its 1-Click
checkout system. The details of the settlement were not disclosed.</p>
<p>
@@ -201,61 +199,80 @@
<p>
On the side, Amazon is doing
-<a href="http://www.salon.com/tech/log/1999/10/28/amazon/index.html";>other
+<a
href="https://web.archive.org/web/20140610154715/http://www.salon.com/1999/10/28/amazon_3/";>other
obnoxious things</a> in another courtroom, too.</p>
-<!-- This link is dead, sinuhe 20030830
-<p>
-The FTC has also made several <a
-href="http://www.gomez.com/features/article.asp?topcat_id=0&col=16&id=7690";>questionable
-decisions regarding Amazon and consumer privacy</a>.</p>
--->
-
<p>
-See <a href="http://progfree.org";>http://progfree.org/</a> for
+See <a
+href="http://endsoftpatents.org";>http://endsoftpatents.org</a> for
more information about the broader issue of
-<a href="http://progfree.org/Patents/patents.html";>software patents</a>.</p>
+<a
href="https://web.archive.org/web/20150329143651/http://progfree.org/Patents/patents.html";>
+software patents</a>.</p>
<p>
<a
href="http://web.archive.org/web/20010430183216/http://www.cpsr.org/links/bookstore/";>
Computer Professionals for
Social Responsibility have dropped their affiliation with Amazon</a>.</p>
-</div>
-
+</div><!-- for id="content", starts in the include above -->
<!--#include virtual="/server/footer.html" -->
<div id="footer">
+<div class="unprintable">
-<p>
-Please send FSF & GNU inquiries to
-<a href="mailto:address@hidden";><em>address@hidden</em></a>.
+<p>Please send general FSF & GNU inquiries to
+<a href="mailto:address@hidden";><address@hidden></a>.
There are also <a href="/contact/">other ways to contact</a>
-the FSF.
-<br />
-Please send broken links and other corrections or suggestions to
-<a href="mailto:address@hidden";><em>address@hidden</em></a>.
-</p>
+the FSF. Broken links and other corrections or suggestions can be sent
+to <a href="mailto:address@hidden";><address@hidden></a>.</p>
-<p>
-Please see the
-<a href="/server/standards/README.translations.html">Translations
-README</a> for information on coordinating and submitting
-translations of this article.
-</p>
+<p><!-- TRANSLATORS: Ignore the original text in this paragraph,
+ replace it with the translation of these two:
+
+ We work hard and do our best to provide accurate, good quality
+ translations. However, we are not exempt from imperfection.
+ Please send your comments and general suggestions in this regard
+ to <a href="mailto:address@hidden";>
+ <address@hidden></a>.</p>
+
+ <p>For information on coordinating and submitting translations of
+ our web pages, see <a
+ href="/server/standards/README.translations.html">Translations
+ README</a>. -->
+Please see the <a
+href="/server/standards/README.translations.html">Translations
+README</a> for information on coordinating and submitting translations
+of this article.</p>
+</div>
+
+<!-- Regarding copyright, in general, standalone pages (as opposed to
+ files generated as part of manuals) on the GNU web server should
+ be under CC BY-ND 4.0. Please do NOT change or remove this
+ without talking with the webmasters or licensing team first.
+ Please make sure the copyright date is consistent with the
+ document. For web pages, it is ok to list just the latest year the
+ document was modified, or published.
+
+ If you wish to list earlier years, that is ok too.
+ Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+ years, as long as each year in the range is in fact a copyrightable
+ year, i.e., a year in which the document was published (including
+ being publicly visible on the web or in a revision control system).
+
+ There is more detail about copyright years in the GNU Maintainers
+ Information document, www.gnu.org/prep/maintain. -->
+
+<p>Copyright © 1999, 2001, 2007, 2008, 2013, 2014, 2015
+Free Software Foundation, Inc.</p>
-<p>
-Copyright © 1999, 2001, 2007, 2008 Free Software Foundation, Inc.,
-</p>
-<address>51 Franklin St, Fifth Floor, Boston, MA 02110, USA</address>
<p>This page is licensed under a <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative
-Commons Attribution-NoDerivs 3.0 United States License</a>.
-</p>
+href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
+Commons Attribution-NoDerivatives 4.0 International License</a>.</p>
-<p>
-Updated:
+<!--#include virtual="/server/bottom-notes.html" -->
+
+<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2012/09/27 16:54:47 $
+$Date: 2017/05/09 20:28:27 $
<!-- timestamp end -->
</p>
</div>
Index: po/amazon.ko.po
===================================================================
RCS file: /web/www/www/philosophy/po/amazon.ko.po,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- po/amazon.ko.po 9 May 2017 20:11:55 -0000 1.25
+++ po/amazon.ko.po 9 May 2017 20:28:27 -0000 1.26
@@ -15,7 +15,6 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Outdated-Since: 2013-01-11 12:57-0500\n"
"X-Generator: Poedit 1.8.7.1\n"
#. type: Content of: <title>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- www/philosophy amazon.ko.html po/amazon.ko-en.h...,
GNUN <=