www/software/po software.ar.po software.el.po s...

[Therese Godefroy]

CVSROOT:        /webcvs/www
Module name:    www
Changes by:     Therese Godefroy <th_g> 16/10/01 14:08:51

Modified files:
        software/po    : software.ar.po software.el.po software.nb.po 
                         software.nn.po software.sk.po software.zh-cn.po 

Log message:
        Trivially update a few strings.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/software/po/software.ar.po?cvsroot=www&r1=1.69&r2=1.70
http://web.cvs.savannah.gnu.org/viewcvs/www/software/po/software.el.po?cvsroot=www&r1=1.73&r2=1.74
http://web.cvs.savannah.gnu.org/viewcvs/www/software/po/software.nb.po?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/software/po/software.nn.po?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/software/po/software.sk.po?cvsroot=www&r1=1.70&r2=1.71
http://web.cvs.savannah.gnu.org/viewcvs/www/software/po/software.zh-cn.po?cvsroot=www&r1=1.62&r2=1.63

Patches:
Index: software.ar.po
===================================================================
RCS file: /webcvs/www/www/software/po/software.ar.po,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -b -r1.69 -r1.70
--- software.ar.po      29 Sep 2016 13:59:10 -0000      1.69
+++ software.ar.po      1 Oct 2016 14:08:50 -0000       1.70
@@ -4,6 +4,8 @@
 #
 # Osama Khalid <address@hidden>, 2009.
 # Nov 2014: trivial update of a few strings (T. Godefroy).
+# Sept. 2016: clean up, retrieve part of a sentence that got lost, update
+# decommissionned list & license (TG).
 #
 msgid ""
 msgstr ""
@@ -21,39 +23,23 @@
 "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 "X-Generator: Lokalize 1.0\n"
 
-# type: Content of: <title>
 #. type: Content of: <title>
 msgid "Software - GNU Project - Free Software Foundation"
 msgstr "برمجيات - مشروع غنو - مؤسسة البرمجيات 
الحرة"
 
-# type: Attribute 'title' of: <link>
 #. type: Content of: <h2>
 msgid "GNU Software"
 msgstr "برمجيات غنو"
 
-# type: Content of: <div><p>
 #. type: Content of: <div><ul><li>
-#, fuzzy
-#| msgid ""
-#| "Download a <a href=\"/distros/free-distros.html\">wholly free GNU/Linux "
-#| "distribution</a>."
 msgid ""
 "<strong><a href=\"/distros/free-distros.html\">Wholly free GNU/Linux "
 "Distributions</a></strong>"
 msgstr ""
-"إذا كنت تبحث عن نظام حر بالكامل لتثبّته 
فراجع <a href=\"/distros/free-distros."
-"html\">قائمتنا بتوزيعات غنو/لينكس الحرة تمام
ًا</a>."
 
-# type: Content of: <div><p>
 #. type: Content of: <div><ul><li>
-#, fuzzy
-#| msgid ""
-#| "Download a <a href=\"/distros/free-distros.html\">wholly free GNU/Linux "
-#| "distribution</a>."
 msgid "<a href=\"/distros/distros.html\">GNU/Linux Distributions</a>"
 msgstr ""
-"إذا كنت تبحث عن نظام حر بالكامل لتثبّته 
فراجع <a href=\"/distros/free-distros."
-"html\">قائمتنا بتوزيعات غنو/لينكس الحرة تمام
ًا</a>."
 
 #. type: Content of: <div><ul><li>
 msgid ""
@@ -61,22 +47,16 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#, fuzzy
-#| msgid "<a href=\"/education/edu-faq.html\">FAQ</a>"
 msgid "<a href=\"/manual/manual.html\">Manuals</a>"
-msgstr "<a href=\"/education/edu-faq.html\">FAQ اشهر الأسئلة 
بالإجابات</a>"
+msgstr ""
 
 #. type: Content of: <div><ul><li>
-#, fuzzy
-#| msgid "<a href=\"/education/edu-resources.html\">Educational Resources</a>"
 msgid "<a href=\"/software/devel.html\">Development resources</a>"
-msgstr "<a href=\"/education/edu-resources.html\">مصادر تعليم
ية</a>"
+msgstr ""
 
 #. type: Content of: <div><ul><li>
-#, fuzzy
-#| msgid "<a href=\"/education/edu-team.html\">The Education Team</a>"
 msgid "<a href=\"/software/gethelp.html\">Get help</a>"
-msgstr "<a href=\"/education/edu-team.html\">الفريق التعليمي</a>"
+msgstr ""
 
 #. type: Content of: <p>
 msgid ""
@@ -97,7 +77,6 @@
 "needs and desires.  The result is still a variant of the GNU system."
 msgstr ""
 
-# type: Content of: <div><p>
 #. type: Content of: <p>
 msgid ""
 "If you're looking for a whole system to install, see our <a href=\"/distros/"
@@ -107,7 +86,6 @@
 "إذا كنت تبحث عن نظام حر بالكامل لتثبّته 
فراجع <a href=\"/distros/free-distros."
 "html\">قائمتنا بتوزيعات غنو/لينكس الحرة تمام
ًا</a>."
 
-# type: Content of: <p>
 #. type: Content of: <p>
 msgid ""
 "To look for individual free software packages, both GNU and non-GNU, please "
@@ -128,7 +106,6 @@
 "directory.fsf.org/wiki/GNU/\">بكل حزم غنو</a>. <a 
href=\"/doc/doc.html"
 "\">وصلات وثائق البرمجيات الحرة</a> مسرودة 
بشكل منفصل."
 
-# type: Content of: <p>
 #. type: Content of: <p>
 #, fuzzy
 #| msgid ""
@@ -149,52 +126,39 @@
 "\"> list of recommended educational software</a>."
 msgstr ""
 
-# type: Content of: <h3>
 #. type: Content of: <h3>
 msgid "How to get GNU software"
 msgstr "كيفية الحصول على برمجيات غنو"
 
-# type: Content of: <div><h4>
 #. type: Content of: <div><p>
 msgid "<strong>Download distributions</strong>"
 msgstr "<strong>نزّل توزيعات</strong>"
 
-# type: Content of: <div><p><a>
 #. type: Content of: <div><p><a>
 msgid "<a href=\"/distros/free-distros.html\">"
 msgstr "<a href=\"/distros/free-distros.html\">"
 
-# type: Attribute 'alt' of: <div><p><a><img>
 #. type: Attribute 'alt' of: <div><p><a><img>
 msgid "GNU and Linux"
 msgstr "غنو ولينكس"
 
-# type: Content of: <div><p>
 #. type: Content of: <div><p>
 msgid "</a>"
 msgstr "</a>"
 
-# type: Content of: <div><p>
 #. type: Content of: <div><p>
-#, fuzzy
-#| msgid ""
-#| "If you're looking for a whole system to install, see our <a href=\"/"
-#| "distros/free-distros.html\">list of GNU/Linux distributions which are "
-#| "entirely free software</a>."
 msgid ""
 "<em>If you're looking for a whole system to install, see our <a href=\"/"
 "distros/free-distros.html\">list of GNU/Linux distributions which are "
 "entirely free software</a>.</em>"
 msgstr ""
-"إذا كنت تبحث عن نظام حر بالكامل لتثبّته 
فراجع <a href=\"/distros/free-distros."
-"html\">قائمتنا بتوزيعات غنو/لينكس الحرة تمام
ًا</a>."
+"<em>إذا كنت تبحث عن نظام حر بالكامل لتثبّته 
فراجع <a href=\"/distros/free-distros."
+"html\">قائمتنا بتوزيعات غنو/لينكس الحرة تمام
ًا</a>.</em>"
 
-# type: Content of: <p>
 #. type: Content of: <p>
 msgid "GNU software is available by several different methods:"
 msgstr "تتوفر برمجيات غنو عبر وسائل عديدة م
ختلفة:"
 
-# type: Content of: <div><p>
 #. type: Content of: <ul><li>
 msgid ""
 "Download a <a href=\"/distros/free-distros.html\">wholly free GNU/Linux "
@@ -207,12 +171,7 @@
 msgid "Get a copy from a friend."
 msgstr "احصل على نسخة من صديق."
 
-# type: Content of: <ul><li>
 #. type: Content of: <ul><li>
-#, fuzzy
-#| msgid ""
-#| "Buy a computer with a wholly free GNU/Linux system preinstalled from <a "
-#| "href=\"/links/companies.html\">one of the companies</a> that offers this."
 msgid ""
 "Buy a computer with a wholly free GNU/Linux system preinstalled from <a href="
 "\"/links/companies.html\">one of the companies</a> that offers this."
@@ -220,7 +179,6 @@
 "اشترِ حاسوبًا مُثبّتًا عليه نظام 
غنو/لينكس حر بالكامل من <a href=\"/links/"
 "companies.html\">إحدى الشركات</a> التي تقدم ذلك."
 
-# type: Content of: <ul><li>
 #. type: Content of: <ul><li>
 #, fuzzy
 #| msgid ""
@@ -262,7 +220,6 @@
 "releases suitably packaged."
 msgstr ""
 
-# type: Content of: <ul><li>
 #. type: Content of: <ul><li>
 #, fuzzy
 #| msgid ""
@@ -283,12 +240,10 @@
 "savannah.gnu.org/\">savannah.gnu.org</a>. تستخدم بعض الحزم م
ستودعات مصدرية "
 "أخرى؛ ينبغي أن تحدد صفحة الحزمة مكان م
ستودعها."
 
-# type: Content of: <h3>
 #. type: Content of: <h3>
 msgid "Develop GNU software"
 msgstr ""
 
-# type: Content of: <p>
 #. type: Content of: <p>
 #, fuzzy
 #| msgid ""
@@ -327,12 +282,10 @@
 "about <a href=\"/software/devel.html\">GNU software developer resources</a>."
 msgstr ""
 
-# type: Content of: <h3>
 #. type: Content of: <h3>
 msgid "<a id=\"allgnupkgs\">All GNU packages</a>"
 msgstr "<a id=\"allgnupkgs\">كل رزمات غنو</a>"
 
-# type: Content of: <p>
 #. type: Content of: <p>
 #, fuzzy
 #| msgid ""
@@ -376,12 +329,10 @@
 msgid "<a href=\"/software/recent-releases.html\">recent GNU releases</a>."
 msgstr ""
 
-# type: Content of: <h3>
 #. type: Content of: <h3>
 msgid "Decommissioned GNU packages"
 msgstr "حزم غنو غير نشطة"
 
-# type: Content of: <p>
 #. type: Content of: <p>
 #, fuzzy
 #| msgid ""
@@ -389,37 +340,7 @@
 #| "been superseded by, or integrated into, other packages.  If you have time "
 #| "and interest in resurrecting any of these, please contact &lt;"
 #| "<tt>address@hidden</tt>&gt;.  Here is the list; we leave the old "
-#| "project pages up (when they existed): <a href=\"aroundme/\">aroundme</a>, "
-#| "<a href=\"gnu3dkit/\">3dkit</a>, <a href=\"abcsh/\">abcsh</a>, <a href="
-#| "\"awacs/\">awacs</a>, <a href=\"cfs-el/\">cfs-el</a>, <a href=\"checker/"
-#| "\">checker</a>, <a href=\"cons/\">cons</a>, <a href=\"dgs/\">dgs</a> "
-#| "(display&nbsp;ghostscript), <a href=\"dld/\">dld</a>, <a href=\"http://";
-#| "directory.fsf.org/project/DrGenius/\">dr.genius</a>, <a href=\"elib/"
-#| "\">elib</a>, <a href=\"ffp/\">ffp</a>, <a href=\"fhp/\">fhp</a>, <a href="
-#| "\"free/\">free&nbsp;(gnu.free)</a>, <a href=\"gcron/\">gcron</a> (see <a "
-#| "href=\"mcron/\">mcron</a>), <a href=\"gfe/\">gfe</a>, <a href=\"http://";
-#| "directory.fsf.org/GNU/ggv.html\">ggv</a> (see <a href=\"gv/\">gv</a>), <a "
-#| "href=\"http://www.ideacode.com//assets/gicqd/\";>gicqd</a>, <a href="
-#| "\"http://directory.fsf.org/project/giptables/\";>giptables</a>, <a href="
-#| "\"http://directory.fsf.org/project/gnochive/\";>gnochive</a>, gnotary, <a "
-#| "href=\"http://directory.fsf.org/project/gnotepad/\";>gnotepad+</a>, "
-#| "gnubios, gnucad, <a href=\"gnufi/\">gnufi</a>, gnupedia (see <a href="
-#| "\"http://wikipedia.org\";>wikipedia</a>), <a href=\"gnusql\">gnusql</a>, "
-#| "<a href=\"gnustep-db/\">gnustep-db</a>, <a href=\"gnuts/\">gnuts</a>, <a "
-#| "href=\"goose/\">goose</a>, <a href=\"gphoto/\">gphoto</a>, <a href="
-#| "\"graphics/\">graphics</a>, <a href=\"grover/\">grover</a>, <a href="
-#| "\"gtkeditor/\">gtkeditor</a>, <a href=\"gtkeyboard/\">gtkeyboard</a>, <a "
-#| "href=\"guss/\">guss</a>, <a href=\"hegemonie/\">hegemonie</a>, <a href="
-#| "\"lengualibre\">lengualibre</a>, leonardo, libopts (see <a href=\"autogen/"
-#| "\">autogen</a>), mana, <a href=\"messenger/\">messenger</a>, <a href="
-#| "\"mgcp/\">mgcp</a>, <a href=\"mll2html/\">mll2html</a>, <a href=\"obst/"
-#| "\">obst</a>, <a href=\"octal/\">octal</a>, p2c, <a href=\"patchwork/"
-#| "\">patchwork</a>, <a href=\"pips/\">pips</a>, <a href=\"poc/\">poc</a>, "
-#| "<a href=\"rat/\">rat</a>, <a href=\"songanizer/\">songanizer</a>, <a href="
-#| "\"sweater/\">sweater</a>, <a href=\"toutdoux/\">toutdoux</a>, <a href="
-#| "\"webpublish/\">webpublish</a>, <a href=\"xbase/\">xbase</a>, <a href="
-#| "\"xinfo/\">xinfo</a>, <a href=\"xmhtml/\">xmhtml</a>, <a href=\"zebra/"
-#| "\">zebra</a>."
+#| "project pages up (when they existed): [...]"
 msgid ""
 "GNU packages are occasionally decommissioned, generally because they've been "
 "superseded by, or integrated into, other packages.  If you have time and "
@@ -466,53 +387,56 @@
 "\"xinfo/\">xinfo</a>, <a href=\"xmhtml/\">xmhtml</a>, <a href=\"zebra/"
 "\">zebra</a>."
 msgstr ""
-"مع حزم أخرى, هنا قائمة بصفحات المشاريع 
القديمة (التي نتركها كما كانت):<br /"
-"><span dir=\"ltr\"><a href=\"aeneas/\">aeneas</a>, <a href=\"aetherspace/"
-"\">aetherspace</a>, <a href=\"aroundme/\">aroundme</a>, <a href=\"gnu3dkit/"
-"\">3dkit</a>, <a href=\"abcsh/\">abcsh</a>, <a href=\"awacs/\">awacs</a>, <a "
-"href=\"cfs-el/\">cfs-el</a>, <a href=\"checker/\">checker</a>, <a href="
-"\"cons/\">cons</a>, <a href=\"dgs/\">dgs</a> (display&nbsp;ghostscript), <a "
-"href=\"dld/\">dld</a>, <a href=\"dotgnu/\">dotgnu</a>, <a href=\"dotgnu-pnet/"
-"\">dotgnu-pnet</a>, <a href=\"http://directory.fsf.org/project/DrGenius/";
-"\">dr.genius</a>, <a href=\"elib/\">elib</a>, <a href=\"ffp/\">ffp</a>, <a "
-"href=\"fhp/\">fhp</a>, <a href=\"free/\">free&nbsp;(gnu.free)</a>, <a href="
-"\"gcron/\">gcron</a> (see <a href=\"mcron/\">mcron</a>), <a href=\"gfe/"
-"\">gfe</a>, <a href=\"http://directory.fsf.org/GNU/ggv.html\";>ggv</a> (see "
-"<a href=\"gv/\">gv</a>), gicqd, <a href=\"http://directory.fsf.org/project/";
-"giptables/\">giptables</a>, <a href=\"gmorph/\">gmorph</a>, <a href=\"http://";
-"directory.fsf.org/project/gnochive/\">gnochive</a>, gnotary, <a href="
-"\"http://directory.fsf.org/project/gnotepad/\";>gnotepad+</a>, gnubios, <a "
-"href=\"gnu-arch/\">gnu-arch</a>, <a href=\"gnu-queue/\">gnu-queue</a>, "
-"gnucad, <a href=\"gnufi/\">gnufi</a>, gnupedia (راجع <a href=\"http://ar.";
-"wikipedia.org\">ويكيبيديا</a>)، <a href=\"gnuskies/\">gnuskies</a>, 
<a href="
-"\"gnusql/\">gnusql</a>, <a href=\"gnustep-db/\">gnustep-db</a>, <a href="
-"\"gnuts/\">gnuts</a>, <a href=\"goldwater/\">goldwater</a>, <a href="
-"\"goodbye/\">goodbye</a>, <a href=\"goose/\">goose</a>, <a href=\"gphoto/"
-"\">gphoto</a>, <a href=\"graphics/\">graphics</a>, grover, <a href="
-"\"gtkeditor/\">gtkeditor</a>, <a href=\"gtkeyboard/\">gtkeyboard</a>, <a "
-"href=\"guss/\">guss</a>, <a href=\"hegemonie/\">hegemonie</a>, <a href="
+"نادرًا ما تكون حزم غنو غير نشطة، وقد تكون 
كذلك عمومًا بسبب استبدلها أو دمجها "
+"مع حزم أخرى, هنا قائمة بصفحات المشاريع 
القديمة (التي نتركها كما كانت):\n"
+"<br /><span dir=\"ltr\">\n"
+"<a href=\"aeneas/"
+"\">aeneas</a>, <a href=\"aetherspace/\">aetherspace</a>, <a href=\"aroundme/"
+"\">aroundme</a>, <a href=\"gnu3dkit/\">3dkit</a>, <a href=\"abcsh/\">abcsh</"
+"a>, <a href=\"awacs/\">awacs</a>, <a href=\"cfs-el/\">cfs-el</a>, <a href="
+"\"checker/\">checker</a>, <a href=\"cons/\">cons</a>, <a href=\"dgs/\">dgs</"
+"a> (display&nbsp;ghostscript), <a href=\"dld/\">dld</a>, <a href=\"dotgnu/"
+"\">dotgnu</a>, <a href=\"dotgnu-pnet/\">dotgnu-pnet</a>, <a href=\"http://";
+"directory.fsf.org/project/DrGenius/\">dr.genius</a>, <a href=\"elib/\">elib</"
+"a>, <a href=\"fcrypt/\">fcrypt</a>, <a href=\"ffp/\">ffp</a>, <a href=\"fhp/"
+"\">fhp</a>, <a href=\"free/\">free&nbsp;(gnu.free)</a>, <a href=\"gcron/"
+"\">gcron</a> (see <a href=\"mcron/\">mcron</a>), <a href=\"gfe/\">gfe</a>, "
+"<a href=\"http://directory.fsf.org/GNU/ggv.html\";>ggv</a> (see <a href=\"gv/"
+"\">gv</a>), gicqd, <a href=\"http://directory.fsf.org/project/giptables/";
+"\">giptables</a>, <a href=\"gmorph/\">gmorph</a>, <a href=\"http://directory.";
+"fsf.org/project/gnochive/\">gnochive</a>, gnotary, <a href=\"http://";
+"directory.fsf.org/project/gnotepad/\">gnotepad+</a>, gnubios, <a href=\"gnu-"
+"arch/\">gnu-arch</a>, <a href=\"gnu-queue/\">gnu-queue</a>, gnucad, <a href="
+"\"gnufi/\">gnufi</a>,\n"
+" gnupedia (راجع <a 
href=\"http://ar.wikipedia.org\";>ويكيبيديا</a>)،\n"
+"<a href=\"gnuskies/\">gnuskies</a>, <a href=\"gnusql/"
+"\">gnusql</a>, <a href=\"gnustep-db/\">gnustep-db</a>, <a href=\"gnuts/"
+"\">gnuts</a>, <a href=\"goldwater/\">goldwater</a>, <a href=\"goodbye/"
+"\">goodbye</a>, <a href=\"goose/\">goose</a>, <a href=\"gphoto/\">gphoto</"
+"a>, <a href=\"graphics/\">graphics</a>, grover, <a href=\"gtkeditor/"
+"\">gtkeditor</a>, <a href=\"gtkeyboard/\">gtkeyboard</a>, <a href=\"guss/"
+"\">guss</a>, <a href=\"hegemonie/\">hegemonie</a>, isofsmk, <a href="
 "\"jdresolve/\">jdresolve</a>, lengualibre, leonardo, libopts (see <a href="
 "\"autogen/\">autogen</a>), mana, <a href=\"messenger/\">messenger</a>, <a "
-"href=\"mgcp/\">mgcp</a>, <a href=\"mll2html/\">mll2html</a>, <a href=\"obst/"
-"\">obst</a>, <a href=\"octal/\">octal</a>, p2c, <a href=\"packaging/"
-"\">packaging</a>, <a href=\"patchwork/\">patchwork</a>, <a href="
-"\"phpgroupware/\">phpgroupware</a>, <a href=\"pips/\">pips</a>, <a href="
-"\"poc/\">poc</a>, <a href=\"proto/\">proto</a>, <a href=\"rat/\">rat</a>, <a "
-"href=\"regex/\">regex</a>, <a href=\"rpge/\">rpge</a>, <a href="
-"\"snakecharmer/\">snakecharmer</a>, <a href=\"songanizer/\">songanizer</a>, "
-"<a href=\"sourceinstall/\">sourceinstall</a>, <a href=\"sweater/\">sweater</"
-"a>, <a href=\"sxml/\">sxml</a>, <a href=\"toutdoux/\">toutdoux</a>, <a href="
-"\"vmslib/\">vmslib</a>, <a href=\"webpublish/\">webpublish</a>, <a href="
-"\"xbase/\">xbase</a>, <a href=\"xinfo/\">xinfo</a>, <a href=\"xmhtml/"
-"\">xmhtml</a>, <a href=\"zebra/\">zebra</a>.</span>"
+"href=\"mgcp/\">mgcp</a>, <a href=\"mll2html/\">mll2html</a>, <a href="
+"\"myserver/\">myserver</a>, <a href=\"obst/\">obst</a>, <a href=\"octal/"
+"\">octal</a>, p2c, <a href=\"packaging/\">packaging</a>, <a href=\"patchwork/"
+"\">patchwork</a>, <a href=\"phpgroupware/\">phpgroupware</a>, <a href=\"pips/"
+"\">pips</a>, <a href=\"poc/\">poc</a>, <a href=\"proto/\">proto</a>, <a href="
+"\"radar/\">radar</a>, <a href=\"rat/\">rat</a>, <a href=\"regex/\">regex</"
+"a>, <a href=\"snakecharmer/\">snakecharmer</a>, <a href=\"songanizer/"
+"\">songanizer</a>, <a href=\"sourceinstall/\">sourceinstall</a>, sovix, <a "
+"href=\"sweater/\">sweater</a>, <a href=\"sxml/\">sxml</a>, <a href="
+"\"toutdoux/\">toutdoux</a>, <a href=\"vmslib/\">vmslib</a>, <a href="
+"\"webpublish/\">webpublish</a>, <a href=\"xbase/\">xbase</a>, <a href="
+"\"xinfo/\">xinfo</a>, <a href=\"xmhtml/\">xmhtml</a>, <a href=\"zebra/"
+"\">zebra</a>.</span>"
 
-# 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><div><p>
 msgid ""
 "Please send general FSF &amp; GNU inquiries to <a 
href=\"mailto:address@hidden";
@@ -562,20 +486,15 @@
 
 #. type: Content of: <div><p>
 #, fuzzy
-#| msgid ""
-#| "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>."
 msgid ""
 "This page is licensed under a <a rel=\"license\" href=\"http://";
 "creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
 "NoDerivatives 4.0 International License</a>."
 msgstr ""
 "هذا المُصنَّف مرخص بموجب <a rel=\"license\" 
href=\"http://creativecommons.org/";
-"licenses/by-nd/3.0/us/deed.ar\">رخصة المشاع الإبداعي نسب 
المصنف - منع "
-"الاشتقاق 3.0 الولايات المتحدة</a>."
+"licenses/by-nd/4.0/deed.ar\">رخصة المشاع الإبداعي نسب 
المصنف - منع "
+"الاشتقاق 4.0 دولي</a>."
 
-# 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*"
@@ -584,59 +503,15 @@
 "فريق الترجمة العربية بإشراف <em>حسام 
حسني</em><br />تم تحديث الترجمة من قبل "
 "<em>هشام ياموت</em>."
 
-# type: Content of: <div><p>
 #.  timestamp start 
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "حٌدثًت:"
 
-#~ msgid ""
-#~ "#dynamic-duo {\n"
-#~ "   float: right;\n"
-#~ "   width: 24em;\n"
-#~ "   font-style: normal;\n"
-#~ "   text-align: center;\n"
-#~ "   padding: .8em;\n"
-#~ "   margin: .3em 1em 1em 1em;\n"
-#~ "   border: .5em solid #acc890;\n"
-#~ "}\n"
-#~ "#dynamic-duo p strong {\n"
-#~ "   font-size: 1.3em;\n"
-#~ "}\n"
-#~ "#dynamic-duo img { width: 100%; }\n"
-#~ "#dynamic-duo p.highlight-para {\n"
-#~ "   text-align: left;\n"
-#~ "   padding: .5em .8em .7em .8em;\n"
-#~ "   margin: .5em;\n"
-#~ "   border-width: 1px;\n"
-#~ "}\n"
-#~ msgstr ""
-#~ "#dynamic-duo {\n"
-#~ "   float: left;\n"
-#~ "   width: 22em;\n"
-#~ "   font-style: normal;\n"
-#~ "   text-align: center;\n"
-#~ "   padding: .8em;\n"
-#~ "   margin: .3em 1em 1em 1em;\n"
-#~ "   border: .5em solid #acc890;\n"
-#~ "}\n"
-#~ "#dynamic-duo p strong {\n"
-#~ "   font-size: 1.3em;\n"
-#~ "}\n"
-#~ "#dynamic-duo img { width: 100%; }\n"
-#~ "#dynamic-duo p.highlight-para {\n"
-#~ "   text-align: right;\n"
-#~ "   padding: .5em .8em .7em .8em;\n"
-#~ "   margin: .5em;\n"
-#~ "   border-width: 1px;\n"
-#~ "}\n"
-
 # type: Content of: <div><p>
-#, fuzzy
-#~| msgid ""
-#~| "Copyright &copy; 2004, 2005, 2006, 2007, 2008, 2009 Free Software "
-#~| "Foundation, Inc."
-#~ msgid "Copyright &copy; 2015 Free Software Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 2004, 2005, 2006, 2007, 2008, 2009 Free Software "
+#~ "Foundation, Inc."
 #~ msgstr ""
 #~ "Copyright &copy; 2004, 2005, 2006, 2007, 2008, 2009 مؤسسة البرم
جيات "
 #~ "الحرة، المحدودة."

Index: software.el.po
===================================================================
RCS file: /webcvs/www/www/software/po/software.el.po,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -b -r1.73 -r1.74
--- software.el.po      29 Sep 2016 13:59:11 -0000      1.73
+++ software.el.po      1 Oct 2016 14:08:50 -0000       1.74
@@ -2,6 +2,7 @@
 # Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gnu.org article.
 # Georgios Zarkadas <address@hidden>, 2010, 2011, 2012.
+# Sept. 2016: update decommissionned package list & img legend (T. Godefroy).
 #
 msgid ""
 msgstr ""
@@ -186,19 +187,14 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
-#, fuzzy
-#| msgid ""
-#| "If you're looking for a whole system to install, see our <a href=\"/"
-#| "distros/free-distros.html\">list of GNU/Linux distributions which are "
-#| "entirely free software</a>."
 msgid ""
 "<em>If you're looking for a whole system to install, see our <a href=\"/"
 "distros/free-distros.html\">list of GNU/Linux distributions which are "
 "entirely free software</a>.</em>"
 msgstr ""
-"Εάν αναζητάτε να εγκαταστήσετε ένα 
ολόκληρο σύστημα, δείτε τη <a href=\"/"
+"<em>Εάν αναζητάτε να εγκαταστήσετε ένα 
ολόκληρο σύστημα, δείτε τη <a href=\"/"
 "distros/free-distros.html\">λίστα διανομών GNU/Linux που 
είναι εντελώς "
-"ελεύθερο λογισμικό</a>."
+"ελεύθερο λογισμικό</a>.</em>"
 
 # type: Content of: <p>
 #. type: Content of: <p>
@@ -536,8 +532,8 @@
 "\">packaging</a>, <a href=\"patchwork/\">patchwork</a>, <a href="
 "\"phpgroupware/\">phpgroupware</a>, <a href=\"pips/\">pips</a>, <a href="
 "\"poc/\">poc</a>, <a href=\"proto/\">proto</a>, <a href=\"radar/\">radar</"
-"a>, <a href=\"rat/\">rat</a>, <a href=\"regex/\">regex</a>, <a href=\"rpge/"
-"\">rpge</a>, <a href=\"snakecharmer/\">snakecharmer</a>, <a href="
+"a>, <a href=\"rat/\">rat</a>, <a href=\"regex/\">regex</a>, "
+"<a href=\"snakecharmer/\">snakecharmer</a>, <a href="
 "\"songanizer/\">songanizer</a>, <a href=\"sourceinstall/\">sourceinstall</"
 "a>, sovix, <a href=\"sweater/\">sweater</a>, <a href=\"sxml/\">sxml</a>, <a "
 "href=\"toutdoux/\">toutdoux</a>, <a href=\"vmslib/\">vmslib</a>, <a href="

Index: software.nb.po
===================================================================
RCS file: /webcvs/www/www/software/po/software.nb.po,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- software.nb.po      29 Sep 2016 13:59:11 -0000      1.8
+++ software.nb.po      1 Oct 2016 14:08:50 -0000       1.9
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the original article.
 # Andreas Tolfsen, 2007.
 # Feb 2015: GNUNify.
+# Sept. 2016: update the decommissionned package list; clean up.
 #
 msgid ""
 msgstr ""
@@ -26,20 +27,14 @@
 msgstr "GNU-Programvare"
 
 #. type: Content of: <div><ul><li>
-#, fuzzy
 msgid ""
 "<strong><a href=\"/distros/free-distros.html\">Wholly free GNU/Linux "
 "Distributions</a></strong>"
 msgstr ""
-"Last ned en <a href=\"/distros/free-distros.html\">helt fri GNU/Linux-"
-"distribusjon</a>."
 
 #. type: Content of: <div><ul><li>
-#, fuzzy
 msgid "<a href=\"/distros/distros.html\">GNU/Linux Distributions</a>"
 msgstr ""
-"Last ned en <a href=\"/distros/free-distros.html\">helt fri GNU/Linux-"
-"distribusjon</a>."
 
 #. type: Content of: <div><ul><li>
 msgid ""
@@ -541,7 +536,7 @@
 "\">patchwork</a>, <a href=\"phpgroupware/\">phpgroupware</a>, <a href=\"pips/"
 "\">pips</a>, <a href=\"poc/\">poc</a>, <a href=\"proto/\">proto</a>, <a href="
 "\"radar/\">radar</a>, <a href=\"rat/\">rat</a>, <a href=\"regex/\">regex</"
-"a>, <a href=\"rpge/\">rpge</a>, <a href=\"snakecharmer/\">snakecharmer</a>, "
+"a>, <a href=\"snakecharmer/\">snakecharmer</a>, "
 "<a href=\"songanizer/\">songanizer</a>, <a href=\"sourceinstall/"
 "\">sourceinstall</a>, sovix, <a href=\"sweater/\">sweater</a>, <a href="
 "\"sxml/\">sxml</a>, <a href=\"toutdoux/\">toutdoux</a>, <a href=\"vmslib/"
@@ -622,51 +617,6 @@
 msgstr "Oppdatert:"
 
 #~ msgid ""
-#~ "#dynamic-duo {\n"
-#~ "   float: right;\n"
-#~ "   width: 24em;\n"
-#~ "   font-style: normal;\n"
-#~ "   text-align: center;\n"
-#~ "   padding: .8em;\n"
-#~ "   margin: .3em 1em 1em 1em;\n"
-#~ "   border: .5em solid #acc890;\n"
-#~ "}\n"
-#~ "#dynamic-duo p strong {\n"
-#~ "   font-size: 1.3em;\n"
-#~ "}\n"
-#~ "#dynamic-duo img { width: 100%; }\n"
-#~ "#dynamic-duo p.highlight-para {\n"
-#~ "   text-align: left;\n"
-#~ "   padding: .5em .8em .7em .8em;\n"
-#~ "   margin: .5em;\n"
-#~ "   border-width: 1px;\n"
-#~ "}\n"
-#~ msgstr ""
-#~ "#dynamic-duo {\n"
-#~ "   float: right;\n"
-#~ "   width: 24em;\n"
-#~ "   font-style: normal;\n"
-#~ "   text-align: center;\n"
-#~ "   padding: .8em;\n"
-#~ "   margin: .3em 1em 1em 1em;\n"
-#~ "   border: .5em solid #acc890;\n"
-#~ "}\n"
-#~ "#dynamic-duo p strong {\n"
-#~ "   font-size: 1.3em;\n"
-#~ "}\n"
-#~ "#dynamic-duo img { width: 100%; }\n"
-#~ "#dynamic-duo p.highlight-para {\n"
-#~ "   text-align: left;\n"
-#~ "   padding: .5em .8em .7em .8em;\n"
-#~ "   margin: .5em;\n"
-#~ "   border-width: 1px;\n"
-#~ "}\n"
-
-#, fuzzy
-#~ msgid "Copyright &copy; 2015 Free Software Foundation, Inc."
-#~ msgstr "Copyright &copy; 2007 Free Software Foundation, Inc."
-
-#~ msgid ""
 #~ "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>."

Index: software.nn.po
===================================================================
RCS file: /webcvs/www/www/software/po/software.nn.po,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- software.nn.po      29 Sep 2016 13:59:11 -0000      1.7
+++ software.nn.po      1 Oct 2016 14:08:50 -0000       1.8
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # Andreas Tolfsen <address@hidden>, 2007.
 # August 2015: GNUNify; trivial update (needs reviewing).
+# Sept. 2016: update the decommissionned package list; clean up.
 #
 msgid ""
 msgstr ""
@@ -22,26 +23,18 @@
 msgstr "Programvare - GNU-prosjektet - Free Software Foundation"
 
 #. type: Content of: <h2>
-#, fuzzy
-#| msgid "Software"
 msgid "GNU Software"
 msgstr "GNU-Programvare"
 
 #. type: Content of: <div><ul><li>
-#, fuzzy
 msgid ""
 "<strong><a href=\"/distros/free-distros.html\">Wholly free GNU/Linux "
 "Distributions</a></strong>"
 msgstr ""
-"Last ned en <a href=\"/distros/free-distros.html\">heilt fri GNU/Linux-"
-"distribusjon</a>."
 
 #. type: Content of: <div><ul><li>
-#, fuzzy
 msgid "<a href=\"/distros/distros.html\">GNU/Linux Distributions</a>"
 msgstr ""
-"Last ned en <a href=\"/distros/free-distros.html\">heilt fri GNU/Linux-"
-"distribusjon</a>."
 
 #. type: Content of: <div><ul><li>
 msgid ""
@@ -440,12 +433,12 @@
 "\">patchwork</a>, <a href=\"phpgroupware/\">phpgroupware</a>, <a href=\"pips/"
 "\">pips</a>, <a href=\"poc/\">poc</a>, <a href=\"proto/\">proto</a>, <a href="
 "\"radar/\">radar</a>, <a href=\"rat/\">rat</a>, <a href=\"regex/\">regex</"
-"a>, <a href=\"rpge/\">rpge</a>, <a href=\"snakecharmer/\">snakecharmer</a>, "
-"<a href=\"songanizer/\">songanizer</a>, <a href=\"sourceinstall/"
-"\">sourceinstall</a>, <a href=\"sweater/\">sweater</a>, <a href=\"sxml/"
-"\">sxml</a>, <a href=\"toutdoux/\">toutdoux</a>, <a href=\"vmslib/\">vmslib</"
-"a>, <a href=\"webpublish/\">webpublish</a>, <a href=\"xbase/\">xbase</a>, <a "
-"href=\"xinfo/\">xinfo</a>, <a href=\"xmhtml/\">xmhtml</a>, <a href=\"zebra/"
+"a>, <a href=\"snakecharmer/\">snakecharmer</a>, <a href=\"songanizer/"
+"\">songanizer</a>, <a href=\"sourceinstall/\">sourceinstall</a>, sovix, <a "
+"href=\"sweater/\">sweater</a>, <a href=\"sxml/\">sxml</a>, <a href="
+"\"toutdoux/\">toutdoux</a>, <a href=\"vmslib/\">vmslib</a>, <a href="
+"\"webpublish/\">webpublish</a>, <a href=\"xbase/\">xbase</a>, <a href="
+"\"xinfo/\">xinfo</a>, <a href=\"xmhtml/\">xmhtml</a>, <a href=\"zebra/"
 "\">zebra</a>."
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -512,47 +505,6 @@
 msgid "Updated:"
 msgstr "Oppdatert:"
 
-#~ msgid ""
-#~ "#dynamic-duo {\n"
-#~ "   float: right;\n"
-#~ "   width: 24em;\n"
-#~ "   font-style: normal;\n"
-#~ "   text-align: center;\n"
-#~ "   padding: .8em;\n"
-#~ "   margin: .3em 1em 1em 1em;\n"
-#~ "   border: .5em solid #acc890;\n"
-#~ "}\n"
-#~ "#dynamic-duo p strong {\n"
-#~ "   font-size: 1.3em;\n"
-#~ "}\n"
-#~ "#dynamic-duo img { width: 100%; }\n"
-#~ "#dynamic-duo p.highlight-para {\n"
-#~ "   text-align: left;\n"
-#~ "   padding: .5em .8em .7em .8em;\n"
-#~ "   margin: .5em;\n"
-#~ "   border-width: 1px;\n"
-#~ "}\n"
-#~ msgstr ""
-#~ "#dynamic-duo {\n"
-#~ "   float: right;\n"
-#~ "   width: 24em;\n"
-#~ "   font-style: normal;\n"
-#~ "   text-align: center;\n"
-#~ "   padding: .8em;\n"
-#~ "   margin: .3em 1em 1em 1em;\n"
-#~ "   border: .5em solid #acc890;\n"
-#~ "}\n"
-#~ "#dynamic-duo p strong {\n"
-#~ "   font-size: 1.3em;\n"
-#~ "}\n"
-#~ "#dynamic-duo img { width: 100%; }\n"
-#~ "#dynamic-duo p.highlight-para {\n"
-#~ "   text-align: left;\n"
-#~ "   padding: .5em .8em .7em .8em;\n"
-#~ "   margin: .5em;\n"
-#~ "   border-width: 1px;\n"
-#~ "}\n"
-
 #~ msgid "Introduction"
 #~ msgstr "Innleiing"
 
@@ -583,15 +535,6 @@
 #~ "dei er blitt overlappa eller har smelte saman med ei anna pakke.  Deires "
 #~ "vevsider finnast fortsatt for rein dokumentasjons skuld:-"
 
-#~ msgid "<a href= \"checker/\">checker</a>"
-#~ msgstr "<a href=\"checker/\">checker</a>"
-
-#~ msgid "<a href=\"dld/\">dld</a>"
-#~ msgstr "<a href=\"dld/\">dld</a>"
-
-#~ msgid "<a href= \"gtkeditor/\">gtkeditor</a>"
-#~ msgstr "<a href=\"gtkeditor/\">gtkeditor</a>"
-
 #~ msgid ""
 #~ "<a href=\"https://agia.fsf.org/order/\";>Buy copies on CD-ROM</a> from the "
 #~ "<a href=\"/fsf/fsf.html\">FSF</a>. This helps provide the funds for the "

Index: software.sk.po
===================================================================
RCS file: /webcvs/www/www/software/po/software.sk.po,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -b -r1.70 -r1.71
--- software.sk.po      29 Sep 2016 13:59:11 -0000      1.70
+++ software.sk.po      1 Oct 2016 14:08:50 -0000       1.71
@@ -2,7 +2,8 @@
 # Copyright (C) 2009 Free Software Foundation, Inc.
 # This file is distributed under the same license as the software.html package.
 # Dominik Smatana <address@hidden>, 2009.
-#
+# Sept. 2016: update the decommissioned package list; trivially update a few
+# strings; remove wrong ones (T. Godefroy).
 #
 msgid ""
 msgstr ""
@@ -18,61 +19,40 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Outdated-Since: 2011-08-06 04:25-0300\n"
 
-# type: Content of: <title>
 #. type: Content of: <title>
 msgid "Software - GNU Project - Free Software Foundation"
 msgstr "Softvér - Projekt GNU - Nadácia pre slobodný softvér"
 
-# type: Attribute 'title' of: <link>
 #. type: Content of: <h2>
-#, fuzzy
-#| msgid "New Free Software"
 msgid "GNU Software"
 msgstr "GNU softvér"
 
-# type: Content of: <div><p>
 #. type: Content of: <div><ul><li>
-#, fuzzy
 msgid ""
 "<strong><a href=\"/distros/free-distros.html\">Wholly free GNU/Linux "
 "Distributions</a></strong>"
 msgstr ""
-"Stiahnutím niektorú zo <a href=\"/distros/free-distros.html\">výhradne "
-"slobodných distribúcií GNU/Linux</a>"
 
-# type: Content of: <div><p>
 #. type: Content of: <div><ul><li>
-#, fuzzy
 msgid "<a href=\"/distros/distros.html\">GNU/Linux Distributions</a>"
 msgstr ""
-"Stiahnutím niektorú zo <a href=\"/distros/free-distros.html\">výhradne "
-"slobodných distribúcií GNU/Linux</a>"
 
 #. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://directory.fsf.org/wiki/GNU/\";>Free Software Directory</a>"
 msgstr ""
 
-# type: Content of: <body><div><div><div><ul><li>
 #. type: Content of: <div><ul><li>
-#, fuzzy
-#| msgid "<a href=\"/software/software.html\">Downloads</a>"
 msgid "<a href=\"/manual/manual.html\">Manuals</a>"
-msgstr "<a href=\"/software/software.html\">Na&nbsp;stiahnutie</a>"
+msgstr ""
 
-# type: Content of: <body><div><div><div><ul><li>
 #. type: Content of: <div><ul><li>
-#, fuzzy
-#| msgid "<a href=\"/software/software.html\">Downloads</a>"
 msgid "<a href=\"/software/devel.html\">Development resources</a>"
-msgstr "<a href=\"/software/software.html\">Na&nbsp;stiahnutie</a>"
+msgstr ""
 
-# type: Content of: <body><div><div><div><ul><li>
 #. type: Content of: <div><ul><li>
-#, fuzzy
-#| msgid "<a href=\"/software/software.html\">Downloads</a>"
 msgid "<a href=\"/software/gethelp.html\">Get help</a>"
-msgstr "<a href=\"/software/software.html\">Na&nbsp;stiahnutie</a>"
+msgstr ""
 
 #. type: Content of: <p>
 msgid ""
@@ -93,7 +73,6 @@
 "needs and desires.  The result is still a variant of the GNU system."
 msgstr ""
 
-# type: Content of: <div><p>
 #. type: Content of: <p>
 msgid ""
 "If you're looking for a whole system to install, see our <a href=\"/distros/"
@@ -104,12 +83,11 @@
 "free-distros.html\">zoznam GNU/Linux distribúcií obsahujúcich výlučne "
 "slobodný softvér</a>."
 
-# type: Content of: <p>
 #. type: Content of: <p>
 #, fuzzy
 #| msgid ""
-#| "To look for individual free software packages, both <acronym title="
-#| "\"GNU's Not Unix!\">GNU</acronym> and non-GNU, please see the <a href="
+#| "To look for individual free software packages, both "
+#| "GNU and non-GNU, please see the <a href="
 #| "\"http://directory.fsf.org/\";>Free Software Directory</a>: a categorized, "
 #| "searchable database of free software.  The Directory is actively "
 #| "maintained by the <a href=\"http://www.fsf.org/\";>Free Software "
@@ -138,7 +116,6 @@
 "href=\"/doc/doc.html\">Odkazy na dokumentáciu k slobodnému softvéru</a> 
sú k "
 "dispozícii na samostatnej stránke."
 
-# type: Content of: <p>
 #. type: Content of: <p>
 #, fuzzy
 #| msgid ""
@@ -160,55 +137,42 @@
 "\"> list of recommended educational software</a>."
 msgstr ""
 
-# type: Content of: <h3>
 #. type: Content of: <h3>
 msgid "How to get GNU software"
 msgstr "Ako získať GNU softvér"
 
-# type: Content of: <div><h4>
 #. type: Content of: <div><p>
 #, fuzzy
 #| msgid "Download distributions"
 msgid "<strong>Download distributions</strong>"
 msgstr "<strong>Stiahnite si distribúcie</strong>"
 
-# type: Content of: <div><p><a>
 #. type: Content of: <div><p><a>
 msgid "<a href=\"/distros/free-distros.html\">"
-msgstr "<a href=\"/distros/free-distros.sk.html\">"
+msgstr "<a href=\"/distros/free-distros.html\">"
 
-# type: Attribute 'alt' of: <div><p><a><img>
 #. type: Attribute 'alt' of: <div><p><a><img>
 msgid "GNU and Linux"
 msgstr "GNU a Linux"
 
-# type: Content of: <div><p>
 #. type: Content of: <div><p>
 msgid "</a>"
 msgstr "</a>"
 
-# type: Content of: <div><p>
 #. type: Content of: <div><p>
-#, fuzzy
-#| msgid ""
-#| "If you're looking for a whole system to install, see our <a href=\"/"
-#| "distros/free-distros.html\">list of GNU/Linux distributions which are "
-#| "entirely free software</a>."
 msgid ""
 "<em>If you're looking for a whole system to install, see our <a href=\"/"
 "distros/free-distros.html\">list of GNU/Linux distributions which are "
 "entirely free software</a>.</em>"
 msgstr ""
-"Ak hľadáte kompletný systém na inštaláciu, pozrite si <a 
href=\"/distros/"
+"<em>Ak hľadáte kompletný systém na inštaláciu, pozrite si <a 
href=\"/distros/"
 "free-distros.html\">zoznam GNU/Linux distribúcií obsahujúcich výlučne "
-"slobodný softvér</a>."
+"slobodný softvér</a>.</em>"
 
-# type: Content of: <p>
 #. type: Content of: <p>
 msgid "GNU software is available by several different methods:"
 msgstr "GNU softvér je možné získať viacerými spôsobmi:"
 
-# type: Content of: <div><p>
 #. type: Content of: <ul><li>
 #, fuzzy
 msgid ""
@@ -222,7 +186,6 @@
 msgid "Get a copy from a friend."
 msgstr "Získaním kópie od známeho."
 
-# type: Content of: <ul><li>
 #. type: Content of: <ul><li>
 #, fuzzy
 #| msgid ""
@@ -237,7 +200,6 @@
 "predinštalovaným jednou zo <a 
href=\"/links/companies.html\">spoločností</"
 "a>, ktoré túto možnosť ponúkajú."
 
-# type: Content of: <ul><li>
 #. type: Content of: <ul><li>
 #, fuzzy
 #| msgid ""
@@ -279,7 +241,6 @@
 "releases suitably packaged."
 msgstr ""
 
-# type: Content of: <ul><li>
 #. type: Content of: <ul><li>
 #, fuzzy
 #| msgid ""
@@ -301,12 +262,10 @@
 "balíčky využívajú iné možnosti uloženia zdrových súborov; bližšie 
informácie "
 "sa dozviete na domovskej stránke príslušného balíčka."
 
-# type: Content of: <h3>
 #. type: Content of: <h3>
 msgid "Develop GNU software"
 msgstr ""
 
-# type: Content of: <p>
 #. type: Content of: <p>
 #, fuzzy
 #| msgid ""
@@ -328,7 +287,6 @@
 "spravovať opustené GNU balíčky a pomáhať s ich vývojom, nájdete na 
stránke "
 "<a href=\"/help/help.html\">Pomôžte GNU</a>."
 
-# type: Content of: <p>
 #. type: Content of: <p>
 #, fuzzy
 #| msgid ""
@@ -363,8 +321,9 @@
 msgstr ""
 
 #. type: Content of: <h3>
+#, fuzzy
 msgid "<a id=\"allgnupkgs\">All GNU packages</a>"
-msgstr ""
+msgstr "<a id=\"allgnupkgs\">Všetky GNU balíčky</a>"
 
 #. type: Content of: <p>
 msgid ""
@@ -398,59 +357,12 @@
 msgid "<a href=\"/software/recent-releases.html\">recent GNU releases</a>."
 msgstr ""
 
-# type: Content of: <h3>
 #. type: Content of: <h3>
 msgid "Decommissioned GNU packages"
 msgstr "Vyradené GNU balíčky"
 
-# type: Content of: <p>
 #. type: Content of: <p>
 #, fuzzy
-#| msgid ""
-#| "GNU packages are occasionally decommissioned, generally because they've "
-#| "been superseded by, or integrated into, other packages.  If you have time "
-#| "and interest in resurrecting any of these, please contact <a href="
-#| "\"mailto:address@hidden";>&lt;address@hidden&gt;</a>.  Here is "
-#| "the list; we leave the old project pages up (when they existed): <a href="
-#| "\"aeneas/\">aeneas</a>, <a href=\"aetherspace/\">aetherspace</a>, <a href="
-#| "\"aroundme/\">aroundme</a>, <a href=\"gnu3dkit/\">3dkit</a>, <a href="
-#| "\"abcsh/\">abcsh</a>, <a href=\"awacs/\">awacs</a>, <a href=\"cfs-el/"
-#| "\">cfs-el</a>, <a href=\"checker/\">checker</a>, <a href=\"cons/\">cons</"
-#| "a>, <a href=\"dgs/\">dgs</a> (display&nbsp;ghostscript), <a href=\"dld/"
-#| "\">dld</a>, <a href=\"dotgnu/\">dotgnu</a>, <a href=\"dotgnu-pnet/"
-#| "\">dotgnu-pnet</a>, <a href=\"http://directory.fsf.org/project/DrGenius/";
-#| "\">dr.genius</a>, <a href=\"elib/\">elib</a>, <a href=\"ffp/\">ffp</a>, "
-#| "<a href=\"fhp/\">fhp</a>, <a href=\"free/\">free&nbsp;(gnu.free)</a>, <a "
-#| "href=\"gcron/\">gcron</a> (see <a href=\"mcron/\">mcron</a>), <a href="
-#| "\"gfe/\">gfe</a>, <a href=\"http://directory.fsf.org/GNU/ggv.html\";>ggv</"
-#| "a> (see <a href=\"gv/\">gv</a>), gicqd, <a href=\"http://directory.fsf.";
-#| "org/project/giptables/\">giptables</a>, <a href=\"gmorph/\">gmorph</a>, "
-#| "<a href=\"http://directory.fsf.org/project/gnochive/\";>gnochive</a>, "
-#| "gnotary, <a href=\"http://directory.fsf.org/project/gnotepad/\";>gnotepad"
-#| "+</a>, gnubios, <a href=\"gnu-arch/\">gnu-arch</a>, <a href=\"gnu-queue/"
-#| "\">gnu-queue</a>, gnucad, <a href=\"gnufi/\">gnufi</a>, gnupedia (see <a "
-#| "href=\"http://wikipedia.org\";>wikipedia</a>), <a href=\"gnuskies/"
-#| "\">gnuskies</a>, <a href=\"gnusql/\">gnusql</a>, <a href=\"gnustep-db/"
-#| "\">gnustep-db</a>, <a href=\"gnuts/\">gnuts</a>, <a href=\"goldwater/"
-#| "\">goldwater</a>, <a href=\"goodbye/\">goodbye</a>, <a href=\"goose/"
-#| "\">goose</a>, <a href=\"gphoto/\">gphoto</a>, <a href=\"graphics/"
-#| "\">graphics</a>, grover, <a href=\"gtkeditor/\">gtkeditor</a>, <a href="
-#| "\"gtkeyboard/\">gtkeyboard</a>, <a href=\"guss/\">guss</a>, <a href="
-#| "\"hegemonie/\">hegemonie</a>, <a href=\"jdresolve/\">jdresolve</a>, "
-#| "lengualibre, leonardo, libopts (see <a href=\"autogen/\">autogen</a>), "
-#| "mana, <a href=\"messenger/\">messenger</a>, <a href=\"mgcp/\">mgcp</a>, "
-#| "<a href=\"mll2html/\">mll2html</a>, <a href=\"obst/\">obst</a>, <a href="
-#| "\"octal/\">octal</a>, p2c, <a href=\"packaging/\">packaging</a>, <a href="
-#| "\"patchwork/\">patchwork</a>, <a href=\"phpgroupware/\">phpgroupware</a>, "
-#| "<a href=\"pips/\">pips</a>, <a href=\"poc/\">poc</a>, <a href=\"proto/"
-#| "\">proto</a>, <a href=\"rat/\">rat</a>, <a href=\"regex/\">regex</a>, <a "
-#| "href=\"rpge/\">rpge</a>, <a href=\"snakecharmer/\">snakecharmer</a>, <a "
-#| "href=\"songanizer/\">songanizer</a>, <a href=\"sourceinstall/"
-#| "\">sourceinstall</a>, <a href=\"sweater/\">sweater</a>, <a href=\"sxml/"
-#| "\">sxml</a>, <a href=\"toutdoux/\">toutdoux</a>, <a href=\"vmslib/"
-#| "\">vmslib</a>, <a href=\"webpublish/\">webpublish</a>, <a href=\"xbase/"
-#| "\">xbase</a>, <a href=\"xinfo/\">xinfo</a>, <a href=\"xmhtml/\">xmhtml</"
-#| "a>, <a href=\"zebra/\">zebra</a>."
 msgid ""
 "GNU packages are occasionally decommissioned, generally because they've been "
 "superseded by, or integrated into, other packages.  If you have time and "
@@ -507,36 +419,38 @@
 "a> (display&nbsp;ghostscript), <a href=\"dld/\">dld</a>, <a href=\"dotgnu/"
 "\">dotgnu</a>, <a href=\"dotgnu-pnet/\">dotgnu-pnet</a>, <a href=\"http://";
 "directory.fsf.org/project/DrGenius/\">dr.genius</a>, <a href=\"elib/\">elib</"
-"a>, <a href=\"ffp/\">ffp</a>, <a href=\"fhp/\">fhp</a>, <a href=\"free/"
-"\">free&nbsp;(gnu.free)</a>, <a href=\"gcron/\">gcron</a> (viď. <a href="
-"\"mcron/\">mcron</a>), <a href=\"gfe/\">gfe</a>, <a href=\"http://directory.";
-"fsf.org/GNU/ggv.html\">ggv</a> (viď. <a href=\"gv/\">gv</a>), gicqd, <a 
href="
-"\"http://directory.fsf.org/project/giptables/\";>giptables</a>, <a href="
-"\"gmorph/\">gmorph</a>, <a href=\"http://directory.fsf.org/project/gnochive/";
-"\">gnochive</a>, gnotary, <a href=\"http://directory.fsf.org/project/";
-"gnotepad/\">gnotepad+</a>, gnubios, <a href=\"gnu-arch/\">gnu-arch</a>, <a "
-"href=\"gnu-queue/\">gnu-queue</a>, gnucad, <a href=\"gnufi/\">gnufi</a>, "
-"gnupedia (viď. <a href=\"http://wikipedia.org\";>wikipedia</a>), <a href="
-"\"gnuskies/\">gnuskies</a>, <a href=\"gnusql/\">gnusql</a>, <a href="
-"\"gnustep-db/\">gnustep-db</a>, <a href=\"gnuts/\">gnuts</a>, <a href="
-"\"goldwater/\">goldwater</a>, <a href=\"goodbye/\">goodbye</a>, <a href="
-"\"goose/\">goose</a>, <a href=\"gphoto/\">gphoto</a>, <a href=\"graphics/"
-"\">graphics</a>, grover, <a href=\"gtkeditor/\">gtkeditor</a>, <a href="
-"\"gtkeyboard/\">gtkeyboard</a>, <a href=\"guss/\">guss</a>, <a href="
-"\"hegemonie/\">hegemonie</a>, <a href=\"jdresolve/\">jdresolve</a>, "
-"lengualibre, leonardo, libopts (viď. <a href=\"autogen/\">autogen</a>), "
-"mana, <a href=\"messenger/\">messenger</a>, <a href=\"mgcp/\">mgcp</a>, <a "
-"href=\"mll2html/\">mll2html</a>, <a href=\"obst/\">obst</a>, <a href=\"octal/"
+"a>, <a href=\"fcrypt/\">fcrypt</a>, <a href=\"ffp/\">ffp</a>, <a href=\"fhp/"
+"\">fhp</a>, <a href=\"free/\">free&nbsp;(gnu.free)</a>, <a href=\"gcron/"
+"\">gcron</a> (viď. <a href=\"mcron/\">mcron</a>), <a href=\"gfe/\">gfe</a>, "
+"<a href=\"http://directory.fsf.org/GNU/ggv.html\";>ggv</a> (viď. <a 
href=\"gv/"
+"\">gv</a>), gicqd, <a href=\"http://directory.fsf.org/project/giptables/";
+"\">giptables</a>, <a href=\"gmorph/\">gmorph</a>, <a href=\"http://directory.";
+"fsf.org/project/gnochive/\">gnochive</a>, gnotary, <a href=\"http://";
+"directory.fsf.org/project/gnotepad/\">gnotepad+</a>, gnubios, <a href=\"gnu-"
+"arch/\">gnu-arch</a>, <a href=\"gnu-queue/\">gnu-queue</a>, gnucad, <a href="
+"\"gnufi/\">gnufi</a>, gnupedia (viď. <a href=\"http://wikipedia.org";
+"\">wikipedia</a>), <a href=\"gnuskies/\">gnuskies</a>, <a href=\"gnusql/"
+"\">gnusql</a>, <a href=\"gnustep-db/\">gnustep-db</a>, <a href=\"gnuts/"
+"\">gnuts</a>, <a href=\"goldwater/\">goldwater</a>, <a href=\"goodbye/"
+"\">goodbye</a>, <a href=\"goose/\">goose</a>, <a href=\"gphoto/\">gphoto</"
+"a>, <a href=\"graphics/\">graphics</a>, grover, <a href=\"gtkeditor/"
+"\">gtkeditor</a>, <a href=\"gtkeyboard/\">gtkeyboard</a>, <a href=\"guss/"
+"\">guss</a>, <a href=\"hegemonie/\">hegemonie</a>, isofsmk, <a href="
+"\"jdresolve/\">jdresolve</a>, lengualibre, leonardo, libopts (viď. <a href="
+"\"autogen/\">autogen</a>), mana, <a href=\"messenger/\">messenger</a>, <a "
+"href=\"mgcp/\">mgcp</a>, <a href=\"mll2html/\">mll2html</a>, <a href="
+"\"myserver/\">myserver</a>, <a href=\"obst/\">obst</a>, <a href=\"octal/"
 "\">octal</a>, p2c, <a href=\"packaging/\">packaging</a>, <a href=\"patchwork/"
 "\">patchwork</a>, <a href=\"phpgroupware/\">phpgroupware</a>, <a href=\"pips/"
 "\">pips</a>, <a href=\"poc/\">poc</a>, <a href=\"proto/\">proto</a>, <a href="
-"\"rat/\">rat</a>, <a href=\"regex/\">regex</a>, <a href=\"rpge/\">rpge</a>, "
-"<a href=\"snakecharmer/\">snakecharmer</a>, <a href=\"songanizer/"
-"\">songanizer</a>, <a href=\"sourceinstall/\">sourceinstall</a>, <a href="
-"\"sweater/\">sweater</a>, <a href=\"sxml/\">sxml</a>, <a href=\"toutdoux/"
-"\">toutdoux</a>, <a href=\"vmslib/\">vmslib</a>, <a href=\"webpublish/"
-"\">webpublish</a>, <a href=\"xbase/\">xbase</a>, <a href=\"xinfo/\">xinfo</"
-"a>, <a href=\"xmhtml/\">xmhtml</a>, <a href=\"zebra/\">zebra</a>."
+"\"radar/\">radar</a>, <a href=\"rat/\">rat</a>, <a href=\"regex/\">regex</"
+"a>, <a href=\"snakecharmer/\">snakecharmer</a>, <a href=\"songanizer/"
+"\">songanizer</a>, <a href=\"sourceinstall/\">sourceinstall</a>, sovix, <a "
+"href=\"sweater/\">sweater</a>, <a href=\"sxml/\">sxml</a>, <a href="
+"\"toutdoux/\">toutdoux</a>, <a href=\"vmslib/\">vmslib</a>, <a href="
+"\"webpublish/\">webpublish</a>, <a href=\"xbase/\">xbase</a>, <a href="
+"\"xinfo/\">xinfo</a>, <a href=\"xmhtml/\">xmhtml</a>, <a href=\"zebra/"
+"\">zebra</a>."
 
 # type: Content of: <div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -556,8 +470,8 @@
 "Vaše otázky pre FSF &amp; GNU posielajte prosím na <a 
href=\"mailto:address@hidden";
 "org\">&lt;address@hidden&gt;</a>.  Môžete tiež využiť <a 
href=\"/contact/\">iné "
 "spôsoby ako kontaktovať</a> FSF.  Prosím upozornite nás na nefunkčné 
odkazy, "
-"chyby a možné vylepšenia na <a href=\"mailto:address@hidden";>&lt;"
-"address@hidden&gt;</a>."
+"chyby a možné vylepšenia na <a href=\"mailto:address@hidden";>&lt;"
+"address@hidden&gt;</a>."
 
 # type: Content of: <div><p>
 #.  TRANSLATORS: Ignore the original text in this paragraph,
@@ -612,52 +526,6 @@
 msgid "Updated:"
 msgstr "Aktualizované:"
 
-#~ msgid ""
-#~ "#dynamic-duo {\n"
-#~ "   float: right;\n"
-#~ "   width: 24em;\n"
-#~ "   font-style: normal;\n"
-#~ "   text-align: center;\n"
-#~ "   padding: .8em;\n"
-#~ "   margin: .3em 1em 1em 1em;\n"
-#~ "   border: .5em solid #acc890;\n"
-#~ "}\n"
-#~ "#dynamic-duo p strong {\n"
-#~ "   font-size: 1.3em;\n"
-#~ "}\n"
-#~ "#dynamic-duo img { width: 100%; }\n"
-#~ "#dynamic-duo p.highlight-para {\n"
-#~ "   text-align: left;\n"
-#~ "   padding: .5em .8em .7em .8em;\n"
-#~ "   margin: .5em;\n"
-#~ "   border-width: 1px;\n"
-#~ "}\n"
-#~ msgstr ""
-#~ "#dynamic-duo {\n"
-#~ "   float: right;\n"
-#~ "   width: 24em;\n"
-#~ "   font-style: normal;\n"
-#~ "   text-align: center;\n"
-#~ "   padding: .8em;\n"
-#~ "   margin: .3em 1em 1em 1em;\n"
-#~ "   border: .5em solid #acc890;\n"
-#~ "}\n"
-#~ "#dynamic-duo p strong {\n"
-#~ "   font-size: 1.3em;\n"
-#~ "}\n"
-#~ "#dynamic-duo img { width: 100%; }\n"
-#~ "#dynamic-duo p.highlight-para {\n"
-#~ "   text-align: left;\n"
-#~ "   padding: .5em .8em .7em .8em;\n"
-#~ "   margin: .5em;\n"
-#~ "   border-width: 1px;\n"
-#~ "}\n"
-
-# type: Content of: <title>
-#, fuzzy
-#~ msgid "Copyright &copy; 2015 Free Software Foundation, Inc."
-#~ msgstr "Copyright &copy; 2009 Free Software Foundation, Inc."
-
 # type: Content of: <div><p>
 #~ msgid ""
 #~ "<span class=\"highlight\">If you're looking for a whole system to "

Index: software.zh-cn.po
===================================================================
RCS file: /webcvs/www/www/software/po/software.zh-cn.po,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -b -r1.62 -r1.63
--- software.zh-cn.po   29 Sep 2016 13:59:11 -0000      1.62
+++ software.zh-cn.po   1 Oct 2016 14:08:50 -0000       1.63
@@ -1,7 +1,9 @@
-# SOME DESCRIPTIVE TITLE
+# Traditional Chinese translation of software/po/software.html
 # Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
+# This file is distributed under the same license as the original page.
 # FIRST AUTHOR <address@hidden>, YEAR.
+# July 2016: update the decommissioned package list; trivially update a few
+# strings; remove wrong ones (T. Godefroy).
 #
 msgid ""
 msgstr ""
@@ -10,73 +12,47 @@
 "PO-Revision-Date: 2012-02-15 17:11+0800\n"
 "Last-Translator: Li Fanxi <address@hidden>\n"
 "Language-Team: Chinese <address@hidden>\n"
-"Language: zh\n"
+"Language: zh-cn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Outdated-Since: 2012-01-10 04:25-0500\n"
 
-# type: Content of: <title>
 #. type: Content of: <title>
 msgid "Software - GNU Project - Free Software Foundation"
-msgstr "下载软件 - GNU 工程 - 自由软件基金会"
+msgstr "软件 - GNU 工程 - 自由软件基金会"
 
-# type: Attribute 'title' of: <link>
 #. type: Content of: <h2>
 #, fuzzy
-#| msgid "New Free Software"
 msgid "GNU Software"
-msgstr "新自由软件"
+msgstr "GNU 软件"
 
-# type: Content of: <p>
 #. type: Content of: <div><ul><li>
-#, fuzzy
-#| msgid ""
-#| "Download a <a href=\"/distros/free-distros.html\">wholly free GNU/Linux "
-#| "distribution</a>."
 msgid ""
 "<strong><a href=\"/distros/free-distros.html\">Wholly free GNU/Linux "
 "Distributions</a></strong>"
 msgstr ""
-"如果您需要安装一个完整的操作系统，请考虑<a 
href=\"/distros/free-distros.html"
-"\">全部由自由软件组成的 GNU/Linux 发行版</a> 。"
 
-# type: Content of: <p>
 #. type: Content of: <div><ul><li>
-#, fuzzy
-#| msgid ""
-#| "Download a <a href=\"/distros/free-distros.html\">wholly free GNU/Linux "
-#| "distribution</a>."
 msgid "<a href=\"/distros/distros.html\">GNU/Linux Distributions</a>"
 msgstr ""
-"如果您需要安装一个完整的操作系统，请考虑<a 
href=\"/distros/free-distros.html"
-"\">全部由自由软件组成的 GNU/Linux 发行版</a> 。"
 
 #. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://directory.fsf.org/wiki/GNU/\";>Free Software Directory</a>"
 msgstr ""
 
-# type: Content of: <body><div><div><div><ul><li>
 #. type: Content of: <div><ul><li>
-#, fuzzy
-#| msgid "<a href=\"/education/education.html\">Education</a>"
 msgid "<a href=\"/manual/manual.html\">Manuals</a>"
-msgstr "<a href=\"/education/education.html\">教育</a>"
+msgstr ""
 
-# type: Content of: <body><div><div><div><ul><li>
 #. type: Content of: <div><ul><li>
-#, fuzzy
-#| msgid "<a href=\"/education/education.html\">Education</a>"
 msgid "<a href=\"/software/devel.html\">Development resources</a>"
-msgstr "<a href=\"/education/education.html\">教育</a>"
+msgstr ""
 
-# type: Content of: <body><div><div><div><ul><li>
 #. type: Content of: <div><ul><li>
-#, fuzzy
-#| msgid "<a href=\"/education/education.html\">Education</a>"
 msgid "<a href=\"/software/gethelp.html\">Get help</a>"
-msgstr "<a href=\"/education/education.html\">教育</a>"
+msgstr ""
 
 #. type: Content of: <p>
 msgid ""
@@ -97,7 +73,6 @@
 "needs and desires.  The result is still a variant of the GNU system."
 msgstr ""
 
-# type: Content of: <p>
 #. type: Content of: <p>
 msgid ""
 "If you're looking for a whole system to install, see our <a href=\"/distros/"
@@ -107,7 +82,6 @@
 "如果您需要安装一个完整的操作系统，请考虑<a 
href=\"/distros/free-distros.html"
 "\">全部由自由软件组成的 GNU/Linux 发行版</a> 。"
 
-# type: Content of: <p>
 #. type: Content of: <p>
 msgid ""
 "To look for individual free software packages, both GNU and non-GNU, please "
@@ -123,12 +97,11 @@
 "要寻找各种软件包，包括 GNU 的和非 GNU 的，请访问 <a 
href=\"http://directory.";
 
"fsf.org/\">自由软件目录</a>，这是一个分类好并可以直接搜索自由软件的数据库。这"
 "个目录由 <a href=\"http://www.fsf.org/\";>自由软件基金会</a> 
持续维护，提供了"
-"指向各种软件主页的列表。它还维护了一个 <a 
href=\"http://directory.fsf.org/";
+"指向各种软件主页的列表。它还维护了一个 <a 
href=\"http://directory.fsf.org/wiki/";
 "GNU/\">所有 GNU 软件包</a> 的列表。本页下部也有一个 <a 
href=\"#allgnupkgs\">"
 "所有 GNU 软件包</a> 的列表。除此之外，还有一个<a 
href=\"/doc/doc.html\">自由"
 "软件文档链接</a> 列表。"
 
-# type: Content of: <p>
 #. type: Content of: <p>
 #, fuzzy
 #| msgid ""
@@ -154,49 +127,35 @@
 msgid "How to get GNU software"
 msgstr "如何获取 GNU 软件"
 
-# type: Content of: <div><h4>
 #. type: Content of: <div><p>
-#, fuzzy
-#| msgid "Download distributions"
 msgid "<strong>Download distributions</strong>"
-msgstr "下载 GNU/Linux 发行版"
+msgstr "<strong>下载 GNU/Linux 发行版</strong>"
 
-# type: Content of: <div><p><a>
 #. type: Content of: <div><p><a>
 msgid "<a href=\"/distros/free-distros.html\">"
 msgstr "<a href=\"/distros/free-distros.html\">"
 
-# type: Attribute 'alt' of: <div><p><a><img>
 #. type: Attribute 'alt' of: <div><p><a><img>
 msgid "GNU and Linux"
 msgstr "GNU 与 Linux"
 
-# type: Content of: <div><p>
 #. type: Content of: <div><p>
 msgid "</a>"
 msgstr "</a>"
 
-# type: Content of: <p>
 #. type: Content of: <div><p>
-#, fuzzy
-#| msgid ""
-#| "If you're looking for a whole system to install, see our <a href=\"/"
-#| "distros/free-distros.html\">list of GNU/Linux distributions which are "
-#| "entirely free software</a>."
 msgid ""
 "<em>If you're looking for a whole system to install, see our <a href=\"/"
 "distros/free-distros.html\">list of GNU/Linux distributions which are "
 "entirely free software</a>.</em>"
 msgstr ""
-"如果您需要安装一个完整的操作系统，请考虑<a 
href=\"/distros/free-distros.html"
-"\">全部由自由软件组成的 GNU/Linux 发行版</a> 。"
+"<em>如果您需要安装一个完整的操作系统，请考虑<a 
href=\"/distros/free-distros.html"
+"\">全部由自由软件组成的 GNU/Linux 发行版</a> 。</em>"
 
-# type: Content of: <p>
 #. type: Content of: <p>
 msgid "GNU software is available by several different methods:"
 msgstr "GNU 软件常常以多种方式发布："
 
-# type: Content of: <p>
 #. type: Content of: <ul><li>
 msgid ""
 "Download a <a href=\"/distros/free-distros.html\">wholly free GNU/Linux "
@@ -207,9 +166,8 @@
 
 #. type: Content of: <ul><li>
 msgid "Get a copy from a friend."
-msgstr ""
+msgstr "从朋友那里获取。"
 
-# type: Content of: <ul><li>
 #. type: Content of: <ul><li>
 #, fuzzy
 #| msgid ""
@@ -222,7 +180,6 @@
 "从 <a href=\"/links/companies.html\">这些公司</a> 购买预装了完å…
¨è‡ªç”±çš„ GNU/"
 "Linux 操作系统的计算机。"
 
-# type: Content of: <ul><li>
 #. type: Content of: <ul><li>
 #, fuzzy
 #| msgid ""
@@ -265,7 +222,6 @@
 "releases suitably packaged."
 msgstr ""
 
-# type: Content of: <ul><li>
 #. type: Content of: <ul><li>
 #, fuzzy
 #| msgid ""
@@ -286,14 +242,10 @@
 "\">savannah.gnu.org</a>ã€€æ¥ç»´æŠ¤ä»–ä»¬çš„æºä»£ç ã€‚æœ‰äº›è½¯ä»¶åŒ…
ä½¿ç”¨å…¶å®ƒæºä»£ç ä»“åº“æˆ–å®Œ"
 "全不使用，每个软件包的主页会提供这方面的信息。"
 
-# type: Content of: <h3>
 #. type: Content of: <h3>
-#, fuzzy
-#| msgid "How to get GNU software"
 msgid "Develop GNU software"
-msgstr "如何获取 GNU 软件"
+msgstr ""
 
-# type: Content of: <p>
 #. type: Content of: <p>
 #, fuzzy
 #| msgid ""
@@ -324,12 +276,26 @@
 msgstr ""
 
 #. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "If you are developing a GNU package, or you are thinking of starting, you "
+#| "may be interested in <a href=\"/software/devel.html\">GNU Software "
+#| "Developer Resources</a>.  If you'd like to make your software an official "
+#| "GNU package, see the <a href=\"/help/evaluation.html\">evaluation "
+#| "information and submission form</a>.  For information on the licenses "
+#| "used for GNU software, and on other free software licenses, see our <a "
+#| "href=\"/licenses/licenses.html\">Licenses</a> page."
 msgid ""
 "If you're maintaining or developing a GNU package, whether newly dubbed or "
 "of long standing, this short list of <a href=\"/software/maintainer-tips.html"
 "\">tips for GNU maintainers</a> may be useful, along with this information "
 "about <a href=\"/software/devel.html\">GNU software developer resources</a>."
 msgstr ""
+"如果您正在开发 GNU 软件，或准备开始开发，请访问 <a 
href=\"/software/devel."
+"html\">GNU 软件开发者资源</a>　。 如果您想把您的软件列å…
¥å®˜æ–¹çš„ GNU 软件列"
+"表，请填写 <a 
href=\"/help/evaluation.html\">è‡ªç”±è½¯ä»¶è¯„ä¼°ä¿¡æ¯å’Œæäº¤è¡¨æ ¼</"
+"a>　。要获取有关 GNU 软件的许可证或å…
¶å®ƒè‡ªç”±è½¯ä»¶è®¸å¯è¯ç›¸å…³çš„信息，请访问 "
+"<a href=\"/licenses/licenses.html\">许可证</a> 页面。"
 
 #. type: Content of: <h3>
 msgid "<a id=\"allgnupkgs\">All GNU packages</a>"
@@ -367,48 +333,11 @@
 msgid "<a href=\"/software/recent-releases.html\">recent GNU releases</a>."
 msgstr ""
 
-# type: Content of: <h3>
 #. type: Content of: <h3>
 msgid "Decommissioned GNU packages"
 msgstr "退役的 GNU 软件"
 
-# type: Content of: <p>
 #. type: Content of: <p>
-#, fuzzy
-#| msgid ""
-#| "GNU packages are occasionally decommissioned, generally because they've "
-#| "been superseded by, or integrated into, other packages.  If you have time "
-#| "and interest in resurrecting any of these, please contact &lt;"
-#| "<tt>address@hidden</tt>&gt;.  Here is the list; we leave the old "
-#| "project pages up (when they existed): <a href=\"aroundme/\">aroundme</a>, "
-#| "<a href=\"gnu3dkit/\">3dkit</a>, <a href=\"abcsh/\">abcsh</a>, <a href="
-#| "\"awacs/\">awacs</a>, <a href=\"cfs-el/\">cfs-el</a>, <a href=\"checker/"
-#| "\">checker</a>, <a href=\"cons/\">cons</a>, <a href=\"dgs/\">dgs</a> "
-#| "(display&nbsp;ghostscript), <a href=\"dld/\">dld</a>, <a href=\"http://";
-#| "directory.fsf.org/project/DrGenius/\">dr.genius</a>, <a href=\"elib/"
-#| "\">elib</a>, <a href=\"ffp/\">ffp</a>, <a href=\"fhp/\">fhp</a>, <a href="
-#| "\"free/\">free&nbsp;(gnu.free)</a>, <a href=\"gcron/\">gcron</a> (see <a "
-#| "href=\"mcron/\">mcron</a>), <a href=\"gfe/\">gfe</a>, <a href=\"http://";
-#| "directory.fsf.org/GNU/ggv.html\">ggv</a> (see <a href=\"gv/\">gv</a>), "
-#| "gicqd, <a href=\"http://directory.fsf.org/project/giptables/\";>giptables</"
-#| "a>, <a href=\"http://directory.fsf.org/project/gnochive/\";>gnochive</a>, "
-#| "gnotary, <a href=\"http://directory.fsf.org/project/gnotepad/\";>gnotepad"
-#| "+</a>, gnubios, gnucad, <a href=\"gnufi/\">gnufi</a>, gnupedia (see <a "
-#| "href=\"http://wikipedia.org\";>wikipedia</a>), <a href=\"gnusql\">gnusql</"
-#| "a>, <a href=\"gnustep-db/\">gnustep-db</a>, <a href=\"gnuts/\">gnuts</a>, "
-#| "<a href=\"goose/\">goose</a>, <a href=\"gphoto/\">gphoto</a>, <a href="
-#| "\"graphics/\">graphics</a>, grover, <a href=\"gtkeditor/\">gtkeditor</a>, "
-#| "<a href=\"gtkeyboard/\">gtkeyboard</a>, <a href=\"guss/\">guss</a>, <a "
-#| "href=\"hegemonie/\">hegemonie</a>, <a href=\"lengualibre\">lengualibre</"
-#| "a>, leonardo, libopts (see <a href=\"autogen/\">autogen</a>), mana, <a "
-#| "href=\"messenger/\">messenger</a>, <a href=\"mgcp/\">mgcp</a>, <a href="
-#| "\"mll2html/\">mll2html</a>, <a href=\"obst/\">obst</a>, <a href=\"octal/"
-#| "\">octal</a>, p2c, <a href=\"patchwork/\">patchwork</a>, <a href=\"pips/"
-#| "\">pips</a>, <a href=\"poc/\">poc</a>, <a href=\"rat/\">rat</a>, <a href="
-#| "\"songanizer/\">songanizer</a>, <a href=\"sweater/\">sweater</a>, <a href="
-#| "\"toutdoux/\">toutdoux</a>, <a href=\"webpublish/\">webpublish</a>, <a "
-#| "href=\"xbase/\">xbase</a>, <a href=\"xinfo/\">xinfo</a>, <a href=\"xmhtml/"
-#| "\">xmhtml</a>, <a href=\"zebra/\">zebra</a>."
 msgid ""
 "GNU packages are occasionally decommissioned, generally because they've been "
 "superseded by, or integrated into, other packages.  If you have time and "
@@ -456,50 +385,54 @@
 "\">zebra</a>."
 msgstr ""
 "部分 GNU 
软件由于被更好的软件代替或是被集成到别的软件包
中而退役。如果您有时间"
-"和兴趣让它们恢复生机，请联系 
&lt;<tt>address@hidden</tt>&gt;。下面是退役"
-"软件的列表，我们仍然保留了它们的项目页面（只要它们还存在）：<a
 href="
-"\"aroundme/\">aroundme</a>, <a href=\"gnu3dkit/\">3dkit</a>, <a href=\"abcsh/"
-"\">abcsh</a>, <a href=\"awacs/\">awacs</a>, <a href=\"cfs-el/\">cfs-el</a>, "
-"<a href=\"checker/\">checker</a>, <a href=\"cons/\">cons</a>, <a href=\"dgs/"
-"\">dgs</a> (display&nbsp;ghostscript), <a href=\"dld/\">dld</a>, <a href="
-"\"http://directory.fsf.org/project/DrGenius/\";>dr.genius</a>, <a href=\"elib/"
-"\">elib</a>, <a href=\"ffp/\">ffp</a>, <a href=\"fhp/\">fhp</a>, <a href="
-"\"free/\">free&nbsp;(gnu.free)</a>, <a href=\"gcron/\">gcron</a> (see <a "
-"href=\"mcron/\">mcron</a>), <a href=\"gfe/\">gfe</a>, <a href=\"http://";
-"directory.fsf.org/GNU/ggv.html\">ggv</a> (see <a href=\"gv/\">gv</a>), "
-"gicqd, <a href=\"http://directory.fsf.org/project/giptables/\";>giptables</"
-"a>, <a href=\"http://directory.fsf.org/project/gnochive/\";>gnochive</a>, "
-"gnotary, <a href=\"http://directory.fsf.org/project/gnotepad/\";>gnotepad+</"
-"a>, gnubios, gnucad, <a href=\"gnufi/\">gnufi</a>, gnupedia (see <a href="
-"\"http://wikipedia.org\";>wikipedia</a>), <a href=\"gnusql\">gnusql</a>, <a "
-"href=\"gnustep-db/\">gnustep-db</a>, <a href=\"gnuts/\">gnuts</a>, <a href="
-"\"goose/\">goose</a>, <a href=\"gphoto/\">gphoto</a>, <a href=\"graphics/"
-"\">graphics</a>, grover, <a href=\"gtkeditor/\">gtkeditor</a>, <a href="
-"\"gtkeyboard/\">gtkeyboard</a>, <a href=\"guss/\">guss</a>, <a href="
-"\"hegemonie/\">hegemonie</a>, <a href=\"lengualibre\">lengualibre</a>, "
-"leonardo, libopts (see <a href=\"autogen/\">autogen</a>), mana, <a href="
-"\"messenger/\">messenger</a>, <a href=\"mgcp/\">mgcp</a>, <a href=\"mll2html/"
-"\">mll2html</a>, <a href=\"obst/\">obst</a>, <a href=\"octal/\">octal</a>, "
-"p2c, <a href=\"patchwork/\">patchwork</a>, <a href=\"pips/\">pips</a>, <a "
-"href=\"poc/\">poc</a>, <a href=\"rat/\">rat</a>, <a href=\"songanizer/"
-"\">songanizer</a>, <a href=\"sweater/\">sweater</a>, <a href=\"toutdoux/"
-"\">toutdoux</a>, <a href=\"webpublish/\">webpublish</a>, <a href=\"xbase/"
-"\">xbase</a>, <a href=\"xinfo/\">xinfo</a>, <a href=\"xmhtml/\">xmhtml</a>, "
-"<a href=\"zebra/\">zebra</a>."
+"和兴趣让它们恢复生机，请联系 
&lt;address@hidden&gt;。下面是退役"
+"软件的列表，我们仍然保留了它们的项目页面（只要它们还存在）：<a
 href=\"aeneas/"
+"\">aeneas</a>, <a href=\"aetherspace/\">aetherspace</a>, <a href=\"aroundme/"
+"\">aroundme</a>, <a href=\"gnu3dkit/\">3dkit</a>, <a href=\"abcsh/\">abcsh</"
+"a>, <a href=\"awacs/\">awacs</a>, <a href=\"cfs-el/\">cfs-el</a>, <a href="
+"\"checker/\">checker</a>, <a href=\"cons/\">cons</a>, <a href=\"dgs/\">dgs</"
+"a> (display&nbsp;ghostscript), <a href=\"dld/\">dld</a>, <a href=\"dotgnu/"
+"\">dotgnu</a>, <a href=\"dotgnu-pnet/\">dotgnu-pnet</a>, <a href=\"http://";
+"directory.fsf.org/project/DrGenius/\">dr.genius</a>, <a href=\"elib/\">elib</"
+"a>, <a href=\"fcrypt/\">fcrypt</a>, <a href=\"ffp/\">ffp</a>, <a href=\"fhp/"
+"\">fhp</a>, <a href=\"free/\">free&nbsp;(gnu.free)</a>, <a href=\"gcron/"
+"\">gcron</a> (参考 <a href=\"mcron/\">mcron</a>), <a href=\"gfe/\">gfe</a>, 
"
+"<a href=\"http://directory.fsf.org/GNU/ggv.html\";>ggv</a> (参考 <a 
href=\"gv/"
+"\">gv</a>), gicqd, <a href=\"http://directory.fsf.org/project/giptables/";
+"\">giptables</a>, <a href=\"gmorph/\">gmorph</a>, <a href=\"http://directory.";
+"fsf.org/project/gnochive/\">gnochive</a>, gnotary, <a href=\"http://";
+"directory.fsf.org/project/gnotepad/\">gnotepad+</a>, gnubios, <a href=\"gnu-"
+"arch/\">gnu-arch</a>, <a href=\"gnu-queue/\">gnu-queue</a>, gnucad, <a href="
+"\"gnufi/\">gnufi</a>, gnupedia (参考 <a href=\"http://wikipedia.org";
+"\">wikipedia</a>), <a href=\"gnuskies/\">gnuskies</a>, <a href=\"gnusql/"
+"\">gnusql</a>, <a href=\"gnustep-db/\">gnustep-db</a>, <a href=\"gnuts/"
+"\">gnuts</a>, <a href=\"goldwater/\">goldwater</a>, <a href=\"goodbye/"
+"\">goodbye</a>, <a href=\"goose/\">goose</a>, <a href=\"gphoto/\">gphoto</"
+"a>, <a href=\"graphics/\">graphics</a>, grover, <a href=\"gtkeditor/"
+"\">gtkeditor</a>, <a href=\"gtkeyboard/\">gtkeyboard</a>, <a href=\"guss/"
+"\">guss</a>, <a href=\"hegemonie/\">hegemonie</a>, isofsmk, <a href="
+"\"jdresolve/\">jdresolve</a>, lengualibre, leonardo, libopts (参考 <a href="
+"\"autogen/\">autogen</a>), mana, <a href=\"messenger/\">messenger</a>, <a "
+"href=\"mgcp/\">mgcp</a>, <a href=\"mll2html/\">mll2html</a>, <a href="
+"\"myserver/\">myserver</a>, <a href=\"obst/\">obst</a>, <a href=\"octal/"
+"\">octal</a>, p2c, <a href=\"packaging/\">packaging</a>, <a href=\"patchwork/"
+"\">patchwork</a>, <a href=\"phpgroupware/\">phpgroupware</a>, <a href=\"pips/"
+"\">pips</a>, <a href=\"poc/\">poc</a>, <a href=\"proto/\">proto</a>, <a href="
+"\"radar/\">radar</a>, <a href=\"rat/\">rat</a>, <a href=\"regex/\">regex</"
+"a>, <a href=\"snakecharmer/\">snakecharmer</a>, <a href=\"songanizer/"
+"\">songanizer</a>, <a href=\"sourceinstall/\">sourceinstall</a>, sovix, <a "
+"href=\"sweater/\">sweater</a>, <a href=\"sxml/\">sxml</a>, <a href="
+"\"toutdoux/\">toutdoux</a>, <a href=\"vmslib/\">vmslib</a>, <a href="
+"\"webpublish/\">webpublish</a>, <a href=\"xbase/\">xbase</a>, <a href="
+"\"xinfo/\">xinfo</a>, <a href=\"xmhtml/\">xmhtml</a>, <a href=\"zebra/"
+"\">zebra</a>."
 
-# 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><div><p>
-#, fuzzy
-#| msgid ""
-#| "Please send general FSF &amp; GNU inquiries to <a 
href=\"mailto:address@hidden";
-#| "org\">&lt;address@hidden&gt;</a>.  There are also <a href=\"/contact/"
-#| "\">other ways to contact</a> the FSF."
 msgid ""
 "Please send general FSF &amp; GNU inquiries to <a 
href=\"mailto:address@hidden";
 "\">&lt;address@hidden&gt;</a>.  There are also <a href=\"/contact/\">other 
ways "
@@ -510,8 +443,9 @@
 "请将有关自由软件基金会(FSF) &amp; GNU 的查询 &amp; 
问题发送到<a href="
 "\"mailto:address@hidden";>&lt;address@hidden&gt;</a>。也可以通过 <a 
href=\"/"
 "contact/\">其他联系方法</a> 联系自由软件基金会(FSF)。"
+"发现任何错误和链接或å…
¶å®ƒéœ€è¦æ›´æ­£çš„地方（或任何建议），请发送邮件至 <a "
+"href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>。"
 
-# type: Content of: <div><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
@@ -532,7 +466,6 @@
 "若您想翻译本文，请参看 <a 
href=\"/server/standards/README.translations.html"
 "\">翻译手册</a> 获取有关协调和提交翻译的相关事项。"
 
-# type: Content of: <div><p>
 #. type: Content of: <div><p>
 #, fuzzy
 #| msgid "Copyright &copy; 2011, 2012 Free Software Foundation, Inc."
@@ -540,21 +473,15 @@
 msgstr "Copyright &copy; 2011 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
-#, fuzzy
-#| msgid ""
-#| "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>."
 msgid ""
 "This page is licensed under a <a rel=\"license\" href=\"http://";
 "creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
 "NoDerivatives 4.0 International License</a>."
 msgstr ""
 "本页面采用 <a rel=\"license\" 
href=\"http://creativecommons.org/licenses/by-";
-"nd/3.0/us/\">Creative Commons Attribution-NoDerivs 3.0 United States "
+"nd/4.0/\">Creative Commons Attribution-NoDerivs 4.0 International "
 "License</a> 许可证授权。"
 
-# 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*"
@@ -562,15 +489,12 @@
 "<b>翻译</b>: 李凡希 2010, 2011, 2012<br />\n"
 "<b>å®¡æ ¡</b>: é‚“æ¥  2010"
 
-# type: Content of: <div><p>
 #.  timestamp start 
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "最后更新："
 
-#, fuzzy
-#~| msgid "Copyright &copy; 2011 Free Software Foundation, Inc."
-#~ msgid "Copyright &copy; 2015 Free Software Foundation, Inc."
+#~ msgid "Copyright &copy; 2011 Free Software Foundation, Inc."
 #~ msgstr "版权所有 &copy; 2011 自由软件基金会"
 
 #~ msgid ""