-#. type: Content of: <title> msgid "What is Copyleft? - GNU Project - Free Software Foundation (FSF)" msgstr "ä»ä¹æ¯èå·¦æï¼ - GNU å·¥ç¨ - èªç±è½¯ä»¶åºéä¼ï¼FSFï¼" # type: Attribute 'content' of: <meta> -#. type: Attribute 'content' of: <meta> msgid "GNU, FSF, Free Software Foundation, Linux, Copyleft" msgstr "" "GNU, FSF, Free Software Foundation, Linux, Copyleft, èªç±è½¯ä»¶åºéä¼, èå·¦æ" # type: Content of: <h2> -#. type: Content of: <h2> msgid "What is Copyleft?" msgstr "ä»ä¹æ¯èå·¦æï¼" # type: Content of: <p> -#. type: Content of: <p> msgid "" "Copyleft is a general method for making a program (or other work) free, and " "requiring all modified and extended versions of the program to be free as " @@ -41,7 +37,6 @@ "æç¨åºçä¿®æ¹åæ©å±é½ä¿æèªç±ã" # type: Content of: <p> -#. type: Content of: <p> msgid "" "The simplest way to make a program free software is to put it in the <a href=" "\"/philosophy/categories.html#PublicDomainSoftware\">public domain</a>, " @@ -61,7 +56,6 @@ "å®ä»¬çåå§ä½èæææçé£æ ·åè®¸ç¨æ·èªç±çä½¿ç¨ï¼è¿ç§èªç±è¢«ä¸é´åå¥å¤ºäºã" # type: Content of: <p> -#. type: Content of: <p> msgid "" "In the <a href=\"/gnu/thegnuproject.html\">GNU project</a>, our aim is to " "give <em>all</em> users the freedom to redistribute and change GNU " @@ -80,7 +74,6 @@ "æ¥æèªç±çæåã" # type: Content of: <p> -#. type: Content of: <p> msgid "" "Copyleft also provides an <a href=\"/philosophy/pragmatic.html\">incentive</" "a> for other programmers to add to free software. Important free programs " @@ -91,7 +84,6 @@ "ä¸ç¹ã" # type: Content of: <p> -#. type: Content of: <p> msgid "" "Copyleft also helps programmers who want to contribute <a href=\"/prep/tasks." "html\">improvements</a> to <a href=\"/philosophy/free-sw.html\">free " @@ -106,7 +98,6 @@ "åªåè´¡ç®å°èªç±è½¯ä»¶ç¤¾åºï¼ä½ä»çèæ¿å¯è½å¸ææè¿äºå·¥ä½åæåä¸çè½¯ä»¶äº§åã" # type: Content of: <p> -#. type: Content of: <p> msgid "" "When we explain to the employer that it is illegal to distribute the " "improved version except as free software, the employer usually decides to " @@ -116,7 +107,6 @@ "å¾ä¼å³å®æå®ä»¬ä½ä¸ºèªç±è½¯ä»¶åå¸èä¸æ¯æå®ä»¬æå¼ã" # type: Content of: <p> -#. type: Content of: <p> msgid "" "To copyleft a program, we first state that it is copyrighted; then we add " "distribution terms, which are a legal instrument that gives everyone the " @@ -130,7 +120,6 @@ "è¯ï¼ä»£ç åèªç±æåå¨æ³å¾ä¸å°±ä¸å¯åå²äºã" # type: Content of: <p> -#. type: Content of: <p> msgid "" "Proprietary software developers use copyright to take away the users' " "freedom; we use copyright to guarantee their freedom. That's why we reverse " @@ -140,7 +129,6 @@ "ä¸ºä»ä¹æä»¬æâèä½æâæ¹ç§°ä¸ºâèå·¦æâã" # type: Content of: <p> -#. type: Content of: <p> msgid "" "Copyleft is a way of using of the copyright on the program. It doesn't mean " "abandoning the copyright; in fact, doing so would make copyleft impossible. " @@ -153,7 +141,6 @@ "ä¸éå¸¸çâçæâå·æç¸åçææã" # type: Content of: <p> -#. type: Content of: <p> msgid "" "Copyleft is a general concept, and you can't use a general concept directly; " "you can only use a specific implementation of the concept. In the GNU " @@ -175,7 +162,6 @@ "\" target=\"_blank\">ä¸ºä»ä¹FSFä»ä½èå¤è·å¾çæè®¸å¯</a>ã" # type: Content of: <p> -#. type: Content of: <p> msgid "" "An alternate form of copyleft, the <a href=\"/copyleft/lesser.html\">GNU " "Lesser General Public License (LGPL) (available in HTML</a>, <a href=\"/" @@ -194,7 +180,6 @@ "ä½ çä¸ä¸ä¸ªå½æ°åºåºç¨å½æ°åºGPL</cite></a>ã" # type: Content of: <p> -#. type: Content of: <p> msgid "" "The <a href=\"/copyleft/fdl.html\">GNU Free Documentation License (FDL) " "(available in HTML</a>, <a href=\"/copyleft/fdl.txt\">text</a> and <a href=" @@ -210,14 +195,12 @@ "éåä¸çã" # type: Content of: <p> -#. type: Content of: <p> msgid "" "The appropriate license is included in many manuals and in each GNU source " "code distribution." msgstr "è¿äºåè®®å¨å¾å¤çæååæ¯ä¸ä»½GNUçæºä»£ç ä¸ä¸èµ·è¢«åå¸ã" # type: Content of: <p> -#. type: Content of: <p> msgid "" "All these licenses are designed so that you can easily apply them to your " "own works, assuming you are the copyright holder. You don't have to modify " @@ -229,7 +212,6 @@ "æå¼ç¨è¿ä¸ªåè®®å°±å¯ä»¥äºã" # type: Content of: <p> -#. type: Content of: <p> msgid "" "Using the same distribution terms for many different programs makes it easy " "to copy code between various different programs. When they all have the " @@ -246,7 +228,6 @@ "æ¯ç¸äºå¼å®¹çã" # type: Content of: <p> -#. type: Content of: <p> msgid "" "If you would like to copyleft your program with the GNU GPL or the GNU LGPL, " "please see the <a href=\"/copyleft/gpl-howto.html\">license instructions " @@ -259,7 +240,6 @@ "ä¸ªåè®®ï¼åè®®æ¯ä¸ä¸ªæ´ä½ï¼åªå¼ç¨å¶ä¸çä¸é¨åæ¯ä¸åè®¸çã" # type: Content of: <p> -#. type: Content of: <p> msgid "" "If you would like to copyleft your manual with the GNU FDL, please see the " "instructions at the <a href=\"/copyleft/fdl.html#SEC4\">end</a> of the FDL " @@ -273,17 +253,17 @@ # type: Content of: <div> #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes. -#. type: Content of: <div> msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*" msgstr " " # type: Content of: <div><p> -#. type: Content of: <div><p> #, fuzzy msgid "" "Please send FSF & GNU inquiries to <a href=\"mailto:address@hidden" "\"><em>address@hidden</em></a>. There are also <a href=\"/contact/\">other " -"ways to contact</a> the FSF." +"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>." msgstr "" "è¯·å°æå³èªç±è½¯ä»¶åºéä¼ä¸GNUçæ¥è¯¢ä¸é®é¢ï¼ä»¥è±è¯ï¼åéå°<a href=\"mailto:" "address@hidden"><em>address@hidden</em></a>ãæ¨ä¹å¯ä»¥éè¿ <a href=\"/contact/\">å¶" @@ -292,20 +272,6 @@ "\"><em>address@hidden</em></a>ã" # type: Content of: <div><p> -#. type: Content of: <div><p> -#, fuzzy -msgid "" -"Please send broken links and other corrections or suggestions to <a href=" -"\"mailto:address@hidden"><em>address@hidden</em></a>." -msgstr "" -"è¯·å°æå³èªç±è½¯ä»¶åºéä¼ä¸GNUçæ¥è¯¢ä¸é®é¢ï¼ä»¥è±è¯ï¼åéå°<a href=\"mailto:" -"address@hidden"><em>address@hidden</em></a>ãæ¨ä¹å¯ä»¥éè¿ <a href=\"/contact/\">å¶" -"å®æ¹æ³</a> èç³»èªç±è½¯ä»¶åºéä¼ã <br /> åç°ä»»ä½éè¯¯åé¾æ¥æå¶å®éè¦æ´æ£çå°æ¹" -"ï¼æä»»ä½å»ºè®®ï¼ï¼è¯·åéé®ä»¶è³ <a href=\"mailto:address@hidden" -"\"><em>address@hidden</em></a>ã" - -# type: Content of: <div><p> -#. type: Content of: <div><p> msgid "" "Please see the <a href=\"/server/standards/README.translations.html" "\">Translations README</a> for information on coordinating and submitting " @@ -315,7 +281,6 @@ "è§£æå³åè°åæäº¤æç« ç¿»è¯çä¿¡æ¯ã" # type: Content of: <div><p> -#. type: Content of: <div><p> msgid "" "Copyright © 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, " "2006, 2007, 2008, 2009 Free Software Foundation, Inc.," @@ -324,7 +289,6 @@ "2006, 2007, 2008, 2009 <a href=\"http://www.fsf.org\">èªç±è½¯ä»¶åºéä¼</a>" # type: Content of: <div><p> -#. type: Content of: <div><p> msgid "" "Verbatim copying and distribution of this entire article is permitted in any " "medium, provided this notice is preserved." @@ -334,17 +298,26 @@ # type: Content of: <div><div> #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits. -#. type: Content of: <div><div> msgid "*GNUN-SLOT: TRANSLATOR'S CREDITS*" msgstr "<b>ç¿»è¯</b>: æå¡å¸ 2007, 2008, 2009, 2010" # type: Content of: <div><p> #. timestamp start -#. type: Content of: <div><p> msgid "Updated:" msgstr "æåæ´æ°ï¼" # type: Content of: <div><h4> -#. type: Content of: <div><h4> msgid "Translations of this page" msgstr "æ¬é¡µçç¿»è¯" + +# type: Content of: <div><p> +#, fuzzy +#~ msgid "" +#~ "Please send broken links and other corrections or suggestions to <a href=" +#~ "\"mailto:address@hidden"><em>address@hidden</em></a>." +#~ msgstr "" +#~ "è¯·å°æå³èªç±è½¯ä»¶åºéä¼ä¸GNUçæ¥è¯¢ä¸é®é¢ï¼ä»¥è±è¯ï¼åéå°<a href=\"mailto:" +#~ "address@hidden"><em>address@hidden</em></a>ãæ¨ä¹å¯ä»¥éè¿ <a href=\"/contact/" +#~ "\">å¶å®æ¹æ³</a> èç³»èªç±è½¯ä»¶åºéä¼ã <br /> åç°ä»»ä½éè¯¯åé¾æ¥æå¶å®éè¦æ´" +#~ "æ£çå°æ¹ï¼æä»»ä½å»ºè®®ï¼ï¼è¯·åéé®ä»¶è³ <a href=\"mailto:address@hidden" +#~ "\"><em>address@hidden</em></a>ã" Index: philosophy/words-to-avoid.zh-cn.po =================================================================== RCS file: /cvsroot/www-zh-cn/www-zh-cn/philosophy/words-to-avoid.zh-cn.po,v retrieving revision 1.5 diff -u -r1.5 words-to-avoid.zh-cn.po --- philosophy/words-to-avoid.zh-cn.po 19 May 2010 15:24:59 -0000 1.5 +++ philosophy/words-to-avoid.zh-cn.po 24 May 2010 01:30:00 -0000 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: words-to-avoid.html\n" -"POT-Creation-Date: 2010-05-17 23:40+0800\n" +"POT-Creation-Date: 2010-03-12 04:25-0500\n" "PO-Revision-Date: 2010-05-09 00:10+0800\n" "Last-Translator: xiangfu <address@hidden>\n" "Language-Team: GNUCTT\n" @@ -15,7 +15,6 @@ "Content-Transfer-Encoding: 8bit\n" # type: Content of: <title> -#. type: Content of: <title> #, fuzzy msgid "" "Confusing Words and Phrases That Are Worth Avoiding - GNU Project - Free " @@ -25,13 +24,11 @@ "ä¼ (FSF)" # type: Content of: <h2> -#. type: Content of: <h2> #, fuzzy msgid "Some Confusing or Loaded Words and Phrases to Avoid (or Use with Care)" msgstr "Some Confusing or Loaded Words and Phrases to Avoid (or use with care)" # type: Content of: <p> -#. type: Content of: <p> #, fuzzy msgid "" "There are a number of words and phrases that we recommend avoiding, or " @@ -42,14 +39,12 @@ "ä»¬è¦ä¹æ¯ææ§ä¹ï¼è¦ä¹æä»¬ä¸å¸æä½ å®å¨èµåå®æå«çè§ç¹ã" # type: Content of: <div> -#. type: Content of: <div> msgid "" "Also note <a href=\"/philosophy/categories.html\">Categories of Free " "Software</a>." msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "<a href=\"/philosophy/philosophy.html\">Other Texts to Read</a> | “<a " "href=\"words-to-avoid.html#BSD-style\">BSD-style</a>” | “<a href=" @@ -88,12 +83,10 @@ msgstr "" # type: Content of: <h4> -#. type: Content of: <h4> msgid "“BSD-style”" msgstr "“BSD-å½¢å¼“" # type: Content of: <p> -#. type: Content of: <p> #, fuzzy msgid "" "The expression “BSD-style license” leads to confusion because it " @@ -106,7 +99,6 @@ "æ¯å¦ï¼åæ¥çBSDçæçææä¸ç¬¦åGNU GPLï¼ä½ç»ä¿®è®¢çBSD çæç¬¦åGPLã" # type: Content of: <p> -#. type: Content of: <p> msgid "" "To avoid confusion, it is best to name <a href=\"/licenses/license-list.html" "\"> the specific license in question</a> and avoid the vague term “BSD-" @@ -114,12 +106,10 @@ msgstr "ä¸ºé¿åæ··æ·ï¼æå¥½é¿åç¨æ¨¡ç³ç âBSD-å½¢å¼ âæ¯è¯ç»å·ä½ççæå½åã" # type: Content of: <h4> -#. type: Content of: <h4> msgid "“Closed”" msgstr "“å°éç“" # type: Content of: <p> -#. type: Content of: <p> #, fuzzy msgid "" "Describing nonfree software as “closed” clearly refers to the " @@ -137,12 +127,10 @@ "“æè¿°éèªç±è½¯ä»¶ ãæä»¬ç¨“éèªç±“æ“ä¸å©“" # type: Content of: <h4> -#. type: Content of: <h4> msgid "“Cloud Computing”" msgstr "“äºè®¡ç®”" # type: Content of: <p> -#. type: Content of: <p> #, fuzzy msgid "" "The term “cloud computing” is a marketing buzzword with no clear " @@ -156,7 +144,6 @@ "ææ¨çæ³æ³ä¸å°è¯ä½¿ç¨å®ï¼ä½ çæ³æ³å°æ¯å«ç³çã" # type: Content of: <p> -#. type: Content of: <p> #, fuzzy msgid "" "When thinking about or responding to a statement someone else has made using " @@ -170,7 +157,6 @@ "é¢ï¼è¿æ ·è½ç´æ¥è®¨è®ºåºæççç»è®ºã" # type: Content of: <p> -#. type: Content of: <p> msgid "" "Curiously, Larry Ellison, a proprietary software developer, also <a href=" "\"http://news.cnet.com/8301-13953_3-10052188-80.html\"> noted the vacuity of " @@ -180,13 +166,11 @@ msgstr "" # type: Content of: <h4> -#. type: Content of: <h4> #, fuzzy msgid "“Commercial”" msgstr "“åä¸ç”" # type: Content of: <p> -#. type: Content of: <p> #, fuzzy msgid "" "Please don't use “commercial” as a synonym for “nonfree." @@ -194,7 +178,6 @@ msgstr "è¯·å«å°âåä¸çâå½ä½âéèªç±âçåä¹è¯ãè¿æ ·æ··æ·äºä¸¤ç§å®å¨ä¸åçæ¦å¿µã" # type: Content of: <p> -#. type: Content of: <p> #, fuzzy msgid "" "A program is commercial if it is developed as a business activity. A " @@ -209,7 +192,6 @@ "ä¸ªè½¯ä»¶åç¨æ·æ¯å¦å¯ä»¥èªç±çä½¿ç¨æ¯ä¸¤ä¸ªä¸åçé®é¢ã" # type: Content of: <p> -#. type: Content of: <p> msgid "" "In the first decade of the free software movement, free software packages " "were almost always noncommercial; the components of the GNU/Linux operating " @@ -222,7 +204,6 @@ "åºç°ã" # type: Content of: <p> -#. type: Content of: <p> #, fuzzy msgid "" "Free commercial software is a contribution to our community, so we should " @@ -237,12 +218,10 @@ "æä»¬ä¸è¦é£æ ·ä½¿ç¨âåä¸åâè¿ä¸ªè¯ã" # type: Content of: <h4> -#. type: Content of: <h4> msgid "“Compensation”" msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "To speak of “compensation for authors” in connection with " "copyright carries the assumptions that (1) copyright exists for the sake of " @@ -253,12 +232,10 @@ msgstr "" # type: Content of: <h4> -#. type: Content of: <h4> msgid "“Consumer”" msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "The term “consumer,” when used to refer to computer users, is " "loaded with assumptions we should reject. Playing a digital recording, or " @@ -266,7 +243,6 @@ msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "The terms “producer” and “consumer” come from " "economic theory, and bring with them its narrow prespective and misguided " @@ -274,7 +250,6 @@ msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "In addition, describing the users of software as “consumers” " "presumes a narrow role for them: it regards them as cattle that passively " @@ -282,7 +257,6 @@ msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "This kind of thinking leads to travesties like the CBDTPA “Consumer " "Broadband and Digital Television Promotion Act” which would require " @@ -291,7 +265,6 @@ msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "The shallow economic conception of users as “consumers” tends to " "go hand in hand with the idea that published works are mere “content." @@ -299,19 +272,16 @@ msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "To describe people who are not limited to passive use of works, we suggest " "terms such as “individuals” and “citizens”." msgstr "" # type: Content of: <h4> -#. type: Content of: <h4> msgid "“Content”" msgstr "âæ»¡è¶³â" # type: Content of: <p> -#. type: Content of: <p> #, fuzzy msgid "" "If you want to describe a feeling of comfort and satisfaction, by all means " @@ -325,7 +295,6 @@ "ä¸æ£é±ä¸ºç®ççå¯äº¤æ¢ååãç»æï¼ä»ä»¬è½»è§äºä½åæ¬èº«ã" # type: Content of: <p> -#. type: Content of: <p> #, fuzzy msgid "" "Those who use this term are often the publishers that push for increased " @@ -342,7 +311,6 @@ "ä»¬çä½èåä½åæ¾ç¤ºåºäºæ¬æã" # type: Content of: <p> -#. type: Content of: <p> msgid "" "However, as long as other people use the term “content " "provider”, political dissidents can well call themselves “" @@ -352,7 +320,6 @@ "providersâ." # type: Content of: <p> -#. type: Content of: <p> msgid "" "The term “content management” takes the prize for vacuity. " "“Content” means “some sort of information,” and " @@ -363,7 +330,6 @@ msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "In most cases, that term really refers to a system for updating pages on a " "Web site. For that, we recommend the term “Web site revision " @@ -371,12 +337,10 @@ msgstr "" # type: Content of: <h4> -#. type: Content of: <h4> msgid "“Creator”" msgstr "âåé èâ" # type: Content of: <p> -#. type: Content of: <p> #, fuzzy msgid "" "The term “creator” as applied to authors implicitly compares " @@ -392,12 +356,10 @@ "è®¸å¤æåµä¸âèä½ææ¥æèâææ¯ä½ ççæ£å«ä¹ã" # type: Content of: <h4> -#. type: Content of: <h4> msgid "“Digital Goods”" msgstr "âæ°åäº§åâ" # type: Content of: <p> -#. type: Content of: <p> #, fuzzy msgid "" "The term “digital goods,” as applied to copies of works of " @@ -408,12 +370,10 @@ "èåªè½è¢«çäº§åéå®ã" # type: Content of: <h4> -#. type: Content of: <h4> msgid "“Digital Rights Management”" msgstr "âæ°åçæç®¡çâ" # type: Content of: <p> -#. type: Content of: <p> msgid "" "“Digital Rights Management” refers to technical schemes designed " "to impose restrictions on computer users. The use of the word “" @@ -426,7 +386,6 @@ "ç¨ï¼æ¨å¨å¼å¯¼ä½ ä¸ç¥ä¸è§çå°å°æ°å¼ºå¶éå¶çè§ç¹ï¼å¿½ç¥äºè¢«å¼ºå¶éå¶çå¹¿å¤§å¬ä¼ã" # type: Content of: <p> -#. type: Content of: <p> #, fuzzy msgid "" "Good alternatives include “Digital Restrictions Management,” and " @@ -436,12 +395,10 @@ "Malwareâ, and âdigital handcuffsâ." # type: Content of: <h4> -#. type: Content of: <h4> msgid "“Ecosystem”" msgstr "âçæç³»ç»â" # type: Content of: <p> -#. type: Content of: <p> msgid "" "It is a mistake to describe the free software community, or any human " "community, as an “ecosystem,” because that word implies the " @@ -449,7 +406,6 @@ msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "The term “ecosystem” implicitly suggests an attitude of " "nonjudgmental observation: don't ask how what <em>should</em> happen, just " @@ -461,7 +417,6 @@ msgstr "" # type: Content of: <p> -#. type: Content of: <p> #, fuzzy msgid "" "By contrast, beings that adopt an ethical stance towards their surroundings " @@ -475,12 +430,10 @@ "æ¿å±ç©ç§ï¼ä¼ ç»èºæ¯ï¼åçµèç¨æ·çèªç±ã" # type: Content of: <h4> -#. type: Content of: <h4> msgid "“For free”" msgstr "âåè´¹â" # type: Content of: <p> -#. type: Content of: <p> msgid "" "If you want to say that a program is free software, please don't say that it " "is available “for free.” That term specifically means “for " @@ -490,7 +443,6 @@ "èªç±è½¯ä»¶æ¯èªç±ï¼ä¸æ¯ä»·æ ¼ã" # type: Content of: <p> -#. type: Content of: <p> msgid "" "Free software copies are often available for free—for example, by " "downloading via FTP. But free software copies are also available for a " @@ -502,7 +454,6 @@ "æ¶ä¸æè½¯ä»¶çå¯æ¬éå¸¸å¨æ¨å¹¿æ¶åè´¹ï¼æäºä¸æè½¯ä»¶å¯¹æäºç¨æ·æ¯åè´¹çã" # type: Content of: <p> -#. type: Content of: <p> msgid "" "To avoid confusion, you can say that the program is available “as free " "software.”" @@ -511,13 +462,11 @@ "ä¸èä¸æ¯åè´¹ï¼" # type: Content of: <h4> -#. type: Content of: <h4> #, fuzzy msgid "“Freely available”" msgstr "âåè´¹â" # type: Content of: <p> -#. type: Content of: <p> #, fuzzy msgid "" "Don't use “freely available software” as a synonym for “" @@ -531,12 +480,10 @@ "æãä¸¤ä¸ªä¸åçå®å¨ä¸åææã" # type: Content of: <h4> -#. type: Content of: <h4> msgid "“Freeware”" msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "Please don't use the term “freeware” as a synonym for “" "free software.” The term “freeware” was used often in the " @@ -547,7 +494,6 @@ "æä¾æºä»£ç çç¨åºï¼ä»å¤©å·²ç»æ²¡æç¹å«ç¸åçæä¹ã" # type: Content of: <p> -#. type: Content of: <p> #, fuzzy msgid "" "When using languages other than English, please avoid borrowing English " @@ -559,7 +505,6 @@ "èâfreewareâãæå¥½æ¯è½å°âfree softwareâç¿»è¯æä½ çè¯è¨ã" # type: Content of: <p> -#. type: Content of: <p> msgid "" "By using a word in <a href=\"/philosophy/fs-translations.html\">your own " "language</a>, you show that you are really referring to freedom and not just " @@ -573,12 +518,10 @@ "æ°ï¼ä½æ¯å½ä»ä»¬å®ä¸¥å¯çææï¼ä»ä»¬ä¼çæ£çè§£è¿ä¸ªé®é¢ã" # type: Content of: <h4> -#. type: Content of: <h4> msgid "“Give away software”" msgstr "" # type: Content of: <p> -#. type: Content of: <p> #, fuzzy msgid "" "It's misleading to use the term “give away” to mean “" @@ -591,12 +534,10 @@ "ä»·æ ¼é®é¢ï¼ä¸æ¯èªç±ãé¿åå°æ°çæ¹æ³æ¯ç¨ârelease as free softwareâï¼èªç±åè¡ï¼." # type: Content of: <h4> -#. type: Content of: <h4> msgid "Hacker" msgstr "" # type: Content of: <p> -#. type: Content of: <p> #, fuzzy msgid "" "A hacker is someone who <a href=\"http://stallman.org/articles/on-hacking." @@ -612,7 +553,6 @@ "éè¯¯çã" # type: Content of: <p> -#. type: Content of: <p> #, fuzzy msgid "" "Please don't spread this mistake. People who break security are “" @@ -620,12 +560,10 @@ msgstr "æä»¬å«ä»ä»¬ âcrackersâ" # type: Content of: <h4> -#. type: Content of: <h4> msgid "“Intellectual property”" msgstr "âç¥è¯äº§æâ" # type: Content of: <p> -#. type: Content of: <p> #, fuzzy msgid "" "Publishers and lawyers like to describe copyright as “intellectual " @@ -640,7 +578,6 @@ "æç¡®âçæâæâä¸å©âæâæ³¨ååæ ã" # type: Content of: <p> -#. type: Content of: <p> #, fuzzy msgid "" "The term “intellectual property” carries a hidden " @@ -651,7 +588,6 @@ "âç¥è¯äº§æâéèäºä¸ä¸ªåè®¾âå³äºææä¸åé®é¢çæèæ¹æ³é½æ¯ä¾é å®ç©è´¢äº§ç±»æ¨çã" # type: Content of: <p> -#. type: Content of: <p> msgid "" "When it comes to copying, this analogy disregards the crucial difference " "between material objects and information: information can be copied and " @@ -661,7 +597,6 @@ "ååäº«ï¼å®ç©æ¯ä¸è½å¤çã" # type: Content of: <p> -#. type: Content of: <p> #, fuzzy msgid "" "To avoid spreading unnecessary bias and confusion, it is best to adopt a " @@ -670,7 +605,6 @@ msgstr "ä¸ºäºé¿åå¯¹è¿ä¸ªè¯çåè§åå°æ°ï¼æå¥½ç¡®å®ä¸è¦è¯´çè³ä¸è¦æ³âç¥è¯äº§æâ" # type: Content of: <p> -#. type: Content of: <p> msgid "" "The hypocrisy of calling these powers “rights” is <a href=\"/" "philosophy/wipo-PublicAwarenessOfCopyright-2002.html\"> starting to make the " @@ -678,12 +612,10 @@ msgstr "" # type: Content of: <h4> -#. type: Content of: <h4> msgid "“LAMP system”" msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "“LAMP” stands for “Linux, Apache, MySQL and PHP”" "—a common combination of software to use on a Web server, except that " @@ -693,12 +625,10 @@ msgstr "" # type: Content of: <h4> -#. type: Content of: <h4> msgid "Linux system" msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "Linux is the name of the kernel that Linus Torvalds developed starting in " "1991. The operating system in which Linux is used is basically GNU with " @@ -709,19 +639,16 @@ msgstr "" # type: Content of: <h4> -#. type: Content of: <h4> msgid "“Market”" msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "It is misleading to describe the users of free software, or the software " "users in general, as a “market.”" msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "This is not to say there is no room for markets in the free software " "community. If you have a free software support business, then you have " @@ -730,7 +657,6 @@ msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "But the free software movement is a social movement, not a business, and the " "success it aims for is not a market success. We are trying to serve the " @@ -741,12 +667,10 @@ msgstr "" # type: Content of: <h4> -#. type: Content of: <h4> msgid "“MP3 player”" msgstr "“MP3 ææ¾å¨”" # type: Content of: <p> -#. type: Content of: <p> msgid "" "In the late 1990's it became feasible to make portable, solid-state digital " "audio players. Most support the patented MP3 codec, but not all. Some " @@ -759,12 +683,10 @@ msgstr "" # type: Content of: <h4> -#. type: Content of: <h4> msgid "“Open”" msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "Please avoid using the term “open” or “open source” " "as a substitute for “free software”. Those terms refer to a <a " @@ -776,12 +698,10 @@ msgstr "" # type: Content of: <h4> -#. type: Content of: <h4> msgid "“PC”" msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "It's ok to use the abbreviation “PC” to refer to a certain kind " "of computer hardware, but please don't use it with the implication that the " @@ -790,18 +710,15 @@ msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "The term “WC” has been suggested for a computer running Windows." msgstr "" # type: Content of: <h4> -#. type: Content of: <h4> msgid "“Photoshop”" msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "Please avoid using the term “photoshop” as a verb, meaning any " "kind of photo manipulation or image editing in general. Photoshop is just " @@ -811,12 +728,10 @@ msgstr "" # type: Content of: <h4> -#. type: Content of: <h4> msgid "“Piracy”" msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "Publishers often refer to copying they don't approve of as “piracy." "” In this way, they imply that it is ethically equivalent to attacking " @@ -827,7 +742,6 @@ msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "If you don't believe that copying not approved by the publisher is just like " "kidnapping and murder, you might prefer not to use the word “" @@ -839,12 +753,10 @@ msgstr "" # type: Content of: <h4> -#. type: Content of: <h4> msgid "“PowerPoint”" msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "Please avoid using the term “PowerPoint” to mean any kind of " "slide presentation. PowerPoint is just the name of one particular " @@ -854,12 +766,10 @@ msgstr "" # type: Content of: <h4> -#. type: Content of: <h4> msgid "“Protection”" msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "Publishers' lawyers love to use the term “protection” to " "describe copyright. This word carries the implication of preventing " @@ -869,7 +779,6 @@ msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "It is easy to avoid “protection” and use neutral terms instead. " "For example, instead of saying, “Copyright protection lasts a very " @@ -878,7 +787,6 @@ msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "If you want to criticize copyright instead of supporting it, you can use the " "term “copyright restrictions.” Thus, you can say, “" @@ -886,7 +794,6 @@ msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "The term “protection” is also used to describe malicious " "features. For instance, “copy protection” is a feature that " @@ -896,12 +803,10 @@ msgstr "" # type: Content of: <h4> -#. type: Content of: <h4> msgid "“RAND (reasonable and nondiscriminatory)”" msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "Standards bodies that promulgate patent-restricted standards that prohibit " "free software typically have a policy of obtaining patent licenses that " @@ -911,7 +816,6 @@ msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "That term whitewashes a class of patent licenses that are normally neither " "reasonable nor nondiscriminatory. It is true that these licenses do not " @@ -921,7 +825,6 @@ msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "Standards bodies should recognize that these licenses are discriminatory, " "and drop the use of the term “reasonable and nondiscriminatory” " @@ -932,7 +835,6 @@ msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "We suggest the term “uniform fee only,” or “UFO” for " "short, as a replacement. It is accurate because the only condition in these " @@ -940,12 +842,10 @@ msgstr "" # type: Content of: <h4> -#. type: Content of: <h4> msgid "“Sell software”" msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "The term “sell software” is ambiguous. Strictly speaking, " "exchanging a copy of a free program for a sum of money is selling; but " @@ -957,19 +857,16 @@ msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "See <a href=\"/philosophy/selling.html\">Selling Free Software</a> for " "further discussion of this issue." msgstr "" # type: Content of: <h4> -#. type: Content of: <h4> msgid "“Software Industry”" msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "The term “software industry” encourages people to imagine that " "software is always developed by a sort of factory and then delivered to " @@ -980,7 +877,6 @@ msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "The term “industry” is being used as propaganda by advocates of " "software patents. They call software development “industry” and " @@ -992,12 +888,10 @@ msgstr "" # type: Content of: <h4> -#. type: Content of: <h4> msgid "“Theft”" msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "Copyright apologists often use words like “stolen” and “" "theft” to describe copyright infringement. At the same time, they ask " @@ -1006,7 +900,6 @@ msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "So it is pertinent to mention that the legal system—at least in the " "US—rejects the idea that copyright infringement is “theft." @@ -1015,7 +908,6 @@ msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "The idea that laws decide what is right or wrong is mistaken in general. " "Laws are, at their best, an attempt to achieve justice; to say that laws " @@ -1023,12 +915,10 @@ msgstr "" # type: Content of: <h4> -#. type: Content of: <h4> msgid "“Trusted Computing”" msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "<a href=\"/philosophy/can-you-trust.html\">“Trusted computing”</" "a> is the proponents' name for a scheme to redesign computers so that " @@ -1038,12 +928,10 @@ msgstr "" # type: Content of: <h4> -#. type: Content of: <h4> msgid "“Vendor”" msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "Please don't use the term “vendor” to refer generally to anyone " "that develops or packages software. Many programs are developed in order to " @@ -1056,7 +944,6 @@ msgstr "" # type: Content of: <h4> -#. type: Content of: <h4> msgid "" "This essay is published in <a href=\"http://shop.fsf.org/product/free-" "software-free-society/\"><cite>Free Software, Free Society: The Selected " @@ -1065,25 +952,19 @@ # type: Content of: <div> #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes. -#. type: Content of: <div> msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*" msgstr "" -#. type: Content of: <div><p> +# type: Content of: <div><p> msgid "" "Please send 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." -msgstr "" - -#. type: Content of: <div><p> -msgid "" -"Please send broken links and other corrections or suggestions to <a href=" -"\"mailto:address@hidden"><address@hidden></a>." +"contact</a> the FSF. <br /> Please send broken links and other corrections " +"or suggestions to <a href=\"mailto:address@hidden"><address@hidden" +"org></a>." msgstr "" # type: Content of: <div><p> -#. type: Content of: <div><p> msgid "" "Please see the <a href=\"/server/standards/README.translations.html" "\">Translations README</a> for information on coordinating and submitting " @@ -1091,14 +972,12 @@ msgstr "" # type: Content of: <div><p> -#. type: Content of: <div><p> msgid "" "Copyright © 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007, 2008, " "2009, 2010 Free Software Foundation, Inc." msgstr "" # type: Content of: <div><p> -#. type: Content of: <div><p> msgid "" "Verbatim copying and distribution of this entire article is permitted in any " "medium without royalty provided this notice is preserved." @@ -1106,18 +985,15 @@ # type: Content of: <div><div> #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits. -#. type: Content of: <div><div> msgid "*GNUN-SLOT: TRANSLATOR'S CREDITS*" msgstr "" # type: Content of: <div><p> #. timestamp start -#. type: Content of: <div><p> msgid "Updated:" msgstr "" # type: Content of: <div><h4> -#. type: Content of: <div><h4> msgid "Translations of this page" msgstr ""

? merger-with-upstream.patch ? philosophy/university.zh-cn.po Index: home.zh-cn.po =================================================================== RCS file: /cvsroot/www-zh-cn/www-zh-cn/home.zh-cn.po,v retrieving revision 1.7 diff -u -r1.7 home.zh-cn.po --- home.zh-cn.po 19 May 2010 15:36:45 -0000 1.7 +++ home.zh-cn.po 24 May 2010 01:29:57 -0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: home.shtml\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-30 16:25-0300\n" +"POT-Creation-Date: 2010-05-18 16:25-0300\n" "PO-Revision-Date: 2010-05-17 13:07+0800\n" "Last-Translator: Li Fanxi \n" "Language-Team: Chinese \n" @@ -509,16 +509,20 @@ "\"> åè°äºº ã" # type: Content of:

+#, fuzzy msgid "" "Take over an unmaintained GNU " -"package: alive, fontutils, gift, gleem, gnatsweb, " -"gtypist, gnushogi, oleo, pgccfd, polyxmass, quickthreads, rpge, vmslib." +"package: alive, dr-geo, fontutils, gift, gleem, gnatsweb, gnushogi, goldwater, halifax, oleo, pgccfd, polyxmass, quickthreads, rpge, sather, " +"snakecharmer, vmslib." msgstr "" " é¿æè´¡ç®ï¼ æ¥" "æå¤±å»ç»´æ¤ç GNU è½¯ä»¶ï¼ alive, \n" "Language-Team: Chinese \n" @@ -15,23 +15,19 @@ "Plural-Forms: \n" # type: Content of: -#. type: Content of: <title> msgid "What is Copyleft? - GNU Project - Free Software Foundation (FSF)" msgstr "ä»ä¹æ¯èå·¦æï¼ - GNU å·¥ç¨ - èªç±è½¯ä»¶åºéä¼ï¼FSFï¼" # type: Attribute 'content' of: <meta> -#. type: Attribute 'content' of: <meta> msgid "GNU, FSF, Free Software Foundation, Linux, Copyleft" msgstr "" "GNU, FSF, Free Software Foundation, Linux, Copyleft, èªç±è½¯ä»¶åºéä¼, èå·¦æ" # type: Content of: <h2> -#. type: Content of: <h2> msgid "What is Copyleft?" msgstr "ä»ä¹æ¯èå·¦æï¼" # type: Content of: <p> -#. type: Content of: <p> msgid "" "Copyleft is a general method for making a program (or other work) free, and " "requiring all modified and extended versions of the program to be free as " @@ -41,7 +37,6 @@ "æç¨åºçä¿®æ¹åæ©å±é½ä¿æèªç±ã" # type: Content of: <p> -#. type: Content of: <p> msgid "" "The simplest way to make a program free software is to put it in the <a href=" "\"/philosophy/categories.html#PublicDomainSoftware\">public domain</a>, " @@ -61,7 +56,6 @@ "å®ä»¬çåå§ä½èæææçé£æ ·åè®¸ç¨æ·èªç±çä½¿ç¨ï¼è¿ç§èªç±è¢«ä¸é´åå¥å¤ºäºã" # type: Content of: <p> -#. type: Content of: <p> msgid "" "In the <a href=\"/gnu/thegnuproject.html\">GNU project</a>, our aim is to " "give <em>all</em> users the freedom to redistribute and change GNU " @@ -80,7 +74,6 @@ "æ¥æèªç±çæåã" # type: Content of: <p> -#. type: Content of: <p> msgid "" "Copyleft also provides an <a href=\"/philosophy/pragmatic.html\">incentive</" "a> for other programmers to add to free software. Important free programs " @@ -91,7 +84,6 @@ "ä¸ç¹ã" # type: Content of: <p> -#. type: Content of: <p> msgid "" "Copyleft also helps programmers who want to contribute <a href=\"/prep/tasks." "html\">improvements</a> to <a href=\"/philosophy/free-sw.html\">free " @@ -106,7 +98,6 @@ "åªåè´¡ç®å°èªç±è½¯ä»¶ç¤¾åºï¼ä½ä»çèæ¿å¯è½å¸ææè¿äºå·¥ä½åæåä¸çè½¯ä»¶äº§åã" # type: Content of: <p> -#. type: Content of: <p> msgid "" "When we explain to the employer that it is illegal to distribute the " "improved version except as free software, the employer usually decides to " @@ -116,7 +107,6 @@ "å¾ä¼å³å®æå®ä»¬ä½ä¸ºèªç±è½¯ä»¶åå¸èä¸æ¯æå®ä»¬æå¼ã" # type: Content of: <p> -#. type: Content of: <p> msgid "" "To copyleft a program, we first state that it is copyrighted; then we add " "distribution terms, which are a legal instrument that gives everyone the " @@ -130,7 +120,6 @@ "è¯ï¼ä»£ç åèªç±æåå¨æ³å¾ä¸å°±ä¸å¯åå²äºã" # type: Content of: <p> -#. type: Content of: <p> msgid "" "Proprietary software developers use copyright to take away the users' " "freedom; we use copyright to guarantee their freedom. That's why we reverse " @@ -140,7 +129,6 @@ "ä¸ºä»ä¹æä»¬æâèä½æâæ¹ç§°ä¸ºâèå·¦æâã" # type: Content of: <p> -#. type: Content of: <p> msgid "" "Copyleft is a way of using of the copyright on the program. It doesn't mean " "abandoning the copyright; in fact, doing so would make copyleft impossible. " @@ -153,7 +141,6 @@ "ä¸éå¸¸çâçæâå·æç¸åçææã" # type: Content of: <p> -#. type: Content of: <p> msgid "" "Copyleft is a general concept, and you can't use a general concept directly; " "you can only use a specific implementation of the concept. In the GNU " @@ -175,7 +162,6 @@ "\" target=\"_blank\">ä¸ºä»ä¹FSFä»ä½èå¤è·å¾çæè®¸å¯</a>ã" # type: Content of: <p> -#. type: Content of: <p> msgid "" "An alternate form of copyleft, the <a href=\"/copyleft/lesser.html\">GNU " "Lesser General Public License (LGPL) (available in HTML</a>, <a href=\"/" @@ -194,7 +180,6 @@ "ä½ çä¸ä¸ä¸ªå½æ°åºåºç¨å½æ°åºGPL</cite></a>ã" # type: Content of: <p> -#. type: Content of: <p> msgid "" "The <a href=\"/copyleft/fdl.html\">GNU Free Documentation License (FDL) " "(available in HTML</a>, <a href=\"/copyleft/fdl.txt\">text</a> and <a href=" @@ -210,14 +195,12 @@ "éåä¸çã" # type: Content of: <p> -#. type: Content of: <p> msgid "" "The appropriate license is included in many manuals and in each GNU source " "code distribution." msgstr "è¿äºåè®®å¨å¾å¤çæååæ¯ä¸ä»½GNUçæºä»£ç ä¸ä¸èµ·è¢«åå¸ã" # type: Content of: <p> -#. type: Content of: <p> msgid "" "All these licenses are designed so that you can easily apply them to your " "own works, assuming you are the copyright holder. You don't have to modify " @@ -229,7 +212,6 @@ "æå¼ç¨è¿ä¸ªåè®®å°±å¯ä»¥äºã" # type: Content of: <p> -#. type: Content of: <p> msgid "" "Using the same distribution terms for many different programs makes it easy " "to copy code between various different programs. When they all have the " @@ -246,7 +228,6 @@ "æ¯ç¸äºå¼å®¹çã" # type: Content of: <p> -#. type: Content of: <p> msgid "" "If you would like to copyleft your program with the GNU GPL or the GNU LGPL, " "please see the <a href=\"/copyleft/gpl-howto.html\">license instructions " @@ -259,7 +240,6 @@ "ä¸ªåè®®ï¼åè®®æ¯ä¸ä¸ªæ´ä½ï¼åªå¼ç¨å¶ä¸çä¸é¨åæ¯ä¸åè®¸çã" # type: Content of: <p> -#. type: Content of: <p> msgid "" "If you would like to copyleft your manual with the GNU FDL, please see the " "instructions at the <a href=\"/copyleft/fdl.html#SEC4\">end</a> of the FDL " @@ -273,17 +253,17 @@ # type: Content of: <div> #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes. -#. type: Content of: <div> msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*" msgstr " " # type: Content of: <div><p> -#. type: Content of: <div><p> #, fuzzy msgid "" "Please send FSF & GNU inquiries to <a href=\"mailto:address@hidden" "\"><em>address@hidden</em></a>. There are also <a href=\"/contact/\">other " -"ways to contact</a> the FSF." +"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>." msgstr "" "è¯·å°æå³èªç±è½¯ä»¶åºéä¼ä¸GNUçæ¥è¯¢ä¸é®é¢ï¼ä»¥è±è¯ï¼åéå°<a href=\"mailto:" "address@hidden"><em>address@hidden</em></a>ãæ¨ä¹å¯ä»¥éè¿ <a href=\"/contact/\">å¶" @@ -292,20 +272,6 @@ "\"><em>address@hidden</em></a>ã" # type: Content of: <div><p> -#. type: Content of: <div><p> -#, fuzzy -msgid "" -"Please send broken links and other corrections or suggestions to <a href=" -"\"mailto:address@hidden"><em>address@hidden</em></a>." -msgstr "" -"è¯·å°æå³èªç±è½¯ä»¶åºéä¼ä¸GNUçæ¥è¯¢ä¸é®é¢ï¼ä»¥è±è¯ï¼åéå°<a href=\"mailto:" -"address@hidden"><em>address@hidden</em></a>ãæ¨ä¹å¯ä»¥éè¿ <a href=\"/contact/\">å¶" -"å®æ¹æ³</a> èç³»èªç±è½¯ä»¶åºéä¼ã <br /> åç°ä»»ä½éè¯¯åé¾æ¥æå¶å®éè¦æ´æ£çå°æ¹" -"ï¼æä»»ä½å»ºè®®ï¼ï¼è¯·åéé®ä»¶è³ <a href=\"mailto:address@hidden" -"\"><em>address@hidden</em></a>ã" - -# type: Content of: <div><p> -#. type: Content of: <div><p> msgid "" "Please see the <a href=\"/server/standards/README.translations.html" "\">Translations README</a> for information on coordinating and submitting " @@ -315,7 +281,6 @@ "è§£æå³åè°åæäº¤æç« ç¿»è¯çä¿¡æ¯ã" # type: Content of: <div><p> -#. type: Content of: <div><p> msgid "" "Copyright © 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, " "2006, 2007, 2008, 2009 Free Software Foundation, Inc.," @@ -324,7 +289,6 @@ "2006, 2007, 2008, 2009 <a href=\"http://www.fsf.org\">èªç±è½¯ä»¶åºéä¼</a>" # type: Content of: <div><p> -#. type: Content of: <div><p> msgid "" "Verbatim copying and distribution of this entire article is permitted in any " "medium, provided this notice is preserved." @@ -334,17 +298,26 @@ # type: Content of: <div><div> #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits. -#. type: Content of: <div><div> msgid "*GNUN-SLOT: TRANSLATOR'S CREDITS*" msgstr "<b>ç¿»è¯</b>: æå¡å¸ 2007, 2008, 2009, 2010" # type: Content of: <div><p> #. timestamp start -#. type: Content of: <div><p> msgid "Updated:" msgstr "æåæ´æ°ï¼" # type: Content of: <div><h4> -#. type: Content of: <div><h4> msgid "Translations of this page" msgstr "æ¬é¡µçç¿»è¯" + +# type: Content of: <div><p> +#, fuzzy +#~ msgid "" +#~ "Please send broken links and other corrections or suggestions to <a href=" +#~ "\"mailto:address@hidden"><em>address@hidden</em></a>." +#~ msgstr "" +#~ "è¯·å°æå³èªç±è½¯ä»¶åºéä¼ä¸GNUçæ¥è¯¢ä¸é®é¢ï¼ä»¥è±è¯ï¼åéå°<a href=\"mailto:" +#~ "address@hidden"><em>address@hidden</em></a>ãæ¨ä¹å¯ä»¥éè¿ <a href=\"/contact/" +#~ "\">å¶å®æ¹æ³</a> èç³»èªç±è½¯ä»¶åºéä¼ã <br /> åç°ä»»ä½éè¯¯åé¾æ¥æå¶å®éè¦æ´" +#~ "æ£çå°æ¹ï¼æä»»ä½å»ºè®®ï¼ï¼è¯·åéé®ä»¶è³ <a href=\"mailto:address@hidden" +#~ "\"><em>address@hidden</em></a>ã" Index: philosophy/words-to-avoid.zh-cn.po =================================================================== RCS file: /cvsroot/www-zh-cn/www-zh-cn/philosophy/words-to-avoid.zh-cn.po,v retrieving revision 1.5 diff -u -r1.5 words-to-avoid.zh-cn.po --- philosophy/words-to-avoid.zh-cn.po 19 May 2010 15:24:59 -0000 1.5 +++ philosophy/words-to-avoid.zh-cn.po 24 May 2010 01:30:00 -0000 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: words-to-avoid.html\n" -"POT-Creation-Date: 2010-05-17 23:40+0800\n" +"POT-Creation-Date: 2010-03-12 04:25-0500\n" "PO-Revision-Date: 2010-05-09 00:10+0800\n" "Last-Translator: xiangfu <address@hidden>\n" "Language-Team: GNUCTT\n" @@ -15,7 +15,6 @@ "Content-Transfer-Encoding: 8bit\n" # type: Content of: <title> -#. type: Content of: <title> #, fuzzy msgid "" "Confusing Words and Phrases That Are Worth Avoiding - GNU Project - Free " @@ -25,13 +24,11 @@ "ä¼ (FSF)" # type: Content of: <h2> -#. type: Content of: <h2> #, fuzzy msgid "Some Confusing or Loaded Words and Phrases to Avoid (or Use with Care)" msgstr "Some Confusing or Loaded Words and Phrases to Avoid (or use with care)" # type: Content of: <p> -#. type: Content of: <p> #, fuzzy msgid "" "There are a number of words and phrases that we recommend avoiding, or " @@ -42,14 +39,12 @@ "ä»¬è¦ä¹æ¯ææ§ä¹ï¼è¦ä¹æä»¬ä¸å¸æä½ å®å¨èµåå®æå«çè§ç¹ã" # type: Content of: <div> -#. type: Content of: <div> msgid "" "Also note <a href=\"/philosophy/categories.html\">Categories of Free " "Software</a>." msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "<a href=\"/philosophy/philosophy.html\">Other Texts to Read</a> | “<a " "href=\"words-to-avoid.html#BSD-style\">BSD-style</a>” | “<a href=" @@ -88,12 +83,10 @@ msgstr "" # type: Content of: <h4> -#. type: Content of: <h4> msgid "“BSD-style”" msgstr "“BSD-å½¢å¼“" # type: Content of: <p> -#. type: Content of: <p> #, fuzzy msgid "" "The expression “BSD-style license” leads to confusion because it " @@ -106,7 +99,6 @@ "æ¯å¦ï¼åæ¥çBSDçæçææä¸ç¬¦åGNU GPLï¼ä½ç»ä¿®è®¢çBSD çæç¬¦åGPLã" # type: Content of: <p> -#. type: Content of: <p> msgid "" "To avoid confusion, it is best to name <a href=\"/licenses/license-list.html" "\"> the specific license in question</a> and avoid the vague term “BSD-" @@ -114,12 +106,10 @@ msgstr "ä¸ºé¿åæ··æ·ï¼æå¥½é¿åç¨æ¨¡ç³ç âBSD-å½¢å¼ âæ¯è¯ç»å·ä½ççæå½åã" # type: Content of: <h4> -#. type: Content of: <h4> msgid "“Closed”" msgstr "“å°éç“" # type: Content of: <p> -#. type: Content of: <p> #, fuzzy msgid "" "Describing nonfree software as “closed” clearly refers to the " @@ -137,12 +127,10 @@ "“æè¿°éèªç±è½¯ä»¶ ãæä»¬ç¨“éèªç±“æ“ä¸å©“" # type: Content of: <h4> -#. type: Content of: <h4> msgid "“Cloud Computing”" msgstr "“äºè®¡ç®”" # type: Content of: <p> -#. type: Content of: <p> #, fuzzy msgid "" "The term “cloud computing” is a marketing buzzword with no clear " @@ -156,7 +144,6 @@ "ææ¨çæ³æ³ä¸å°è¯ä½¿ç¨å®ï¼ä½ çæ³æ³å°æ¯å«ç³çã" # type: Content of: <p> -#. type: Content of: <p> #, fuzzy msgid "" "When thinking about or responding to a statement someone else has made using " @@ -170,7 +157,6 @@ "é¢ï¼è¿æ ·è½ç´æ¥è®¨è®ºåºæççç»è®ºã" # type: Content of: <p> -#. type: Content of: <p> msgid "" "Curiously, Larry Ellison, a proprietary software developer, also <a href=" "\"http://news.cnet.com/8301-13953_3-10052188-80.html\"> noted the vacuity of " @@ -180,13 +166,11 @@ msgstr "" # type: Content of: <h4> -#. type: Content of: <h4> #, fuzzy msgid "“Commercial”" msgstr "“åä¸ç”" # type: Content of: <p> -#. type: Content of: <p> #, fuzzy msgid "" "Please don't use “commercial” as a synonym for “nonfree." @@ -194,7 +178,6 @@ msgstr "è¯·å«å°âåä¸çâå½ä½âéèªç±âçåä¹è¯ãè¿æ ·æ··æ·äºä¸¤ç§å®å¨ä¸åçæ¦å¿µã" # type: Content of: <p> -#. type: Content of: <p> #, fuzzy msgid "" "A program is commercial if it is developed as a business activity. A " @@ -209,7 +192,6 @@ "ä¸ªè½¯ä»¶åç¨æ·æ¯å¦å¯ä»¥èªç±çä½¿ç¨æ¯ä¸¤ä¸ªä¸åçé®é¢ã" # type: Content of: <p> -#. type: Content of: <p> msgid "" "In the first decade of the free software movement, free software packages " "were almost always noncommercial; the components of the GNU/Linux operating " @@ -222,7 +204,6 @@ "åºç°ã" # type: Content of: <p> -#. type: Content of: <p> #, fuzzy msgid "" "Free commercial software is a contribution to our community, so we should " @@ -237,12 +218,10 @@ "æä»¬ä¸è¦é£æ ·ä½¿ç¨âåä¸åâè¿ä¸ªè¯ã" # type: Content of: <h4> -#. type: Content of: <h4> msgid "“Compensation”" msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "To speak of “compensation for authors” in connection with " "copyright carries the assumptions that (1) copyright exists for the sake of " @@ -253,12 +232,10 @@ msgstr "" # type: Content of: <h4> -#. type: Content of: <h4> msgid "“Consumer”" msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "The term “consumer,” when used to refer to computer users, is " "loaded with assumptions we should reject. Playing a digital recording, or " @@ -266,7 +243,6 @@ msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "The terms “producer” and “consumer” come from " "economic theory, and bring with them its narrow prespective and misguided " @@ -274,7 +250,6 @@ msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "In addition, describing the users of software as “consumers” " "presumes a narrow role for them: it regards them as cattle that passively " @@ -282,7 +257,6 @@ msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "This kind of thinking leads to travesties like the CBDTPA “Consumer " "Broadband and Digital Television Promotion Act” which would require " @@ -291,7 +265,6 @@ msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "The shallow economic conception of users as “consumers” tends to " "go hand in hand with the idea that published works are mere “content." @@ -299,19 +272,16 @@ msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "To describe people who are not limited to passive use of works, we suggest " "terms such as “individuals” and “citizens”." msgstr "" # type: Content of: <h4> -#. type: Content of: <h4> msgid "“Content”" msgstr "âæ»¡è¶³â" # type: Content of: <p> -#. type: Content of: <p> #, fuzzy msgid "" "If you want to describe a feeling of comfort and satisfaction, by all means " @@ -325,7 +295,6 @@ "ä¸æ£é±ä¸ºç®ççå¯äº¤æ¢ååãç»æï¼ä»ä»¬è½»è§äºä½åæ¬èº«ã" # type: Content of: <p> -#. type: Content of: <p> #, fuzzy msgid "" "Those who use this term are often the publishers that push for increased " @@ -342,7 +311,6 @@ "ä»¬çä½èåä½åæ¾ç¤ºåºäºæ¬æã" # type: Content of: <p> -#. type: Content of: <p> msgid "" "However, as long as other people use the term “content " "provider”, political dissidents can well call themselves “" @@ -352,7 +320,6 @@ "providersâ." # type: Content of: <p> -#. type: Content of: <p> msgid "" "The term “content management” takes the prize for vacuity. " "“Content” means “some sort of information,” and " @@ -363,7 +330,6 @@ msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "In most cases, that term really refers to a system for updating pages on a " "Web site. For that, we recommend the term “Web site revision " @@ -371,12 +337,10 @@ msgstr "" # type: Content of: <h4> -#. type: Content of: <h4> msgid "“Creator”" msgstr "âåé èâ" # type: Content of: <p> -#. type: Content of: <p> #, fuzzy msgid "" "The term “creator” as applied to authors implicitly compares " @@ -392,12 +356,10 @@ "è®¸å¤æåµä¸âèä½ææ¥æèâææ¯ä½ ççæ£å«ä¹ã" # type: Content of: <h4> -#. type: Content of: <h4> msgid "“Digital Goods”" msgstr "âæ°åäº§åâ" # type: Content of: <p> -#. type: Content of: <p> #, fuzzy msgid "" "The term “digital goods,” as applied to copies of works of " @@ -408,12 +370,10 @@ "èåªè½è¢«çäº§åéå®ã" # type: Content of: <h4> -#. type: Content of: <h4> msgid "“Digital Rights Management”" msgstr "âæ°åçæç®¡çâ" # type: Content of: <p> -#. type: Content of: <p> msgid "" "“Digital Rights Management” refers to technical schemes designed " "to impose restrictions on computer users. The use of the word “" @@ -426,7 +386,6 @@ "ç¨ï¼æ¨å¨å¼å¯¼ä½ ä¸ç¥ä¸è§çå°å°æ°å¼ºå¶éå¶çè§ç¹ï¼å¿½ç¥äºè¢«å¼ºå¶éå¶çå¹¿å¤§å¬ä¼ã" # type: Content of: <p> -#. type: Content of: <p> #, fuzzy msgid "" "Good alternatives include “Digital Restrictions Management,” and " @@ -436,12 +395,10 @@ "Malwareâ, and âdigital handcuffsâ." # type: Content of: <h4> -#. type: Content of: <h4> msgid "“Ecosystem”" msgstr "âçæç³»ç»â" # type: Content of: <p> -#. type: Content of: <p> msgid "" "It is a mistake to describe the free software community, or any human " "community, as an “ecosystem,” because that word implies the " @@ -449,7 +406,6 @@ msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "The term “ecosystem” implicitly suggests an attitude of " "nonjudgmental observation: don't ask how what <em>should</em> happen, just " @@ -461,7 +417,6 @@ msgstr "" # type: Content of: <p> -#. type: Content of: <p> #, fuzzy msgid "" "By contrast, beings that adopt an ethical stance towards their surroundings " @@ -475,12 +430,10 @@ "æ¿å±ç©ç§ï¼ä¼ ç»èºæ¯ï¼åçµèç¨æ·çèªç±ã" # type: Content of: <h4> -#. type: Content of: <h4> msgid "“For free”" msgstr "âåè´¹â" # type: Content of: <p> -#. type: Content of: <p> msgid "" "If you want to say that a program is free software, please don't say that it " "is available “for free.” That term specifically means “for " @@ -490,7 +443,6 @@ "èªç±è½¯ä»¶æ¯èªç±ï¼ä¸æ¯ä»·æ ¼ã" # type: Content of: <p> -#. type: Content of: <p> msgid "" "Free software copies are often available for free—for example, by " "downloading via FTP. But free software copies are also available for a " @@ -502,7 +454,6 @@ "æ¶ä¸æè½¯ä»¶çå¯æ¬éå¸¸å¨æ¨å¹¿æ¶åè´¹ï¼æäºä¸æè½¯ä»¶å¯¹æäºç¨æ·æ¯åè´¹çã" # type: Content of: <p> -#. type: Content of: <p> msgid "" "To avoid confusion, you can say that the program is available “as free " "software.”" @@ -511,13 +462,11 @@ "ä¸èä¸æ¯åè´¹ï¼" # type: Content of: <h4> -#. type: Content of: <h4> #, fuzzy msgid "“Freely available”" msgstr "âåè´¹â" # type: Content of: <p> -#. type: Content of: <p> #, fuzzy msgid "" "Don't use “freely available software” as a synonym for “" @@ -531,12 +480,10 @@ "æãä¸¤ä¸ªä¸åçå®å¨ä¸åææã" # type: Content of: <h4> -#. type: Content of: <h4> msgid "“Freeware”" msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "Please don't use the term “freeware” as a synonym for “" "free software.” The term “freeware” was used often in the " @@ -547,7 +494,6 @@ "æä¾æºä»£ç çç¨åºï¼ä»å¤©å·²ç»æ²¡æç¹å«ç¸åçæä¹ã" # type: Content of: <p> -#. type: Content of: <p> #, fuzzy msgid "" "When using languages other than English, please avoid borrowing English " @@ -559,7 +505,6 @@ "èâfreewareâãæå¥½æ¯è½å°âfree softwareâç¿»è¯æä½ çè¯è¨ã" # type: Content of: <p> -#. type: Content of: <p> msgid "" "By using a word in <a href=\"/philosophy/fs-translations.html\">your own " "language</a>, you show that you are really referring to freedom and not just " @@ -573,12 +518,10 @@ "æ°ï¼ä½æ¯å½ä»ä»¬å®ä¸¥å¯çææï¼ä»ä»¬ä¼çæ£çè§£è¿ä¸ªé®é¢ã" # type: Content of: <h4> -#. type: Content of: <h4> msgid "“Give away software”" msgstr "" # type: Content of: <p> -#. type: Content of: <p> #, fuzzy msgid "" "It's misleading to use the term “give away” to mean “" @@ -591,12 +534,10 @@ "ä»·æ ¼é®é¢ï¼ä¸æ¯èªç±ãé¿åå°æ°çæ¹æ³æ¯ç¨ârelease as free softwareâï¼èªç±åè¡ï¼." # type: Content of: <h4> -#. type: Content of: <h4> msgid "Hacker" msgstr "" # type: Content of: <p> -#. type: Content of: <p> #, fuzzy msgid "" "A hacker is someone who <a href=\"http://stallman.org/articles/on-hacking." @@ -612,7 +553,6 @@ "éè¯¯çã" # type: Content of: <p> -#. type: Content of: <p> #, fuzzy msgid "" "Please don't spread this mistake. People who break security are “" @@ -620,12 +560,10 @@ msgstr "æä»¬å«ä»ä»¬ âcrackersâ" # type: Content of: <h4> -#. type: Content of: <h4> msgid "“Intellectual property”" msgstr "âç¥è¯äº§æâ" # type: Content of: <p> -#. type: Content of: <p> #, fuzzy msgid "" "Publishers and lawyers like to describe copyright as “intellectual " @@ -640,7 +578,6 @@ "æç¡®âçæâæâä¸å©âæâæ³¨ååæ ã" # type: Content of: <p> -#. type: Content of: <p> #, fuzzy msgid "" "The term “intellectual property” carries a hidden " @@ -651,7 +588,6 @@ "âç¥è¯äº§æâéèäºä¸ä¸ªåè®¾âå³äºææä¸åé®é¢çæèæ¹æ³é½æ¯ä¾é å®ç©è´¢äº§ç±»æ¨çã" # type: Content of: <p> -#. type: Content of: <p> msgid "" "When it comes to copying, this analogy disregards the crucial difference " "between material objects and information: information can be copied and " @@ -661,7 +597,6 @@ "ååäº«ï¼å®ç©æ¯ä¸è½å¤çã" # type: Content of: <p> -#. type: Content of: <p> #, fuzzy msgid "" "To avoid spreading unnecessary bias and confusion, it is best to adopt a " @@ -670,7 +605,6 @@ msgstr "ä¸ºäºé¿åå¯¹è¿ä¸ªè¯çåè§åå°æ°ï¼æå¥½ç¡®å®ä¸è¦è¯´çè³ä¸è¦æ³âç¥è¯äº§æâ" # type: Content of: <p> -#. type: Content of: <p> msgid "" "The hypocrisy of calling these powers “rights” is <a href=\"/" "philosophy/wipo-PublicAwarenessOfCopyright-2002.html\"> starting to make the " @@ -678,12 +612,10 @@ msgstr "" # type: Content of: <h4> -#. type: Content of: <h4> msgid "“LAMP system”" msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "“LAMP” stands for “Linux, Apache, MySQL and PHP”" "—a common combination of software to use on a Web server, except that " @@ -693,12 +625,10 @@ msgstr "" # type: Content of: <h4> -#. type: Content of: <h4> msgid "Linux system" msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "Linux is the name of the kernel that Linus Torvalds developed starting in " "1991. The operating system in which Linux is used is basically GNU with " @@ -709,19 +639,16 @@ msgstr "" # type: Content of: <h4> -#. type: Content of: <h4> msgid "“Market”" msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "It is misleading to describe the users of free software, or the software " "users in general, as a “market.”" msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "This is not to say there is no room for markets in the free software " "community. If you have a free software support business, then you have " @@ -730,7 +657,6 @@ msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "But the free software movement is a social movement, not a business, and the " "success it aims for is not a market success. We are trying to serve the " @@ -741,12 +667,10 @@ msgstr "" # type: Content of: <h4> -#. type: Content of: <h4> msgid "“MP3 player”" msgstr "“MP3 ææ¾å¨”" # type: Content of: <p> -#. type: Content of: <p> msgid "" "In the late 1990's it became feasible to make portable, solid-state digital " "audio players. Most support the patented MP3 codec, but not all. Some " @@ -759,12 +683,10 @@ msgstr "" # type: Content of: <h4> -#. type: Content of: <h4> msgid "“Open”" msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "Please avoid using the term “open” or “open source” " "as a substitute for “free software”. Those terms refer to a <a " @@ -776,12 +698,10 @@ msgstr "" # type: Content of: <h4> -#. type: Content of: <h4> msgid "“PC”" msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "It's ok to use the abbreviation “PC” to refer to a certain kind " "of computer hardware, but please don't use it with the implication that the " @@ -790,18 +710,15 @@ msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "The term “WC” has been suggested for a computer running Windows." msgstr "" # type: Content of: <h4> -#. type: Content of: <h4> msgid "“Photoshop”" msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "Please avoid using the term “photoshop” as a verb, meaning any " "kind of photo manipulation or image editing in general. Photoshop is just " @@ -811,12 +728,10 @@ msgstr "" # type: Content of: <h4> -#. type: Content of: <h4> msgid "“Piracy”" msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "Publishers often refer to copying they don't approve of as “piracy." "” In this way, they imply that it is ethically equivalent to attacking " @@ -827,7 +742,6 @@ msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "If you don't believe that copying not approved by the publisher is just like " "kidnapping and murder, you might prefer not to use the word “" @@ -839,12 +753,10 @@ msgstr "" # type: Content of: <h4> -#. type: Content of: <h4> msgid "“PowerPoint”" msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "Please avoid using the term “PowerPoint” to mean any kind of " "slide presentation. PowerPoint is just the name of one particular " @@ -854,12 +766,10 @@ msgstr "" # type: Content of: <h4> -#. type: Content of: <h4> msgid "“Protection”" msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "Publishers' lawyers love to use the term “protection” to " "describe copyright. This word carries the implication of preventing " @@ -869,7 +779,6 @@ msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "It is easy to avoid “protection” and use neutral terms instead. " "For example, instead of saying, “Copyright protection lasts a very " @@ -878,7 +787,6 @@ msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "If you want to criticize copyright instead of supporting it, you can use the " "term “copyright restrictions.” Thus, you can say, “" @@ -886,7 +794,6 @@ msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "The term “protection” is also used to describe malicious " "features. For instance, “copy protection” is a feature that " @@ -896,12 +803,10 @@ msgstr "" # type: Content of: <h4> -#. type: Content of: <h4> msgid "“RAND (reasonable and nondiscriminatory)”" msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "Standards bodies that promulgate patent-restricted standards that prohibit " "free software typically have a policy of obtaining patent licenses that " @@ -911,7 +816,6 @@ msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "That term whitewashes a class of patent licenses that are normally neither " "reasonable nor nondiscriminatory. It is true that these licenses do not " @@ -921,7 +825,6 @@ msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "Standards bodies should recognize that these licenses are discriminatory, " "and drop the use of the term “reasonable and nondiscriminatory” " @@ -932,7 +835,6 @@ msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "We suggest the term “uniform fee only,” or “UFO” for " "short, as a replacement. It is accurate because the only condition in these " @@ -940,12 +842,10 @@ msgstr "" # type: Content of: <h4> -#. type: Content of: <h4> msgid "“Sell software”" msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "The term “sell software” is ambiguous. Strictly speaking, " "exchanging a copy of a free program for a sum of money is selling; but " @@ -957,19 +857,16 @@ msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "See <a href=\"/philosophy/selling.html\">Selling Free Software</a> for " "further discussion of this issue." msgstr "" # type: Content of: <h4> -#. type: Content of: <h4> msgid "“Software Industry”" msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "The term “software industry” encourages people to imagine that " "software is always developed by a sort of factory and then delivered to " @@ -980,7 +877,6 @@ msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "The term “industry” is being used as propaganda by advocates of " "software patents. They call software development “industry” and " @@ -992,12 +888,10 @@ msgstr "" # type: Content of: <h4> -#. type: Content of: <h4> msgid "“Theft”" msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "Copyright apologists often use words like “stolen” and “" "theft” to describe copyright infringement. At the same time, they ask " @@ -1006,7 +900,6 @@ msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "So it is pertinent to mention that the legal system—at least in the " "US—rejects the idea that copyright infringement is “theft." @@ -1015,7 +908,6 @@ msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "The idea that laws decide what is right or wrong is mistaken in general. " "Laws are, at their best, an attempt to achieve justice; to say that laws " @@ -1023,12 +915,10 @@ msgstr "" # type: Content of: <h4> -#. type: Content of: <h4> msgid "“Trusted Computing”" msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "<a href=\"/philosophy/can-you-trust.html\">“Trusted computing”</" "a> is the proponents' name for a scheme to redesign computers so that " @@ -1038,12 +928,10 @@ msgstr "" # type: Content of: <h4> -#. type: Content of: <h4> msgid "“Vendor”" msgstr "" # type: Content of: <p> -#. type: Content of: <p> msgid "" "Please don't use the term “vendor” to refer generally to anyone " "that develops or packages software. Many programs are developed in order to " @@ -1056,7 +944,6 @@ msgstr "" # type: Content of: <h4> -#. type: Content of: <h4> msgid "" "This essay is published in <a href=\"http://shop.fsf.org/product/free-" "software-free-society/\"><cite>Free Software, Free Society: The Selected " @@ -1065,25 +952,19 @@ # type: Content of: <div> #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes. -#. type: Content of: <div> msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*" msgstr "" -#. type: Content of: <div><p> +# type: Content of: <div><p> msgid "" "Please send 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." -msgstr "" - -#. type: Content of: <div><p> -msgid "" -"Please send broken links and other corrections or suggestions to <a href=" -"\"mailto:address@hidden"><address@hidden></a>." +"contact</a> the FSF. <br /> Please send broken links and other corrections " +"or suggestions to <a href=\"mailto:address@hidden"><address@hidden" +"org></a>." msgstr "" # type: Content of: <div><p> -#. type: Content of: <div><p> msgid "" "Please see the <a href=\"/server/standards/README.translations.html" "\">Translations README</a> for information on coordinating and submitting " @@ -1091,14 +972,12 @@ msgstr "" # type: Content of: <div><p> -#. type: Content of: <div><p> msgid "" "Copyright © 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007, 2008, " "2009, 2010 Free Software Foundation, Inc." msgstr "" # type: Content of: <div><p> -#. type: Content of: <div><p> msgid "" "Verbatim copying and distribution of this entire article is permitted in any " "medium without royalty provided this notice is preserved." @@ -1106,18 +985,15 @@ # type: Content of: <div><div> #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits. -#. type: Content of: <div><div> msgid "*GNUN-SLOT: TRANSLATOR'S CREDITS*" msgstr "" # type: Content of: <div><p> #. timestamp start -#. type: Content of: <div><p> msgid "Updated:" msgstr "" # type: Content of: <div><h4> -#. type: Content of: <div><h4> msgid "Translations of this page" msgstr ""