www-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

www manual/po/manual.de.po manual/po/manual.pot...


From: GNUN
Subject: www manual/po/manual.de.po manual/po/manual.pot...
Date: Mon, 15 Apr 2013 15:59:26 +0000

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     13/04/15 15:59:26

Modified files:
        manual/po      : manual.de.po manual.pot manual.translist 
        software/po    : software.ar.po software.ca.po software.de.po 
                         software.el-diff.html software.el.po 
                         software.es.po software.fr.po software.it.po 
                         software.ja.po software.pot software.ru.po 
                         software.sk.po software.sq.po software.zh-cn.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/manual/po/manual.de.po?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/manual/po/manual.pot?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/manual/po/manual.translist?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/software/po/software.ar.po?cvsroot=www&r1=1.41&r2=1.42
http://web.cvs.savannah.gnu.org/viewcvs/www/software/po/software.ca.po?cvsroot=www&r1=1.70&r2=1.71
http://web.cvs.savannah.gnu.org/viewcvs/www/software/po/software.de.po?cvsroot=www&r1=1.58&r2=1.59
http://web.cvs.savannah.gnu.org/viewcvs/www/software/po/software.el-diff.html?cvsroot=www&r1=1.13&r2=1.14
http://web.cvs.savannah.gnu.org/viewcvs/www/software/po/software.el.po?cvsroot=www&r1=1.45&r2=1.46
http://web.cvs.savannah.gnu.org/viewcvs/www/software/po/software.es.po?cvsroot=www&r1=1.49&r2=1.50
http://web.cvs.savannah.gnu.org/viewcvs/www/software/po/software.fr.po?cvsroot=www&r1=1.81&r2=1.82
http://web.cvs.savannah.gnu.org/viewcvs/www/software/po/software.it.po?cvsroot=www&r1=1.119&r2=1.120
http://web.cvs.savannah.gnu.org/viewcvs/www/software/po/software.ja.po?cvsroot=www&r1=1.34&r2=1.35
http://web.cvs.savannah.gnu.org/viewcvs/www/software/po/software.pot?cvsroot=www&r1=1.48&r2=1.49
http://web.cvs.savannah.gnu.org/viewcvs/www/software/po/software.ru.po?cvsroot=www&r1=1.35&r2=1.36
http://web.cvs.savannah.gnu.org/viewcvs/www/software/po/software.sk.po?cvsroot=www&r1=1.43&r2=1.44
http://web.cvs.savannah.gnu.org/viewcvs/www/software/po/software.sq.po?cvsroot=www&r1=1.30&r2=1.31
http://web.cvs.savannah.gnu.org/viewcvs/www/software/po/software.zh-cn.po?cvsroot=www&r1=1.39&r2=1.40

Patches:
Index: manual/po/manual.de.po
===================================================================
RCS file: /web/www/www/manual/po/manual.de.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- manual/po/manual.de.po      19 Feb 2013 19:31:18 -0000      1.5
+++ manual/po/manual.de.po      15 Apr 2013 15:59:23 -0000      1.6
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: manual.html\n"
-"POT-Creation-Date: 2013-02-10 18:25-0500\n"
+"POT-Creation-Date: 2013-04-15 15:55+0000\n"
 "PO-Revision-Date: 2013-01-10 22:00+0100\n"
 "Last-Translator: Joerg Kohne <joeko (AT) online [PUNKT] de>\n"
 "Language-Team: German <address@hidden>\n"
@@ -14,6 +14,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2013-04-15 15:55+0000\n"
 
 #. type: Content of: <title>
 msgid "GNU Manuals Online - GNU Project - Free Software Foundation"
@@ -24,12 +25,25 @@
 msgstr "GNU-Handbücher online"
 
 #. type: Content of: <p>
-msgid ""
-"This table lists official GNU packages with links to their primary "
-"documentation, where available.  When a package has several associated "
-"manuals, they are all listed.  If a package has no specific manual online, "
-"the link just goes to the package's home page (which is also linked to "
-"explicitly)."
+# | This table lists [-official-] {+<a
+# | href=\"/software/software.html\">official+} GNU [-packages-]
+# | {+packages</a>+} with links to their primary documentation, where
+# | available.  When a package has several associated manuals, they are all
+# | listed.  If a package has no specific manual online, the link just goes to
+# | the package's home page (which is also linked to explicitly).
+#, fuzzy
+#| msgid ""
+#| "This table lists official GNU packages with links to their primary "
+#| "documentation, where available.  When a package has several associated "
+#| "manuals, they are all listed.  If a package has no specific manual "
+#| "online, the link just goes to the package's home page (which is also "
+#| "linked to explicitly)."
+msgid ""
+"This table lists <a href=\"/software/software.html\">official GNU packages</"
+"a> with links to their primary documentation, where available.  When a "
+"package has several associated manuals, they are all listed.  If a package "
+"has no specific manual online, the link just goes to the package's home page "
+"(which is also linked to explicitly)."
 msgstr ""
 "Diese Tabelle listet offizielle GNU-Pakete mit Verweisen zu ihrer primären "
 "Dokumentation, sofern verfügbar, auf. Können einem Paket mehrere 
Handbücher "

Index: manual/po/manual.pot
===================================================================
RCS file: /web/www/www/manual/po/manual.pot,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- manual/po/manual.pot        10 Feb 2013 23:28:24 -0000      1.2
+++ manual/po/manual.pot        15 Apr 2013 15:59:23 -0000      1.3
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: manual.html\n"
-"POT-Creation-Date: 2013-02-10 18:25-0500\n"
+"POT-Creation-Date: 2013-04-15 15:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -25,11 +25,11 @@
 
 #. type: Content of: <p>
 msgid ""
-"This table lists official GNU packages with links to their primary "
-"documentation, where available.  When a package has several associated "
-"manuals, they are all listed.  If a package has no specific manual online, "
-"the link just goes to the package's home page (which is also linked to "
-"explicitly)."
+"This table lists <a href=\"/software/software.html\">official GNU "
+"packages</a> with links to their primary documentation, where available.  "
+"When a package has several associated manuals, they are all listed.  If a "
+"package has no specific manual online, the link just goes to the package's "
+"home page (which is also linked to explicitly)."
 msgstr ""
 
 #. type: Content of: <p>

Index: manual/po/manual.translist
===================================================================
RCS file: /web/www/www/manual/po/manual.translist,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- manual/po/manual.translist  1 Mar 2013 04:11:21 -0000       1.4
+++ manual/po/manual.translist  15 Apr 2013 15:59:23 -0000      1.5
@@ -2,8 +2,8 @@
 <!--#set var="TRANSLATION_LIST"
 value='<div id="translations">
 <p>
-<span dir="ltr" class="original"><a 
href="/manual/manual.en.html">English</a>&nbsp;[en]</span>&nbsp;&nbsp;
-<span dir="ltr"><a 
href="/manual/manual.de.html">Deutsch</a>&nbsp;[de]</span>&nbsp;&nbsp;
+<span dir="ltr" class="original"><a lang="en" hreflang="en" 
href="/manual/manual.en.html">English</a>&nbsp;[en]</span>&nbsp;&nbsp;
+<span dir="ltr"><a lang="de" hreflang="de" 
href="/manual/manual.de.html">Deutsch</a>&nbsp;[de]</span>&nbsp;&nbsp;
 </p>
 </div>' -->
 <!--#if expr="$HTML_BODY = yes" -->

Index: software/po/software.ar.po
===================================================================
RCS file: /web/www/www/software/po/software.ar.po,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- software/po/software.ar.po  13 Apr 2013 16:33:05 -0000      1.41
+++ software/po/software.ar.po  15 Apr 2013 15:59:24 -0000      1.42
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: software\n"
-"POT-Creation-Date: 2013-04-13 16:28+0000\n"
+"POT-Creation-Date: 2013-04-15 15:55+0000\n"
 "PO-Revision-Date: 2011-01-19 15:41+0200\n"
 "Last-Translator: \n"
 "Language-Team: Arabic <address@hidden>\n"
@@ -66,10 +66,10 @@
 "software, that we in the GNU Project have developed since 1984.  The GNU "
 "system contains all of the <a href=\"/philosophy/categories.html#GNUsoftware"
 "\">official GNU software packages</a> (which are listed below), and also "
-"includes much non-GNU free software, such as the X Window System.  Also, the "
-"GNU system is not a single static set of programs; users and distributors "
-"may select different packages according to their needs and desires.  The "
-"result is still a variant of the GNU system."
+"includes non-GNU free software, such as TeX and the X Window System.  Also, "
+"the GNU system is not a single static set of programs; users and "
+"distributors may select different packages according to their needs and "
+"desires.  The result is still a variant of the GNU system."
 msgstr ""
 
 # type: Content of: <div><p>
@@ -158,8 +158,8 @@
 #| "like to try free software."
 msgid ""
 "Finally, we have a <a href=\"/software/for-windows.html\">short list of free "
-"software for Microsoft Windows</a>, for the Windows user who would like to "
-"try free software."
+"software for Microsoft Windows</a>, for Windows users who would like to try "
+"free software."
 msgstr ""
 "أخيرا هنا <a href=\"/software/for-windows.html\">قائمة 
قصيرة ببرمجيات حرة "
 "لمايكروسوفت ويندوز</a>، لمسخدمي ويندوز الم
هتمين بالبرمجيات الحرة."
@@ -184,6 +184,10 @@
 "href=\"/distros/free-distros.html\">قائمتنا بتوزيعات 
غنو/لينكس الحرة تمامًا</"
 "a>.</span>"
 
+#. type: Content of: <ul><li>
+msgid "Get a copy from a friend."
+msgstr ""
+
 # type: Content of: <ul><li>
 #. type: Content of: <ul><li>
 msgid ""
@@ -205,24 +209,24 @@
 "<a href=\"/order/ftp.html\">Download individual packages from the web or via "
 "FTP</a>: we provide source code for all GNU software as <a href=\"/"
 "philosophy/free-sw.html\">free software</a>, and free of charge.  (Please "
-"also make a <a href=\"/help/donate.html\">donation</a> to the FSF, if you "
-"can, to help us write more free software.)"
+"also make a <a href=\"/help/donate.html\">donation</a> to the FSF if you "
+"can, to help support the creation of more free software.)"
 msgstr ""
 "<a href=\"/order/ftp.html\">نزّلها من الوب أو عبر FTP</a>: 
نحن نوفر كل أكواد "
 "برمجيات غنو المصدرية بالمجان. (من فضلك ام
نح <a href=\"/help/donate.html"
 "\">تبرعًا</a> لإف&#8203;إف&#8203;إف -إن استطعت- لم
ساعتدنا في كتابة المزيد من "
 "البرمجيات الحرة)."
 
-# type: Content of: <ul><li>
 #. type: Content of: <ul><li>
 msgid ""
-"Get a copy from a friend.  (Likewise please make a donation if you can.)"
-msgstr "احصل على نسخة من صديق. (عندها امنح 
تبرعًا إن استطعت)"
+"Use the <a href=\"/software/guix/guix.html\">GNU Guix</a> functional package "
+"manager to install and manage GNU package releases."
+msgstr ""
 
 #. type: Content of: <ul><li>
 msgid ""
-"Use the <a href=\"/software/gsrc/gsrc.html\">GNU SRC</a> package to easily "
-"install many of the latest GNU package releases on their own, without "
+"Use the <a href=\"/software/gsrc/gsrc.html\">GNU GSRC</a> collection to "
+"easily install the latest GNU package releases on their own, without "
 "conflicting with any system versions."
 msgstr ""
 
@@ -237,12 +241,19 @@
 
 # type: Content of: <ul><li>
 #. type: Content of: <ul><li>
-msgid ""
-"Get the development sources for a package and build them, to help with "
-"development.  Many GNU packages keep their development sources at the GNU "
-"hosting site <a href=\"http://savannah.gnu.org/\";>savannah.gnu.org</a>. Some "
-"packages use other source repositories, or have none at all.  Each package's "
-"web pages should give the specifics."
+#, fuzzy
+#| msgid ""
+#| "Get the development sources for a package and build them, to help with "
+#| "development.  Many GNU packages keep their development sources at the GNU "
+#| "hosting site <a href=\"http://savannah.gnu.org/\";>savannah.gnu.org</a>. "
+#| "Some packages use other source repositories, or have none at all.  Each "
+#| "package's web pages should give the specifics."
+msgid ""
+"Get the development sources for a package and build them.  Many GNU packages "
+"keep their development sources at the GNU hosting site <a href=\"http://";
+"savannah.gnu.org/\">savannah.gnu.org</a>.  Some packages use other source "
+"repositories, or have none at all.  Each package's web pages should give the "
+"specifics."
 msgstr ""
 "احصل على مصادر تطوير الحزمة وابنها. تستطيع 
بهذه الطريقة تجربة أحدث المزايا. "
 "تبقي كثير من حزم غنو مصادر تطويرها في موقع 
استضافة غنو <a href=\"http://";
@@ -488,6 +499,11 @@
 msgid "Updated:"
 msgstr "حٌدثًت:"
 
+# type: Content of: <ul><li>
+#~ msgid ""
+#~ "Get a copy from a friend.  (Likewise please make a donation if you can.)"
+#~ msgstr "احصل على نسخة من صديق. (عندها امنح 
تبرعًا إن استطعت)"
+
 # type: Content of: <div><p>
 #~ msgid ""
 #~ "Copyright &copy; 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, "

Index: software/po/software.ca.po
===================================================================
RCS file: /web/www/www/software/po/software.ca.po,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -b -r1.70 -r1.71
--- software/po/software.ca.po  13 Apr 2013 16:33:05 -0000      1.70
+++ software/po/software.ca.po  15 Apr 2013 15:59:24 -0000      1.71
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: software.ca\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-13 16:28+0000\n"
+"POT-Creation-Date: 2013-04-15 15:55+0000\n"
 "PO-Revision-Date: 2013-03-25 09:16+0100\n"
 "Last-Translator: Miquel Puigpelat <address@hidden>\n"
 "Language-Team: Catalan <address@hidden>\n"
@@ -60,16 +60,28 @@
 "completament lliures</a>.</span>"
 
 #. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"/philosophy/categories.html#TheGNUsystem\">The GNU operating "
+#| "system</a> is the Unix-like operating system, which is entirely free "
+#| "software, that we in the GNU Project have developed since 1984.  The GNU "
+#| "system contains all of the <a href=\"/philosophy/categories."
+#| "html#GNUsoftware\">official GNU software packages</a> (which are listed "
+#| "below), and also includes much non-GNU free software, such as the X "
+#| "Window System.  Also, the GNU system is not a single static set of "
+#| "programs; users and distributors may select different packages according "
+#| "to their needs and desires.  The result is still a variant of the GNU "
+#| "system."
 msgid ""
 "<a href=\"/philosophy/categories.html#TheGNUsystem\">The GNU operating "
 "system</a> is the Unix-like operating system, which is entirely free "
 "software, that we in the GNU Project have developed since 1984.  The GNU "
 "system contains all of the <a href=\"/philosophy/categories.html#GNUsoftware"
 "\">official GNU software packages</a> (which are listed below), and also "
-"includes much non-GNU free software, such as the X Window System.  Also, the "
-"GNU system is not a single static set of programs; users and distributors "
-"may select different packages according to their needs and desires.  The "
-"result is still a variant of the GNU system."
+"includes non-GNU free software, such as TeX and the X Window System.  Also, "
+"the GNU system is not a single static set of programs; users and "
+"distributors may select different packages according to their needs and "
+"desires.  The result is still a variant of the GNU system."
 msgstr ""
 "<a href=\"/philosophy/categories.ca.html#TheGNUsystem\">El sistema operatiu "
 "GNU</a> és un sistema operatiu a l'estil d'Unix, de caràcter completament "
@@ -154,10 +166,15 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Finally, we have a <a href=\"/software/for-windows.html\">short list of "
+#| "free software for Microsoft Windows</a>, for the Windows user who would "
+#| "like to try free software."
 msgid ""
 "Finally, we have a <a href=\"/software/for-windows.html\">short list of free "
-"software for Microsoft Windows</a>, for the Windows user who would like to "
-"try free software."
+"software for Microsoft Windows</a>, for Windows users who would like to try "
+"free software."
 msgstr ""
 "Finalment, aquí teniu una <a href=\"/software/for-windows.html\">breu llista 
"
 "de Programari Lliure per a Microsoft Windows</a>, per als usuaris de Windows "
@@ -182,6 +199,10 @@
 "Descarregueu una <a href=\"/distros/free-distros.ca.html\">distribució GNU/"
 "Linux completament lliure</a>."
 
+#. type: Content of: <ul><li>
+msgid "Get a copy from a friend."
+msgstr ""
+
 # type: Content of: <ul><li>
 #. type: Content of: <ul><li>
 msgid ""
@@ -194,12 +215,19 @@
 
 # type: Content of: <ul><li>
 #. type: Content of: <ul><li>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"/order/ftp.html\">Download individual packages from the web or "
+#| "via FTP</a>: we provide source code for all GNU software as <a href=\"/"
+#| "philosophy/free-sw.html\">free software</a>, and free of charge.  (Please "
+#| "also make a <a href=\"/help/donate.html\">donation</a> to the FSF, if you "
+#| "can, to help us write more free software.)"
 msgid ""
 "<a href=\"/order/ftp.html\">Download individual packages from the web or via "
 "FTP</a>: we provide source code for all GNU software as <a href=\"/"
 "philosophy/free-sw.html\">free software</a>, and free of charge.  (Please "
-"also make a <a href=\"/help/donate.html\">donation</a> to the FSF, if you "
-"can, to help us write more free software.)"
+"also make a <a href=\"/help/donate.html\">donation</a> to the FSF if you "
+"can, to help support the creation of more free software.)"
 msgstr ""
 "<a href=\"/order/ftp.html\">Descarregant paquets individuals per la pàgina o 
"
 "per FTP</a>: proporcionem el codi font per a tot el programari GNU com a <a "
@@ -208,18 +236,29 @@
 "\">donació</a> a la FSF, per ajudar-nos a desenvolupar més programari "
 "lliure.)"
 
-# type: Content of: <ul><li>
 #. type: Content of: <ul><li>
+#, fuzzy
+#| msgid ""
+#| "Use the <a href=\"/software/gsrc/gsrc.html\">GNU SRC</a> package to "
+#| "easily install many of the latest GNU package releases on their own, "
+#| "without conflicting with any system versions."
 msgid ""
-"Get a copy from a friend.  (Likewise please make a donation if you can.)"
+"Use the <a href=\"/software/guix/guix.html\">GNU Guix</a> functional package "
+"manager to install and manage GNU package releases."
 msgstr ""
-"Demanant una còpia a un amic. (Com abans, feu també si podeu una donació 
si "
-"podeu.)"
+"Utilitzeu el paquet <a href=\"/software/gsrc/gsrc.html\">GNU SRC</a> per "
+"instal·lar fàcilment moltes de les darreres versions dels paquets GNU, "
+"evitant conflictes amb qualsevol altra de les versions del sistema."
 
 #. type: Content of: <ul><li>
+#, fuzzy
+#| msgid ""
+#| "Use the <a href=\"/software/gsrc/gsrc.html\">GNU SRC</a> package to "
+#| "easily install many of the latest GNU package releases on their own, "
+#| "without conflicting with any system versions."
 msgid ""
-"Use the <a href=\"/software/gsrc/gsrc.html\">GNU SRC</a> package to easily "
-"install many of the latest GNU package releases on their own, without "
+"Use the <a href=\"/software/gsrc/gsrc.html\">GNU GSRC</a> collection to "
+"easily install the latest GNU package releases on their own, without "
 "conflicting with any system versions."
 msgstr ""
 "Utilitzeu el paquet <a href=\"/software/gsrc/gsrc.html\">GNU SRC</a> per "
@@ -242,12 +281,19 @@
 
 # type: Content of: <ul><li>
 #. type: Content of: <ul><li>
-msgid ""
-"Get the development sources for a package and build them, to help with "
-"development.  Many GNU packages keep their development sources at the GNU "
-"hosting site <a href=\"http://savannah.gnu.org/\";>savannah.gnu.org</a>. Some "
-"packages use other source repositories, or have none at all.  Each package's "
-"web pages should give the specifics."
+#, fuzzy
+#| msgid ""
+#| "Get the development sources for a package and build them, to help with "
+#| "development.  Many GNU packages keep their development sources at the GNU "
+#| "hosting site <a href=\"http://savannah.gnu.org/\";>savannah.gnu.org</a>. "
+#| "Some packages use other source repositories, or have none at all.  Each "
+#| "package's web pages should give the specifics."
+msgid ""
+"Get the development sources for a package and build them.  Many GNU packages "
+"keep their development sources at the GNU hosting site <a href=\"http://";
+"savannah.gnu.org/\">savannah.gnu.org</a>.  Some packages use other source "
+"repositories, or have none at all.  Each package's web pages should give the "
+"specifics."
 msgstr ""
 "Descarregant el codi font d'un paquet i compilant-lo, per ajudar al seu "
 "desenvolupament. Molts paquets de GNU mantenen el seu codi font a  <a href="
@@ -484,6 +530,13 @@
 msgid "Updated:"
 msgstr "Updated:"
 
+# type: Content of: <ul><li>
+#~ msgid ""
+#~ "Get a copy from a friend.  (Likewise please make a donation if you can.)"
+#~ msgstr ""
+#~ "Demanant una còpia a un amic. (Com abans, feu també si podeu una 
donació "
+#~ "si podeu.)"
+
 #
 #
 #

Index: software/po/software.de.po
===================================================================
RCS file: /web/www/www/software/po/software.de.po,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- software/po/software.de.po  13 Apr 2013 16:33:05 -0000      1.58
+++ software/po/software.de.po  15 Apr 2013 15:59:24 -0000      1.59
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: software.html\n"
-"POT-Creation-Date: 2013-04-13 16:28+0000\n"
+"POT-Creation-Date: 2013-04-15 15:55+0000\n"
 "PO-Revision-Date: 2013-04-02 22:00+0200\n"
 "Last-Translator: Joerg Kohne <joeko (AT) online [PUNKT] de>\n"
 "Language-Team: German <address@hidden>\n"
@@ -50,16 +50,38 @@
 "Linux-Gesamtsystem</a> installieren.</span>"
 
 #. type: Content of: <p>
+# | <a href=\"/philosophy/categories.html#TheGNUsystem\">The GNU operating
+# | system</a> is the Unix-like operating system, which is entirely free
+# | software, that we in the GNU Project have developed since 1984.  The GNU
+# | system contains all of the <a
+# | href=\"/philosophy/categories.html#GNUsoftware\">official GNU software
+# | packages</a> (which are listed below), and also includes [-much-] non-GNU
+# | free software, such as {+TeX and+} the X Window System.  Also, the GNU
+# | system is not a single static set of programs; users and distributors may
+# | select different packages according to their needs and desires.  The
+# | result is still a variant of the GNU system.
+#, fuzzy
+#| msgid ""
+#| "<a href=\"/philosophy/categories.html#TheGNUsystem\">The GNU operating "
+#| "system</a> is the Unix-like operating system, which is entirely free "
+#| "software, that we in the GNU Project have developed since 1984.  The GNU "
+#| "system contains all of the <a href=\"/philosophy/categories."
+#| "html#GNUsoftware\">official GNU software packages</a> (which are listed "
+#| "below), and also includes much non-GNU free software, such as the X "
+#| "Window System.  Also, the GNU system is not a single static set of "
+#| "programs; users and distributors may select different packages according "
+#| "to their needs and desires.  The result is still a variant of the GNU "
+#| "system."
 msgid ""
 "<a href=\"/philosophy/categories.html#TheGNUsystem\">The GNU operating "
 "system</a> is the Unix-like operating system, which is entirely free "
 "software, that we in the GNU Project have developed since 1984.  The GNU "
 "system contains all of the <a href=\"/philosophy/categories.html#GNUsoftware"
 "\">official GNU software packages</a> (which are listed below), and also "
-"includes much non-GNU free software, such as the X Window System.  Also, the "
-"GNU system is not a single static set of programs; users and distributors "
-"may select different packages according to their needs and desires.  The "
-"result is still a variant of the GNU system."
+"includes non-GNU free software, such as TeX and the X Window System.  Also, "
+"the GNU system is not a single static set of programs; users and "
+"distributors may select different packages according to their needs and "
+"desires.  The result is still a variant of the GNU system."
 msgstr ""
 "Das <a href=\"/philosophy/categories.html#TheGNUsystem\">GNU-Betriebssystem</"
 "a> ist ein seit 1984 im GNU-Projekt entwickeltes, unixähnliches "
@@ -135,10 +157,18 @@
 "a>."
 
 #. type: Content of: <p>
+# | Finally, we have a <a href=\"/software/for-windows.html\">short list of
+# | free software for Microsoft Windows</a>, for [-the-] Windows user{+s+} who
+# | would like to try free software.
+#, fuzzy
+#| msgid ""
+#| "Finally, we have a <a href=\"/software/for-windows.html\">short list of "
+#| "free software for Microsoft Windows</a>, for the Windows user who would "
+#| "like to try free software."
 msgid ""
 "Finally, we have a <a href=\"/software/for-windows.html\">short list of free "
-"software for Microsoft Windows</a>, for the Windows user who would like to "
-"try free software."
+"software for Microsoft Windows</a>, for Windows users who would like to try "
+"free software."
 msgstr ""
 "Und schließlich ein kleiner Überblick über <a href=\"/software/for-windows"
 "\">Freie Software für Microsoft Windows</a>, für die Windows-Benutzer, die "
@@ -161,6 +191,10 @@
 "Distributionen</a>;"
 
 #. type: Content of: <ul><li>
+msgid "Get a copy from a friend."
+msgstr ""
+
+#. type: Content of: <ul><li>
 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."
@@ -169,12 +203,25 @@
 "Rechner bereits vorinstalliertem und völlig freien GNU/Linux-System;"
 
 #. type: Content of: <ul><li>
+# | <a href=\"/order/ftp.html\">Download individual packages from the web or
+# | via FTP</a>: we provide source code for all GNU software as <a
+# | href=\"/philosophy/free-sw.html\">free software</a>, and free of charge. 
+# | (Please also make a <a href=\"/help/donate.html\">donation</a> to the
+# | FSF[-,-] if you can, to help [-us write-] {+support the creation of+} more
+# | free software.)
+#, fuzzy
+#| msgid ""
+#| "<a href=\"/order/ftp.html\">Download individual packages from the web or "
+#| "via FTP</a>: we provide source code for all GNU software as <a href=\"/"
+#| "philosophy/free-sw.html\">free software</a>, and free of charge.  (Please "
+#| "also make a <a href=\"/help/donate.html\">donation</a> to the FSF, if you "
+#| "can, to help us write more free software.)"
 msgid ""
 "<a href=\"/order/ftp.html\">Download individual packages from the web or via "
 "FTP</a>: we provide source code for all GNU software as <a href=\"/"
 "philosophy/free-sw.html\">free software</a>, and free of charge.  (Please "
-"also make a <a href=\"/help/donate.html\">donation</a> to the FSF, if you "
-"can, to help us write more free software.)"
+"also make a <a href=\"/help/donate.html\">donation</a> to the FSF if you "
+"can, to help support the creation of more free software.)"
 msgstr ""
 "durch <a href=\"/order/ftp.html\">Herunterladen einzelner Pakete via HTTP "
 "oder FTP</a>: der Quellcode der gesamten GNU-Software ist als <a href=\"/"
@@ -183,14 +230,38 @@
 "FSF</a>, wenn Sie können, um mehr Freie Software schreiben zu können);"
 
 #. type: Content of: <ul><li>
+# | Use the <a [-href=\"/software/gsrc/gsrc.html\">GNU SRC</a>-]
+# | {+href=\"/software/guix/guix.html\">GNU Guix</a> functional+} package
+# | {+manager+} to [-easily-] install [-many of the latest-] {+and manage+}
+# | GNU package [-releases on their own, without conflicting with any system
+# | versions.-] {+releases.+}
+#, fuzzy
+#| msgid ""
+#| "Use the <a href=\"/software/gsrc/gsrc.html\">GNU SRC</a> package to "
+#| "easily install many of the latest GNU package releases on their own, "
+#| "without conflicting with any system versions."
 msgid ""
-"Get a copy from a friend.  (Likewise please make a donation if you can.)"
-msgstr "durch einen Freund (bitte Spenden Sie ebenso, wenn Sie können);"
+"Use the <a href=\"/software/guix/guix.html\">GNU Guix</a> functional package "
+"manager to install and manage GNU package releases."
+msgstr ""
+"durch das <a href=\"/software/gsrc/gsrc.html\" hreflang=\"en\" title=\"GNU "
+"Source Release Collection\">GNU SRC</a>-Paket, um auf einfache Weise viele "
+"der neuesten GNU-Pakete ohne Konflikte mit einer Systemversion zu "
+"installieren;"
 
 #. type: Content of: <ul><li>
+# | Use the <a href=\"/software/gsrc/gsrc.html\">GNU [-SRC</a> package-]
+# | {+GSRC</a> collection+} to easily install [-many of-] the latest GNU
+# | package releases on their own, without conflicting with any system
+# | versions.
+#, fuzzy
+#| msgid ""
+#| "Use the <a href=\"/software/gsrc/gsrc.html\">GNU SRC</a> package to "
+#| "easily install many of the latest GNU package releases on their own, "
+#| "without conflicting with any system versions."
 msgid ""
-"Use the <a href=\"/software/gsrc/gsrc.html\">GNU SRC</a> package to easily "
-"install many of the latest GNU package releases on their own, without "
+"Use the <a href=\"/software/gsrc/gsrc.html\">GNU GSRC</a> collection to "
+"easily install the latest GNU package releases on their own, without "
 "conflicting with any system versions."
 msgstr ""
 "durch das <a href=\"/software/gsrc/gsrc.html\" hreflang=\"en\" title=\"GNU "
@@ -214,12 +285,25 @@
 "angemessen zu verpacken;"
 
 #. type: Content of: <ul><li>
-msgid ""
-"Get the development sources for a package and build them, to help with "
-"development.  Many GNU packages keep their development sources at the GNU "
-"hosting site <a href=\"http://savannah.gnu.org/\";>savannah.gnu.org</a>. Some "
-"packages use other source repositories, or have none at all.  Each package's "
-"web pages should give the specifics."
+# | Get the development sources for a package and build [-them, to help with
+# | development.-] {+them.+}  Many GNU packages keep their development sources
+# | at the GNU hosting site <a
+# | href=\"http://savannah.gnu.org/\";>savannah.gnu.org</a>.  Some packages use
+# | other source repositories, or have none at all.  Each package's web pages
+# | should give the specifics.
+#, fuzzy
+#| msgid ""
+#| "Get the development sources for a package and build them, to help with "
+#| "development.  Many GNU packages keep their development sources at the GNU "
+#| "hosting site <a href=\"http://savannah.gnu.org/\";>savannah.gnu.org</a>. "
+#| "Some packages use other source repositories, or have none at all.  Each "
+#| "package's web pages should give the specifics."
+msgid ""
+"Get the development sources for a package and build them.  Many GNU packages "
+"keep their development sources at the GNU hosting site <a href=\"http://";
+"savannah.gnu.org/\">savannah.gnu.org</a>.  Some packages use other source "
+"repositories, or have none at all.  Each package's web pages should give the "
+"specifics."
 msgstr ""
 "durch den Quellcode eines in Entwicklung befindlichen Pakets und dessen "
 "Erzeugung eines fertigen Anwendungsprogramms, um bei der Entwicklung zu "
@@ -535,6 +619,10 @@
 msgstr "Aktualisierung:"
 
 #~ msgid ""
+#~ "Get a copy from a friend.  (Likewise please make a donation if you can.)"
+#~ msgstr "durch einen Freund (bitte Spenden Sie ebenso, wenn Sie können);"
+
+#~ 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="

Index: software/po/software.el-diff.html
===================================================================
RCS file: /web/www/www/software/po/software.el-diff.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- software/po/software.el-diff.html   13 Apr 2013 16:33:05 -0000      1.13
+++ software/po/software.el-diff.html   15 Apr 2013 15:59:24 -0000      1.14
@@ -33,9 +33,9 @@
 software, that we in the GNU Project have developed since 1984.  The GNU
 system contains all of the &lt;a
 href="/philosophy/categories.html#GNUsoftware"&gt;official GNU software
-packages&lt;/a&gt; (which are listed below), and also includes much non-GNU
-free software, such as the X Window System.  Also, the GNU system is not
-a single static set of programs; users and distributors may select
+packages&lt;/a&gt; (which are listed below), and also includes <span 
class="removed"><del><strong>much</strong></del></span> non-GNU free
+software, such as <span class="inserted"><ins><em>TeX and</em></ins></span> 
the X Window System.  Also, the GNU system is
+not a single static set of programs; users and distributors may select
 different packages according to their needs and desires.  The result is
 still a variant of the GNU system.&lt;/p&gt;
 
@@ -70,7 +70,7 @@
 href="/licenses/licenses.html"&gt;Licenses&lt;/a&gt; page.&lt;/p&gt;
 
 &lt;p&gt;Finally, we have a &lt;a href="/software/for-windows.html"&gt;short 
list of
-free software for Microsoft Windows&lt;/a&gt;, for the Windows user who would
+free software for Microsoft Windows&lt;/a&gt;, for <span 
class="removed"><del><strong>the</strong></del></span> Windows <span 
class="removed"><del><strong>user</strong></del></span> <span 
class="inserted"><ins><em>users</em></ins></span> who would
 like to try free software.&lt;/p&gt;
 
 
@@ -82,22 +82,27 @@
 &lt;li&gt;Download a &lt;a href="/distros/free-distros.html"&gt;wholly free
 GNU/Linux distribution&lt;/a&gt;.&lt;/li&gt;
 
+<span class="inserted"><ins><em>&lt;li&gt;Get a copy from a 
friend.&lt;/li&gt;</em></ins></span>
+
 &lt;li&gt;Buy a computer with a wholly free GNU/Linux system preinstalled
 from &lt;a href="/links/companies.html"&gt;one of the companies&lt;/a&gt; that
 offers this.&lt;/li&gt;
 
 &lt;li&gt;&lt;a href="/order/ftp.html"&gt;Download individual packages from 
the web
 or via FTP&lt;/a&gt;: we provide source code for all GNU software as &lt;a
-href="/philosophy/free-sw.html"&gt;free software&lt;/a&gt;, and free of
-charge.  (Please also make a &lt;a 
href="/help/donate.html"&gt;donation&lt;/a&gt; to
-the FSF, if you can, to help us write more free software.)&lt;/li&gt;
-
-&lt;li&gt;Get a copy from a friend.  (Likewise please make a donation if you
-can.)&lt;/li&gt;
-
-&lt;li&gt;Use the &lt;a href="/software/gsrc/gsrc.html"&gt;GNU SRC&lt;/a&gt; 
package to
-easily install many of the latest GNU package releases on their own,
-without conflicting with any system versions.&lt;/li&gt;
+href="/philosophy/free-sw.html"&gt;free software&lt;/a&gt;, and free of charge.
+(Please also make a &lt;a href="/help/donate.html"&gt;donation&lt;/a&gt; to 
the <span class="removed"><del><strong>FSF,</strong></del></span> <span 
class="inserted"><ins><em>FSF</em></ins></span>
+if you can, to help <span class="removed"><del><strong>us 
write</strong></del></span> <span class="inserted"><ins><em>support the 
creation of</em></ins></span> more free software.)&lt;/li&gt;
+
+<span class="removed"><del><strong>&lt;li&gt;Get a copy from a friend.  
(Likewise please make a donation if you
+can.)&lt;/li&gt;</strong></del></span>
+
+&lt;li&gt;Use the &lt;a <span 
class="removed"><del><strong>href="/software/gsrc/gsrc.html"&gt;GNU 
SRC&lt;/a&gt;</strong></del></span> <span 
class="inserted"><ins><em>href="/software/guix/guix.html"&gt;GNU Guix&lt;/a&gt; 
functional</em></ins></span>
+package <span class="inserted"><ins><em>manager to install and manage GNU 
package releases.&lt;/li&gt;
+
+&lt;li&gt;Use the &lt;a href="/software/gsrc/gsrc.html"&gt;GNU GSRC&lt;/a&gt; 
collection</em></ins></span> to
+easily install <span class="removed"><del><strong>many 
of</strong></del></span> the latest GNU package releases on their own, without
+conflicting with any system versions.&lt;/li&gt;
 
 &lt;li&gt;Use the 
 &lt;a
@@ -107,11 +112,11 @@
 PPA&lt;/a&gt; (Personal Package Archive) on Trisquel, gNewSense, or related
 distros to get the latest releases suitably packaged.&lt;/li&gt;
 
-&lt;li&gt;Get the development sources for a package and build them, to help
-with development.  Many GNU packages keep their development sources at
-the GNU hosting site &lt;a
-href="http://savannah.gnu.org/"&gt;savannah.gnu.org&lt;/a&gt;. Some packages 
use
-other source repositories, or have none at all.  Each package's web
+&lt;li&gt;Get the development sources for a package and build <span 
class="removed"><del><strong>them, to help
+with development.</strong></del></span> <span 
class="inserted"><ins><em>them.</em></ins></span>
+Many GNU packages keep their development sources at the GNU hosting site
+&lt;a href="http://savannah.gnu.org/"&gt;savannah.gnu.org&lt;/a&gt;.  Some 
packages
+use other source repositories, or have none at all.  Each package's web
 pages should give the specifics.&lt;/li&gt;
 
 &lt;/ul&gt;
@@ -254,7 +259,7 @@
 
 &lt;p&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2013/04/13 16:33:05 $
+$Date: 2013/04/15 15:59:24 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: software/po/software.el.po
===================================================================
RCS file: /web/www/www/software/po/software.el.po,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- software/po/software.el.po  13 Apr 2013 16:33:05 -0000      1.45
+++ software/po/software.el.po  15 Apr 2013 15:59:24 -0000      1.46
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: www-el_v0.2.0\n"
-"POT-Creation-Date: 2013-04-13 16:28+0000\n"
+"POT-Creation-Date: 2013-04-15 15:55+0000\n"
 "PO-Revision-Date: 2012-03-04 19:42+0200\n"
 "Last-Translator: Georgios Zarkadas <address@hidden>\n"
 "Language-Team: Greek <address@hidden>\n"
@@ -58,16 +58,28 @@
 "Linux που είναι εντελώς ελεύθερο 
λογισμικό</a>.</span>"
 
 #. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"/philosophy/categories.html#TheGNUsystem\">The GNU operating "
+#| "system</a> is the Unix-like operating system, which is entirely free "
+#| "software, that we in the GNU Project have developed since 1984.  The GNU "
+#| "system contains all of the <a href=\"/philosophy/categories."
+#| "html#GNUsoftware\">official GNU software packages</a> (which are listed "
+#| "below), and also includes much non-GNU free software, such as the X "
+#| "Window System.  Also, the GNU system is not a single static set of "
+#| "programs; users and distributors may select different packages according "
+#| "to their needs and desires.  The result is still a variant of the GNU "
+#| "system."
 msgid ""
 "<a href=\"/philosophy/categories.html#TheGNUsystem\">The GNU operating "
 "system</a> is the Unix-like operating system, which is entirely free "
 "software, that we in the GNU Project have developed since 1984.  The GNU "
 "system contains all of the <a href=\"/philosophy/categories.html#GNUsoftware"
 "\">official GNU software packages</a> (which are listed below), and also "
-"includes much non-GNU free software, such as the X Window System.  Also, the "
-"GNU system is not a single static set of programs; users and distributors "
-"may select different packages according to their needs and desires.  The "
-"result is still a variant of the GNU system."
+"includes non-GNU free software, such as TeX and the X Window System.  Also, "
+"the GNU system is not a single static set of programs; users and "
+"distributors may select different packages according to their needs and "
+"desires.  The result is still a variant of the GNU system."
 msgstr ""
 "<a href=\"/philosophy/categories.html#TheGNUsystem\">Το λειτου
ργικό σύστημα "
 "GNU</a> είναι το παρόμοιο με Unix λειτουργικό 
σύστημα, το οποίο είναι "
@@ -153,10 +165,15 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Finally, we have a <a href=\"/software/for-windows.html\">short list of "
+#| "free software for Microsoft Windows</a>, for the Windows user who would "
+#| "like to try free software."
 msgid ""
 "Finally, we have a <a href=\"/software/for-windows.html\">short list of free "
-"software for Microsoft Windows</a>, for the Windows user who would like to "
-"try free software."
+"software for Microsoft Windows</a>, for Windows users who would like to try "
+"free software."
 msgstr ""
 "Τέλος, έχουμε μία <a 
href=\"/software/for-windows.html\">σύντομη λίστα με "
 "ελεύθερο λογισμικό για τα Microsoft Windows</a>, για 
το χρήστη των Windows "
@@ -181,6 +198,10 @@
 "Μεταφορτώστε μια <a 
href=\"/distros/free-distros.html\">εξολοκλήρου ελεύθερη "
 "διανομή GNU/Linux</a>."
 
+#. type: Content of: <ul><li>
+msgid "Get a copy from a friend."
+msgstr ""
+
 # type: Content of: <ul><li>
 #. type: Content of: <ul><li>
 msgid ""
@@ -193,12 +214,19 @@
 
 # type: Content of: <ul><li>
 #. type: Content of: <ul><li>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"/order/ftp.html\">Download individual packages from the web or "
+#| "via FTP</a>: we provide source code for all GNU software as <a href=\"/"
+#| "philosophy/free-sw.html\">free software</a>, and free of charge.  (Please "
+#| "also make a <a href=\"/help/donate.html\">donation</a> to the FSF, if you "
+#| "can, to help us write more free software.)"
 msgid ""
 "<a href=\"/order/ftp.html\">Download individual packages from the web or via "
 "FTP</a>: we provide source code for all GNU software as <a href=\"/"
 "philosophy/free-sw.html\">free software</a>, and free of charge.  (Please "
-"also make a <a href=\"/help/donate.html\">donation</a> to the FSF, if you "
-"can, to help us write more free software.)"
+"also make a <a href=\"/help/donate.html\">donation</a> to the FSF if you "
+"can, to help support the creation of more free software.)"
 msgstr ""
 "<a href=\"/order/ftp.html\">Μεταφορτώστε το από τον 
ιστό ή μέσω FTP</a>: "
 "παρέχουμε πηγαίο κώδικα για όλο το 
λογισμικό GNU, ως <a href=\"/philosophy/"
@@ -207,18 +235,30 @@
 "ΙΕΛ, εάν μπορείτε, ώστε να μας βοηθήσετε να 
γράψουμε περισσότερο ελεύθερο "
 "λογισμικό.)"
 
-# type: Content of: <ul><li>
 #. type: Content of: <ul><li>
+#, fuzzy
+#| msgid ""
+#| "Use the <a href=\"/software/gsrc/gsrc.html\">GNU SRC</a> package to "
+#| "easily install many of the latest GNU package releases on their own, "
+#| "without conflicting with any system versions."
 msgid ""
-"Get a copy from a friend.  (Likewise please make a donation if you can.)"
+"Use the <a href=\"/software/guix/guix.html\">GNU Guix</a> functional package "
+"manager to install and manage GNU package releases."
 msgstr ""
-"Προμηθευτείτε ένα αντίγραφο από κάποιο 
φίλο. (Παρομοίως, παρακαλούμε κάντε "
-"μια δωρεά εάν μπορείτε.)"
+"Χρησιμοποιείστε το πακέτο <a 
href=\"/software/gsrc/gsrc.html\">GNU SRC</a> "
+"για να εγκαταστήσετε εύκολα πολλές από 
τις τελευταίες εκδόσεις των πακέτων "
+"GNU μεμονωμένα, χωρίς να συγκρούονται με 
οποιεσδήποτε εκδόσεις του "
+"συστήματος."
 
 #. type: Content of: <ul><li>
+#, fuzzy
+#| msgid ""
+#| "Use the <a href=\"/software/gsrc/gsrc.html\">GNU SRC</a> package to "
+#| "easily install many of the latest GNU package releases on their own, "
+#| "without conflicting with any system versions."
 msgid ""
-"Use the <a href=\"/software/gsrc/gsrc.html\">GNU SRC</a> package to easily "
-"install many of the latest GNU package releases on their own, without "
+"Use the <a href=\"/software/gsrc/gsrc.html\">GNU GSRC</a> collection to "
+"easily install the latest GNU package releases on their own, without "
 "conflicting with any system versions."
 msgstr ""
 "Χρησιμοποιείστε το πακέτο <a 
href=\"/software/gsrc/gsrc.html\">GNU SRC</a> "
@@ -243,12 +283,19 @@
 
 # type: Content of: <ul><li>
 #. type: Content of: <ul><li>
-msgid ""
-"Get the development sources for a package and build them, to help with "
-"development.  Many GNU packages keep their development sources at the GNU "
-"hosting site <a href=\"http://savannah.gnu.org/\";>savannah.gnu.org</a>. Some "
-"packages use other source repositories, or have none at all.  Each package's "
-"web pages should give the specifics."
+#, fuzzy
+#| msgid ""
+#| "Get the development sources for a package and build them, to help with "
+#| "development.  Many GNU packages keep their development sources at the GNU "
+#| "hosting site <a href=\"http://savannah.gnu.org/\";>savannah.gnu.org</a>. "
+#| "Some packages use other source repositories, or have none at all.  Each "
+#| "package's web pages should give the specifics."
+msgid ""
+"Get the development sources for a package and build them.  Many GNU packages "
+"keep their development sources at the GNU hosting site <a href=\"http://";
+"savannah.gnu.org/\">savannah.gnu.org</a>.  Some packages use other source "
+"repositories, or have none at all.  Each package's web pages should give the "
+"specifics."
 msgstr ""
 "Προμηθευτείτε τον πηγαίο κώδικα για ένα 
πακέτο και μεταγλωττίστε τον, ώστε "
 "να βοηθήσετε στην ανάπτυξή του.  Πολλά 
πακέτα GNU διατηρούν τον πηγαίο τους "
@@ -477,3 +524,10 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Ενημερώθηκε:"
+
+# type: Content of: <ul><li>
+#~ msgid ""
+#~ "Get a copy from a friend.  (Likewise please make a donation if you can.)"
+#~ msgstr ""
+#~ "Προμηθευτείτε ένα αντίγραφο από κάποιο 
φίλο. (Παρομοίως, παρακαλούμε "
+#~ "κάντε μια δωρεά εάν μπορείτε.)"

Index: software/po/software.es.po
===================================================================
RCS file: /web/www/www/software/po/software.es.po,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- software/po/software.es.po  14 Apr 2013 09:14:44 -0000      1.49
+++ software/po/software.es.po  15 Apr 2013 15:59:24 -0000      1.50
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: software.html\n"
-"POT-Creation-Date: 2013-04-14 11:06+0300\n"
+"POT-Creation-Date: 2013-04-15 15:55+0000\n"
 "PO-Revision-Date: 2013-04-14 11:03+0100\n"
 "Last-Translator: Dora Scilipoti <dora AT gnu DOT org>\n"
 "Language-Team: Spanish <address@hidden>\n"
@@ -19,6 +19,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2013-04-15 15:55+0000\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
 # type: Content of: <title>
@@ -64,16 +65,38 @@
 "software libre</a>.</span>"
 
 #. type: Content of: <p>
+# | <a href=\"/philosophy/categories.html#TheGNUsystem\">The GNU operating
+# | system</a> is the Unix-like operating system, which is entirely free
+# | software, that we in the GNU Project have developed since 1984.  The GNU
+# | system contains all of the <a
+# | href=\"/philosophy/categories.html#GNUsoftware\">official GNU software
+# | packages</a> (which are listed below), and also includes [-much-] non-GNU
+# | free software, such as {+TeX and+} the X Window System.  Also, the GNU
+# | system is not a single static set of programs; users and distributors may
+# | select different packages according to their needs and desires.  The
+# | result is still a variant of the GNU system.
+#, fuzzy
+#| msgid ""
+#| "<a href=\"/philosophy/categories.html#TheGNUsystem\">The GNU operating "
+#| "system</a> is the Unix-like operating system, which is entirely free "
+#| "software, that we in the GNU Project have developed since 1984.  The GNU "
+#| "system contains all of the <a href=\"/philosophy/categories."
+#| "html#GNUsoftware\">official GNU software packages</a> (which are listed "
+#| "below), and also includes much non-GNU free software, such as the X "
+#| "Window System.  Also, the GNU system is not a single static set of "
+#| "programs; users and distributors may select different packages according "
+#| "to their needs and desires.  The result is still a variant of the GNU "
+#| "system."
 msgid ""
 "<a href=\"/philosophy/categories.html#TheGNUsystem\">The GNU operating "
 "system</a> is the Unix-like operating system, which is entirely free "
 "software, that we in the GNU Project have developed since 1984.  The GNU "
 "system contains all of the <a href=\"/philosophy/categories.html#GNUsoftware"
 "\">official GNU software packages</a> (which are listed below), and also "
-"includes much non-GNU free software, such as the X Window System.  Also, the "
-"GNU system is not a single static set of programs; users and distributors "
-"may select different packages according to their needs and desires.  The "
-"result is still a variant of the GNU system."
+"includes non-GNU free software, such as TeX and the X Window System.  Also, "
+"the GNU system is not a single static set of programs; users and "
+"distributors may select different packages according to their needs and "
+"desires.  The result is still a variant of the GNU system."
 msgstr ""
 "<a href=\"/philosophy/categories.html#TheGNUsystem\">El sistema operativo "
 "GNU</a> es el sistema operativo similar a Unix que es completamente software "
@@ -160,10 +183,18 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
+# | Finally, we have a <a href=\"/software/for-windows.html\">short list of
+# | free software for Microsoft Windows</a>, for [-the-] Windows user{+s+} who
+# | would like to try free software.
+#, fuzzy
+#| msgid ""
+#| "Finally, we have a <a href=\"/software/for-windows.html\">short list of "
+#| "free software for Microsoft Windows</a>, for the Windows user who would "
+#| "like to try free software."
 msgid ""
 "Finally, we have a <a href=\"/software/for-windows.html\">short list of free "
-"software for Microsoft Windows</a>, for the Windows user who would like to "
-"try free software."
+"software for Microsoft Windows</a>, for Windows users who would like to try "
+"free software."
 msgstr ""
 "Por último, tenemos <a href=\"/software/for-windows.html\">una breve lista "
 "de software libre para Microsoft Windows</a>, para los usuarios de Windows a "
@@ -188,6 +219,10 @@
 "Descargue una <a href=\"/distros/free-distros.html\">distribución GNU/Linux "
 "totalmente libre</a>."
 
+#. type: Content of: <ul><li>
+msgid "Get a copy from a friend."
+msgstr ""
+
 # type: Content of: <ul><li>
 #. type: Content of: <ul><li>
 msgid ""
@@ -199,12 +234,25 @@
 
 # type: Content of: <ul><li>
 #. type: Content of: <ul><li>
+# | <a href=\"/order/ftp.html\">Download individual packages from the web or
+# | via FTP</a>: we provide source code for all GNU software as <a
+# | href=\"/philosophy/free-sw.html\">free software</a>, and free of charge. 
+# | (Please also make a <a href=\"/help/donate.html\">donation</a> to the
+# | FSF[-,-] if you can, to help [-us write-] {+support the creation of+} more
+# | free software.)
+#, fuzzy
+#| msgid ""
+#| "<a href=\"/order/ftp.html\">Download individual packages from the web or "
+#| "via FTP</a>: we provide source code for all GNU software as <a href=\"/"
+#| "philosophy/free-sw.html\">free software</a>, and free of charge.  (Please "
+#| "also make a <a href=\"/help/donate.html\">donation</a> to the FSF, if you "
+#| "can, to help us write more free software.)"
 msgid ""
 "<a href=\"/order/ftp.html\">Download individual packages from the web or via "
 "FTP</a>: we provide source code for all GNU software as <a href=\"/"
 "philosophy/free-sw.html\">free software</a>, and free of charge.  (Please "
-"also make a <a href=\"/help/donate.html\">donation</a> to the FSF, if you "
-"can, to help us write more free software.)"
+"also make a <a href=\"/help/donate.html\">donation</a> to the FSF if you "
+"can, to help support the creation of more free software.)"
 msgstr ""
 "<a href=\"/order/ftp.html\">Descargue los paquetes individuales desde la web "
 "o vía FTP</a>: proveemos el código fuente de todo el software de GNU como 
<a "
@@ -212,18 +260,38 @@
 "por favor realice una <a href=\"/help/donate.html\">donación</a> a la FSF "
 "para ayudarnos a escribir más software libre."
 
-# type: Content of: <ul><li>
 #. type: Content of: <ul><li>
+# | Use the <a [-href=\"/software/gsrc/gsrc.html\">GNU SRC</a>-]
+# | {+href=\"/software/guix/guix.html\">GNU Guix</a> functional+} package
+# | {+manager+} to [-easily-] install [-many of the latest-] {+and manage+}
+# | GNU package [-releases on their own, without conflicting with any system
+# | versions.-] {+releases.+}
+#, fuzzy
+#| msgid ""
+#| "Use the <a href=\"/software/gsrc/gsrc.html\">GNU SRC</a> package to "
+#| "easily install many of the latest GNU package releases on their own, "
+#| "without conflicting with any system versions."
 msgid ""
-"Get a copy from a friend.  (Likewise please make a donation if you can.)"
+"Use the <a href=\"/software/guix/guix.html\">GNU Guix</a> functional package "
+"manager to install and manage GNU package releases."
 msgstr ""
-"Obtenga una copia de un amigo. Igualmente, si puede, por favor haga una "
-"donación."
+"Utilice el paquete <a href=\"/software/gsrc/gsrc.html\">SRC de GNU</a> para "
+"instalar fácilmente las últimas versiones de muchos de los paquetes de GNU, 
"
+"sin que se generen conflictos con las versiones ya instaladas en el sistema. "
 
 #. type: Content of: <ul><li>
+# | Use the <a href=\"/software/gsrc/gsrc.html\">GNU [-SRC</a> package-]
+# | {+GSRC</a> collection+} to easily install [-many of-] the latest GNU
+# | package releases on their own, without conflicting with any system
+# | versions.
+#, fuzzy
+#| msgid ""
+#| "Use the <a href=\"/software/gsrc/gsrc.html\">GNU SRC</a> package to "
+#| "easily install many of the latest GNU package releases on their own, "
+#| "without conflicting with any system versions."
 msgid ""
-"Use the <a href=\"/software/gsrc/gsrc.html\">GNU SRC</a> package to easily "
-"install many of the latest GNU package releases on their own, without "
+"Use the <a href=\"/software/gsrc/gsrc.html\">GNU GSRC</a> collection to "
+"easily install the latest GNU package releases on their own, without "
 "conflicting with any system versions."
 msgstr ""
 "Utilice el paquete <a href=\"/software/gsrc/gsrc.html\">SRC de GNU</a> para "
@@ -246,12 +314,25 @@
 
 # type: Content of: <ul><li>
 #. type: Content of: <ul><li>
-msgid ""
-"Get the development sources for a package and build them, to help with "
-"development.  Many GNU packages keep their development sources at the GNU "
-"hosting site <a href=\"http://savannah.gnu.org/\";>savannah.gnu.org</a>. Some "
-"packages use other source repositories, or have none at all.  Each package's "
-"web pages should give the specifics."
+# | Get the development sources for a package and build [-them, to help with
+# | development.-] {+them.+}  Many GNU packages keep their development sources
+# | at the GNU hosting site <a
+# | href=\"http://savannah.gnu.org/\";>savannah.gnu.org</a>.  Some packages use
+# | other source repositories, or have none at all.  Each package's web pages
+# | should give the specifics.
+#, fuzzy
+#| msgid ""
+#| "Get the development sources for a package and build them, to help with "
+#| "development.  Many GNU packages keep their development sources at the GNU "
+#| "hosting site <a href=\"http://savannah.gnu.org/\";>savannah.gnu.org</a>. "
+#| "Some packages use other source repositories, or have none at all.  Each "
+#| "package's web pages should give the specifics."
+msgid ""
+"Get the development sources for a package and build them.  Many GNU packages "
+"keep their development sources at the GNU hosting site <a href=\"http://";
+"savannah.gnu.org/\">savannah.gnu.org</a>.  Some packages use other source "
+"repositories, or have none at all.  Each package's web pages should give the "
+"specifics."
 msgstr ""
 "Obtenga el código fuente en desarrollo para un paquete y constrúyalo, para "
 "ayudar con su desarrollo. Muchos paquetes de GNU mantienen sus fuentes en "
@@ -452,3 +533,10 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Última actualización: "
+
+# type: Content of: <ul><li>
+#~ msgid ""
+#~ "Get a copy from a friend.  (Likewise please make a donation if you can.)"
+#~ msgstr ""
+#~ "Obtenga una copia de un amigo. Igualmente, si puede, por favor haga una "
+#~ "donación."

Index: software/po/software.fr.po
===================================================================
RCS file: /web/www/www/software/po/software.fr.po,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -b -r1.81 -r1.82
--- software/po/software.fr.po  13 Apr 2013 16:33:05 -0000      1.81
+++ software/po/software.fr.po  15 Apr 2013 15:59:24 -0000      1.82
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: software.html\n"
-"POT-Creation-Date: 2013-04-13 16:28+0000\n"
+"POT-Creation-Date: 2013-04-15 15:55+0000\n"
 "PO-Revision-Date: 2013-03-29 23:42+0100\n"
 "Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
 "Language-Team: French <address@hidden>\n"
@@ -54,16 +54,38 @@
 "distributions GNU/Linux qui sont entièrement libres</a>.</span>"
 
 #. type: Content of: <p>
+# | <a href=\"/philosophy/categories.html#TheGNUsystem\">The GNU operating
+# | system</a> is the Unix-like operating system, which is entirely free
+# | software, that we in the GNU Project have developed since 1984.  The GNU
+# | system contains all of the <a
+# | href=\"/philosophy/categories.html#GNUsoftware\">official GNU software
+# | packages</a> (which are listed below), and also includes [-much-] non-GNU
+# | free software, such as {+TeX and+} the X Window System.  Also, the GNU
+# | system is not a single static set of programs; users and distributors may
+# | select different packages according to their needs and desires.  The
+# | result is still a variant of the GNU system.
+#, fuzzy
+#| msgid ""
+#| "<a href=\"/philosophy/categories.html#TheGNUsystem\">The GNU operating "
+#| "system</a> is the Unix-like operating system, which is entirely free "
+#| "software, that we in the GNU Project have developed since 1984.  The GNU "
+#| "system contains all of the <a href=\"/philosophy/categories."
+#| "html#GNUsoftware\">official GNU software packages</a> (which are listed "
+#| "below), and also includes much non-GNU free software, such as the X "
+#| "Window System.  Also, the GNU system is not a single static set of "
+#| "programs; users and distributors may select different packages according "
+#| "to their needs and desires.  The result is still a variant of the GNU "
+#| "system."
 msgid ""
 "<a href=\"/philosophy/categories.html#TheGNUsystem\">The GNU operating "
 "system</a> is the Unix-like operating system, which is entirely free "
 "software, that we in the GNU Project have developed since 1984.  The GNU "
 "system contains all of the <a href=\"/philosophy/categories.html#GNUsoftware"
 "\">official GNU software packages</a> (which are listed below), and also "
-"includes much non-GNU free software, such as the X Window System.  Also, the "
-"GNU system is not a single static set of programs; users and distributors "
-"may select different packages according to their needs and desires.  The "
-"result is still a variant of the GNU system."
+"includes non-GNU free software, such as TeX and the X Window System.  Also, "
+"the GNU system is not a single static set of programs; users and "
+"distributors may select different packages according to their needs and "
+"desires.  The result is still a variant of the GNU system."
 msgstr ""
 "<a href=\"/philosophy/categories.html#TheGNUsystem\">Le système "
 "d'exploitation <acronym title=\"GNU's Not Unix!\">GNU</acronym></a> est un "
@@ -143,10 +165,18 @@
 "consulter la page des <a href=\"/licenses/licenses.html\">licences</a>."
 
 #. type: Content of: <p>
+# | Finally, we have a <a href=\"/software/for-windows.html\">short list of
+# | free software for Microsoft Windows</a>, for [-the-] Windows user{+s+} who
+# | would like to try free software.
+#, fuzzy
+#| msgid ""
+#| "Finally, we have a <a href=\"/software/for-windows.html\">short list of "
+#| "free software for Microsoft Windows</a>, for the Windows user who would "
+#| "like to try free software."
 msgid ""
 "Finally, we have a <a href=\"/software/for-windows.html\">short list of free "
-"software for Microsoft Windows</a>, for the Windows user who would like to "
-"try free software."
+"software for Microsoft Windows</a>, for Windows users who would like to try "
+"free software."
 msgstr ""
 "Enfin, voici une <a href=\"/software/for-windows.html\">courte liste de "
 "logiciels libres pour Microsoft Windows</a>, pour les utilisateurs de "
@@ -169,6 +199,10 @@
 "Linux entièrement libre</a>."
 
 #. type: Content of: <ul><li>
+msgid "Get a copy from a friend."
+msgstr ""
+
+#. type: Content of: <ul><li>
 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."
@@ -178,12 +212,25 @@
 "le propose."
 
 #. type: Content of: <ul><li>
+# | <a href=\"/order/ftp.html\">Download individual packages from the web or
+# | via FTP</a>: we provide source code for all GNU software as <a
+# | href=\"/philosophy/free-sw.html\">free software</a>, and free of charge. 
+# | (Please also make a <a href=\"/help/donate.html\">donation</a> to the
+# | FSF[-,-] if you can, to help [-us write-] {+support the creation of+} more
+# | free software.)
+#, fuzzy
+#| msgid ""
+#| "<a href=\"/order/ftp.html\">Download individual packages from the web or "
+#| "via FTP</a>: we provide source code for all GNU software as <a href=\"/"
+#| "philosophy/free-sw.html\">free software</a>, and free of charge.  (Please "
+#| "also make a <a href=\"/help/donate.html\">donation</a> to the FSF, if you "
+#| "can, to help us write more free software.)"
 msgid ""
 "<a href=\"/order/ftp.html\">Download individual packages from the web or via "
 "FTP</a>: we provide source code for all GNU software as <a href=\"/"
 "philosophy/free-sw.html\">free software</a>, and free of charge.  (Please "
-"also make a <a href=\"/help/donate.html\">donation</a> to the FSF, if you "
-"can, to help us write more free software.)"
+"also make a <a href=\"/help/donate.html\">donation</a> to the FSF if you "
+"can, to help support the creation of more free software.)"
 msgstr ""
 "<a href=\"/order/ftp.html\">En téléchargeant les paquets individuels du web 
"
 "ou par FTP</a> : nous fournissons gratuitement le code source pour tous les "
@@ -193,16 +240,38 @@
 "libres)."
 
 #. type: Content of: <ul><li>
+# | Use the <a [-href=\"/software/gsrc/gsrc.html\">GNU SRC</a>-]
+# | {+href=\"/software/guix/guix.html\">GNU Guix</a> functional+} package
+# | {+manager+} to [-easily-] install [-many of the latest-] {+and manage+}
+# | GNU package [-releases on their own, without conflicting with any system
+# | versions.-] {+releases.+}
+#, fuzzy
+#| msgid ""
+#| "Use the <a href=\"/software/gsrc/gsrc.html\">GNU SRC</a> package to "
+#| "easily install many of the latest GNU package releases on their own, "
+#| "without conflicting with any system versions."
 msgid ""
-"Get a copy from a friend.  (Likewise please make a donation if you can.)"
+"Use the <a href=\"/software/guix/guix.html\">GNU Guix</a> functional package "
+"manager to install and manage GNU package releases."
 msgstr ""
-"En obtenant une copie par un ami (de même, veuillez faire un don si vous le "
-"pouvez)."
+"En utilisant le paquet <a href=\"/software/gsrc/gsrc.html\">GNU SRC</a> pour "
+"installer facilement beaucoup des paquets GNU les plus récents, "
+"indépendamment des autres, sans entrer en conflit avec une quelconque "
+"version du système."
 
 #. type: Content of: <ul><li>
+# | Use the <a href=\"/software/gsrc/gsrc.html\">GNU [-SRC</a> package-]
+# | {+GSRC</a> collection+} to easily install [-many of-] the latest GNU
+# | package releases on their own, without conflicting with any system
+# | versions.
+#, fuzzy
+#| msgid ""
+#| "Use the <a href=\"/software/gsrc/gsrc.html\">GNU SRC</a> package to "
+#| "easily install many of the latest GNU package releases on their own, "
+#| "without conflicting with any system versions."
 msgid ""
-"Use the <a href=\"/software/gsrc/gsrc.html\">GNU SRC</a> package to easily "
-"install many of the latest GNU package releases on their own, without "
+"Use the <a href=\"/software/gsrc/gsrc.html\">GNU GSRC</a> collection to "
+"easily install the latest GNU package releases on their own, without "
 "conflicting with any system versions."
 msgstr ""
 "En utilisant le paquet <a href=\"/software/gsrc/gsrc.html\">GNU SRC</a> pour "
@@ -226,12 +295,25 @@
 "les plus récentes empaquetées correctement."
 
 #. type: Content of: <ul><li>
-msgid ""
-"Get the development sources for a package and build them, to help with "
-"development.  Many GNU packages keep their development sources at the GNU "
-"hosting site <a href=\"http://savannah.gnu.org/\";>savannah.gnu.org</a>. Some "
-"packages use other source repositories, or have none at all.  Each package's "
-"web pages should give the specifics."
+# | Get the development sources for a package and build [-them, to help with
+# | development.-] {+them.+}  Many GNU packages keep their development sources
+# | at the GNU hosting site <a
+# | href=\"http://savannah.gnu.org/\";>savannah.gnu.org</a>.  Some packages use
+# | other source repositories, or have none at all.  Each package's web pages
+# | should give the specifics.
+#, fuzzy
+#| msgid ""
+#| "Get the development sources for a package and build them, to help with "
+#| "development.  Many GNU packages keep their development sources at the GNU "
+#| "hosting site <a href=\"http://savannah.gnu.org/\";>savannah.gnu.org</a>. "
+#| "Some packages use other source repositories, or have none at all.  Each "
+#| "package's web pages should give the specifics."
+msgid ""
+"Get the development sources for a package and build them.  Many GNU packages "
+"keep their development sources at the GNU hosting site <a href=\"http://";
+"savannah.gnu.org/\">savannah.gnu.org</a>.  Some packages use other source "
+"repositories, or have none at all.  Each package's web pages should give the "
+"specifics."
 msgstr ""
 "En récupérant les sources de développement pour un paquet et en les "
 "compilant, pour aider au développement. De nombreux paquets GNU font "
@@ -513,3 +595,9 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Dernière mise à jour :"
+
+#~ msgid ""
+#~ "Get a copy from a friend.  (Likewise please make a donation if you can.)"
+#~ msgstr ""
+#~ "En obtenant une copie par un ami (de même, veuillez faire un don si vous "
+#~ "le pouvez)."

Index: software/po/software.it.po
===================================================================
RCS file: /web/www/www/software/po/software.it.po,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -b -r1.119 -r1.120
--- software/po/software.it.po  13 Apr 2013 16:33:05 -0000      1.119
+++ software/po/software.it.po  15 Apr 2013 15:59:25 -0000      1.120
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: software.html\n"
-"POT-Creation-Date: 2013-04-13 16:28+0000\n"
+"POT-Creation-Date: 2013-04-15 15:55+0000\n"
 "PO-Revision-Date: 2013-03-29 23:22+0100\n"
 "Last-Translator: Andrea Pescetti <address@hidden>\n"
 "Language-Team: Italian\n"
@@ -58,16 +58,38 @@
 "span>"
 
 #. type: Content of: <p>
+# | <a href=\"/philosophy/categories.html#TheGNUsystem\">The GNU operating
+# | system</a> is the Unix-like operating system, which is entirely free
+# | software, that we in the GNU Project have developed since 1984.  The GNU
+# | system contains all of the <a
+# | href=\"/philosophy/categories.html#GNUsoftware\">official GNU software
+# | packages</a> (which are listed below), and also includes [-much-] non-GNU
+# | free software, such as {+TeX and+} the X Window System.  Also, the GNU
+# | system is not a single static set of programs; users and distributors may
+# | select different packages according to their needs and desires.  The
+# | result is still a variant of the GNU system.
+#, fuzzy
+#| msgid ""
+#| "<a href=\"/philosophy/categories.html#TheGNUsystem\">The GNU operating "
+#| "system</a> is the Unix-like operating system, which is entirely free "
+#| "software, that we in the GNU Project have developed since 1984.  The GNU "
+#| "system contains all of the <a href=\"/philosophy/categories."
+#| "html#GNUsoftware\">official GNU software packages</a> (which are listed "
+#| "below), and also includes much non-GNU free software, such as the X "
+#| "Window System.  Also, the GNU system is not a single static set of "
+#| "programs; users and distributors may select different packages according "
+#| "to their needs and desires.  The result is still a variant of the GNU "
+#| "system."
 msgid ""
 "<a href=\"/philosophy/categories.html#TheGNUsystem\">The GNU operating "
 "system</a> is the Unix-like operating system, which is entirely free "
 "software, that we in the GNU Project have developed since 1984.  The GNU "
 "system contains all of the <a href=\"/philosophy/categories.html#GNUsoftware"
 "\">official GNU software packages</a> (which are listed below), and also "
-"includes much non-GNU free software, such as the X Window System.  Also, the "
-"GNU system is not a single static set of programs; users and distributors "
-"may select different packages according to their needs and desires.  The "
-"result is still a variant of the GNU system."
+"includes non-GNU free software, such as TeX and the X Window System.  Also, "
+"the GNU system is not a single static set of programs; users and "
+"distributors may select different packages according to their needs and "
+"desires.  The result is still a variant of the GNU system."
 msgstr ""
 "Il <a href=\"/philosophy/categories.html#TheGNUsystem\">sistema operativo "
 "GNU</a> è il sistema operativo simile a UNIX, ma costituito esclusivamente "
@@ -152,10 +174,18 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
+# | Finally, we have a <a href=\"/software/for-windows.html\">short list of
+# | free software for Microsoft Windows</a>, for [-the-] Windows user{+s+} who
+# | would like to try free software.
+#, fuzzy
+#| msgid ""
+#| "Finally, we have a <a href=\"/software/for-windows.html\">short list of "
+#| "free software for Microsoft Windows</a>, for the Windows user who would "
+#| "like to try free software."
 msgid ""
 "Finally, we have a <a href=\"/software/for-windows.html\">short list of free "
-"software for Microsoft Windows</a>, for the Windows user who would like to "
-"try free software."
+"software for Microsoft Windows</a>, for Windows users who would like to try "
+"free software."
 msgstr ""
 "Infine, qui potete trovare una breve lista di <a href=\"/software/for-"
 "windows.html\">software libero da utilizzare sul sistema Microsoft Windows</"
@@ -180,6 +210,10 @@
 "Scaricare una <a href=\"/distros/free-distros.html\">distribuzione GNU/Linux "
 "completamente libera</a>."
 
+#. type: Content of: <ul><li>
+msgid "Get a copy from a friend."
+msgstr ""
+
 # type: Content of: <ul><li>
 #. type: Content of: <ul><li>
 msgid ""
@@ -192,12 +226,25 @@
 
 # type: Content of: <ul><li>
 #. type: Content of: <ul><li>
+# | <a href=\"/order/ftp.html\">Download individual packages from the web or
+# | via FTP</a>: we provide source code for all GNU software as <a
+# | href=\"/philosophy/free-sw.html\">free software</a>, and free of charge. 
+# | (Please also make a <a href=\"/help/donate.html\">donation</a> to the
+# | FSF[-,-] if you can, to help [-us write-] {+support the creation of+} more
+# | free software.)
+#, fuzzy
+#| msgid ""
+#| "<a href=\"/order/ftp.html\">Download individual packages from the web or "
+#| "via FTP</a>: we provide source code for all GNU software as <a href=\"/"
+#| "philosophy/free-sw.html\">free software</a>, and free of charge.  (Please "
+#| "also make a <a href=\"/help/donate.html\">donation</a> to the FSF, if you "
+#| "can, to help us write more free software.)"
 msgid ""
 "<a href=\"/order/ftp.html\">Download individual packages from the web or via "
 "FTP</a>: we provide source code for all GNU software as <a href=\"/"
 "philosophy/free-sw.html\">free software</a>, and free of charge.  (Please "
-"also make a <a href=\"/help/donate.html\">donation</a> to the FSF, if you "
-"can, to help us write more free software.)"
+"also make a <a href=\"/help/donate.html\">donation</a> to the FSF if you "
+"can, to help support the creation of more free software.)"
 msgstr ""
 "<a href=\"/order/ftp.html\">Scaricarlo dal web o tramite FTP</a>: forniamo "
 "il codice sorgente per tutto il software GNU, gratuitamente e come <a href="
@@ -205,17 +252,38 @@
 "possibilità, fate una <a href=\"/help/donate.html\">donazione</a> alla FSF, "
 "per aiutarci a scrivere altro software libero."
 
-# type: Content of: <ul><li>
 #. type: Content of: <ul><li>
+# | Use the <a [-href=\"/software/gsrc/gsrc.html\">GNU SRC</a>-]
+# | {+href=\"/software/guix/guix.html\">GNU Guix</a> functional+} package
+# | {+manager+} to [-easily-] install [-many of the latest-] {+and manage+}
+# | GNU package [-releases on their own, without conflicting with any system
+# | versions.-] {+releases.+}
+#, fuzzy
+#| msgid ""
+#| "Use the <a href=\"/software/gsrc/gsrc.html\">GNU SRC</a> package to "
+#| "easily install many of the latest GNU package releases on their own, "
+#| "without conflicting with any system versions."
 msgid ""
-"Get a copy from a friend.  (Likewise please make a donation if you can.)"
+"Use the <a href=\"/software/guix/guix.html\">GNU Guix</a> functional package "
+"manager to install and manage GNU package releases."
 msgstr ""
-"Ottenete una copia da un amico (come sopra, se potete fate una donazione)."
+"Potete usare <a href=\"/software/gsrc/gsrc.html\">GNU SRC</a> per installare "
+"facilmente l'ultima versione di molti pacchetti GNU senza rischiare "
+"conflitti con le versioni già presenti nel sistema."
 
 #. type: Content of: <ul><li>
+# | Use the <a href=\"/software/gsrc/gsrc.html\">GNU [-SRC</a> package-]
+# | {+GSRC</a> collection+} to easily install [-many of-] the latest GNU
+# | package releases on their own, without conflicting with any system
+# | versions.
+#, fuzzy
+#| msgid ""
+#| "Use the <a href=\"/software/gsrc/gsrc.html\">GNU SRC</a> package to "
+#| "easily install many of the latest GNU package releases on their own, "
+#| "without conflicting with any system versions."
 msgid ""
-"Use the <a href=\"/software/gsrc/gsrc.html\">GNU SRC</a> package to easily "
-"install many of the latest GNU package releases on their own, without "
+"Use the <a href=\"/software/gsrc/gsrc.html\">GNU GSRC</a> collection to "
+"easily install the latest GNU package releases on their own, without "
 "conflicting with any system versions."
 msgstr ""
 "Potete usare <a href=\"/software/gsrc/gsrc.html\">GNU SRC</a> per installare "
@@ -238,12 +306,25 @@
 
 # type: Content of: <ul><li>
 #. type: Content of: <ul><li>
-msgid ""
-"Get the development sources for a package and build them, to help with "
-"development.  Many GNU packages keep their development sources at the GNU "
-"hosting site <a href=\"http://savannah.gnu.org/\";>savannah.gnu.org</a>. Some "
-"packages use other source repositories, or have none at all.  Each package's "
-"web pages should give the specifics."
+# | Get the development sources for a package and build [-them, to help with
+# | development.-] {+them.+}  Many GNU packages keep their development sources
+# | at the GNU hosting site <a
+# | href=\"http://savannah.gnu.org/\";>savannah.gnu.org</a>.  Some packages use
+# | other source repositories, or have none at all.  Each package's web pages
+# | should give the specifics.
+#, fuzzy
+#| msgid ""
+#| "Get the development sources for a package and build them, to help with "
+#| "development.  Many GNU packages keep their development sources at the GNU "
+#| "hosting site <a href=\"http://savannah.gnu.org/\";>savannah.gnu.org</a>. "
+#| "Some packages use other source repositories, or have none at all.  Each "
+#| "package's web pages should give the specifics."
+msgid ""
+"Get the development sources for a package and build them.  Many GNU packages "
+"keep their development sources at the GNU hosting site <a href=\"http://";
+"savannah.gnu.org/\">savannah.gnu.org</a>.  Some packages use other source "
+"repositories, or have none at all.  Each package's web pages should give the "
+"specifics."
 msgstr ""
 "Ottenere i sorgenti di sviluppo di un pacchetto e compilarli, per aiutare "
 "nello sviluppo. Molti pacchetti GNU mantengono i loro sorgenti di sviluppo "
@@ -534,3 +615,9 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Ultimo aggiornamento:"
+
+# type: Content of: <ul><li>
+#~ msgid ""
+#~ "Get a copy from a friend.  (Likewise please make a donation if you can.)"
+#~ msgstr ""
+#~ "Ottenete una copia da un amico (come sopra, se potete fate una donazione)."

Index: software/po/software.ja.po
===================================================================
RCS file: /web/www/www/software/po/software.ja.po,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- software/po/software.ja.po  15 Apr 2013 00:58:32 -0000      1.34
+++ software/po/software.ja.po  15 Apr 2013 15:59:25 -0000      1.35
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: software.html\n"
-"POT-Creation-Date: 2013-04-13 16:28+0000\n"
+"POT-Creation-Date: 2013-04-15 15:55+0000\n"
 "PO-Revision-Date: 2013-04-15 09:25+0900\n"
 "Last-Translator: NIIBE Yutaka <address@hidden>\n"
 "Language-Team: Japanese <address@hidden>\n"
@@ -14,6 +14,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2013-04-15 15:55+0000\n"
 
 #. type: Content of: <title>
 msgid "Software - GNU Project - Free Software Foundation"
@@ -50,16 +51,28 @@
 "のGNU/Linuxディストリビューションの一覧</a>をご覧くだ
さい。</span>"
 
 #. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"/philosophy/categories.html#TheGNUsystem\">The GNU operating "
+#| "system</a> is the Unix-like operating system, which is entirely free "
+#| "software, that we in the GNU Project have developed since 1984.  The GNU "
+#| "system contains all of the <a href=\"/philosophy/categories."
+#| "html#GNUsoftware\">official GNU software packages</a> (which are listed "
+#| "below), and also includes much non-GNU free software, such as the X "
+#| "Window System.  Also, the GNU system is not a single static set of "
+#| "programs; users and distributors may select different packages according "
+#| "to their needs and desires.  The result is still a variant of the GNU "
+#| "system."
 msgid ""
 "<a href=\"/philosophy/categories.html#TheGNUsystem\">The GNU operating "
 "system</a> is the Unix-like operating system, which is entirely free "
 "software, that we in the GNU Project have developed since 1984.  The GNU "
 "system contains all of the <a href=\"/philosophy/categories.html#GNUsoftware"
 "\">official GNU software packages</a> (which are listed below), and also "
-"includes much non-GNU free software, such as the X Window System.  Also, the "
-"GNU system is not a single static set of programs; users and distributors "
-"may select different packages according to their needs and desires.  The "
-"result is still a variant of the GNU system."
+"includes non-GNU free software, such as TeX and the X Window System.  Also, "
+"the GNU system is not a single static set of programs; users and "
+"distributors may select different packages according to their needs and "
+"desires.  The result is still a variant of the GNU system."
 msgstr ""
 "<a 
href=\"/philosophy/categories.html#TheGNUsystem\">GNUオペレーティングシス"
 "テム</a>はUnixライクのオペレーティングシステムで、å…
¨ä½“が自由ソフトウェアであ"
@@ -136,10 +149,15 @@
 "</a>ページをご覧ください。"
 
 #. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Finally, we have a <a href=\"/software/for-windows.html\">short list of "
+#| "free software for Microsoft Windows</a>, for the Windows user who would "
+#| "like to try free software."
 msgid ""
 "Finally, we have a <a href=\"/software/for-windows.html\">short list of free "
-"software for Microsoft Windows</a>, for the Windows user who would like to "
-"try free software."
+"software for Microsoft Windows</a>, for Windows users who would like to try "
+"free software."
 msgstr ""
 "最後に、<a 
href=\"/software/for-windows.html\">マイクロソフト・ウィンドウズの"
 
"ための自由ソフトウェア</a>の短いリストもあります。自由ソフトウェアを試してみ"
@@ -162,6 +180,10 @@
 "ション</a>をダウンロードする。"
 
 #. type: Content of: <ul><li>
+msgid "Get a copy from a friend."
+msgstr ""
+
+#. type: Content of: <ul><li>
 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."
@@ -170,12 +192,19 @@
 "する<a href=\"/links/companies.html\">会社</a>から買う。"
 
 #. type: Content of: <ul><li>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"/order/ftp.html\">Download individual packages from the web or "
+#| "via FTP</a>: we provide source code for all GNU software as <a href=\"/"
+#| "philosophy/free-sw.html\">free software</a>, and free of charge.  (Please "
+#| "also make a <a href=\"/help/donate.html\">donation</a> to the FSF, if you "
+#| "can, to help us write more free software.)"
 msgid ""
 "<a href=\"/order/ftp.html\">Download individual packages from the web or via "
 "FTP</a>: we provide source code for all GNU software as <a href=\"/"
 "philosophy/free-sw.html\">free software</a>, and free of charge.  (Please "
-"also make a <a href=\"/help/donate.html\">donation</a> to the FSF, if you "
-"can, to help us write more free software.)"
+"also make a <a href=\"/help/donate.html\">donation</a> to the FSF if you "
+"can, to help support the creation of more free software.)"
 msgstr ""
 "<a href=\"/order/ftp.html\">個々
のパッケージをウェブあるいはFTPからダウンロー"
 "ドする</a>: わたしたちは、すべてのGNUソフトウェアを<a 
href=\"/philosophy/"
@@ -184,14 +213,28 @@
 "もっと多くの自由ソフトウェアを書くのを支援してくだ
さい。)"
 
 #. type: Content of: <ul><li>
+#, fuzzy
+#| msgid ""
+#| "Use the <a href=\"/software/gsrc/gsrc.html\">GNU SRC</a> package to "
+#| "easily install many of the latest GNU package releases on their own, "
+#| "without conflicting with any system versions."
 msgid ""
-"Get a copy from a friend.  (Likewise please make a donation if you can.)"
-msgstr 
"友達からコピーをもらう。(同様に可能ならば寄付してくだ
さい。)"
+"Use the <a href=\"/software/guix/guix.html\">GNU Guix</a> functional package "
+"manager to install and manage GNU package releases."
+msgstr ""
+"<a href=\"/software/gsrc/gsrc.html\">GNU 
SRC</a>パッケージを用いて、システム"
+"の版と衝突することなく、たくさんの最新のGNUパッケージリリースを自分自身でイン"
+"ストールする。"
 
 #. type: Content of: <ul><li>
+#, fuzzy
+#| msgid ""
+#| "Use the <a href=\"/software/gsrc/gsrc.html\">GNU SRC</a> package to "
+#| "easily install many of the latest GNU package releases on their own, "
+#| "without conflicting with any system versions."
 msgid ""
-"Use the <a href=\"/software/gsrc/gsrc.html\">GNU SRC</a> package to easily "
-"install many of the latest GNU package releases on their own, without "
+"Use the <a href=\"/software/gsrc/gsrc.html\">GNU GSRC</a> collection to "
+"easily install the latest GNU package releases on their own, without "
 "conflicting with any system versions."
 msgstr ""
 "<a href=\"/software/gsrc/gsrc.html\">GNU 
SRC</a>パッケージを用いて、システム"
@@ -213,12 +256,19 @@
 "手する。"
 
 #. type: Content of: <ul><li>
-msgid ""
-"Get the development sources for a package and build them, to help with "
-"development.  Many GNU packages keep their development sources at the GNU "
-"hosting site <a href=\"http://savannah.gnu.org/\";>savannah.gnu.org</a>. Some "
-"packages use other source repositories, or have none at all.  Each package's "
-"web pages should give the specifics."
+#, fuzzy
+#| msgid ""
+#| "Get the development sources for a package and build them, to help with "
+#| "development.  Many GNU packages keep their development sources at the GNU "
+#| "hosting site <a href=\"http://savannah.gnu.org/\";>savannah.gnu.org</a>. "
+#| "Some packages use other source repositories, or have none at all.  Each "
+#| "package's web pages should give the specifics."
+msgid ""
+"Get the development sources for a package and build them.  Many GNU packages "
+"keep their development sources at the GNU hosting site <a href=\"http://";
+"savannah.gnu.org/\">savannah.gnu.org</a>.  Some packages use other source "
+"repositories, or have none at all.  Each package's web pages should give the "
+"specifics."
 msgstr ""
 "開発を手伝うには、パッケージの開発版ソースをå…
¥æ‰‹ã—構築してください。たくさん"
 
"のGNUパッケージは、開発版ソースをGNUホスティング・サイト<a
 href=\"http://";
@@ -400,3 +450,7 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "最終更新:"
+
+#~ msgid ""
+#~ "Get a copy from a friend.  (Likewise please make a donation if you can.)"
+#~ msgstr 
"友達からコピーをもらう。(同様に可能ならば寄付してくだ
さい。)"

Index: software/po/software.pot
===================================================================
RCS file: /web/www/www/software/po/software.pot,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- software/po/software.pot    13 Apr 2013 16:33:05 -0000      1.48
+++ software/po/software.pot    15 Apr 2013 15:59:25 -0000      1.49
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: software.html\n"
-"POT-Creation-Date: 2013-04-13 16:28+0000\n"
+"POT-Creation-Date: 2013-04-15 15:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -53,11 +53,11 @@
 "software, that we in the GNU Project have developed since 1984.  The GNU "
 "system contains all of the <a "
 "href=\"/philosophy/categories.html#GNUsoftware\">official GNU software "
-"packages</a> (which are listed below), and also includes much non-GNU free "
-"software, such as the X Window System.  Also, the GNU system is not a single "
-"static set of programs; users and distributors may select different packages "
-"according to their needs and desires.  The result is still a variant of the "
-"GNU system."
+"packages</a> (which are listed below), and also includes non-GNU free "
+"software, such as TeX and the X Window System.  Also, the GNU system is not "
+"a single static set of programs; users and distributors may select different "
+"packages according to their needs and desires.  The result is still a "
+"variant of the GNU system."
 msgstr ""
 
 #. type: Content of: <p>
@@ -104,8 +104,8 @@
 #. type: Content of: <p>
 msgid ""
 "Finally, we have a <a href=\"/software/for-windows.html\">short list of free "
-"software for Microsoft Windows</a>, for the Windows user who would like to "
-"try free software."
+"software for Microsoft Windows</a>, for Windows users who would like to try "
+"free software."
 msgstr ""
 
 #. type: Content of: <h3>
@@ -123,6 +123,10 @@
 msgstr ""
 
 #. type: Content of: <ul><li>
+msgid "Get a copy from a friend."
+msgstr ""
+
+#. type: Content of: <ul><li>
 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."
@@ -133,18 +137,20 @@
 "<a href=\"/order/ftp.html\">Download individual packages from the web or via "
 "FTP</a>: we provide source code for all GNU software as <a "
 "href=\"/philosophy/free-sw.html\">free software</a>, and free of charge.  "
-"(Please also make a <a href=\"/help/donate.html\">donation</a> to the FSF, "
-"if you can, to help us write more free software.)"
+"(Please also make a <a href=\"/help/donate.html\">donation</a> to the FSF if "
+"you can, to help support the creation of more free software.)"
 msgstr ""
 
 #. type: Content of: <ul><li>
-msgid "Get a copy from a friend.  (Likewise please make a donation if you 
can.)"
+msgid ""
+"Use the <a href=\"/software/guix/guix.html\">GNU Guix</a> functional package "
+"manager to install and manage GNU package releases."
 msgstr ""
 
 #. type: Content of: <ul><li>
 msgid ""
-"Use the <a href=\"/software/gsrc/gsrc.html\">GNU SRC</a> package to easily "
-"install many of the latest GNU package releases on their own, without "
+"Use the <a href=\"/software/gsrc/gsrc.html\">GNU GSRC</a> collection to "
+"easily install the latest GNU package releases on their own, without "
 "conflicting with any system versions."
 msgstr ""
 
@@ -160,11 +166,11 @@
 
 #. type: Content of: <ul><li>
 msgid ""
-"Get the development sources for a package and build them, to help with "
-"development.  Many GNU packages keep their development sources at the GNU "
-"hosting site <a href=\"http://savannah.gnu.org/\";>savannah.gnu.org</a>. Some "
-"packages use other source repositories, or have none at all.  Each package's "
-"web pages should give the specifics."
+"Get the development sources for a package and build them.  Many GNU packages "
+"keep their development sources at the GNU hosting site <a "
+"href=\"http://savannah.gnu.org/\";>savannah.gnu.org</a>.  Some packages use "
+"other source repositories, or have none at all.  Each package's web pages "
+"should give the specifics."
 msgstr ""
 
 #. type: Content of: <h3>

Index: software/po/software.ru.po
===================================================================
RCS file: /web/www/www/software/po/software.ru.po,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- software/po/software.ru.po  13 Apr 2013 16:58:24 -0000      1.35
+++ software/po/software.ru.po  15 Apr 2013 15:59:25 -0000      1.36
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: software.html\n"
-"POT-Creation-Date: 2013-04-13 16:28+0000\n"
+"POT-Creation-Date: 2013-04-15 15:55+0000\n"
 "PO-Revision-Date: 2013-04-13 17:17+0000\n"
 "Last-Translator: Ineiev <address@hidden>\n"
 "Language-Team: Russian <address@hidden>\n"
@@ -15,6 +15,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2013-04-15 15:55+0000\n"
 
 #. type: Content of: <title>
 msgid "Software - GNU Project - Free Software Foundation"
@@ -52,16 +53,38 @@
 "span>"
 
 #. type: Content of: <p>
+# | <a href=\"/philosophy/categories.html#TheGNUsystem\">The GNU operating
+# | system</a> is the Unix-like operating system, which is entirely free
+# | software, that we in the GNU Project have developed since 1984.  The GNU
+# | system contains all of the <a
+# | href=\"/philosophy/categories.html#GNUsoftware\">official GNU software
+# | packages</a> (which are listed below), and also includes [-much-] non-GNU
+# | free software, such as {+TeX and+} the X Window System.  Also, the GNU
+# | system is not a single static set of programs; users and distributors may
+# | select different packages according to their needs and desires.  The
+# | result is still a variant of the GNU system.
+#, fuzzy
+#| msgid ""
+#| "<a href=\"/philosophy/categories.html#TheGNUsystem\">The GNU operating "
+#| "system</a> is the Unix-like operating system, which is entirely free "
+#| "software, that we in the GNU Project have developed since 1984.  The GNU "
+#| "system contains all of the <a href=\"/philosophy/categories."
+#| "html#GNUsoftware\">official GNU software packages</a> (which are listed "
+#| "below), and also includes much non-GNU free software, such as the X "
+#| "Window System.  Also, the GNU system is not a single static set of "
+#| "programs; users and distributors may select different packages according "
+#| "to their needs and desires.  The result is still a variant of the GNU "
+#| "system."
 msgid ""
 "<a href=\"/philosophy/categories.html#TheGNUsystem\">The GNU operating "
 "system</a> is the Unix-like operating system, which is entirely free "
 "software, that we in the GNU Project have developed since 1984.  The GNU "
 "system contains all of the <a href=\"/philosophy/categories.html#GNUsoftware"
 "\">official GNU software packages</a> (which are listed below), and also "
-"includes much non-GNU free software, such as the X Window System.  Also, the "
-"GNU system is not a single static set of programs; users and distributors "
-"may select different packages according to their needs and desires.  The "
-"result is still a variant of the GNU system."
+"includes non-GNU free software, such as TeX and the X Window System.  Also, "
+"the GNU system is not a single static set of programs; users and "
+"distributors may select different packages according to their needs and "
+"desires.  The result is still a variant of the GNU system."
 msgstr ""
 "<a href=\"/philosophy/categories.html#TheGNUsystem\">Операционная 
система "
 "GNU</a>&nbsp;&mdash; это операционная система типа 
Unix, полностью состоящая "
@@ -141,10 +164,18 @@
 "\">странице лицензий</a>."
 
 #. type: Content of: <p>
+# | Finally, we have a <a href=\"/software/for-windows.html\">short list of
+# | free software for Microsoft Windows</a>, for [-the-] Windows user{+s+} who
+# | would like to try free software.
+#, fuzzy
+#| msgid ""
+#| "Finally, we have a <a href=\"/software/for-windows.html\">short list of "
+#| "free software for Microsoft Windows</a>, for the Windows user who would "
+#| "like to try free software."
 msgid ""
 "Finally, we have a <a href=\"/software/for-windows.html\">short list of free "
-"software for Microsoft Windows</a>, for the Windows user who would like to "
-"try free software."
+"software for Microsoft Windows</a>, for Windows users who would like to try "
+"free software."
 msgstr ""
 "Наконец, у нас есть <a 
href=\"/software/for-windows.html\">краткий список "
 "свободных программ для Microsoft Windows</a>&nbsp;&mdash; 
для пользователей "
@@ -167,6 +198,10 @@
 "дистрибутив GNU/Linux</a> по сети."
 
 #. type: Content of: <ul><li>
+msgid "Get a copy from a friend."
+msgstr ""
+
+#. type: Content of: <ul><li>
 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."
@@ -176,12 +211,25 @@
 "предлагают их."
 
 #. type: Content of: <ul><li>
+# | <a href=\"/order/ftp.html\">Download individual packages from the web or
+# | via FTP</a>: we provide source code for all GNU software as <a
+# | href=\"/philosophy/free-sw.html\">free software</a>, and free of charge. 
+# | (Please also make a <a href=\"/help/donate.html\">donation</a> to the
+# | FSF[-,-] if you can, to help [-us write-] {+support the creation of+} more
+# | free software.)
+#, fuzzy
+#| msgid ""
+#| "<a href=\"/order/ftp.html\">Download individual packages from the web or "
+#| "via FTP</a>: we provide source code for all GNU software as <a href=\"/"
+#| "philosophy/free-sw.html\">free software</a>, and free of charge.  (Please "
+#| "also make a <a href=\"/help/donate.html\">donation</a> to the FSF, if you "
+#| "can, to help us write more free software.)"
 msgid ""
 "<a href=\"/order/ftp.html\">Download individual packages from the web or via "
 "FTP</a>: we provide source code for all GNU software as <a href=\"/"
 "philosophy/free-sw.html\">free software</a>, and free of charge.  (Please "
-"also make a <a href=\"/help/donate.html\">donation</a> to the FSF, if you "
-"can, to help us write more free software.)"
+"also make a <a href=\"/help/donate.html\">donation</a> to the FSF if you "
+"can, to help support the creation of more free software.)"
 msgstr ""
 "<a href=\"/order/ftp.html\">Получить отдельные пакеты 
программ по HTTP или "
 "FTP</a>: мы предоставляем исходный текст всех 
программ GNU в качестве <a "
@@ -191,16 +239,37 @@
 "программ.)"
 
 #. type: Content of: <ul><li>
+# | Use the <a [-href=\"/software/gsrc/gsrc.html\">GNU SRC</a>-]
+# | {+href=\"/software/guix/guix.html\">GNU Guix</a> functional+} package
+# | {+manager+} to [-easily-] install [-many of the latest-] {+and manage+}
+# | GNU package [-releases on their own, without conflicting with any system
+# | versions.-] {+releases.+}
+#, fuzzy
+#| msgid ""
+#| "Use the <a href=\"/software/gsrc/gsrc.html\">GNU SRC</a> package to "
+#| "easily install many of the latest GNU package releases on their own, "
+#| "without conflicting with any system versions."
 msgid ""
-"Get a copy from a friend.  (Likewise please make a donation if you can.)"
+"Use the <a href=\"/software/guix/guix.html\">GNU Guix</a> functional package "
+"manager to install and manage GNU package releases."
 msgstr ""
-"Взять копию у знакомого. (И в этом случае 
внесите, пожалуйста, по "
-"возможности пожертвование.)"
+"Воспользоваться пакетом <a 
href=\"/software/gsrc/gsrc.html\">GNU SRC</a>, "
+"позволяющим легко установить последние 
выпуски многих пакетов GNU отдельно "
+"от системы, не вызывая конфликтов ни с 
какими системными версиями."
 
 #. type: Content of: <ul><li>
+# | Use the <a href=\"/software/gsrc/gsrc.html\">GNU [-SRC</a> package-]
+# | {+GSRC</a> collection+} to easily install [-many of-] the latest GNU
+# | package releases on their own, without conflicting with any system
+# | versions.
+#, fuzzy
+#| msgid ""
+#| "Use the <a href=\"/software/gsrc/gsrc.html\">GNU SRC</a> package to "
+#| "easily install many of the latest GNU package releases on their own, "
+#| "without conflicting with any system versions."
 msgid ""
-"Use the <a href=\"/software/gsrc/gsrc.html\">GNU SRC</a> package to easily "
-"install many of the latest GNU package releases on their own, without "
+"Use the <a href=\"/software/gsrc/gsrc.html\">GNU GSRC</a> collection to "
+"easily install the latest GNU package releases on their own, without "
 "conflicting with any system versions."
 msgstr ""
 "Воспользоваться пакетом <a 
href=\"/software/gsrc/gsrc.html\">GNU SRC</a>, "
@@ -222,12 +291,25 @@
 "последние выпуски, упакованные подх
одящим образом."
 
 #. type: Content of: <ul><li>
-msgid ""
-"Get the development sources for a package and build them, to help with "
-"development.  Many GNU packages keep their development sources at the GNU "
-"hosting site <a href=\"http://savannah.gnu.org/\";>savannah.gnu.org</a>. Some "
-"packages use other source repositories, or have none at all.  Each package's "
-"web pages should give the specifics."
+# | Get the development sources for a package and build [-them, to help with
+# | development.-] {+them.+}  Many GNU packages keep their development sources
+# | at the GNU hosting site <a
+# | href=\"http://savannah.gnu.org/\";>savannah.gnu.org</a>.  Some packages use
+# | other source repositories, or have none at all.  Each package's web pages
+# | should give the specifics.
+#, fuzzy
+#| msgid ""
+#| "Get the development sources for a package and build them, to help with "
+#| "development.  Many GNU packages keep their development sources at the GNU "
+#| "hosting site <a href=\"http://savannah.gnu.org/\";>savannah.gnu.org</a>. "
+#| "Some packages use other source repositories, or have none at all.  Each "
+#| "package's web pages should give the specifics."
+msgid ""
+"Get the development sources for a package and build them.  Many GNU packages "
+"keep their development sources at the GNU hosting site <a href=\"http://";
+"savannah.gnu.org/\">savannah.gnu.org</a>.  Some packages use other source "
+"repositories, or have none at all.  Each package's web pages should give the "
+"specifics."
 msgstr ""
 "Взять рабочую версию исходных текстов 
пакета и собрать его, чтобы помочь "
 "разработке. Многие пакеты GNU хранят 
рабочие версии своих исходных текстов "
@@ -422,3 +504,9 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Обновлено:"
+
+#~ msgid ""
+#~ "Get a copy from a friend.  (Likewise please make a donation if you can.)"
+#~ msgstr ""
+#~ "Взять копию у знакомого. (И в этом случае 
внесите, пожалуйста, по "
+#~ "возможности пожертвование.)"

Index: software/po/software.sk.po
===================================================================
RCS file: /web/www/www/software/po/software.sk.po,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- software/po/software.sk.po  13 Apr 2013 16:33:06 -0000      1.43
+++ software/po/software.sk.po  15 Apr 2013 15:59:25 -0000      1.44
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: software.html\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-13 16:28+0000\n"
+"POT-Creation-Date: 2013-04-15 15:55+0000\n"
 "PO-Revision-Date: 2009-09-27 18:45+0200\n"
 "Last-Translator: Dominik Smatana <address@hidden>\n"
 "Language-Team: Slovak <address@hidden>\n"
@@ -66,10 +66,10 @@
 "software, that we in the GNU Project have developed since 1984.  The GNU "
 "system contains all of the <a href=\"/philosophy/categories.html#GNUsoftware"
 "\">official GNU software packages</a> (which are listed below), and also "
-"includes much non-GNU free software, such as the X Window System.  Also, the "
-"GNU system is not a single static set of programs; users and distributors "
-"may select different packages according to their needs and desires.  The "
-"result is still a variant of the GNU system."
+"includes non-GNU free software, such as TeX and the X Window System.  Also, "
+"the GNU system is not a single static set of programs; users and "
+"distributors may select different packages according to their needs and "
+"desires.  The result is still a variant of the GNU system."
 msgstr ""
 
 # type: Content of: <div><p>
@@ -166,8 +166,8 @@
 #| "curious about free software."
 msgid ""
 "Finally, we have a <a href=\"/software/for-windows.html\">short list of free "
-"software for Microsoft Windows</a>, for the Windows user who would like to "
-"try free software."
+"software for Microsoft Windows</a>, for Windows users who would like to try "
+"free software."
 msgstr ""
 "Ponúkame vám tiež <a href=\"/software/for-windows.html\">krátky zoznam "
 "slobodného softvéru pre Microsoft Windows</a>, pre užívateľov Windows, 
ktorí "
@@ -198,6 +198,10 @@
 "si <a href=\"/distros/free-distros.sk.html\">zoznam GNU/Linux distribúcií "
 "obsahujúcich výlučne slobodný softvér</a>.</span>"
 
+#. type: Content of: <ul><li>
+msgid "Get a copy from a friend."
+msgstr ""
+
 # type: Content of: <ul><li>
 #. type: Content of: <ul><li>
 #, fuzzy
@@ -225,26 +229,24 @@
 "<a href=\"/order/ftp.html\">Download individual packages from the web or via "
 "FTP</a>: we provide source code for all GNU software as <a href=\"/"
 "philosophy/free-sw.html\">free software</a>, and free of charge.  (Please "
-"also make a <a href=\"/help/donate.html\">donation</a> to the FSF, if you "
-"can, to help us write more free software.)"
+"also make a <a href=\"/help/donate.html\">donation</a> to the FSF if you "
+"can, to help support the creation of more free software.)"
 msgstr ""
 "<a href=\"/order/ftp.html\">Stiahnutím z webu alebo cez FTP</a>: poskytujeme 
"
 "zdrojové súbory pre všetok GNU softvér, bezplatne.  (Prosím poskytnite 
<a "
 "href=\"/help/donate.html\">dotáciu</a> pre FSF, ak je to možné, pomôžete 
nám "
 "tak vytvoriť viac slobodného softvéru.)"
 
-# type: Content of: <ul><li>
 #. type: Content of: <ul><li>
 msgid ""
-"Get a copy from a friend.  (Likewise please make a donation if you can.)"
+"Use the <a href=\"/software/guix/guix.html\">GNU Guix</a> functional package "
+"manager to install and manage GNU package releases."
 msgstr ""
-"Získaním kópie od známeho.  (Aj v tomto prípade prosím poskytnite 
dotáciu, "
-"ak je to možné.)"
 
 #. type: Content of: <ul><li>
 msgid ""
-"Use the <a href=\"/software/gsrc/gsrc.html\">GNU SRC</a> package to easily "
-"install many of the latest GNU package releases on their own, without "
+"Use the <a href=\"/software/gsrc/gsrc.html\">GNU GSRC</a> collection to "
+"easily install the latest GNU package releases on their own, without "
 "conflicting with any system versions."
 msgstr ""
 
@@ -267,11 +269,11 @@
 #| "\">savannah.gnu.org</a>. Some packages use other source repositories; the "
 #| "package's web pages should say where the repository is."
 msgid ""
-"Get the development sources for a package and build them, to help with "
-"development.  Many GNU packages keep their development sources at the GNU "
-"hosting site <a href=\"http://savannah.gnu.org/\";>savannah.gnu.org</a>. Some "
-"packages use other source repositories, or have none at all.  Each package's "
-"web pages should give the specifics."
+"Get the development sources for a package and build them.  Many GNU packages "
+"keep their development sources at the GNU hosting site <a href=\"http://";
+"savannah.gnu.org/\">savannah.gnu.org</a>.  Some packages use other source "
+"repositories, or have none at all.  Each package's web pages should give the "
+"specifics."
 msgstr ""
 "Získaním zdrojových kódov od vývojárov nejakého balíčka a ich 
následnou "
 "kompiláciou. Takýmto spôsobom máte možnosť vyskúšať najnovšie 
verzie. Mnohé "
@@ -494,6 +496,13 @@
 msgid "Updated:"
 msgstr "Aktualizované:"
 
+# type: Content of: <ul><li>
+#~ msgid ""
+#~ "Get a copy from a friend.  (Likewise please make a donation if you can.)"
+#~ msgstr ""
+#~ "Získaním kópie od známeho.  (Aj v tomto prípade prosím poskytnite "
+#~ "dotáciu, ak je to možné.)"
+
 # type: Content of: <div><p>
 #, fuzzy
 #~| msgid ""

Index: software/po/software.sq.po
===================================================================
RCS file: /web/www/www/software/po/software.sq.po,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- software/po/software.sq.po  13 Apr 2013 16:33:06 -0000      1.30
+++ software/po/software.sq.po  15 Apr 2013 15:59:25 -0000      1.31
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-04-13 16:28+0000\n"
+"POT-Creation-Date: 2013-04-15 15:55+0000\n"
 "PO-Revision-Date: 2013-04-12 20:33+0200\n"
 "Last-Translator: Besnik Bleta <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -51,16 +51,28 @@
 "shpërndarjeve GNU/Linux që janë krejtësisht software i lirë</a>.</span>"
 
 #. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"/philosophy/categories.html#TheGNUsystem\">The GNU operating "
+#| "system</a> is the Unix-like operating system, which is entirely free "
+#| "software, that we in the GNU Project have developed since 1984.  The GNU "
+#| "system contains all of the <a href=\"/philosophy/categories."
+#| "html#GNUsoftware\">official GNU software packages</a> (which are listed "
+#| "below), and also includes much non-GNU free software, such as the X "
+#| "Window System.  Also, the GNU system is not a single static set of "
+#| "programs; users and distributors may select different packages according "
+#| "to their needs and desires.  The result is still a variant of the GNU "
+#| "system."
 msgid ""
 "<a href=\"/philosophy/categories.html#TheGNUsystem\">The GNU operating "
 "system</a> is the Unix-like operating system, which is entirely free "
 "software, that we in the GNU Project have developed since 1984.  The GNU "
 "system contains all of the <a href=\"/philosophy/categories.html#GNUsoftware"
 "\">official GNU software packages</a> (which are listed below), and also "
-"includes much non-GNU free software, such as the X Window System.  Also, the "
-"GNU system is not a single static set of programs; users and distributors "
-"may select different packages according to their needs and desires.  The "
-"result is still a variant of the GNU system."
+"includes non-GNU free software, such as TeX and the X Window System.  Also, "
+"the GNU system is not a single static set of programs; users and "
+"distributors may select different packages according to their needs and "
+"desires.  The result is still a variant of the GNU system."
 msgstr ""
 "<a href=\"/philosophy/categories.html#TheGNUsystem\">Sistemi operativ GNU</"
 "a> është një sistem operativ i ngjashëm me Unix-in, dhe që është 
krejtësisht "
@@ -139,10 +151,15 @@
 "shihni faqen tonë të <a href=\"/licenses/licenses.html\">Lejeve</a>."
 
 #. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Finally, we have a <a href=\"/software/for-windows.html\">short list of "
+#| "free software for Microsoft Windows</a>, for the Windows user who would "
+#| "like to try free software."
 msgid ""
 "Finally, we have a <a href=\"/software/for-windows.html\">short list of free "
-"software for Microsoft Windows</a>, for the Windows user who would like to "
-"try free software."
+"software for Microsoft Windows</a>, for Windows users who would like to try "
+"free software."
 msgstr ""
 "Së fundi, kemi <a href=\"/software/for-windows.html\">një listë të 
shkurtër "
 "software-esh të lirë për Microsoft Windows</a>, për përdorues të 
Windows-it "
@@ -165,6 +182,10 @@
 "krejtësisht të lirë</a>."
 
 #. type: Content of: <ul><li>
+msgid "Get a copy from a friend."
+msgstr ""
+
+#. type: Content of: <ul><li>
 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."
@@ -174,12 +195,19 @@
 "që ofrojnë të tillë."
 
 #. type: Content of: <ul><li>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"/order/ftp.html\">Download individual packages from the web or "
+#| "via FTP</a>: we provide source code for all GNU software as <a href=\"/"
+#| "philosophy/free-sw.html\">free software</a>, and free of charge.  (Please "
+#| "also make a <a href=\"/help/donate.html\">donation</a> to the FSF, if you "
+#| "can, to help us write more free software.)"
 msgid ""
 "<a href=\"/order/ftp.html\">Download individual packages from the web or via "
 "FTP</a>: we provide source code for all GNU software as <a href=\"/"
 "philosophy/free-sw.html\">free software</a>, and free of charge.  (Please "
-"also make a <a href=\"/help/donate.html\">donation</a> to the FSF, if you "
-"can, to help us write more free software.)"
+"also make a <a href=\"/help/donate.html\">donation</a> to the FSF if you "
+"can, to help support the creation of more free software.)"
 msgstr ""
 "<a href=\"/order/ftp.html\">Shkarkoni paketa individuale prej web-it ose "
 "përmes FTP-je</a>: furnizojmë kodin burim për krejt software-et GNU, si <a 
"
@@ -188,14 +216,28 @@
 "nëse mundeni, që të na ndihmoni të shkruajmë më tepër software të 
lirë.)"
 
 #. type: Content of: <ul><li>
+#, fuzzy
+#| msgid ""
+#| "Use the <a href=\"/software/gsrc/gsrc.html\">GNU SRC</a> package to "
+#| "easily install many of the latest GNU package releases on their own, "
+#| "without conflicting with any system versions."
 msgid ""
-"Get a copy from a friend.  (Likewise please make a donation if you can.)"
-msgstr "Merrni kopje nga miqtë.  (Dhe bëni një dhurim, nëse mundeni.)"
+"Use the <a href=\"/software/guix/guix.html\">GNU Guix</a> functional package "
+"manager to install and manage GNU package releases."
+msgstr ""
+"Përdorni paketën <a href=\"/software/gsrc/gsrc.html\">GNU SRC</a> që të "
+"instaloni lehtë shumë prej versioneve më të reja të paketave GNU, pa 
pasur "
+"përplasje me ndonjë version sistemi."
 
 #. type: Content of: <ul><li>
+#, fuzzy
+#| msgid ""
+#| "Use the <a href=\"/software/gsrc/gsrc.html\">GNU SRC</a> package to "
+#| "easily install many of the latest GNU package releases on their own, "
+#| "without conflicting with any system versions."
 msgid ""
-"Use the <a href=\"/software/gsrc/gsrc.html\">GNU SRC</a> package to easily "
-"install many of the latest GNU package releases on their own, without "
+"Use the <a href=\"/software/gsrc/gsrc.html\">GNU GSRC</a> collection to "
+"easily install the latest GNU package releases on their own, without "
 "conflicting with any system versions."
 msgstr ""
 "Përdorni paketën <a href=\"/software/gsrc/gsrc.html\">GNU SRC</a> që të "
@@ -217,12 +259,19 @@
 "versionin më të ri të paketuar në një formë të përshtatshme."
 
 #. type: Content of: <ul><li>
-msgid ""
-"Get the development sources for a package and build them, to help with "
-"development.  Many GNU packages keep their development sources at the GNU "
-"hosting site <a href=\"http://savannah.gnu.org/\";>savannah.gnu.org</a>. Some "
-"packages use other source repositories, or have none at all.  Each package's "
-"web pages should give the specifics."
+#, fuzzy
+#| msgid ""
+#| "Get the development sources for a package and build them, to help with "
+#| "development.  Many GNU packages keep their development sources at the GNU "
+#| "hosting site <a href=\"http://savannah.gnu.org/\";>savannah.gnu.org</a>. "
+#| "Some packages use other source repositories, or have none at all.  Each "
+#| "package's web pages should give the specifics."
+msgid ""
+"Get the development sources for a package and build them.  Many GNU packages "
+"keep their development sources at the GNU hosting site <a href=\"http://";
+"savannah.gnu.org/\">savannah.gnu.org</a>.  Some packages use other source "
+"repositories, or have none at all.  Each package's web pages should give the "
+"specifics."
 msgstr ""
 "Merrni burimin e zhvillimeve për një paketë dhe montojeni vetë, dhe 
ndihmoni "
 "me zhvillimin e saj.  Mjaft paketa GNU burimet e zhvillimit i mbajnë te 
site-"
@@ -446,3 +495,7 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "U përditësua më:"
+
+#~ msgid ""
+#~ "Get a copy from a friend.  (Likewise please make a donation if you can.)"
+#~ msgstr "Merrni kopje nga miqtë.  (Dhe bëni një dhurim, nëse mundeni.)"

Index: software/po/software.zh-cn.po
===================================================================
RCS file: /web/www/www/software/po/software.zh-cn.po,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- software/po/software.zh-cn.po       13 Apr 2013 16:33:06 -0000      1.39
+++ software/po/software.zh-cn.po       15 Apr 2013 15:59:25 -0000      1.40
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: software.zh-cn.html\n"
-"POT-Creation-Date: 2013-04-13 16:28+0000\n"
+"POT-Creation-Date: 2013-04-15 15:55+0000\n"
 "PO-Revision-Date: 2012-02-15 17:11+0800\n"
 "Last-Translator: Li Fanxi <address@hidden>\n"
 "Language-Team: Chinese <address@hidden>\n"
@@ -64,10 +64,10 @@
 "software, that we in the GNU Project have developed since 1984.  The GNU "
 "system contains all of the <a href=\"/philosophy/categories.html#GNUsoftware"
 "\">official GNU software packages</a> (which are listed below), and also "
-"includes much non-GNU free software, such as the X Window System.  Also, the "
-"GNU system is not a single static set of programs; users and distributors "
-"may select different packages according to their needs and desires.  The "
-"result is still a variant of the GNU system."
+"includes non-GNU free software, such as TeX and the X Window System.  Also, "
+"the GNU system is not a single static set of programs; users and "
+"distributors may select different packages according to their needs and "
+"desires.  The result is still a variant of the GNU system."
 msgstr ""
 
 # type: Content of: <p>
@@ -134,10 +134,15 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Finally, we have a <a href=\"/software/for-windows.html\">short list of "
+#| "free software for Microsoft Windows</a>, for the Windows user who would "
+#| "like to try free software."
 msgid ""
 "Finally, we have a <a href=\"/software/for-windows.html\">short list of free "
-"software for Microsoft Windows</a>, for the Windows user who would like to "
-"try free software."
+"software for Microsoft Windows</a>, for Windows users who would like to try "
+"free software."
 msgstr ""
 "最后,这里是 <a href=\"/software/for-windows.html\">Microsoft 
Windows上的自由"
 "软件</a> 列表,提供给想在 Windows 
下使用自由软件的人们。"
@@ -161,6 +166,10 @@
 "如果您需要安装一个完整的操作系统,请考虑<a 
href=\"/distros/free-distros.html"
 "\">全部由自由软件组成的 GNU/Linux 发行版</a> 。"
 
+#. type: Content of: <ul><li>
+msgid "Get a copy from a friend."
+msgstr ""
+
 # type: Content of: <ul><li>
 #. type: Content of: <ul><li>
 msgid ""
@@ -172,28 +181,35 @@
 
 # type: Content of: <ul><li>
 #. type: Content of: <ul><li>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"/order/ftp.html\">Download individual packages from the web or "
+#| "via FTP</a>: we provide source code for all GNU software as <a href=\"/"
+#| "philosophy/free-sw.html\">free software</a>, and free of charge.  (Please "
+#| "also make a <a href=\"/help/donate.html\">donation</a> to the FSF, if you "
+#| "can, to help us write more free software.)"
 msgid ""
 "<a href=\"/order/ftp.html\">Download individual packages from the web or via "
 "FTP</a>: we provide source code for all GNU software as <a href=\"/"
 "philosophy/free-sw.html\">free software</a>, and free of charge.  (Please "
-"also make a <a href=\"/help/donate.html\">donation</a> to the FSF, if you "
-"can, to help us write more free software.)"
+"also make a <a href=\"/help/donate.html\">donation</a> to the FSF if you "
+"can, to help support the creation of more free software.)"
 msgstr ""
 "<a href=\"/order/ftp.html\">通过网络从 FTP 下载</a> :我们å…
è´¹æä¾›æ‰€æœ‰ GNU "
 "<a href=\"/philosophy/free-sw.html\">自由软件</a> 的源代码。  
(如果有条件,请"
 "考虑向自由软件基金会 <a href=\"/help/donate.html\">捐款</a> 
,以支持我们编写"
 "更多的自由软件。)"
 
-# type: Content of: <ul><li>
 #. type: Content of: <ul><li>
 msgid ""
-"Get a copy from a friend.  (Likewise please make a donation if you can.)"
-msgstr "从朋友那里获取。(同æ 
·ï¼Œå¦‚果有能力,欢迎您捐款。)"
+"Use the <a href=\"/software/guix/guix.html\">GNU Guix</a> functional package "
+"manager to install and manage GNU package releases."
+msgstr ""
 
 #. type: Content of: <ul><li>
 msgid ""
-"Use the <a href=\"/software/gsrc/gsrc.html\">GNU SRC</a> package to easily "
-"install many of the latest GNU package releases on their own, without "
+"Use the <a href=\"/software/gsrc/gsrc.html\">GNU GSRC</a> collection to "
+"easily install the latest GNU package releases on their own, without "
 "conflicting with any system versions."
 msgstr ""
 
@@ -208,12 +224,19 @@
 
 # type: Content of: <ul><li>
 #. type: Content of: <ul><li>
-msgid ""
-"Get the development sources for a package and build them, to help with "
-"development.  Many GNU packages keep their development sources at the GNU "
-"hosting site <a href=\"http://savannah.gnu.org/\";>savannah.gnu.org</a>. Some "
-"packages use other source repositories, or have none at all.  Each package's "
-"web pages should give the specifics."
+#, fuzzy
+#| msgid ""
+#| "Get the development sources for a package and build them, to help with "
+#| "development.  Many GNU packages keep their development sources at the GNU "
+#| "hosting site <a href=\"http://savannah.gnu.org/\";>savannah.gnu.org</a>. "
+#| "Some packages use other source repositories, or have none at all.  Each "
+#| "package's web pages should give the specifics."
+msgid ""
+"Get the development sources for a package and build them.  Many GNU packages "
+"keep their development sources at the GNU hosting site <a href=\"http://";
+"savannah.gnu.org/\">savannah.gnu.org</a>.  Some packages use other source "
+"repositories, or have none at all.  Each package's web pages should give the "
+"specifics."
 msgstr ""
 "您可以考虑获取软件包开发中的源代ç 
å¹¶è‡ªè¡Œç¼–译,以便可以参与到我们的开发中。很"
 "多 GNU 软件包通过使用 GNU 的托管网站 <a 
href=\"http://savannah.gnu.org/";
@@ -423,6 +446,11 @@
 msgid "Updated:"
 msgstr "最后更新:"
 
+# type: Content of: <ul><li>
+#~ msgid ""
+#~ "Get a copy from a friend.  (Likewise please make a donation if you can.)"
+#~ msgstr "从朋友那里获取。(同æ 
·ï¼Œå¦‚果有能力,欢迎您捐款。)"
+
 # type: Content of: <div><p>
 #~ msgid ""
 #~ "Copyright &copy; 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, "



reply via email to

[Prev in Thread] Current Thread [Next in Thread]