www-commits
[Top][All Lists]
Advanced

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

www links/links.de.html links/links.nl.html lin...


From: GNUN
Subject: www links/links.de.html links/links.nl.html lin...
Date: Sun, 22 Apr 2018 05:00:07 -0400 (EDT)

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     18/04/22 05:00:07

Modified files:
        links          : links.de.html links.nl.html 
        links/po       : links.de-diff.html links.de.po links.es.po 
                         links.fr.po links.ja-diff.html links.ja.po 
                         links.nl-diff.html links.nl.po links.pot 
                         links.pt-br.po 
        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.nb.po software.nl.po 
                         software.nn.po software.pl.po software.pot 
                         software.pt-br.po software.ru.po software.sk.po 
                         software.sq.po software.uk.po software.zh-cn.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/links/links.de.html?cvsroot=www&r1=1.74&r2=1.75
http://web.cvs.savannah.gnu.org/viewcvs/www/links/links.nl.html?cvsroot=www&r1=1.13&r2=1.14
http://web.cvs.savannah.gnu.org/viewcvs/www/links/po/links.de-diff.html?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/links/po/links.de.po?cvsroot=www&r1=1.111&r2=1.112
http://web.cvs.savannah.gnu.org/viewcvs/www/links/po/links.es.po?cvsroot=www&r1=1.130&r2=1.131
http://web.cvs.savannah.gnu.org/viewcvs/www/links/po/links.fr.po?cvsroot=www&r1=1.137&r2=1.138
http://web.cvs.savannah.gnu.org/viewcvs/www/links/po/links.ja-diff.html?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/links/po/links.ja.po?cvsroot=www&r1=1.54&r2=1.55
http://web.cvs.savannah.gnu.org/viewcvs/www/links/po/links.nl-diff.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/links/po/links.nl.po?cvsroot=www&r1=1.13&r2=1.14
http://web.cvs.savannah.gnu.org/viewcvs/www/links/po/links.pot?cvsroot=www&r1=1.64&r2=1.65
http://web.cvs.savannah.gnu.org/viewcvs/www/links/po/links.pt-br.po?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/software/po/software.ar.po?cvsroot=www&r1=1.73&r2=1.74
http://web.cvs.savannah.gnu.org/viewcvs/www/software/po/software.ca.po?cvsroot=www&r1=1.116&r2=1.117
http://web.cvs.savannah.gnu.org/viewcvs/www/software/po/software.de.po?cvsroot=www&r1=1.127&r2=1.128
http://web.cvs.savannah.gnu.org/viewcvs/www/software/po/software.el-diff.html?cvsroot=www&r1=1.47&r2=1.48
http://web.cvs.savannah.gnu.org/viewcvs/www/software/po/software.el.po?cvsroot=www&r1=1.75&r2=1.76
http://web.cvs.savannah.gnu.org/viewcvs/www/software/po/software.es.po?cvsroot=www&r1=1.96&r2=1.97
http://web.cvs.savannah.gnu.org/viewcvs/www/software/po/software.fr.po?cvsroot=www&r1=1.124&r2=1.125
http://web.cvs.savannah.gnu.org/viewcvs/www/software/po/software.it.po?cvsroot=www&r1=1.174&r2=1.175
http://web.cvs.savannah.gnu.org/viewcvs/www/software/po/software.ja.po?cvsroot=www&r1=1.83&r2=1.84
http://web.cvs.savannah.gnu.org/viewcvs/www/software/po/software.nb.po?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/software/po/software.nl.po?cvsroot=www&r1=1.15&r2=1.16
http://web.cvs.savannah.gnu.org/viewcvs/www/software/po/software.nn.po?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/software/po/software.pl.po?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/software/po/software.pot?cvsroot=www&r1=1.71&r2=1.72
http://web.cvs.savannah.gnu.org/viewcvs/www/software/po/software.pt-br.po?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/software/po/software.ru.po?cvsroot=www&r1=1.105&r2=1.106
http://web.cvs.savannah.gnu.org/viewcvs/www/software/po/software.sk.po?cvsroot=www&r1=1.72&r2=1.73
http://web.cvs.savannah.gnu.org/viewcvs/www/software/po/software.sq.po?cvsroot=www&r1=1.79&r2=1.80
http://web.cvs.savannah.gnu.org/viewcvs/www/software/po/software.uk.po?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/software/po/software.zh-cn.po?cvsroot=www&r1=1.66&r2=1.67

Patches:
Index: links/links.de.html
===================================================================
RCS file: /web/www/www/links/links.de.html,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -b -r1.74 -r1.75
--- links/links.de.html 2 Mar 2018 06:35:51 -0000       1.74
+++ links/links.de.html 22 Apr 2018 09:00:06 -0000      1.75
@@ -3,7 +3,7 @@
  https://www.gnu.org/links/po/links.de.po</a>'
  --><!--#set var="ORIGINAL_FILE" value="/links/links.html"
  --><!--#set var="DIFF_FILE" value="/links/po/links.de-diff.html"
- --><!--#set var="OUTDATED_SINCE" value="2018-01-01" --><!--#set 
var="ENGLISH_PAGE" value="/links/links.en.html" -->
+ --><!--#set var="OUTDATED_SINCE" value="2018-01-01" -->
 
 <!--#include virtual="/server/header.de.html" -->
 <!-- Parent-Version: 1.79 -->
@@ -470,7 +470,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Letzte Änderung:
 
-$Date: 2018/03/02 06:35:51 $
+$Date: 2018/04/22 09:00:06 $
 
 <!-- timestamp end -->
 </p>

Index: links/links.nl.html
===================================================================
RCS file: /web/www/www/links/links.nl.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- links/links.nl.html 2 Mar 2018 06:35:51 -0000       1.13
+++ links/links.nl.html 22 Apr 2018 09:00:06 -0000      1.14
@@ -3,7 +3,7 @@
  https://www.gnu.org/links/po/links.nl.po</a>'
  --><!--#set var="ORIGINAL_FILE" value="/links/links.html"
  --><!--#set var="DIFF_FILE" value="/links/po/links.nl-diff.html"
- --><!--#set var="OUTDATED_SINCE" value="2018-01-01" --><!--#set 
var="ENGLISH_PAGE" value="/links/links.en.html" -->
+ --><!--#set var="OUTDATED_SINCE" value="2018-01-01" -->
 
 <!--#include virtual="/server/header.nl.html" -->
 <!-- Parent-Version: 1.84 -->
@@ -415,7 +415,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Bijgewerkt:
 
-$Date: 2018/03/02 06:35:51 $
+$Date: 2018/04/22 09:00:06 $
 
 <!-- timestamp end -->
 </p>

Index: links/po/links.de-diff.html
===================================================================
RCS file: /web/www/www/links/po/links.de-diff.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- links/po/links.de-diff.html 2 Mar 2018 06:35:51 -0000       1.5
+++ links/po/links.de-diff.html 22 Apr 2018 09:00:06 -0000      1.6
@@ -64,9 +64,10 @@
        EmacsWiki: ElispArea&lt;/a&gt;&lt;/li&gt;
   &lt;li&gt;&lt;a 
href="https://web.archive.org/web/20091208112854/http://ftp.back2roots.org/geekgadgets/"&gt;GNU
        programs for the Amiga and BeOS&lt;/a&gt;&lt;/li&gt;
-  &lt;li&gt;&lt;a href="/software/for-windows.html"&gt;A short list of free 
software
-      for Microsoft Windows&lt;/a&gt;, for the Windows user who is curious
-      about free software.&lt;/li&gt;
+  &lt;li&gt;&lt;a <span 
class="removed"><del><strong>href="/software/for-windows.html"&gt;A</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://directory.fsf.org/wiki/Free_Software_Directory:Free_software_replacements"&gt;
+       A</em></ins></span> short list of free software <span 
class="inserted"><ins><em>replacements&lt;/a&gt;</em></ins></span> for <span 
class="removed"><del><strong>Microsoft Windows&lt;/a&gt;, for the Windows user 
who is curious
+      about free software.&lt;/li&gt;</strong></del></span> <span 
class="inserted"><ins><em>proprietary
+       software running on various proprietary 
systems.&lt;/li&gt;</em></ins></span>
 &lt;/ul&gt;
 
 
@@ -407,7 +408,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2018/03/02 06:35:51 $
+$Date: 2018/04/22 09:00:06 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: links/po/links.de.po
===================================================================
RCS file: /web/www/www/links/po/links.de.po,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -b -r1.111 -r1.112
--- links/po/links.de.po        19 Jan 2018 14:05:16 -0000      1.111
+++ links/po/links.de.po        22 Apr 2018 09:00:06 -0000      1.112
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: links.html\n"
 "Report-Msgid-Bugs-To: Webmasters <address@hidden>\n"
-"POT-Creation-Date: 2018-01-01 05:57+0000\n"
+"POT-Creation-Date: 2018-04-22 08:56+0000\n"
 "PO-Revision-Date: 2017-12-05 22:00+0100\n"
 "Last-Translator: Jоегg Kоhпе <joeko (AT) online [PUNKT] de>\n"
 "Language-Team: German <address@hidden>\n"
@@ -116,13 +116,10 @@
 
 #. type: Content of: <ul><li>
 msgid ""
-"<a href=\"/software/for-windows.html\">A short list of free software for "
-"Microsoft Windows</a>, for the Windows user who is curious about free "
-"software."
-msgstr ""
-"<cite><a href=\"/software/for-windows\">Freie Software für Microsoft "
-"Windows</a></cite> (eine kleine Auswahl)&#160;&#8209;&#160;für Windows-"
-"Anwender, die neugierig auf Freie Software sind."
+"<a href=\"https://directory.fsf.org/wiki/Free_Software_Directory:";
+"Free_software_replacements\"> A short list of free software replacements</a> "
+"for proprietary software running on various proprietary systems."
+msgstr ""
 
 #. type: Content of: <h3>
 msgid "Free software documentation"
@@ -939,6 +936,15 @@
 msgstr "Letzte Änderung:"
 
 #~ msgid ""
+#~ "<a href=\"/software/for-windows.html\">A short list of free software for "
+#~ "Microsoft Windows</a>, for the Windows user who is curious about free "
+#~ "software."
+#~ msgstr ""
+#~ "<cite><a href=\"/software/for-windows\">Freie Software für Microsoft "
+#~ "Windows</a></cite> (eine kleine Auswahl)&#160;&#8209;&#160;für Windows-"
+#~ "Anwender, die neugierig auf Freie Software sind."
+
+#~ msgid ""
 #~ "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
 #~ msgstr "Copyright &copy; 2014-2017 Free Software Foundation, Inc."
 

Index: links/po/links.es.po
===================================================================
RCS file: /web/www/www/links/po/links.es.po,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -b -r1.130 -r1.131
--- links/po/links.es.po        19 Jan 2018 01:01:56 -0000      1.130
+++ links/po/links.es.po        22 Apr 2018 09:00:06 -0000      1.131
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: links.es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-01 05:57+0000\n"
+"POT-Creation-Date: 2018-04-22 08:56+0000\n"
 "PO-Revision-Date: 2018-01-18 23:52+0100\n"
 "Last-Translator: Dora Scilipoti <dora AT gnu DOT org>\n"
 "Language-Team: Spanish <address@hidden>\n"
@@ -20,6 +20,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2018-04-22 08:56+0000\n"
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Generator: Poedit 1.6.10\n"
 
@@ -130,16 +131,12 @@
 "<a href=\"https://web.archive.org/web/20091208112854/http://ftp.back2roots.";
 "org/geekgadgets/\">Programas de GNU para Amiga y BeOS</a>"
 
-# type: Content of: <ul><li>
 #. type: Content of: <ul><li>
 msgid ""
-"<a href=\"/software/for-windows.html\">A short list of free software for "
-"Microsoft Windows</a>, for the Windows user who is curious about free "
-"software."
-msgstr ""
-"<a href=\"/software/for-windows.html\">Una lista corta de software libre "
-"para Windows de Microsoft</a>, para los usuarios de Windows que tengan "
-"curiosidad por el software libre."
+"<a href=\"https://directory.fsf.org/wiki/Free_Software_Directory:";
+"Free_software_replacements\"> A short list of free software replacements</a> "
+"for proprietary software running on various proprietary systems."
+msgstr ""
 
 # type: Content of: <h3>
 #. type: Content of: <h3>
@@ -1003,3 +1000,13 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Última actualización:"
+
+# type: Content of: <ul><li>
+#~ msgid ""
+#~ "<a href=\"/software/for-windows.html\">A short list of free software for "
+#~ "Microsoft Windows</a>, for the Windows user who is curious about free "
+#~ "software."
+#~ msgstr ""
+#~ "<a href=\"/software/for-windows.html\">Una lista corta de software libre "
+#~ "para Windows de Microsoft</a>, para los usuarios de Windows que tengan "
+#~ "curiosidad por el software libre."

Index: links/po/links.fr.po
===================================================================
RCS file: /web/www/www/links/po/links.fr.po,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -b -r1.137 -r1.138
--- links/po/links.fr.po        1 Jan 2018 17:10:20 -0000       1.137
+++ links/po/links.fr.po        22 Apr 2018 09:00:06 -0000      1.138
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: links.html\n"
-"POT-Creation-Date: 2018-01-01 05:57+0000\n"
+"POT-Creation-Date: 2018-04-22 08:56+0000\n"
 "PO-Revision-Date: 2018-01-01 17:56+0100\n"
 "Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
 "Language-Team: French <address@hidden>\n"
@@ -16,6 +16,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2018-04-22 08:56+0000\n"
 "Plural-Forms: \n"
 "X-Generator: Gtranslator 2.91.5\n"
 
@@ -117,13 +118,10 @@
 
 #. type: Content of: <ul><li>
 msgid ""
-"<a href=\"/software/for-windows.html\">A short list of free software for "
-"Microsoft Windows</a>, for the Windows user who is curious about free "
-"software."
-msgstr ""
-"<a href=\"/software/for-windows.html\">Une courte liste de logiciels libres "
-"pour Microsoft Windows</a>, pour les utilisateurs de Windows curieux des "
-"logiciels libres."
+"<a href=\"https://directory.fsf.org/wiki/Free_Software_Directory:";
+"Free_software_replacements\"> A short list of free software replacements</a> "
+"for proprietary software running on various proprietary systems."
+msgstr ""
 
 #. type: Content of: <h3>
 msgid "Free software documentation"
@@ -907,3 +905,12 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Dernière mise à jour :"
+
+#~ msgid ""
+#~ "<a href=\"/software/for-windows.html\">A short list of free software for "
+#~ "Microsoft Windows</a>, for the Windows user who is curious about free "
+#~ "software."
+#~ msgstr ""
+#~ "<a href=\"/software/for-windows.html\">Une courte liste de logiciels "
+#~ "libres pour Microsoft Windows</a>, pour les utilisateurs de Windows "
+#~ "curieux des logiciels libres."

Index: links/po/links.ja-diff.html
===================================================================
RCS file: /web/www/www/links/po/links.ja-diff.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- links/po/links.ja-diff.html 1 Jan 2018 07:20:33 -0000       1.8
+++ links/po/links.ja-diff.html 22 Apr 2018 09:00:06 -0000      1.9
@@ -64,9 +64,10 @@
        EmacsWiki: ElispArea&lt;/a&gt;&lt;/li&gt;
   &lt;li&gt;&lt;a 
href="https://web.archive.org/web/20091208112854/http://ftp.back2roots.org/geekgadgets/"&gt;GNU
        programs for the Amiga and BeOS&lt;/a&gt;&lt;/li&gt;
-  &lt;li&gt;&lt;a href="/software/for-windows.html"&gt;A short list of free 
software
-      for Microsoft Windows&lt;/a&gt;, for the Windows user who is curious
-      about free software.&lt;/li&gt;
+  &lt;li&gt;&lt;a <span 
class="removed"><del><strong>href="/software/for-windows.html"&gt;A</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://directory.fsf.org/wiki/Free_Software_Directory:Free_software_replacements"&gt;
+       A</em></ins></span> short list of free software <span 
class="inserted"><ins><em>replacements&lt;/a&gt;</em></ins></span> for <span 
class="removed"><del><strong>Microsoft Windows&lt;/a&gt;, for the Windows user 
who is curious
+      about free software.&lt;/li&gt;</strong></del></span> <span 
class="inserted"><ins><em>proprietary
+       software running on various proprietary 
systems.&lt;/li&gt;</em></ins></span>
 &lt;/ul&gt;
 
 
@@ -410,7 +411,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2018/01/01 07:20:33 $
+$Date: 2018/04/22 09:00:06 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: links/po/links.ja.po
===================================================================
RCS file: /web/www/www/links/po/links.ja.po,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- links/po/links.ja.po        1 Jan 2018 06:22:00 -0000       1.54
+++ links/po/links.ja.po        22 Apr 2018 09:00:06 -0000      1.55
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: links.html\n"
-"POT-Creation-Date: 2018-01-01 05:57+0000\n"
+"POT-Creation-Date: 2018-04-22 08:56+0000\n"
 "PO-Revision-Date: 2016-10-31 10:14+0900\n"
 "Last-Translator: NIIBE Yutaka <address@hidden>\n"
 "Language-Team: Japanese <address@hidden>\n"
@@ -123,13 +123,10 @@
 
 #. type: Content of: <ul><li>
 msgid ""
-"<a href=\"/software/for-windows.html\">A short list of free software for "
-"Microsoft Windows</a>, for the Windows user who is curious about free "
-"software."
-msgstr ""
-"<a 
href=\"/software/for-windows.html\">マイクロソフト・ウィンドウズのための短"
-"い自由ソフトウェアのリスト</a>、自由ソフトウェアに関心があるウィンドウズの"
-"ユーザのために。"
+"<a href=\"https://directory.fsf.org/wiki/Free_Software_Directory:";
+"Free_software_replacements\"> A short list of free software replacements</a> "
+"for proprietary software running on various proprietary systems."
+msgstr ""
 
 #. type: Content of: <h3>
 msgid "Free software documentation"
@@ -923,6 +920,15 @@
 msgid "Updated:"
 msgstr "最終更新:"
 
+#~ msgid ""
+#~ "<a href=\"/software/for-windows.html\">A short list of free software for "
+#~ "Microsoft Windows</a>, for the Windows user who is curious about free "
+#~ "software."
+#~ msgstr ""
+#~ "<a 
href=\"/software/for-windows.html\">マイクロソフト・ウィンドウズのため"
+#~ 
"の短い自由ソフトウェアのリスト</a>、自由ソフトウェアに関心があるウィンドウ"
+#~ "ズのユーザのために。"
+
 #~ msgid "<a href=\"http://www.chillingeffects.org\";>chillingeffects.org</a>"
 #~ msgstr "<a href=\"http://www.chillingeffects.org\";>chillingeffects.org</a>"
 

Index: links/po/links.nl-diff.html
===================================================================
RCS file: /web/www/www/links/po/links.nl-diff.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- links/po/links.nl-diff.html 2 Mar 2018 06:35:51 -0000       1.1
+++ links/po/links.nl-diff.html 22 Apr 2018 09:00:06 -0000      1.2
@@ -64,9 +64,10 @@
        EmacsWiki: ElispArea&lt;/a&gt;&lt;/li&gt;
   &lt;li&gt;&lt;a 
href="https://web.archive.org/web/20091208112854/http://ftp.back2roots.org/geekgadgets/"&gt;GNU
        programs for the Amiga and BeOS&lt;/a&gt;&lt;/li&gt;
-  &lt;li&gt;&lt;a href="/software/for-windows.html"&gt;A short list of free 
software
-      for Microsoft Windows&lt;/a&gt;, for the Windows user who is curious
-      about free software.&lt;/li&gt;
+  &lt;li&gt;&lt;a <span 
class="removed"><del><strong>href="/software/for-windows.html"&gt;A</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://directory.fsf.org/wiki/Free_Software_Directory:Free_software_replacements"&gt;
+       A</em></ins></span> short list of free software <span 
class="inserted"><ins><em>replacements&lt;/a&gt;</em></ins></span> for <span 
class="removed"><del><strong>Microsoft Windows&lt;/a&gt;, for the Windows user 
who is curious
+      about free software.&lt;/li&gt;</strong></del></span> <span 
class="inserted"><ins><em>proprietary
+       software running on various proprietary 
systems.&lt;/li&gt;</em></ins></span>
 &lt;/ul&gt;
 
 
@@ -407,7 +408,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2018/03/02 06:35:51 $
+$Date: 2018/04/22 09:00:06 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: links/po/links.nl.po
===================================================================
RCS file: /web/www/www/links/po/links.nl.po,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- links/po/links.nl.po        1 Jan 2018 06:22:00 -0000       1.13
+++ links/po/links.nl.po        22 Apr 2018 09:00:06 -0000      1.14
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: links.html\n"
-"POT-Creation-Date: 2018-01-01 05:57+0000\n"
+"POT-Creation-Date: 2018-04-22 08:56+0000\n"
 "PO-Revision-Date: 2017-11-24 22:23+0100\n"
 "Last-Translator: Justin van Steijn <address@hidden>\n"
 "Language-Team: Dutch <address@hidden>\n"
@@ -111,13 +111,10 @@
 
 #. type: Content of: <ul><li>
 msgid ""
-"<a href=\"/software/for-windows.html\">A short list of free software for "
-"Microsoft Windows</a>, for the Windows user who is curious about free "
-"software."
-msgstr ""
-"<a href=\"/software/for-windows.html\">Een korte lijst met vrije software "
-"voor Microsoft Windows</a>, voor Windows-gebruikers die nieuwsgierig zijn "
-"naar vrije software."
+"<a href=\"https://directory.fsf.org/wiki/Free_Software_Directory:";
+"Free_software_replacements\"> A short list of free software replacements</a> "
+"for proprietary software running on various proprietary systems."
+msgstr ""
 
 #. type: Content of: <h3>
 msgid "Free software documentation"
@@ -872,5 +869,14 @@
 msgid "Updated:"
 msgstr "Bijgewerkt:"
 
+#~ msgid ""
+#~ "<a href=\"/software/for-windows.html\">A short list of free software for "
+#~ "Microsoft Windows</a>, for the Windows user who is curious about free "
+#~ "software."
+#~ msgstr ""
+#~ "<a href=\"/software/for-windows.html\">Een korte lijst met vrije software "
+#~ "voor Microsoft Windows</a>, voor Windows-gebruikers die nieuwsgierig zijn "
+#~ "naar vrije software."
+
 #~ msgid "<a href=\"http://www.chillingeffects.org\";>chillingeffects.org</a>"
 #~ msgstr "<a href=\"http://www.chillingeffects.org\";>chillingeffects.org</a>"

Index: links/po/links.pot
===================================================================
RCS file: /web/www/www/links/po/links.pot,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -b -r1.64 -r1.65
--- links/po/links.pot  1 Jan 2018 06:22:00 -0000       1.64
+++ links/po/links.pot  22 Apr 2018 09:00:06 -0000      1.65
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: links.html\n"
-"POT-Creation-Date: 2018-01-01 05:57+0000\n"
+"POT-Creation-Date: 2018-04-22 08:56+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"
@@ -92,9 +92,10 @@
 
 #. type: Content of: <ul><li>
 msgid ""
-"<a href=\"/software/for-windows.html\">A short list of free software for "
-"Microsoft Windows</a>, for the Windows user who is curious about free "
-"software."
+"<a "
+"href=\"https://directory.fsf.org/wiki/Free_Software_Directory:Free_software_replacements\";>
 "
+"A short list of free software replacements</a> for proprietary software "
+"running on various proprietary systems."
 msgstr ""
 
 #. type: Content of: <h3>

Index: links/po/links.pt-br.po
===================================================================
RCS file: /web/www/www/links/po/links.pt-br.po,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- links/po/links.pt-br.po     20 Apr 2018 10:10:26 -0000      1.9
+++ links/po/links.pt-br.po     22 Apr 2018 09:00:06 -0000      1.10
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: links.html\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-01 05:57+0000\n"
+"POT-Creation-Date: 2018-04-22 08:56+0000\n"
 "PO-Revision-Date: 2018-01-22 18:01-0200\n"
 "Last-Translator: Rafael Fontenelle <address@hidden>\n"
 "Language-Team: Brazilian Portuguese <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"
+"X-Outdated-Since: 2018-04-22 08:56+0000\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Virtaal 1.0.0-beta1\n"
 
@@ -113,13 +114,10 @@
 
 #. type: Content of: <ul><li>
 msgid ""
-"<a href=\"/software/for-windows.html\">A short list of free software for "
-"Microsoft Windows</a>, for the Windows user who is curious about free "
-"software."
+"<a href=\"https://directory.fsf.org/wiki/Free_Software_Directory:";
+"Free_software_replacements\"> A short list of free software replacements</a> "
+"for proprietary software running on various proprietary systems."
 msgstr ""
-"<a href=\"/software/for-windows.html\">Uma lista curta de softwares livres "
-"do Microsoft Windows</a>, para o usuário do Windows que está curioso sobre "
-"software livre."
 
 #. type: Content of: <h3>
 msgid "Free software documentation"
@@ -889,6 +887,15 @@
 msgstr "Última atualização: "
 
 #~ msgid ""
+#~ "<a href=\"/software/for-windows.html\">A short list of free software for "
+#~ "Microsoft Windows</a>, for the Windows user who is curious about free "
+#~ "software."
+#~ msgstr ""
+#~ "<a href=\"/software/for-windows.html\">Uma lista curta de softwares "
+#~ "livres do Microsoft Windows</a>, para o usuário do Windows que está "
+#~ "curioso sobre software livre."
+
+#~ msgid ""
 #~ "To help promote knowledge of free software that isn't <a href=\"/"
 #~ "philosophy/categories.html#GNUsoftware\">GNU software distributed by the "
 #~ "FSF</a>, we have collected the following links to other web sites that "

Index: software/po/software.ar.po
===================================================================
RCS file: /web/www/www/software/po/software.ar.po,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -b -r1.73 -r1.74
--- software/po/software.ar.po  28 Mar 2017 16:00:43 -0000      1.73
+++ software/po/software.ar.po  22 Apr 2018 09:00:06 -0000      1.74
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: software.html\n"
-"POT-Creation-Date: 2016-09-29 13:55+0000\n"
+"POT-Creation-Date: 2018-04-22 08:56+0000\n"
 "PO-Revision-Date: 2011-01-19 15:41+0200\n"
 "Last-Translator: \n"
 "Language-Team: Arabic <address@hidden>\n"
@@ -107,24 +107,13 @@
 "directory.fsf.org/wiki/GNU/\">بكل حزم غنو</a>. <a 
href=\"/doc/doc.html"
 "\">وصلات وثائق البرمجيات الحرة</a> مسرودة 
بشكل منفصل."
 
-# | Finally, [-here is-] {+we have a+} <a
-# | [-href=\"/software/for-windows.html\">a short-]
-# | {+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.
 #. type: Content of: <p>
-#, fuzzy
-#| msgid ""
-#| "Finally, here is <a href=\"/software/for-windows.html\">a 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 Windows users who would like to try "
-"free software."
+msgid ""
+"Finally, we have <a href=\"https://directory.fsf.org/wiki/";
+"Free_Software_Directory:Free_software_replacements\"> a short list of free "
+"software replacements</a> for proprietary software running on various "
+"proprietary systems."
 msgstr ""
-"أخيرا هنا <a href=\"/software/for-windows.html\">قائمة 
قصيرة ببرمجيات حرة "
-"لمايكروسوفت ويندوز</a>، لمسخدمي ويندوز الم
هتمين بالبرمجيات الحرة."
 
 #. type: Content of: <p>
 msgid ""
@@ -556,13 +545,13 @@
 "تنسيق وتقديم ترجمات موقعنا الإلكتروني، 
يرجى الاطلاع على الرابط التالي <a "
 "href=\"/server/standards/README.translations.html\">دليل الترجم
Ø©</a>."
 
-# | Copyright &copy; [-2011, 2012-] {+2015, 2016+} Free Software Foundation,
-# | Inc.
 #. type: Content of: <div><p>
 #, fuzzy
 #| msgid "Copyright &copy; 2011, 2012 Free Software Foundation, Inc."
-msgid "Copyright &copy; 2015, 2016 Free Software Foundation, Inc."
-msgstr "Copyright &copy; 2011, 2012 مؤسسة البرمجيات الحرة، 
المحدودة."
+msgid "Copyright &copy; 2015, 2016, 2018 Free Software Foundation, Inc."
+msgstr ""
+"حقوق النشر &copy; 2011, 2012  مؤسسة البرمجيات 
الحرة Free Software "
+"Foundation, Inc."
 
 #. type: Content of: <div><p>
 #, fuzzy
@@ -588,6 +577,31 @@
 msgid "Updated:"
 msgstr "حٌدثًت:"
 
+# | Finally, [-here is-] {+we have a+} <a
+# | [-href=\"/software/for-windows.html\">a short-]
+# | {+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, here is <a href=\"/software/for-windows.html\">a 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 Windows users who would like "
+#~ "to try free software."
+#~ msgstr ""
+#~ "أخيرا هنا <a href=\"/software/for-windows.html\">قائمة 
قصيرة ببرمجيات حرة "
+#~ "لمايكروسوفت ويندوز</a>، لمسخدمي ويندوز 
المهتمين بالبرمجيات الحرة."
+
+# | Copyright &copy; [-2011, 2012-] {+2015, 2016+} Free Software Foundation,
+# | Inc.
+#, fuzzy
+#~| msgid "Copyright &copy; 2011, 2012 Free Software Foundation, Inc."
+#~ msgid "Copyright &copy; 2015, 2016 Free Software Foundation, Inc."
+#~ msgstr "Copyright &copy; 2011, 2012 مؤسسة البرمجيات 
الحرة، المحدودة."
+
 #~ msgid ""
 #~ "Copyright &copy; 2004, 2005, 2006, 2007, 2008, 2009 Free Software "
 #~ "Foundation, Inc."

Index: software/po/software.ca.po
===================================================================
RCS file: /web/www/www/software/po/software.ca.po,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -b -r1.116 -r1.117
--- software/po/software.ca.po  29 Sep 2016 13:59:10 -0000      1.116
+++ software/po/software.ca.po  22 Apr 2018 09:00:06 -0000      1.117
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: software.ca\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-29 13:55+0000\n"
+"POT-Creation-Date: 2018-04-22 08:56+0000\n"
 "PO-Revision-Date: 2016-09-18 09:11+0200\n"
 "Last-Translator: Miquel Puigpelat <address@hidden>\n"
 "Language-Team: Catalan <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"
+"X-Outdated-Since: 2018-04-22 08:56+0000\n"
 
 # type: Content of: <title>
 #. type: Content of: <title>
@@ -126,16 +127,13 @@
 "una llista apart trobareu <a href=\"/doc/doc.html\">enllaços a la "
 "documentació del programari lliure</a>."
 
-# type: Content of: <p>
 #. 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 Windows users who would like to try "
-"free software."
-msgstr ""
-"Finalment, tenim una <a href=\"/software/for-windows.html\">breu llista de "
-"Programari Lliure per a Microsoft Windows</a>, per als usuaris de Windows "
-"que vulguin provar el programari lliure."
+"Finally, we have <a href=\"https://directory.fsf.org/wiki/";
+"Free_Software_Directory:Free_software_replacements\"> a short list of free "
+"software replacements</a> for proprietary software running on various "
+"proprietary systems."
+msgstr ""
 
 #. type: Content of: <p>
 msgid ""
@@ -512,8 +510,10 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2015, 2016 Free Software Foundation, Inc."
-msgstr "Copyright &copy; 2015, 2016 Free Software Foundation, Inc."
+#, fuzzy
+#| msgid "Copyright &copy; 2014, 2015 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2015, 2016, 2018 Free Software Foundation, Inc."
+msgstr "Copyright &copy; 2014, 2015 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -539,6 +539,20 @@
 msgid "Updated:"
 msgstr "Updated:"
 
+# 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 Windows users who would like "
+#~ "to try free software."
+#~ msgstr ""
+#~ "Finalment, tenim una <a href=\"/software/for-windows.html\">breu llista "
+#~ "de Programari Lliure per a Microsoft Windows</a>, per als usuaris de "
+#~ "Windows que vulguin provar el programari lliure."
+
+# type: Content of: <div><p>
+#~ msgid "Copyright &copy; 2015, 2016 Free Software Foundation, Inc."
+#~ msgstr "Copyright &copy; 2015, 2016 Free Software Foundation, Inc."
+
 #~ msgid ""
 #~ "#dynamic-duo {\n"
 #~ "   float: right;\n"

Index: software/po/software.de.po
===================================================================
RCS file: /web/www/www/software/po/software.de.po,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -b -r1.127 -r1.128
--- software/po/software.de.po  3 Dec 2016 23:45:17 -0000       1.127
+++ software/po/software.de.po  22 Apr 2018 09:00:06 -0000      1.128
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: software.html\n"
 "Report-Msgid-Bugs-To: Webmasters <address@hidden>\n"
-"POT-Creation-Date: 2016-09-29 13:55+0000\n"
+"POT-Creation-Date: 2018-04-22 08:56+0000\n"
 "PO-Revision-Date: 2016-05-03 22:00+0200\n"
 "Last-Translator: Jоегg Kоhпе <joeko (AT) online [PUNKT] de>\n"
 "Language-Team: www-de <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"
+"X-Outdated-Since: 2018-04-22 08:56+0000\n"
 
 #. type: Content of: <title>
 msgid "Software - GNU Project - Free Software Foundation"
@@ -125,13 +126,11 @@
 
 #. 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 Windows users who would like to try "
-"free software."
-msgstr ""
-"Und schließlich haben wir noch eine engere Auswahl an <cite><a href=\"/"
-"software/for-windows\">Freie Software unter Microsoft Windows</a></cite>, "
-"für Windows-Nutzer, die <em>freie</em> Software ausprobieren möchten."
+"Finally, we have <a href=\"https://directory.fsf.org/wiki/";
+"Free_Software_Directory:Free_software_replacements\"> a short list of free "
+"software replacements</a> for proprietary software running on various "
+"proprietary systems."
+msgstr ""
 
 #. type: Content of: <p>
 msgid ""
@@ -503,8 +502,12 @@
 "standards/README.translations\">LIESMICH für Übersetzungen</a>."
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2015, 2016 Free Software Foundation, Inc."
-msgstr "Copyright &copy; 2015, 2016 Free Software Foundation, Inc."
+# | Copyright &copy; [-2014,-] 2015, [-2016-] {+2016, 2018+} Free Software
+# | Foundation, Inc.
+#, fuzzy
+#| msgid "Copyright &copy; 2014, 2015, 2016 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2015, 2016, 2018 Free Software Foundation, Inc."
+msgstr "Copyright &copy; 2014-2016 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -529,6 +532,18 @@
 msgstr "Letzte Änderung:"
 
 #~ msgid ""
+#~ "Finally, we have a <a href=\"/software/for-windows.html\">short list of "
+#~ "free software for Microsoft Windows</a>, for Windows users who would like "
+#~ "to try free software."
+#~ msgstr ""
+#~ "Und schließlich haben wir noch eine engere Auswahl an <cite><a href=\"/"
+#~ "software/for-windows\">Freie Software unter Microsoft Windows</a></cite>, "
+#~ "für Windows-Nutzer, die <em>freie</em> Software ausprobieren möchten."
+
+#~ msgid "Copyright &copy; 2015, 2016 Free Software Foundation, Inc."
+#~ msgstr "Copyright &copy; 2015, 2016 Free Software Foundation, Inc."
+
+#~ msgid ""
 #~ "#dynamic-duo {\n"
 #~ "   float: right;\n"
 #~ "   width: 24em;\n"

Index: software/po/software.el-diff.html
===================================================================
RCS file: /web/www/www/software/po/software.el-diff.html,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- software/po/software.el-diff.html   18 Nov 2016 07:33:09 -0000      1.47
+++ software/po/software.el-diff.html   22 Apr 2018 09:00:06 -0000      1.48
@@ -27,11 +27,11 @@
    width: 9em;
    line-height: 1.5em;
    text-decoration: none;
-}</em></ins></span>
-#dynamic-duo { <span class="inserted"><ins><em>display: none; }
address@hidden (min-width: 48em) {
+}
+#dynamic-duo { display: none; }
address@hidden (min-width: 48em) {</em></ins></span>
    #dynamic-duo {
-      display: block;</em></ins></span>
+      <span class="inserted"><ins><em>display: block;</em></ins></span>
       float: right;
       width: <span class="removed"><del><strong>24em;
    font-style: normal;</strong></del></span> <span 
class="inserted"><ins><em>20em;
@@ -121,11 +121,13 @@
 href="/doc/doc.html"&gt;Free software documentation links&lt;/a&gt; are listed
 separately.&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 Windows users who would
-like to try free software.&lt;/p&gt;
+&lt;p&gt;Finally, we have <span 
class="removed"><del><strong>a</strong></del></span> &lt;a <span 
class="removed"><del><strong>href="/software/for-windows.html"&gt;short</strong></del></span>
+<span 
class="inserted"><ins><em>href="https://directory.fsf.org/wiki/Free_Software_Directory:Free_software_replacements"&gt;
+a short</em></ins></span> list of free software <span 
class="inserted"><ins><em>replacements&lt;/a&gt;</em></ins></span> for <span 
class="removed"><del><strong>Microsoft Windows&lt;/a&gt;, for Windows users who 
would
+like to try free software.&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>proprietary software
+running on various proprietary systems.&lt;/p&gt;
 
-<span class="inserted"><ins><em>&lt;p&gt;We have also published a &lt;a 
href="/software/free-software-for-education.html"&gt;
+&lt;p&gt;We have also published a &lt;a 
href="/software/free-software-for-education.html"&gt;
 list of recommended educational software&lt;/a&gt;.&lt;/p&gt;
 
 &lt;div style="clear:both"&gt;&lt;/div&gt;</em></ins></span>
@@ -383,7 +385,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. --&gt;
 
-&lt;p&gt;Copyright &copy; <span 
class="removed"><del><strong>2015</strong></del></span> <span 
class="inserted"><ins><em>2015, 2016</em></ins></span> Free Software 
Foundation, Inc.&lt;/p&gt;
+&lt;p&gt;Copyright &copy; <span 
class="removed"><del><strong>2015</strong></del></span> <span 
class="inserted"><ins><em>2015, 2016, 2018</em></ins></span> Free Software 
Foundation, Inc.&lt;/p&gt;
 
 &lt;p&gt;This page is licensed under a &lt;a rel="license"
 <span 
class="removed"><del><strong>href="http://creativecommons.org/licenses/by-nd/3.0/us/"&gt;Creative</strong></del></span>
@@ -394,7 +396,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2016/11/18 07:33:09 $
+$Date: 2018/04/22 09:00:06 $
 &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.75
retrieving revision 1.76
diff -u -b -r1.75 -r1.76
--- software/po/software.el.po  1 Oct 2016 14:28:15 -0000       1.75
+++ software/po/software.el.po  22 Apr 2018 09:00:06 -0000      1.76
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: www-el_v0.2.0\n"
-"POT-Creation-Date: 2016-09-29 13:55+0000\n"
+"POT-Creation-Date: 2018-04-22 08:56+0000\n"
 "PO-Revision-Date: 2015-04-12 22:39+0200\n"
 "Last-Translator: Georgios Zarkadas <address@hidden>\n"
 "Language-Team: Greek <address@hidden>\n"
@@ -144,16 +144,13 @@
 "\">όλων των πακέτων GNU</a> δίνεται παρακάτω.  
<a href=\"/doc/doc.html"
 "\">Σύνδεσμοι σε ελεύθερη τεκμηρίωση 
λογισμικού</a> παρατίθενται ξεχωριστά."
 
-# type: Content of: <p>
 #. 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 Windows users who would like to try "
-"free software."
-msgstr ""
-"Τέλος, έχουμε μία <a 
href=\"/software/for-windows.html\">σύντομη λίστα με "
-"ελεύθερο λογισμικό για τα Microsoft Windows</a>, για 
χρήστες των Windows που "
-"θα ήθελαν να δοκιμάσουν ελεύθερο 
λογισμικό."
+"Finally, we have <a href=\"https://directory.fsf.org/wiki/";
+"Free_Software_Directory:Free_software_replacements\"> a short list of free "
+"software replacements</a> for proprietary software running on various "
+"proprietary systems."
+msgstr ""
 
 #. type: Content of: <p>
 msgid ""
@@ -588,7 +585,7 @@
 #. type: Content of: <div><p>
 #, fuzzy
 #| msgid "Copyright &copy; 2014, 2015 Free Software Foundation, Inc."
-msgid "Copyright &copy; 2015, 2016 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2015, 2016, 2018 Free Software Foundation, Inc."
 msgstr ""
 "Πνευματικά δικαιώματα &copy; 2014, 2015 Ίδρυμα 
Ελεύθερου Λογισμικού, Inc."
 
@@ -624,6 +621,22 @@
 msgid "Updated:"
 msgstr "Ενημερώθηκε:"
 
+# 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 Windows users who would like "
+#~ "to try free software."
+#~ msgstr ""
+#~ "Τέλος, έχουμε μία <a 
href=\"/software/for-windows.html\">σύντομη λίστα με "
+#~ "ελεύθερο λογισμικό για τα Microsoft Windows</a>, 
για χρήστες των Windows "
+#~ "που θα ήθελαν να δοκιμάσουν ελεύθερο 
λογισμικό."
+
+#, fuzzy
+#~| msgid "Copyright &copy; 2014, 2015 Free Software Foundation, Inc."
+#~ msgid "Copyright &copy; 2015, 2016 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Πνευματικά δικαιώματα &copy; 2014, 2015 Ίδρυμα 
Ελεύθερου Λογισμικού, Inc."
+
 #~ msgid ""
 #~ "#dynamic-duo {\n"
 #~ "   float: right;\n"

Index: software/po/software.es.po
===================================================================
RCS file: /web/www/www/software/po/software.es.po,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -b -r1.96 -r1.97
--- software/po/software.es.po  29 Sep 2016 13:59:11 -0000      1.96
+++ software/po/software.es.po  22 Apr 2018 09:00:06 -0000      1.97
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: software.html\n"
-"POT-Creation-Date: 2016-09-29 13:55+0000\n"
+"POT-Creation-Date: 2018-04-22 08:56+0000\n"
 "PO-Revision-Date: 2016-05-06 10:21+0100\n"
 "Last-Translator: Javier Fdez. Retenaga <address@hidden>\n"
 "Language-Team: Spanish <address@hidden>\n"
@@ -20,6 +20,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2018-04-22 08:56+0000\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Generator: Poedit 1.6.10\n"
 
@@ -136,16 +137,13 @@
 "\"/doc/doc.html\">enlaces a documentación de software libre</a> se "
 "encuentran en una lista separada."
 
-# type: Content of: <p>
 #. 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 Windows users who would like to try "
-"free software."
-msgstr ""
-"Por último, tenemos una <a href=\"/software/for-windows.html\">breve lista "
-"de software libre para Microsoft Windows</a>, para los usuarios de Windows a "
-"quienes les gustaría probar el software libre."
+"Finally, we have <a href=\"https://directory.fsf.org/wiki/";
+"Free_Software_Directory:Free_software_replacements\"> a short list of free "
+"software replacements</a> for proprietary software running on various "
+"proprietary systems."
+msgstr ""
 
 #. type: Content of: <p>
 msgid ""
@@ -533,8 +531,12 @@
 "de este sitio web."
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2015, 2016 Free Software Foundation, Inc."
-msgstr "Copyright &copy; 2015, 2016 Free Software Foundation, Inc."
+# | Copyright &copy; [-2014,-] 2015, [-2016-] {+2016, 2018+} Free Software
+# | Foundation, Inc.
+#, fuzzy
+#| msgid "Copyright &copy; 2014, 2015, 2016 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2015, 2016, 2018 Free Software Foundation, Inc."
+msgstr "Copyright &copy; 2014, 2015, 2016 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -560,6 +562,19 @@
 msgid "Updated:"
 msgstr "Última actualización:"
 
+# 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 Windows users who would like "
+#~ "to try free software."
+#~ msgstr ""
+#~ "Por último, tenemos una <a href=\"/software/for-windows.html\">breve "
+#~ "lista de software libre para Microsoft Windows</a>, para los usuarios de "
+#~ "Windows a quienes les gustaría probar el software libre."
+
+#~ msgid "Copyright &copy; 2015, 2016 Free Software Foundation, Inc."
+#~ msgstr "Copyright &copy; 2015, 2016 Free Software Foundation, Inc."
+
 #~ msgid ""
 #~ "#dynamic-duo {\n"
 #~ "   float: right;\n"

Index: software/po/software.fr.po
===================================================================
RCS file: /web/www/www/software/po/software.fr.po,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -b -r1.124 -r1.125
--- software/po/software.fr.po  29 Sep 2016 13:59:11 -0000      1.124
+++ software/po/software.fr.po  22 Apr 2018 09:00:06 -0000      1.125
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: software.html\n"
-"POT-Creation-Date: 2016-09-29 13:55+0000\n"
+"POT-Creation-Date: 2018-04-22 08:56+0000\n"
 "PO-Revision-Date: 2016-07-27 13:49+0200\n"
 "Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
 "Language-Team: French <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"
+"X-Outdated-Since: 2018-04-22 08:56+0000\n"
 "Plural-Forms: \n"
 "X-Generator: Gtranslator 2.91.5\n"
 
@@ -126,13 +127,11 @@
 
 #. 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 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 "
-"Windows qui veulent essayer des logiciels libres."
+"Finally, we have <a href=\"https://directory.fsf.org/wiki/";
+"Free_Software_Directory:Free_software_replacements\"> a short list of free "
+"software replacements</a> for proprietary software running on various "
+"proprietary systems."
+msgstr ""
 
 #. type: Content of: <p>
 msgid ""
@@ -493,8 +492,12 @@
 "README.translations.html\">guide de traduction</a>."
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2015, 2016 Free Software Foundation, Inc."
-msgstr "Copyright &copy; 2015, 2016 Free Software Foundation, Inc."
+# | Copyright &copy; [-2014,-] 2015, [-2016-] {+2016, 2018+} Free Software
+# | Foundation, Inc.
+#, fuzzy
+#| msgid "Copyright &copy; 2014, 2015, 2016 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2015, 2016, 2018 Free Software Foundation, Inc."
+msgstr "Copyright &copy; 2014, 2015, 2016 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -518,3 +521,15 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Dernière mise à jour :"
+
+#~ msgid ""
+#~ "Finally, we have a <a href=\"/software/for-windows.html\">short list of "
+#~ "free 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 "
+#~ "Windows qui veulent essayer des logiciels libres."
+
+#~ msgid "Copyright &copy; 2015, 2016 Free Software Foundation, Inc."
+#~ msgstr "Copyright &copy; 2015, 2016 Free Software Foundation, Inc."

Index: software/po/software.it.po
===================================================================
RCS file: /web/www/www/software/po/software.it.po,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -b -r1.174 -r1.175
--- software/po/software.it.po  29 Sep 2016 13:59:11 -0000      1.174
+++ software/po/software.it.po  22 Apr 2018 09:00:06 -0000      1.175
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: software.html\n"
-"POT-Creation-Date: 2016-09-29 13:55+0000\n"
+"POT-Creation-Date: 2018-04-22 08:56+0000\n"
 "PO-Revision-Date: 2016-05-22 20:31+0100\n"
 "Last-Translator: Andrea Pescetti <address@hidden>\n"
 "Language-Team: Italian\n"
@@ -13,6 +13,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2018-04-22 08:56+0000\n"
 "X-Generator: Poedit 1.5.4\n"
 
 # type: Content of: <title>
@@ -123,16 +124,13 @@
 "\">tutti i pacchetti GNU</a> è qui sotto.  Un altro elenco contiene i <a "
 "href=\"/doc/doc.html\">collegamenti alla documentazione</a>."
 
-# type: Content of: <p>
 #. 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 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</"
-"a>, per gli utenti Windows interessati al software libero."
+"Finally, we have <a href=\"https://directory.fsf.org/wiki/";
+"Free_Software_Directory:Free_software_replacements\"> a short list of free "
+"software replacements</a> for proprietary software running on various "
+"proprietary systems."
+msgstr ""
 
 #. type: Content of: <p>
 msgid ""
@@ -511,8 +509,12 @@
 "traduzioni</a>."
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2015, 2016 Free Software Foundation, Inc."
-msgstr "Copyright &copy; 2015, 2016 Free Software Foundation, Inc."
+# | Copyright &copy; [-2014,-] 2015, [-2016-] {+2016, 2018+} Free Software
+# | Foundation, Inc.
+#, fuzzy
+#| msgid "Copyright &copy; 2014, 2015, 2016 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2015, 2016, 2018 Free Software Foundation, Inc."
+msgstr "Copyright &copy; 2014, 2015, 2016 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -538,6 +540,19 @@
 msgid "Updated:"
 msgstr "Ultimo aggiornamento:"
 
+# 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 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</a>, per gli utenti Windows interessati al software libero."
+
+#~ msgid "Copyright &copy; 2015, 2016 Free Software Foundation, Inc."
+#~ msgstr "Copyright &copy; 2015, 2016 Free Software Foundation, Inc."
+
 #~ msgid ""
 #~ "#dynamic-duo {\n"
 #~ "   float: right;\n"

Index: software/po/software.ja.po
===================================================================
RCS file: /web/www/www/software/po/software.ja.po,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -b -r1.83 -r1.84
--- software/po/software.ja.po  29 Sep 2016 13:59:11 -0000      1.83
+++ software/po/software.ja.po  22 Apr 2018 09:00:06 -0000      1.84
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: software.html\n"
-"POT-Creation-Date: 2016-09-29 13:55+0000\n"
+"POT-Creation-Date: 2018-04-22 08:56+0000\n"
 "PO-Revision-Date: 2016-06-24 13:34+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"
+"X-Outdated-Since: 2018-04-22 08:56+0000\n"
 
 #. type: Content of: <title>
 msgid "Software - GNU Project - Free Software Foundation"
@@ -118,13 +119,11 @@
 
 #. 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 Windows users who would like to try "
-"free software."
-msgstr ""
-"最後に、<a 
href=\"/software/for-windows.html\">マイクロソフト・ウィンドウズの"
-"ための自由ソフトウェア</a>の短いリストもあります。自由ソフトウェアを試してみ"
-"たい、ウィンドウズの利用者のために。"
+"Finally, we have <a href=\"https://directory.fsf.org/wiki/";
+"Free_Software_Directory:Free_software_replacements\"> a short list of free "
+"software replacements</a> for proprietary software running on various "
+"proprietary systems."
+msgstr ""
 
 #. type: Content of: <p>
 msgid ""
@@ -471,8 +470,10 @@
 "README.translations.html\">翻訳 README</a>をご覧ください。"
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2015, 2016 Free Software Foundation, Inc."
-msgstr "Copyright &copy; 2015, 2016 Free Software Foundation, Inc."
+#, fuzzy
+#| msgid "Copyright &copy; 2014, 2015, 2016 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2015, 2016, 2018 Free Software Foundation, Inc."
+msgstr "Copyright &copy; 2014, 2015, 2016 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -495,6 +496,15 @@
 msgstr "最終更新:"
 
 #~ msgid ""
+#~ "Finally, we have a <a href=\"/software/for-windows.html\">short list of "
+#~ "free software for Microsoft Windows</a>, for Windows users who would like "
+#~ "to try free software."
+#~ msgstr ""
+#~ "最後に、<a 
href=\"/software/for-windows.html\">マイクロソフト・ウィンドウ"
+#~ 
"ズのための自由ソフトウェア</a>の短いリストもあります。自由ソフトウェアを試"
+#~ "してみたい、ウィンドウズの利用者のために。"
+
+#~ msgid ""
 #~ "#dynamic-duo {\n"
 #~ "   float: right;\n"
 #~ "   width: 24em;\n"

Index: software/po/software.nb.po
===================================================================
RCS file: /web/www/www/software/po/software.nb.po,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- software/po/software.nb.po  1 Oct 2016 14:28:15 -0000       1.10
+++ software/po/software.nb.po  22 Apr 2018 09:00:06 -0000      1.11
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: software.html\n"
-"POT-Creation-Date: 2016-09-29 13:55+0000\n"
+"POT-Creation-Date: 2018-04-22 08:56+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
 "Language-Team: web-translators <address@hidden>\n"
@@ -119,26 +119,13 @@
 "det er tilgjengelig.  Den inneholder også  en liste over <a href=\"http://";
 "directory.fsf.org/wiki/GNU/\">alle GNU-pakker</a>."
 
-# | Finally, [-here is-] {+we have a+} <a
-# | [-href=\"/software/for-windows.html\">a short-]
-# | {+href=\"/software/for-windows.html\">short+} list of [-Free Software-]
-# | {+free software+} for Microsoft Windows</a>, for [-the-] Windows user{+s+}
-# | who [-is curious about Free Software.-] {+would like to try free
-# | software.+}
 #. type: Content of: <p>
-#, fuzzy
-#| msgid ""
-#| "Finally, here is <a href=\"/software/for-windows.html\">a short list of "
-#| "Free Software for Microsoft Windows</a>, for the Windows user who is "
-#| "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 Windows users who would like to try "
-"free software."
-msgstr ""
-"Til slutt finnes det <a href=\"/software/for-windows.html\">en kort liste "
-"over fri programvare for Microsoft Windows</a>, for de Windows-brukerne som "
-"er nyskjerrige på fri programvare."
+msgid ""
+"Finally, we have <a href=\"https://directory.fsf.org/wiki/";
+"Free_Software_Directory:Free_software_replacements\"> a short list of free "
+"software replacements</a> for proprietary software running on various "
+"proprietary systems."
+msgstr ""
 
 #. type: Content of: <p>
 msgid ""
@@ -588,7 +575,7 @@
 #. type: Content of: <div><p>
 #, fuzzy
 #| msgid "What is the Free Software Foundation?"
-msgid "Copyright &copy; 2015, 2016 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2015, 2016, 2018 Free Software Foundation, Inc."
 msgstr "Hva er Free Software Foundation?"
 
 #. type: Content of: <div><p>
@@ -616,6 +603,32 @@
 msgid "Updated:"
 msgstr "Oppdatert:"
 
+# | Finally, [-here is-] {+we have a+} <a
+# | [-href=\"/software/for-windows.html\">a short-]
+# | {+href=\"/software/for-windows.html\">short+} list of [-Free Software-]
+# | {+free software+} for Microsoft Windows</a>, for [-the-] Windows user{+s+}
+# | who [-is curious about Free Software.-] {+would like to try free
+# | software.+}
+#, fuzzy
+#~| msgid ""
+#~| "Finally, here is <a href=\"/software/for-windows.html\">a short list of "
+#~| "Free Software for Microsoft Windows</a>, for the Windows user who is "
+#~| "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 Windows users who would like "
+#~ "to try free software."
+#~ msgstr ""
+#~ "Til slutt finnes det <a href=\"/software/for-windows.html\">en kort liste "
+#~ "over fri programvare for Microsoft Windows</a>, for de Windows-brukerne "
+#~ "som er nyskjerrige på fri programvare."
+
+# type: Content of: <table><tr><td><h3>
+#, fuzzy
+#~| msgid "What is the Free Software Foundation?"
+#~ msgid "Copyright &copy; 2015, 2016 Free Software Foundation, Inc."
+#~ msgstr "Hva er Free Software Foundation?"
+
 #~ msgid ""
 #~ "This page is licensed under a <a rel=\"license\" href=\"http://";
 #~ "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"

Index: software/po/software.nl.po
===================================================================
RCS file: /web/www/www/software/po/software.nl.po,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- software/po/software.nl.po  29 Sep 2016 13:59:11 -0000      1.15
+++ software/po/software.nl.po  22 Apr 2018 09:00:06 -0000      1.16
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: software.html\n"
-"POT-Creation-Date: 2016-09-29 13:55+0000\n"
+"POT-Creation-Date: 2018-04-22 08:56+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Tom Uijldert <address@hidden>\n"
 "Language-Team: Dutch\n"
@@ -16,6 +16,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2018-04-22 08:56+0000\n"
 "X-Generator: Poedit 1.5.4\n"
 
 #. type: Content of: <title>
@@ -126,13 +127,11 @@
 
 #. 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 Windows users who would like to try "
-"free software."
-msgstr ""
-"Tenslotte hebben we een <a href=\"/software/for-windows.html\">korte lijst "
-"met vrije software voor Microsoft Windows</a>, voor Windows-gebruikers die "
-"vrije software willen proberen."
+"Finally, we have <a href=\"https://directory.fsf.org/wiki/";
+"Free_Software_Directory:Free_software_replacements\"> a short list of free "
+"software replacements</a> for proprietary software running on various "
+"proprietary systems."
+msgstr ""
 
 #. type: Content of: <p>
 msgid ""
@@ -492,8 +491,12 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2015, 2016 Free Software Foundation, Inc."
-msgstr "Copyright &copy; 2015, 2016 Free Software Foundation, Inc."
+# | Copyright &copy; [-2011-] {+2015, 2016, 2018+} Free Software Foundation,
+# | Inc.
+#, fuzzy
+#| msgid "Copyright &copy; 2011 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2015, 2016, 2018 Free Software Foundation, Inc."
+msgstr "Copyright &copy; 2011 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -516,6 +519,19 @@
 msgstr "Bijgewerkt:"
 
 #~ msgid ""
+#~ "Finally, we have a <a href=\"/software/for-windows.html\">short list of "
+#~ "free software for Microsoft Windows</a>, for Windows users who would like "
+#~ "to try free software."
+#~ msgstr ""
+#~ "Tenslotte hebben we een <a href=\"/software/for-windows.html\">korte "
+#~ "lijst met vrije software voor Microsoft Windows</a>, voor Windows-"
+#~ "gebruikers die vrije software willen proberen."
+
+# type: Content of: <div><p>
+#~ msgid "Copyright &copy; 2015, 2016 Free Software Foundation, Inc."
+#~ msgstr "Copyright &copy; 2015, 2016 Free Software Foundation, Inc."
+
+#~ msgid ""
 #~ "#dynamic-duo {\n"
 #~ "   float: right;\n"
 #~ "   width: 24em;\n"

Index: software/po/software.nn.po
===================================================================
RCS file: /web/www/www/software/po/software.nn.po,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- software/po/software.nn.po  1 Oct 2016 14:08:50 -0000       1.8
+++ software/po/software.nn.po  22 Apr 2018 09:00:06 -0000      1.9
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: software.html\n"
-"POT-Creation-Date: 2016-09-29 13:55+0000\n"
+"POT-Creation-Date: 2018-04-22 08:56+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Thérèse Godefroy <address@hidden>\n"
 "Language-Team: web-translators\n"
@@ -108,19 +108,12 @@
 "\"http://directory.fsf.org/wiki/GNU/\";>alle GNU-pakker</a>."
 
 #. type: Content of: <p>
-#, fuzzy
-#| msgid ""
-#| "Finally, here is <a href=\"/software/for-windows.html\">a short list of "
-#| "Free Software for Microsoft Windows</a>, for the Windows user who is "
-#| "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 Windows users who would like to try "
-"free software."
-msgstr ""
-"Til slutt finnast det <a href=\"/software/for-windows.html\">ei kort liste "
-"over fri programvare for Microsoft Windows</a>, for dei Windows-brukerane "
-"som er nysgjerrige på fri programvare."
+msgid ""
+"Finally, we have <a href=\"https://directory.fsf.org/wiki/";
+"Free_Software_Directory:Free_software_replacements\"> a short list of free "
+"software replacements</a> for proprietary software running on various "
+"proprietary systems."
+msgstr ""
 
 #. type: Content of: <p>
 msgid ""
@@ -481,7 +474,7 @@
 #. type: Content of: <div><p>
 #, fuzzy
 #| msgid "Copyright &copy; 2015 Free Software Foundation, Inc."
-msgid "Copyright &copy; 2015, 2016 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2015, 2016, 2018 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2007 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
@@ -505,6 +498,20 @@
 msgid "Updated:"
 msgstr "Oppdatert:"
 
+#, fuzzy
+#~| msgid ""
+#~| "Finally, here is <a href=\"/software/for-windows.html\">a short list of "
+#~| "Free Software for Microsoft Windows</a>, for the Windows user who is "
+#~| "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 Windows users who would like "
+#~ "to try free software."
+#~ msgstr ""
+#~ "Til slutt finnast det <a href=\"/software/for-windows.html\">ei kort "
+#~ "liste over fri programvare for Microsoft Windows</a>, for dei Windows-"
+#~ "brukerane som er nysgjerrige på fri programvare."
+
 #~ msgid "Introduction"
 #~ msgstr "Innleiing"
 

Index: software/po/software.pl.po
===================================================================
RCS file: /web/www/www/software/po/software.pl.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- software/po/software.pl.po  16 Nov 2016 04:24:08 -0000      1.3
+++ software/po/software.pl.po  22 Apr 2018 09:00:06 -0000      1.4
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: software.html\n"
-"POT-Creation-Date: 2016-09-29 13:55+0000\n"
+"POT-Creation-Date: 2018-04-22 08:56+0000\n"
 "PO-Revision-Date: 2016-11-15 21:22-0600\n"
 "Last-Translator: Jan Owoc <jsowoc AT gmail.com>\n"
 "Language-Team: Polish <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"
+"X-Outdated-Since: 2018-04-22 08:56+0000\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 "X-Generator: Virtaal 0.7.1\n"
@@ -122,13 +123,11 @@
 
 #. 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 Windows users who would like to try "
-"free software."
-msgstr ""
-"Mamy też <a href=\"/software/for-windows.html\">krótką listę wolnego "
-"oprogramowania dla systemu Microsoft Windows</a>, dla tych użytkowników "
-"Windows, którzy chcieliby spróbować wolnego oprogramowania."
+"Finally, we have <a href=\"https://directory.fsf.org/wiki/";
+"Free_Software_Directory:Free_software_replacements\"> a short list of free "
+"software replacements</a> for proprietary software running on various "
+"proprietary systems."
+msgstr ""
 
 #. type: Content of: <p>
 msgid ""
@@ -488,8 +487,12 @@
 "tłumaczeń</a>."
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2015, 2016 Free Software Foundation, Inc."
-msgstr "Copyright &copy; 2015, 2016 Free Software Foundation, Inc."
+# | Copyright &copy; [-2014,-] 2015, [-2016-] {+2016, 2018+} Free Software
+# | Foundation, Inc.
+#, fuzzy
+#| msgid "Copyright &copy; 2014, 2015, 2016 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2015, 2016, 2018 Free Software Foundation, Inc."
+msgstr "Copyright &copy; 2014, 2015, 2016 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -511,3 +514,15 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Aktualizowane:"
+
+#~ msgid ""
+#~ "Finally, we have a <a href=\"/software/for-windows.html\">short list of "
+#~ "free software for Microsoft Windows</a>, for Windows users who would like "
+#~ "to try free software."
+#~ msgstr ""
+#~ "Mamy też <a href=\"/software/for-windows.html\">krótką listę wolnego "
+#~ "oprogramowania dla systemu Microsoft Windows</a>, dla tych użytkowników "
+#~ "Windows, którzy chcieliby spróbować wolnego oprogramowania."
+
+#~ msgid "Copyright &copy; 2015, 2016 Free Software Foundation, Inc."
+#~ msgstr "Copyright &copy; 2015, 2016 Free Software Foundation, Inc."

Index: software/po/software.pot
===================================================================
RCS file: /web/www/www/software/po/software.pot,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -b -r1.71 -r1.72
--- software/po/software.pot    29 Sep 2016 13:59:11 -0000      1.71
+++ software/po/software.pot    22 Apr 2018 09:00:06 -0000      1.72
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: software.html\n"
-"POT-Creation-Date: 2016-09-29 13:55+0000\n"
+"POT-Creation-Date: 2018-04-22 08:56+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"
@@ -92,9 +92,10 @@
 
 #. 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 Windows users who would like to try "
-"free software."
+"Finally, we have <a "
+"href=\"https://directory.fsf.org/wiki/Free_Software_Directory:Free_software_replacements\";>
 "
+"a short list of free software replacements</a> for proprietary software "
+"running on various proprietary systems."
 msgstr ""
 
 #. type: Content of: <p>
@@ -353,7 +354,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2015, 2016 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2015, 2016, 2018 Free Software Foundation, Inc."
 msgstr ""
 
 #. type: Content of: <div><p>

Index: software/po/software.pt-br.po
===================================================================
RCS file: /web/www/www/software/po/software.pt-br.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- software/po/software.pt-br.po       7 Apr 2018 08:20:37 -0000       1.3
+++ software/po/software.pt-br.po       22 Apr 2018 09:00:07 -0000      1.4
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: software.html\n"
-"POT-Creation-Date: 2016-09-29 13:55+0000\n"
+"POT-Creation-Date: 2018-04-22 08:56+0000\n"
 "PO-Revision-Date: 2018-01-17 16:32-0200\n"
 "Last-Translator: Rafael Fontenelle <address@hidden>\n"
 "Language-Team: Brazilian Portuguese <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"
+"X-Outdated-Since: 2018-04-22 08:56+0000\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Virtaal 1.0.0-beta1\n"
 
@@ -122,13 +123,11 @@
 
 #. 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 Windows users who would like to try "
-"free software."
-msgstr ""
-"Finalmente, temos uma <a href=\"/software/for-windows.html\">lista curta de "
-"softwares livres para o Microsoft Windows</a>, para usuários do Windows que "
-"gostariam de experimentar o software livre."
+"Finally, we have <a href=\"https://directory.fsf.org/wiki/";
+"Free_Software_Directory:Free_software_replacements\"> a short list of free "
+"software replacements</a> for proprietary software running on various "
+"proprietary systems."
+msgstr ""
 
 #. type: Content of: <p>
 msgid ""
@@ -488,8 +487,10 @@
 "envio de traduções das páginas desse site."
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2015, 2016 Free Software Foundation, Inc."
-msgstr "Copyright &copy; 2015, 2016 Free Software Foundation, Inc."
+#, fuzzy
+#| msgid "Copyright &copy; 2014, 2015 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2015, 2016, 2018 Free Software Foundation, Inc."
+msgstr "Copyright &copy; 2014, 2015 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -515,3 +516,15 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Última atualização: "
+
+#~ msgid ""
+#~ "Finally, we have a <a href=\"/software/for-windows.html\">short list of "
+#~ "free software for Microsoft Windows</a>, for Windows users who would like "
+#~ "to try free software."
+#~ msgstr ""
+#~ "Finalmente, temos uma <a href=\"/software/for-windows.html\">lista curta "
+#~ "de softwares livres para o Microsoft Windows</a>, para usuários do "
+#~ "Windows que gostariam de experimentar o software livre."
+
+#~ msgid "Copyright &copy; 2015, 2016 Free Software Foundation, Inc."
+#~ msgstr "Copyright &copy; 2015, 2016 Free Software Foundation, Inc."

Index: software/po/software.ru.po
===================================================================
RCS file: /web/www/www/software/po/software.ru.po,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -b -r1.105 -r1.106
--- software/po/software.ru.po  5 Dec 2016 10:27:54 -0000       1.105
+++ software/po/software.ru.po  22 Apr 2018 09:00:07 -0000      1.106
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: software.html\n"
-"POT-Creation-Date: 2016-09-29 13:55+0000\n"
+"POT-Creation-Date: 2018-04-22 08:56+0000\n"
 "PO-Revision-Date: 2016-05-03 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"
+"X-Outdated-Since: 2018-04-22 08:56+0000\n"
 
 #. type: Content of: <title>
 msgid "Software - GNU Project - Free Software Foundation"
@@ -121,13 +122,11 @@
 
 #. 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 Windows users who would like to try "
-"free software."
-msgstr ""
-"Наконец, у нас есть <a 
href=\"/software/for-windows.html\">краткий список "
-"свободных программ для Microsoft Windows</a>&nbsp;&mdash; 
для пользователей "
-"Windows, желающих опробовать свободные 
программы."
+"Finally, we have <a href=\"https://directory.fsf.org/wiki/";
+"Free_Software_Directory:Free_software_replacements\"> a short list of free "
+"software replacements</a> for proprietary software running on various "
+"proprietary systems."
+msgstr ""
 
 #. type: Content of: <p>
 msgid ""
@@ -489,9 +488,12 @@
 "предложениям переводов наших статей см. в 
<a href=\"/server/standards/README."
 "translations.html\">&ldquo;Руководстве по 
переводам&rdquo;</a>."
 
-# type: Content of: <div><p>
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2015, 2016 Free Software Foundation, Inc."
+# | Copyright &copy; [-2014,-] 2015, [-2016-] {+2016, 2018+} Free Software
+# | Foundation, Inc.
+#, fuzzy
+#| msgid "Copyright &copy; 2014, 2015, 2016 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2015, 2016, 2018 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2014, 2015, 2016 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
@@ -517,6 +519,19 @@
 msgstr "Обновлено:"
 
 #~ msgid ""
+#~ "Finally, we have a <a href=\"/software/for-windows.html\">short list of "
+#~ "free 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; для "
+#~ "пользователей Windows, желающих опробовать 
свободные программы."
+
+# type: Content of: <div><p>
+#~ msgid "Copyright &copy; 2015, 2016 Free Software Foundation, Inc."
+#~ msgstr "Copyright &copy; 2014, 2015, 2016 Free Software Foundation, Inc."
+
+#~ msgid ""
 #~ "#dynamic-duo {\n"
 #~ "   float: right;\n"
 #~ "   width: 24em;\n"

Index: software/po/software.sk.po
===================================================================
RCS file: /web/www/www/software/po/software.sk.po,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -b -r1.72 -r1.73
--- software/po/software.sk.po  1 Oct 2016 14:28:15 -0000       1.72
+++ software/po/software.sk.po  22 Apr 2018 09:00:07 -0000      1.73
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: software.html\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-29 13:55+0000\n"
+"POT-Creation-Date: 2018-04-22 08:56+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"
@@ -116,19 +116,12 @@
 "dispozícii na samostatnej stránke."
 
 #. type: Content of: <p>
-#, fuzzy
-#| msgid ""
-#| "Finally, here is <a href=\"/software/for-windows.html\">a short list of "
-#| "free software for Microsoft Windows</a>, for the Windows user who is "
-#| "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 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í "
-"by sa radi dozvedeli viac o slobodnom softvéri."
+msgid ""
+"Finally, we have <a href=\"https://directory.fsf.org/wiki/";
+"Free_Software_Directory:Free_software_replacements\"> a short list of free "
+"software replacements</a> for proprietary software running on various "
+"proprietary systems."
+msgstr ""
 
 #. type: Content of: <p>
 msgid ""
@@ -499,8 +492,8 @@
 # type: Content of: <title>
 #. type: Content of: <div><p>
 #, fuzzy
-#| msgid "Copyright &copy; 2014, 2015 Free Software Foundation, Inc."
-msgid "Copyright &copy; 2015, 2016 Free Software Foundation, Inc."
+#| msgid "Copyright &copy; 2014, 2015, 2016 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2015, 2016, 2018 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2009 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
@@ -525,6 +518,26 @@
 msgid "Updated:"
 msgstr "Aktualizované:"
 
+#, fuzzy
+#~| msgid ""
+#~| "Finally, here is <a href=\"/software/for-windows.html\">a short list of "
+#~| "free software for Microsoft Windows</a>, for the Windows user who is "
+#~| "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 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í by sa radi dozvedeli viac o slobodnom softvéri."
+
+# type: Content of: <title>
+#, fuzzy
+#~| msgid "Copyright &copy; 2014, 2015 Free Software Foundation, Inc."
+#~ msgid "Copyright &copy; 2015, 2016 Free Software Foundation, Inc."
+#~ msgstr "Copyright &copy; 2009 Free Software Foundation, Inc."
+
 # type: Content of: <div><p>
 #~ msgid ""
 #~ "<span class=\"highlight\">If you're looking for a whole system to "

Index: software/po/software.sq.po
===================================================================
RCS file: /web/www/www/software/po/software.sq.po,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -b -r1.79 -r1.80
--- software/po/software.sq.po  29 Sep 2016 13:59:11 -0000      1.79
+++ software/po/software.sq.po  22 Apr 2018 09:00:07 -0000      1.80
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2016-09-29 13:55+0000\n"
+"POT-Creation-Date: 2018-04-22 08:56+0000\n"
 "PO-Revision-Date: 2016-06-09 14:16+0200\n"
 "Last-Translator: Besnik Bleta <address@hidden>\n"
 "Language-Team: LANGUAGE <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"
+"X-Outdated-Since: 2018-04-22 08:56+0000\n"
 "X-Generator: Poedit 1.6.10\n"
 
 #. type: Content of: <title>
@@ -120,13 +121,11 @@
 
 #. 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 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-i të lirë për Microsoft Windows</a>, për përdorues të 
Windows-it që "
-"do të donin të provonin software të lirë."
+"Finally, we have <a href=\"https://directory.fsf.org/wiki/";
+"Free_Software_Directory:Free_software_replacements\"> a short list of free "
+"software replacements</a> for proprietary software running on various "
+"proprietary systems."
+msgstr ""
 
 #. type: Content of: <p>
 msgid ""
@@ -487,7 +486,9 @@
 "standards/README.translations.html\">README për përkthimet</a>."
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2015, 2016 Free Software Foundation, Inc."
+#, fuzzy
+#| msgid "Copyright &copy; 2014, 2015, 2016 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2015, 2016, 2018 Free Software Foundation, Inc."
 msgstr ""
 "Të drejta kopjimi &copy; 2014, 2015, 2016 Free Software Foundation, Inc."
 
@@ -512,6 +513,19 @@
 msgstr "U përditësua më:"
 
 #~ msgid ""
+#~ "Finally, we have a <a href=\"/software/for-windows.html\">short list of "
+#~ "free 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-i të lirë për Microsoft Windows</a>, për përdorues 
të "
+#~ "Windows-it që do të donin të provonin software të lirë."
+
+#~ msgid "Copyright &copy; 2015, 2016 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Të drejta kopjimi &copy; 2014, 2015, 2016 Free Software Foundation, Inc."
+
+#~ msgid ""
 #~ "#dynamic-duo {\n"
 #~ "   float: right;\n"
 #~ "   width: 24em;\n"

Index: software/po/software.uk.po
===================================================================
RCS file: /web/www/www/software/po/software.uk.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- software/po/software.uk.po  29 Sep 2016 13:59:11 -0000      1.4
+++ software/po/software.uk.po  22 Apr 2018 09:00:07 -0000      1.5
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: software.html\n"
-"POT-Creation-Date: 2016-09-29 13:55+0000\n"
+"POT-Creation-Date: 2018-04-22 08:56+0000\n"
 "PO-Revision-Date: 2016-08-09 09:35+0200\n"
 "Last-Translator: Andriy Bandura <address@hidden>\n"
 "Language-Team: Ukrainian <>\n"
@@ -14,6 +14,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2018-04-22 08:56+0000\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Lokalize 2.0\n"
@@ -121,13 +122,11 @@
 
 #. 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 Windows users who would like to try "
-"free software."
-msgstr ""
-"Нарешті, у нас є <a 
href=\"/software/for-windows.html\">короткий список "
-"вільних програм під Microsoft Windows</a>&nbsp;&mdash; 
для користувачів "
-"Windows, що бажають випробувати вільні 
програми."
+"Finally, we have <a href=\"https://directory.fsf.org/wiki/";
+"Free_Software_Directory:Free_software_replacements\"> a short list of free "
+"software replacements</a> for proprietary software running on various "
+"proprietary systems."
+msgstr ""
 
 #. type: Content of: <p>
 msgid ""
@@ -484,9 +483,12 @@
 "translations.html\">&ldquo;Посібнику з 
перекладу&rdquo;</a>."
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2015, 2016 Free Software Foundation, Inc."
+#, fuzzy
+#| msgid "Copyright &copy; 2014, 2015, 2016 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2015, 2016, 2018 Free Software Foundation, Inc."
 msgstr ""
-"Copyright &copy; 2015, 2016 Фонд вільного програмного 
забезпечення, Inc."
+"Copyright &copy; 2014, 2015, 2016 Фонд вільного 
програмного забезпечення, "
+"Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -509,3 +511,16 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Оновлено:"
+
+#~ msgid ""
+#~ "Finally, we have a <a href=\"/software/for-windows.html\">short list of "
+#~ "free 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; 
для користувачів "
+#~ "Windows, що бажають випробувати вільні 
програми."
+
+#~ msgid "Copyright &copy; 2015, 2016 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 2015, 2016 Фонд вільного 
програмного забезпечення, Inc."

Index: software/po/software.zh-cn.po
===================================================================
RCS file: /web/www/www/software/po/software.zh-cn.po,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -b -r1.66 -r1.67
--- software/po/software.zh-cn.po       27 Aug 2017 13:28:45 -0000      1.66
+++ software/po/software.zh-cn.po       22 Apr 2018 09:00:07 -0000      1.67
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: software.zh-cn.html\n"
-"POT-Creation-Date: 2016-09-29 13:55+0000\n"
+"POT-Creation-Date: 2018-04-22 08:56+0000\n"
 "PO-Revision-Date: 2017-08-27 20:50+0800\n"
 "Last-Translator: Wensheng Xie <address@hidden>\n"
 "Language-Team: Chinese <address@hidden>\n"
@@ -17,6 +17,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2018-04-22 08:56+0000\n"
 
 #. type: Content of: <title>
 msgid "Software - GNU Project - Free Software Foundation"
@@ -112,12 +113,11 @@
 
 #. 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 Windows users who would like to try "
-"free software."
+"Finally, we have <a href=\"https://directory.fsf.org/wiki/";
+"Free_Software_Directory:Free_software_replacements\"> a short list of free "
+"software replacements</a> for proprietary software running on various "
+"proprietary systems."
 msgstr ""
-"最后,这里是一个<a href=\"/software/for-windows.html\">Microsoft 
Windows上的"
-"自由软件</a>简表,提供给想在 Windows 
下使用自由软件的人们。"
 
 #. type: Content of: <p>
 msgid ""
@@ -448,9 +448,12 @@
 "若您想翻译本文,请参看 <a 
href=\"/server/standards/README.translations.html"
 "\">翻译须知</a> 获取有关协调和提交翻译的相关事项。"
 
+# type: Content of: <div><p>
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2015, 2016 Free Software Foundation, Inc."
-msgstr "Copyright &copy; 2015, 2016 Free Software Foundation, Inc."
+#, fuzzy
+#| msgid "Copyright &copy; 2011, 2012 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2015, 2016, 2018 Free Software Foundation, Inc."
+msgstr "Copyright &copy; 2011 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -476,6 +479,17 @@
 msgid "Updated:"
 msgstr "最后更新:"
 
+#~ msgid ""
+#~ "Finally, we have a <a href=\"/software/for-windows.html\">short list of "
+#~ "free 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 
下使用自由软件的人们。"
+
+#~ msgid "Copyright &copy; 2015, 2016 Free Software Foundation, Inc."
+#~ msgstr "Copyright &copy; 2015, 2016 Free Software Foundation, Inc."
+
 #~ msgid "Copyright &copy; 2011 Free Software Foundation, Inc."
 #~ msgstr "版权所有 &copy; 2011 自由软件基金会"
 



reply via email to

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