www-commits
[Top][All Lists]
Advanced

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

www/software/po for-windows.de.po for-windows.f...


From: GNUN
Subject: www/software/po for-windows.de.po for-windows.f...
Date: Wed, 15 Jul 2015 13:27:33 +0000

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     15/07/15 13:27:33

Modified files:
        software/po    : for-windows.de.po for-windows.fr.po 
                         for-windows.hr-diff.html for-windows.hr.po 
                         for-windows.pot 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/software/po/for-windows.de.po?cvsroot=www&r1=1.64&r2=1.65
http://web.cvs.savannah.gnu.org/viewcvs/www/software/po/for-windows.fr.po?cvsroot=www&r1=1.21&r2=1.22
http://web.cvs.savannah.gnu.org/viewcvs/www/software/po/for-windows.hr-diff.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/software/po/for-windows.hr.po?cvsroot=www&r1=1.14&r2=1.15
http://web.cvs.savannah.gnu.org/viewcvs/www/software/po/for-windows.pot?cvsroot=www&r1=1.28&r2=1.29

Patches:
Index: for-windows.de.po
===================================================================
RCS file: /web/www/www/software/po/for-windows.de.po,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -b -r1.64 -r1.65
--- for-windows.de.po   11 Mar 2015 14:37:03 -0000      1.64
+++ for-windows.de.po   15 Jul 2015 13:27:31 -0000      1.65
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: for-windows.html\n"
-"POT-Creation-Date: 2015-03-09 21:55+0000\n"
+"POT-Creation-Date: 2015-07-15 13:25+0000\n"
 "PO-Revision-Date: 2015-03-10 22:00+0100\n"
 "Last-Translator: Jоегg Kоhпе <joeko (AT) online [PUNKT] de>\n"
 "Language-Team: German <address@hidden>\n"
@@ -14,32 +14,12 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2015-07-15 13:25+0000\n"
 
 #. type: Content of: <title>
 msgid "Free Software for Windows - GNU Project - Free Software Foundation"
 msgstr "Freie Software für Windows - GNU-Projekt - Free Software Foundation"
 
-#. type: Content of: <style>
-#, no-wrap
-msgid ""
-"#windows7sins {\n"
-"   float: right;\n"
-"   width: 25em;\n"
-"   text-align: center;\n"
-"   margin: 0 1em 1em 1em;\n"
-"}\n"
-"blockquote#windows7sins p { margin: .3em 0 0 0; }\n"
-"#windows7sins img { width: 100%; }\n"
-msgstr ""
-"#windows7sins {\n"
-"   float: right;\n"
-"   width: 25em;\n"
-"   text-align: center;\n"
-"   margin: 0 1em 1em 1em;\n"
-"}\n"
-"blockquote#windows7sins p { margin: .3em 0 0 0; }\n"
-"#windows7sins img { width: 100%; }\n"
-
 #. type: Content of: <h2>
 msgid "Free Software for Windows"
 msgstr "Freie Software für Windows"
@@ -74,10 +54,34 @@
 msgstr "„Verbesserung“ von Windows 8"
 
 #. type: Content of: <p>
-msgid ""
-"When we say these application programs are <a href= \"/philosophy/free-sw."
-"html\">free software</a>, we're talking about freedom, not price. It means "
-"that you are free to use these programs constructively, either alone or in a "
+# | When we say these application programs are <a href=[-
+# | -]\"/philosophy/free-sw.html\">free software</a>, we're talking about
+# | freedom, not price. It means that you are free to use these programs
+# | constructively, either alone or in a community, while respecting the
+# | freedom of others. The source code is available, so that you can study the
+# | software, adapt it to your needs, fix bugs, and release versions with new
+# | features. You can also convince or pay others to do these things for you.
+# | You are also free to give away and free to sell copies, under the terms of
+# | the applicable free software license. These programs are free software
+# | because <em>you have freedom</em> in using them. Free software develops
+# | under the control of its users.
+#, fuzzy
+#| msgid ""
+#| "When we say these application programs are <a href= \"/philosophy/free-sw."
+#| "html\">free software</a>, we're talking about freedom, not price. It "
+#| "means that you are free to use these programs constructively, either "
+#| "alone or in a community, while respecting the freedom of others. The "
+#| "source code is available, so that you can study the software, adapt it to "
+#| "your needs, fix bugs, and release versions with new features. You can "
+#| "also convince or pay others to do these things for you. You are also free "
+#| "to give away and free to sell copies, under the terms of the applicable "
+#| "free software license. These programs are free software because <em>you "
+#| "have freedom</em> in using them. Free software develops under the control "
+#| "of its users."
+msgid ""
+"When we say these application programs are <a href=\"/philosophy/free-sw.html"
+"\">free software</a>, we're talking about freedom, not price. It means that "
+"you are free to use these programs constructively, either alone or in a "
 "community, while respecting the freedom of others. The source code is "
 "available, so that you can study the software, adapt it to your needs, fix "
 "bugs, and release versions with new features. You can also convince or pay "
@@ -100,15 +104,34 @@
 "ihrer Nutzer entwickelt."
 
 #. type: Content of: <p>
+# | Microsoft Windows is a clear and instructive example of nonfree software.
+# | Its source code is a secret, so programmers cannot learn from it, fix it,
+# | adapt it to their clients (your) needs, or even verify what it really
+# | does. If you share copies with your neighbors, you will be called a
+# | [-\"pirate\",-] {+&ldquo;pirate&rdquo;,+} and users have been threatened
+# | with imprisonment for this. Nonfree software is completely controlled by
+# | its developer, who also has power over the users. We started the free
+# | software movement because <a
+# | href=\"/philosophy/freedom-or-power.html\">this power is unjust</a>.
+#, fuzzy
+#| msgid ""
+#| "Microsoft Windows is a clear and instructive example of nonfree software. "
+#| "Its source code is a secret, so programmers cannot learn from it, fix it, "
+#| "adapt it to their clients (your) needs, or even verify what it really "
+#| "does. If you share copies with your neighbors, you will be called a "
+#| "\"pirate\", and users have been threatened with imprisonment for this. "
+#| "Nonfree software is completely controlled by its developer, who also has "
+#| "power over the users. We started the free software movement because <a "
+#| "href=\"/philosophy/freedom-or-power.html\">this power is unjust</a>."
 msgid ""
 "Microsoft Windows is a clear and instructive example of nonfree software. "
 "Its source code is a secret, so programmers cannot learn from it, fix it, "
 "adapt it to their clients (your) needs, or even verify what it really does. "
-"If you share copies with your neighbors, you will be called a \"pirate\", "
-"and users have been threatened with imprisonment for this. Nonfree software "
-"is completely controlled by its developer, who also has power over the "
-"users. We started the free software movement because <a href=\"/philosophy/"
-"freedom-or-power.html\">this power is unjust</a>."
+"If you share copies with your neighbors, you will be called a &ldquo;"
+"pirate&rdquo;, and users have been threatened with imprisonment for this. "
+"Nonfree software is completely controlled by its developer, who also has "
+"power over the users. We started the free software movement because <a href="
+"\"/philosophy/freedom-or-power.html\">this power is unjust</a>."
 msgstr ""
 "Microsoft Windows ist ein gutes und lehrreiches Beispiel für unfreie "
 "Software. Der Quellcode ist ein Geheimnis, Programmierer können davon weder "
@@ -133,8 +156,14 @@
 "steht man noch immer unter der Macht von Microsoft."
 
 #. type: Content of: <p>
+# | So the next step is to replace Windows with a <a
+# | href=\"/distros{+/+}\">free operating system such as GNU/Linux</a>.
+#, fuzzy
+#| msgid ""
+#| "So the next step is to replace Windows with a <a href=\"/distros\">free "
+#| "operating system such as GNU/Linux</a>."
 msgid ""
-"So the next step is to replace Windows with a <a href=\"/distros\">free "
+"So the next step is to replace Windows with a <a href=\"/distros/\">free "
 "operating system such as GNU/Linux</a>."
 msgstr ""
 "Der nächste Schritt ist also, Windows mit einem <a href=\"/distros/free-"
@@ -146,63 +175,92 @@
 msgstr ""
 "<strong>Allerdings befassen wir uns hier nur um den ersten Schritt.</strong>"
 
-#. type: Content of: <h3>
-msgid "<a href=\"http://directory.fsf.org/blender.html\";>Blender 3D</a>"
-msgstr "<a href=\"http://directory.fsf.org/blender.html\";>Blender 3D</a>"
+#. type: Content of: <table><thead><tr><th>
+msgid "Category"
+msgstr ""
 
-#. type: Content of: <p>
-msgid "<strong>Replacement for:</strong> Maya, 3DSMax"
-msgstr "<i>Ersatz für:</i> <b>Maya</b>, <b>3DSMax</b>"
+#. type: Content of: <table><thead><tr><th>
+msgid "Free program<a href=\"#f1\"><sup>1</sup></a>"
+msgstr ""
 
-#. type: Content of: <p>
-msgid ""
-"Blender is the first and only fully integrated 3D graphics creation suite "
-"allowing modeling, animation, rendering, post-production, realtime "
-"interactive 3D and game creation and playback with cross-platform "
-"compatibility."
+#. type: Content of: <table><thead><tr><th>
+msgid "Replacement for"
 msgstr ""
-"<b>Blender</b>, das erste und einzige voll integrierte 3D-"
-"Grafikerstellungspaket, ermöglicht Modellierung, Animation, Rendering, "
-"Nachbearbeitung, interaktive 3D-Echtzeit und -Spielerstellung und -"
-"wiedergabe mit plattformübergreifender Kompatibilität."
 
-#. type: Content of: <h3>
-msgid "<a href=\"http://directory.fsf.org/dia.html\";>Dia</a>"
-msgstr "<a href=\"http://directory.fsf.org/dia.html\";>Dia</a>"
+#. type: Content of: <table><tbody><tr><td>
+msgid "Graphics and Design"
+msgstr ""
 
-#. type: Content of: <p>
-msgid "<strong>Replacement for:</strong> Microsoft Visio"
-msgstr "<i>Ersatz für:</i> <b>Microsoft Visio</b>"
+#. type: Content of: <table><tbody><tr><td>
+msgid "<a href=\"#Dia\">Dia</a>"
+msgstr ""
 
-#. type: Content of: <p>
-msgid ""
-"Dia is designed to be much like the proprietary Microsoft program 'Visio'. "
-"It can be used to draw many different kinds of diagrams. It currently has "
-"special objects to help draw entity relationship diagrams, UML diagrams, "
-"flowcharts, network diagrams, and simple circuits. It is also possible to "
-"add support for new shapes by writing simple XML files, using a subset of "
-"SVG to draw the shape."
+#. type: Content of: <table><tbody><tr><td>
+msgid "Microsoft Visio"
 msgstr ""
-"<b>Dia</b> ist dem proprietären Microsoft-Programm Visio ähnlich. Es kann "
-"zum Zeichnen vieler verschiedener Diagramme verwendet werden. Es enthält "
-"spezielle Objekte, um Entitätsbeziehungs-, UML-, Fluss- und Netzwerk-"
-"Diagramme und einfache Stromkreise zu zeichnen. Es ist auch möglich, "
-"Unterstützung für neue Formen durch einfache XML-Dateien hinzuzufügen, 
unter "
-"Nutzung eines Teils von SVG."
 
-#. type: Content of: <p>
-msgid ""
-"It can load and save diagrams to a custom XML format (gzipped by default, to "
-"save space), can export diagrams to EPS or SVG formats and can print "
-"diagrams (including ones that span multiple pages)."
+#. type: Content of: <table><tbody><tr><td>
+msgid "<a href=\"#GIMP\">GIMP</a>"
 msgstr ""
-"<b>Dia</b> kann Diagramme in einem benutzerdefiniertem XML-Format laden und "
-"speichern (standardmäßig gezippt, um Speicherplatz zu sparen) sowie das 
EPS- "
-"oder SVG-Format exportieren und drucken (einschließlich Übergrößen auf "
-"mehrere Seiten aufgeteilt)."
 
-#. type: Content of: <h3>
-msgid "<a href=\"http://directory.fsf.org/pidgin.html\";>Pidgin</a>"
+#. type: Content of: <table><tbody><tr><td>
+msgid "Photoshop, Paint Shop Pro"
+msgstr ""
+
+#. type: Content of: <table><tbody><tr><td>
+# | <a [-href=\"http://www.inkscape.org/\";>Inkscape</a>-]
+# | {+href=\"#Inkscape\">Inkscape</a>+}
+#, fuzzy
+#| msgid "<a href=\"http://www.inkscape.org/\";>Inkscape</a>"
+msgid "<a href=\"#Inkscape\">Inkscape</a>"
+msgstr "<a href=\"http://www.inkscape.org/\";>Inkscape</a>"
+
+#. type: Content of: <table><tbody><tr><td>
+# | [-<strong>Replacement for:</strong>-]Adobe Illustrator, Macromedia
+# | Freehand, [-CorelDraw or-] {+CorelDraw,+} Xara Xtreme
+#, fuzzy
+#| msgid ""
+#| "<strong>Replacement for:</strong> Adobe Illustrator, Macromedia Freehand, "
+#| "CorelDraw or Xara Xtreme"
+msgid "Adobe Illustrator, Macromedia Freehand, CorelDraw, Xara Xtreme"
+msgstr ""
+"<i>Ersatz für:</i> <b>Adobe Illustrator</b>, <b>Macromedia Freehand</b>, "
+"<b>CorelDraw</b> oder <b>Xara Xtreme</b>"
+
+#. type: Content of: <table><tbody><tr><td>
+msgid "Internet"
+msgstr ""
+
+#. type: Content of: <table><tbody><tr><td>
+# | <a [-href=\"http://www.claws-mail.org/\";>Claws-]
+# | {+href=\"#ClawsMail\">Claws+} Mail</a>
+#, fuzzy
+#| msgid "<a href=\"http://www.claws-mail.org/\";>Claws Mail</a>"
+msgid "<a href=\"#ClawsMail\">Claws Mail</a>"
+msgstr "<a href=\"http://www.claws-mail.org/\";>Claws Mail</a>"
+
+#. type: Content of: <table><tbody><tr><td>
+msgid "Outlook, Outlook Express"
+msgstr ""
+
+#. type: Content of: <table><tbody><tr><td>
+# | <a [-href=\"http://gnunet.org\";>GNUnet</a>-]
+# | {+href=\"#GNUnet\">GNUnet</a>+}
+#, fuzzy
+#| msgid "<a href=\"http://gnunet.org\";>GNUnet</a>"
+msgid "<a href=\"#GNUnet\">GNUnet</a>"
+msgstr "<a href=\"http://gnunet.org\";>GNUnet</a>"
+
+#. type: Content of: <table><tbody><tr><td>
+msgid "Napster, etc."
+msgstr ""
+
+#. type: Content of: <table><tbody><tr><td>
+# | <a [-href=\"http://directory.fsf.org/pidgin.html\";>Pidgin</a>-]
+# | {+href=\"#Pidgin\">Pidgin</a>+}
+#, fuzzy
+#| msgid "<a href=\"http://directory.fsf.org/pidgin.html\";>Pidgin</a>"
+msgid "<a href=\"#Pidgin\">Pidgin</a>"
 msgstr "<a href=\"http://directory.fsf.org/pidgin.html\";>Pidgin</a>"
 
 # IM services:
@@ -211,71 +269,186 @@
 # IM software:
 # Bitlbee (GNU-System), Kopete (GNU-System), Pidgin (prev. Gaim) (GNU-System),
 # Miranda, Odigo, Trillian, [Fire (Macintosh)]
-#. type: Content of: <p>
-msgid ""
-"<strong>Replacement for:</strong> Trillian, AIM, MSN, Yahoo and ICQ chat "
-"clients"
+#. type: Content of: <table><tbody><tr><td>
+# | [-<strong>Replacement for:</strong>-]Trillian, AIM, MSN, [-Yahoo and-]
+# | {+Yahoo,+} ICQ chat clients
+#, fuzzy
+#| msgid ""
+#| "<strong>Replacement for:</strong> Trillian, AIM, MSN, Yahoo and ICQ chat "
+#| "clients"
+msgid "Trillian, AIM, MSN, Yahoo, ICQ chat clients"
 msgstr ""
 "<i>Ersatz für:</i> <b>Trillian</b>, <b>AOL Instant Messenger (AIM)</b>, "
 "<b>Microsoft MSN-Messenger</b>, <b>Yahoo!-Messenger</b> und <b>ICQ</b> Chat-"
 "Klienten"
 
-#. type: Content of: <p>
-msgid ""
-"Pidgin (Gaim) is a multi-protocol instant messaging client, with support for:"
+#. type: Content of: <table><tbody><tr><td>
+# | <a [-href=\"http://www.qupzilla.com/\";>QupZilla</a>-]
+# | {+href=\"#QupZilla\">QupZilla</a>+}
+#, fuzzy
+#| msgid "<a href=\"http://www.qupzilla.com/\";>QupZilla</a>"
+msgid "<a href=\"#QupZilla\">QupZilla</a>"
+msgstr "<a href=\"http://www.qupzilla.com/\";>QupZilla</a>"
+
+#. type: Content of: <table><tbody><tr><td>
+msgid "Firefox<a href=\"#f2\"><sup>2</sup></a>, Chrome, Internet Explorer"
 msgstr ""
-"<b>Pidgin</b> ist ein Mehrprotokoll-Instant-Messaging-Klient mit "
-"Unterstützung für:"
 
-#. type: Content of: <ul><li>
-msgid "AIM (Oscar and TOC protocols),"
-msgstr "<b>AIM</b> (Oscar- und TOC-Protokolle),"
+#. type: Content of: <table><tbody><tr><td>
+# | <a [-href=\"http://www.tribler.org/\";>Tribler</a>-]
+# | {+href=\"#Tribler\">Tribler</a>+}
+#, fuzzy
+#| msgid "<a href=\"http://www.tribler.org/\";>Tribler</a>"
+msgid "<a href=\"#Tribler\">Tribler</a>"
+msgstr "<a href=\"http://www.tribler.org/\";>Tribler</a>"
 
-#. type: Content of: <ul><li>
-msgid "ICQ,"
-msgstr "<b>ICQ</b>,"
+#. type: Content of: <table><tbody><tr><td>
+msgid "BitTorrent"
+msgstr ""
 
-#. type: Content of: <ul><li>
-msgid "MSN Messenger,"
-msgstr "<b>Windows Live Messenger</b> (früher <b>MSN Messenger</b>)"
+#. type: Content of: <table><tbody><tr><td>
+msgid "Multimedia"
+msgstr ""
 
-#. type: Content of: <ul><li>
-msgid "Yahoo,"
-msgstr "<b>Yahoo Mail</b> (früher <b>Yahoo Web-Messenger</b>),"
+#. type: Content of: <table><tbody><tr><td>
+# | <a [-href=\"http://directory.fsf.org/blender.html\";>Blender 3D</a>-]
+# | {+href=\"#Blender3D\">Blender3D</a>+}
+#, fuzzy
+#| msgid "<a href=\"http://directory.fsf.org/blender.html\";>Blender 3D</a>"
+msgid "<a href=\"#Blender3D\">Blender3D</a>"
+msgstr "<a href=\"http://directory.fsf.org/blender.html\";>Blender 3D</a>"
 
-#. type: Content of: <ul><li>
-msgid "IRC,"
-msgstr "<b>IRC</b>,"
+#. type: Content of: <table><tbody><tr><td>
+msgid "Maya, 3DSMax"
+msgstr ""
 
-#. type: Content of: <ul><li>
-msgid "Jabber,"
-msgstr "<b>Jabber</b>,"
+#. type: Content of: <table><tbody><tr><td>
+# | <a [-href=\"http://videolan.org/vlc/\";>VideoLAN-]
+# | {+href=\"#VLC\">VideoLan+} Client (VLC)</a>
+#, fuzzy
+#| msgid "<a href=\"http://videolan.org/vlc/\";>VideoLAN Client (VLC)</a>"
+msgid "<a href=\"#VLC\">VideoLan Client (VLC)</a>"
+msgstr "<a href=\"http://videolan.org/vlc/\";>VLC Media Player</a>"
 
-#. type: Content of: <ul><li>
-msgid "Novell,"
-msgstr "<b>Novell Messenger</b>,"
+#. type: Content of: <table><tbody><tr><td>
+# | [-<strong>Replacement for:</strong>-]Windows Media Player, PowerDVD
+#, fuzzy
+#| msgid "<strong>Replacement for:</strong> Windows Media Player, PowerDVD"
+msgid "Windows Media Player, PowerDVD"
+msgstr ""
+"<i>Ersatz für:</i> <b>Windows Media Player</b>, <b>CyberLink PowerDVD</b>"
 
-#. type: Content of: <ul><li>
-msgid "Gadu-Gadu, and"
-msgstr "<b>Gadu-Gadu</b> und"
+#. type: Content of: <table><tbody><tr><td>
+msgid "Office and Productivity"
+msgstr ""
 
-#. type: Content of: <ul><li>
-msgid "Zephyr networks."
-msgstr "<b>Zephyr Networks</b>."
+#. type: Content of: <table><tbody><tr><td>
+# | <a [-href=\"http://www.libreoffice.org/\";>LibreOffice</a>-]
+# | {+href=\"#LibreOffice\">LibreOffice</a>+}
+#, fuzzy
+#| msgid "<a href=\"http://www.libreoffice.org/\";>LibreOffice</a>"
+msgid "<a href=\"#LibreOffice\">LibreOffice</a>"
+msgstr "<a href=\"http://www.libreoffice.org/\";>LibreOffice</a>"
 
-#. type: Content of: <p>
-msgid "Pidgin also supports plugins, for additional functionality."
-msgstr "<b>Pidgin</b> unterstützt auch Plug-ins für zusätzliche Funktionen."
+#. type: Content of: <table><tbody><tr><td>
+msgid "Microsoft Office"
+msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <table><tbody><tr><td>
+msgid "Publishing"
+msgstr ""
+
+#. type: Content of: <table><tbody><tr><td>
+# | <a [-href=\"http://www.scribus.net/\";>Scribus</a>-]
+# | {+href=\"#Scribus\">Scribus</a>+}
+#, fuzzy
+#| msgid "<a href=\"http://www.scribus.net/\";>Scribus</a>"
+msgid "<a href=\"#Scribus\">Scribus</a>"
+msgstr "<a href=\"http://www.scribus.net/\";>Scribus</a>"
+
+#. type: Content of: <table><tbody><tr><td>
+# | [-<strong>Replacement for:</strong>-]PageMaker, InDesign, QuarkXPress
+#, fuzzy
+#| msgid "<strong>Replacement for:</strong> PageMaker, InDesign, QuarkXPress"
+msgid "PageMaker, InDesign, QuarkXPress"
+msgstr ""
+"<i>Ersatz für:</i> <b>PageMaker</b>, <b>InDesign</b>, <b>QuarkXPress</b>"
+
+#. type: Content of: <table><tbody><tr><td>
+msgid "Programming Utilities"
+msgstr ""
+
+#. type: Content of: <table><tbody><tr><td>
+# | <a [-href=\"http://www.mingw.org\";>MinGW</a>-]
+# | {+href=\"#MinGW\">MinGW</a>+}
+#, fuzzy
+#| msgid "<a href=\"http://www.mingw.org\";>MinGW</a>"
+msgid "<a href=\"#MinGW\">MinGW</a>"
+msgstr "<a href=\"http://www.mingw.org\";>MinGW</a>"
+
+#. type: Content of: <table><tbody><tr><td>
+msgid "Microsoft Visual C++"
+msgstr ""
+
+#. type: Content of: <div><ol><li>
+msgid ""
+"This is a selection of the more common free software applications available "
+"for the Microsoft Windows platform, and is nothing like a comprehensive list."
+msgstr ""
+"Dies ist eine kleine, nicht sehr umfassende Auswahl der häufigsten Freie-"
+"Software-Anwendungen für die Microsoft Windows-Plattform."
+
+#. type: Content of: <div><ol><li>
+msgid ""
+"Why not recommend Firefox? As explained in our <a href=\"/philosophy/free-sw."
+"html\">Free Software Definition</a>, all four freedoms must be available on "
+"both a commercial and non-commercial basis. Mozilla's trademark policy "
+"serves to limit Freedom 2 to gratis distribution only, making the software "
+"nonfree."
+msgstr ""
+"Warum keine Empfehlung für <b>Firefox</b>? In unserer <a href=\"/philosophy/"
+"free-sw\">Freie-Software-Definition</a> wird erläutert, warum alle vier "
+"Freiheiten auf sowohl kommerzieller und unkommerzieller Basis verfügbar sein 
"
+"müssen. Mozillas Richtlinie für eingetragene Warenzeichen dient dazu, "
+"<em>Freiheit 2</em> nur auf die kostenfreie Verteilung zu beschränken&#160;"
+"&#8209;&#160;wodurch die Software unfrei wird."
+
+#. type: Content of: <dl><dt>
+msgid "<a href=\"http://directory.fsf.org/dia.html\";>Dia</a>"
+msgstr "<a href=\"http://directory.fsf.org/dia.html\";>Dia</a>"
+
+#. type: Content of: <dl><dd><p>
+msgid ""
+"Dia is designed to be much like the proprietary Microsoft program 'Visio'. "
+"It can be used to draw many different kinds of diagrams. It currently has "
+"special objects to help draw entity relationship diagrams, UML diagrams, "
+"flowcharts, network diagrams, and simple circuits. It is also possible to "
+"add support for new shapes by writing simple XML files, using a subset of "
+"SVG to draw the shape."
+msgstr ""
+"<b>Dia</b> ist dem proprietären Microsoft-Programm Visio ähnlich. Es kann "
+"zum Zeichnen vieler verschiedener Diagramme verwendet werden. Es enthält "
+"spezielle Objekte, um Entitätsbeziehungs-, UML-, Fluss- und Netzwerk-"
+"Diagramme und einfache Stromkreise zu zeichnen. Es ist auch möglich, "
+"Unterstützung für neue Formen durch einfache XML-Dateien hinzuzufügen, 
unter "
+"Nutzung eines Teils von SVG."
+
+#. type: Content of: <dl><dd><p>
+msgid ""
+"It can load and save diagrams to a custom XML format (gzipped by default, to "
+"save space), can export diagrams to EPS or SVG formats and can print "
+"diagrams (including ones that span multiple pages)."
+msgstr ""
+"<b>Dia</b> kann Diagramme in einem benutzerdefiniertem XML-Format laden und "
+"speichern (standardmäßig gezippt, um Speicherplatz zu sparen) sowie das 
EPS- "
+"oder SVG-Format exportieren und drucken (einschließlich Übergrößen auf "
+"mehrere Seiten aufgeteilt)."
+
+#. type: Content of: <dl><dt>
 msgid "<a href=\"http://directory.fsf.org/gimp.html\";>GIMP</a>"
 msgstr "<a href=\"http://directory.fsf.org/gimp.html\";>GIMP</a>"
 
-#. type: Content of: <p>
-msgid "<strong>Replacement for:</strong> Photoshop, Paint Shop Pro"
-msgstr "<i>Ersatz für:</i> <b>Photoshop</b>, <b>Paint Shop Pro</b>"
-
-#. type: Content of: <p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "GIMP is an acronym for GNU Image Manipulation Program.  It can be used as a "
 "simple paint program, an expert quality photo retouching program, an online "
@@ -287,7 +460,7 @@
 "Fotoretuschiersoftware, Online-Stapelverarbeitung-System, Massenproduktion "
 "Bild-Renderer, Bild-Formatkonverter usw. verwendet werden."
 
-#. type: Content of: <p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "GIMP is expandable and extensible. It is designed to be augmented with plug-"
 "ins and extensions to do just about anything."
@@ -295,7 +468,7 @@
 "<b>GIMP</b> ist erweiterbar und kann mit Plug-ins und Erweiterungen ergänzt "
 "werden, um so gut wie alles damit machen zu können."
 
-#. type: Content of: <p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "<i>Anyone who is familiar with the GNU/Linux operating system has probably "
 "seen/used the GIMP at some stage. In terms of compatibility, GIMP can open/"
@@ -307,46 +480,11 @@
 "Kompatibilität kann <b>GIMP</b> das <em>.psd</em>- und das <em>.psp</em>-"
 "Format von <b>Paint Shop Pro</b> und <b>PhotoShop</b> öffnen."
 
-#. type: Content of: <h3>
-msgid "<a href=\"http://gnunet.org\";>GNUnet</a>"
-msgstr "<a href=\"http://gnunet.org\";>GNUnet</a>"
-
-#. type: Content of: <p>
-msgid "<strong>Replacement for:</strong> Napster, etc."
-msgstr "<i>Ersatz für:</i> <b>Napster</b> usw."
-
-#. type: Content of: <p>
-msgid ""
-"GNUnet is a framework for secure peer-to-peer networking that does not use "
-"any centralized or otherwise trusted services. A first service implemented "
-"on top of the networking layer allows anonymous censorship-resistant file-"
-"sharing. GNUnet uses a simple, excess-based economic model to allocate "
-"resources. Peers in GNUnet monitor each others behavior with respect to "
-"resource usage; peers that contribute to the network are rewarded with "
-"better service."
-msgstr ""
-"<b>GNUnet</b> ist ein Framework für sichere Peer-to-Peer-Netzwerke, das "
-"keine zentralisierten oder auf andere Weise vertrauenswürdige Dienste nutzt. 
"
-"Ein erster, auf Netzwerkebene umgesetzter Dienst ermöglicht anonymen "
-"zensurresistenten Dateiaustausch. <b>GNUnet</b> benutzt ein einfaches, "
-"Überschussbasiertes ökonomisches Modell, um Ressourcen bereitzustellen. "
-"Peers im <b>GNUnet</b> überwachen das Verhalten der anderen in Bezug auf "
-"Ressourcen: Peers, die zum Netzwerk beitragen, werden mit einem besseren "
-"Dienst belohnt."
-
-#. type: Content of: <h3>
+#. type: Content of: <dl><dt>
 msgid "<a href=\"http://www.inkscape.org/\";>Inkscape</a>"
 msgstr "<a href=\"http://www.inkscape.org/\";>Inkscape</a>"
 
-#. type: Content of: <p>
-msgid ""
-"<strong>Replacement for:</strong> Adobe Illustrator, Macromedia Freehand, "
-"CorelDraw or Xara Xtreme"
-msgstr ""
-"<i>Ersatz für:</i> <b>Adobe Illustrator</b>, <b>Macromedia Freehand</b>, "
-"<b>CorelDraw</b> oder <b>Xara Xtreme</b>"
-
-#. type: Content of: <p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "Inkscape is an vector graphics editor, with capabilities similar to "
 "Illustrator, Freehand, CorelDraw, or Xara Xtreme using the W3C standard "
@@ -361,7 +499,7 @@
 "Funktionen wie Formen, Pfade, Text, Marker, Klonen, Alpha Blending, "
 "Transformationen, Farbverläufe, Muster und Gruppierung."
 
-#. type: Content of: <p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "Inkscape also supports Creative Commons meta-data, node editing, layers, "
 "complex path operations, bitmap tracing, text-on-path, flowed text, direct "
@@ -374,36 +512,11 @@
 "unterstützt. Dateiformate wie JPEG, PNG, TIFF und andere können importiert "
 "und PNG als auch mehrere Vektor-basierte Formate exportiert werden."
 
-#. type: Content of: <h3>
-msgid "<a href=\"http://www.mingw.org\";>MinGW</a>"
-msgstr "<a href=\"http://www.mingw.org\";>MinGW</a>"
-
-#. type: Content of: <p>
-msgid "<strong>Replacement for:</strong> Microsoft Visual C++"
-msgstr "<i>Ersatz für:</i> <b>Microsoft Visual C++</b>"
-
-#. type: Content of: <p>
-msgid ""
-"MinGW (Minimalist GNU for Windows) provides many of the GNU programming "
-"utilities on Windows. It includes the GNU Compiler Collection (GCC), "
-"Binutils, GNU Debugger (GDB), Make, and more."
-msgstr ""
-"<b>MinGW</b>, für <b><span xml:lang=\"en\" lang=\"en\">Minimalist GNU for "
-"Windows</span></b>, bietet viele der GNU-Dienstprogramme zur "
-"Softwareentwicklung unter Windows und enthält die <b>GNU Compiler "
-"Collection</b> (GCC), <b>GNU Binary Utilities</b> (Binutils), <b>GNU "
-"Debugger</b> (GDB), <b>GNU Make</b> uvm."
-
-#. type: Content of: <h3>
+#. type: Content of: <dl><dt>
 msgid "<a href=\"http://www.claws-mail.org/\";>Claws Mail</a>"
 msgstr "<a href=\"http://www.claws-mail.org/\";>Claws Mail</a>"
 
-#. type: Content of: <p>
-msgid "<strong>Replacement for:</strong> Outlook, Outlook Express"
-msgstr ""
-"<i>Ersatz für:</i> <b>Microsoft Outlook</b>, <b>Microsoft Outlook 
Express</b>"
-
-#. type: Content of: <p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "Claws Mail is designed to be familiar to new users coming from other popular "
 "email clients, as well as experienced users."
@@ -411,61 +524,132 @@
 "<b>Claws Mail</b> soll für neue Nutzer, die bisher andere gängige E-Mail-"
 "Programmen nutzten, als auch für erfahrene Nutzer vertraut sein."
 
-#. type: Content of: <h3>
-msgid "<a href=\"http://www.libreoffice.org/\";>LibreOffice</a>"
-msgstr "<a href=\"http://www.libreoffice.org/\";>LibreOffice</a>"
+#. type: Content of: <dl><dt>
+msgid "<a href=\"http://gnunet.org\";>GNUnet</a>"
+msgstr "<a href=\"http://gnunet.org\";>GNUnet</a>"
 
-#. type: Content of: <p>
-msgid "<strong>Replacement for:</strong> Microsoft Office"
-msgstr "<i>Ersatz für:</i> <b>Microsoft Office</b>"
+#. type: Content of: <dl><dd><p>
+msgid ""
+"GNUnet is a framework for secure peer-to-peer networking that does not use "
+"any centralized or otherwise trusted services. A first service implemented "
+"on top of the networking layer allows anonymous censorship-resistant file-"
+"sharing. GNUnet uses a simple, excess-based economic model to allocate "
+"resources. Peers in GNUnet monitor each others behavior with respect to "
+"resource usage; peers that contribute to the network are rewarded with "
+"better service."
+msgstr ""
+"<b>GNUnet</b> ist ein Framework für sichere Peer-to-Peer-Netzwerke, das "
+"keine zentralisierten oder auf andere Weise vertrauenswürdige Dienste nutzt. 
"
+"Ein erster, auf Netzwerkebene umgesetzter Dienst ermöglicht anonymen "
+"zensurresistenten Dateiaustausch. <b>GNUnet</b> benutzt ein einfaches, "
+"Überschussbasiertes ökonomisches Modell, um Ressourcen bereitzustellen. "
+"Peers im <b>GNUnet</b> überwachen das Verhalten der anderen in Bezug auf "
+"Ressourcen: Peers, die zum Netzwerk beitragen, werden mit einem besseren "
+"Dienst belohnt."
 
-#. type: Content of: <p>
+#. type: Content of: <dl><dt>
+msgid "<a href=\"http://directory.fsf.org/pidgin.html\";>Pidgin</a>"
+msgstr "<a href=\"http://directory.fsf.org/pidgin.html\";>Pidgin</a>"
+
+#. type: Content of: <dl><dd><p>
 msgid ""
-"LibreOffice is a multi-platform office productivity suite compatible with "
-"all major file formats."
+"Pidgin (Gaim) is a multi-protocol instant messaging client, with support for:"
 msgstr ""
-"<b>LibreOffice</b> ist ein plattformunabhängiges Büropaket, kompatibel mit "
-"allen gängigen Dateiformaten."
+"<b>Pidgin</b> ist ein Mehrprotokoll-Instant-Messaging-Klient mit "
+"Unterstützung für:"
 
-#. type: Content of: <h3>
-msgid "<a href=\"http://www.scribus.net/\";>Scribus</a>"
-msgstr "<a href=\"http://www.scribus.net/\";>Scribus</a>"
+#. type: Content of: <dl><dd><ul><li>
+msgid "AIM (Oscar and TOC protocols),"
+msgstr "<b>AIM</b> (Oscar- und TOC-Protokolle),"
 
-#. type: Content of: <p>
-msgid "<strong>Replacement for:</strong> PageMaker, InDesign, QuarkXPress"
+#. type: Content of: <dl><dd><ul><li>
+msgid "ICQ,"
+msgstr "<b>ICQ</b>,"
+
+#. type: Content of: <dl><dd><ul><li>
+msgid "MSN Messenger,"
+msgstr "<b>Windows Live Messenger</b> (früher <b>MSN Messenger</b>)"
+
+#. type: Content of: <dl><dd><ul><li>
+msgid "Yahoo,"
+msgstr "<b>Yahoo Mail</b> (früher <b>Yahoo Web-Messenger</b>),"
+
+#. type: Content of: <dl><dd><ul><li>
+msgid "IRC,"
+msgstr "<b>IRC</b>,"
+
+#. type: Content of: <dl><dd><ul><li>
+msgid "Jabber,"
+msgstr "<b>Jabber</b>,"
+
+#. type: Content of: <dl><dd><ul><li>
+msgid "Novell,"
+msgstr "<b>Novell Messenger</b>,"
+
+#. type: Content of: <dl><dd><ul><li>
+msgid "Gadu-Gadu, and"
+msgstr "<b>Gadu-Gadu</b> und"
+
+#. type: Content of: <dl><dd><ul><li>
+msgid "Zephyr networks."
+msgstr "<b>Zephyr Networks</b>."
+
+#. type: Content of: <dl><dd><p>
+msgid "Pidgin also supports plugins, for additional functionality."
+msgstr "<b>Pidgin</b> unterstützt auch Plug-ins für zusätzliche Funktionen."
+
+#. type: Content of: <dl><dt>
+msgid "<a href=\"http://www.qupzilla.com/\";>QupZilla</a>"
+msgstr "<a href=\"http://www.qupzilla.com/\";>QupZilla</a>"
+
+#. type: Content of: <dl><dd><p>
+msgid ""
+"QupZilla is a cross-platform web browser with a unified RSS reader, history "
+"and bookmarks in a single window."
 msgstr ""
-"<i>Ersatz für:</i> <b>PageMaker</b>, <b>InDesign</b>, <b>QuarkXPress</b>"
+"<b>QupZilla</b> ist ein plattformübergreifender Webbrowser mit "
+"vereinheitlichten RSS-Leser, Verlauf und Lesezeichen in einem einzigen "
+"Fenster."
 
-#. type: Content of: <p>
+#. type: Content of: <dl><dt>
+msgid "<a href=\"http://www.tribler.org/\";>Tribler</a>"
+msgstr "<a href=\"http://www.tribler.org/\";>Tribler</a>"
+
+#. type: Content of: <dl><dd><p>
+# | Tribler is an application that enables its users to find[-,-] enjoy and
+# | share video, audio, pictures, and other things.
+#, fuzzy
+#| msgid ""
+#| "Tribler is an application that enables its users to find, enjoy and share "
+#| "video, audio, pictures, and other things."
 msgid ""
-"Scribus is a desktop publishing application, like Adobe PageMaker or Adobe "
-"InDesign from the proprietary software world. It is free software, "
-"distributed under the terms of the Gnu General Public License."
+"Tribler is an application that enables its users to find enjoy and share "
+"video, audio, pictures, and other things."
 msgstr ""
-"<b>Scribus</b> ist eine Desktop-Publishing-Anwendung wie Adobe PageMaker "
-"oder Adobe InDesign aus der proprietären Softwarewelt. Es ist Freie "
-"Software, vertrieben unter den Bedingungen der <span xml:lang=\"en\" lang="
-"\"en\">GNU General Public License</span>."
+"Mit <b>Tribler</b> können Benutzer Video- und Audiodateien, Bilder und "
+"andere Dinge finden, genießen und gemeinsam austauschen."
 
-#. type: Content of: <p>
+#. type: Content of: <dl><dt>
+msgid "<a href=\"http://directory.fsf.org/blender.html\";>Blender 3D</a>"
+msgstr "<a href=\"http://directory.fsf.org/blender.html\";>Blender 3D</a>"
+
+#. type: Content of: <dl><dd><p>
 msgid ""
-"Scribus supports many major graphic formats including most all of the "
-"standard ones used in DTP in addition to SVG import and export."
+"Blender is the first and only fully integrated 3D graphics creation suite "
+"allowing modeling, animation, rendering, post-production, realtime "
+"interactive 3D and game creation and playback with cross-platform "
+"compatibility."
 msgstr ""
-"Unterstützt werden viele gängige Grafikformate, darunter neben dem SVG-"
-"Import und -Export die meisten standardmäßig im DTP-Bereich genutzten "
-"Formate."
+"<b>Blender</b>, das erste und einzige voll integrierte 3D-"
+"Grafikerstellungspaket, ermöglicht Modellierung, Animation, Rendering, "
+"Nachbearbeitung, interaktive 3D-Echtzeit und -Spielerstellung und -"
+"wiedergabe mit plattformübergreifender Kompatibilität."
 
-#. type: Content of: <h3>
+#. type: Content of: <dl><dt>
 msgid "<a href=\"http://videolan.org/vlc/\";>VideoLAN Client (VLC)</a>"
 msgstr "<a href=\"http://videolan.org/vlc/\";>VLC Media Player</a>"
 
-#. type: Content of: <p>
-msgid "<strong>Replacement for:</strong> Windows Media Player, PowerDVD"
-msgstr ""
-"<i>Ersatz für:</i> <b>Windows Media Player</b>, <b>CyberLink PowerDVD</b>"
-
-#. type: Content of: <p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "VLC (initially VideoLAN Client) is a highly portable multimedia player for "
 "various audio and video formats (MPEG-1, MPEG-2, MPEG-4, DivX, MP3, OGG, "
@@ -479,81 +663,57 @@
 "Protokolle. VLC kann auch als Server zum Streamen im Unicast- oder Multicast "
 "mit IPv4 oder IPv6 auf einem Netzwerk mit hoher Bandbreite verwendet werden."
 
-#. type: Content of: <h3>
-msgid "<a href=\"http://www.tribler.org/\";>Tribler</a>"
-msgstr "<a href=\"http://www.tribler.org/\";>Tribler</a>"
-
-#. type: Content of: <p>
-msgid "<strong>Replacement for:</strong> BitTorrent"
-msgstr "<i>Ersatz für:</i> <b>BitTorrent</b>"
+#. type: Content of: <dl><dt>
+msgid "<a href=\"http://www.libreoffice.org/\";>LibreOffice</a>"
+msgstr "<a href=\"http://www.libreoffice.org/\";>LibreOffice</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <dl><dd><p>
 msgid ""
-"Tribler is an application that enables its users to find, enjoy and share "
-"video, audio, pictures, and other things."
+"LibreOffice is a multi-platform office productivity suite compatible with "
+"all major file formats."
 msgstr ""
-"Mit <b>Tribler</b> können Benutzer Video- und Audiodateien, Bilder und "
-"andere Dinge finden, genießen und gemeinsam austauschen."
+"<b>LibreOffice</b> ist ein plattformunabhängiges Büropaket, kompatibel mit "
+"allen gängigen Dateiformaten."
 
-#. type: Content of: <h3>
-msgid "<a href=\"/software/gnuzilla/\">GNU IceCat</a>"
-msgstr "<a href=\"/software/icecat/\">GNU IceCat</a>"
+#. type: Content of: <dl><dt>
+msgid "<a href=\"http://www.scribus.net/\";>Scribus</a>"
+msgstr "<a href=\"http://www.scribus.net/\";>Scribus</a>"
 
-# Opera, Apple Safari
-#. type: Content of: <p>
+#. type: Content of: <dl><dd><p>
 msgid ""
-"<strong>Replacement for:</strong> Mozilla Firefox, Google Chrome, Microsoft "
-"Internet Explorer"
+"Scribus is a desktop publishing application, like Adobe PageMaker or Adobe "
+"InDesign from the proprietary software world. It is free software, "
+"distributed under the terms of the Gnu General Public License."
 msgstr ""
-"<i>Ersatz für:</i> <b><ins>Apple Safari</ins></b>, <b>Google Chrome</b>, "
-"<b>Microsoft Internet Explorer</b>, <b>Mozilla Firefox</b>, <b><ins>Opera</"
-"ins></b>"
-
-#. type: Content of: <p>
-msgid ""
-"IceCat is the GNU version of the Firefox browser. It is entirely free "
-"software, which does not recommend non-free plugins and addons.  It also "
-"features built-in privacy-protecting features."
-msgstr ""
-"<b>IceCat</b> ist die GNU-Variante des Firefox-Webbrowsers und voll und ganz "
-"Freie Software. Unfreie Plug-ins und Add-ons werden nicht weiterempfohlen. "
-"Außerdem sind Funktionen enthalten, die die Privatsphäre schützen."
+"<b>Scribus</b> ist eine Desktop-Publishing-Anwendung wie Adobe PageMaker "
+"oder Adobe InDesign aus der proprietären Softwarewelt. Es ist Freie "
+"Software, vertrieben unter den Bedingungen der <span xml:lang=\"en\" lang="
+"\"en\">GNU General Public License</span>."
 
-#. type: Content of: <p>
+#. type: Content of: <dl><dd><p>
 msgid ""
-"Why not recommend Firefox? As explained in our <a href=\"/philosophy/free-sw."
-"html\">Free Software Definition</a>, all four freedoms must be available on "
-"both a commercial and non-commercial basis. Mozilla's trademark policy "
-"serves to limit Freedom 2 to gratis distribution only, making the software "
-"nonfree."
+"Scribus supports many major graphic formats including most all of the "
+"standard ones used in DTP in addition to SVG import and export."
 msgstr ""
-"Warum keine Empfehlung für <b>Firefox</b>? In unserer <a href=\"/philosophy/"
-"free-sw\">Freie-Software-Definition</a> wird erläutert, warum alle vier "
-"Freiheiten auf sowohl kommerzieller und unkommerzieller Basis verfügbar sein 
"
-"müssen. Mozillas Richtlinie für eingetragene Warenzeichen dient dazu, "
-"<em>Freiheit 2</em> nur auf die kostenfreie Verteilung zu beschränken&#160;"
-"&#8209;&#160;wodurch die Software unfrei wird."
-
-#. type: Content of: <h3>
-msgid "<a href=\"http://www.qupzilla.com/\";>QupZilla</a>"
-msgstr "<a href=\"http://www.qupzilla.com/\";>QupZilla</a>"
+"Unterstützt werden viele gängige Grafikformate, darunter neben dem SVG-"
+"Import und -Export die meisten standardmäßig im DTP-Bereich genutzten "
+"Formate."
 
-#. type: Content of: <p>
-msgid ""
-"QupZilla is a cross-platform web browser with a unified RSS reader, history "
-"and bookmarks in a single window."
-msgstr ""
-"<b>QupZilla</b> ist ein plattformübergreifender Webbrowser mit "
-"vereinheitlichten RSS-Leser, Verlauf und Lesezeichen in einem einzigen "
-"Fenster."
+#. type: Content of: <dl><dt>
+msgid "<a href=\"http://www.mingw.org\";>MinGW</a>"
+msgstr "<a href=\"http://www.mingw.org\";>MinGW</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <dl><dd><p>
 msgid ""
-"This is a selection of the more common free software applications available "
-"for the Microsoft Windows platform, and is nothing like a comprehensive list."
+"MinGW (Minimalist GNU for Windows) provides many of the GNU programming "
+"utilities on Windows. It includes the GNU Compiler Collection (GCC), "
+"Binutils, GNU Debugger (GDB), Make, and more."
 msgstr ""
-"Dies ist eine kleine, nicht sehr umfassende Auswahl der häufigsten Freie-"
-"Software-Anwendungen für die Microsoft Windows-Plattform."
+"<b>MinGW</b>, für <b><span xml:lang=\"en\" lang=\"en\">Minimalist GNU for "
+"Windows</span></b>, bietet viele der GNU-Dienstprogramme zur "
+"Softwareentwicklung unter Windows und enthält die <b>GNU Compiler "
+"Collection</b> (GCC), <b>GNU Binary Utilities</b> (Binutils), <b>GNU "
+"Debugger</b> (GDB), <b>GNU Make</b> uvm."
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
@@ -636,6 +796,73 @@
 msgid "Updated:"
 msgstr "Aktualisierung:"
 
+#~ msgid ""
+#~ "#windows7sins {\n"
+#~ "   float: right;\n"
+#~ "   width: 25em;\n"
+#~ "   text-align: center;\n"
+#~ "   margin: 0 1em 1em 1em;\n"
+#~ "}\n"
+#~ "blockquote#windows7sins p { margin: .3em 0 0 0; }\n"
+#~ "#windows7sins img { width: 100%; }\n"
+#~ msgstr ""
+#~ "#windows7sins {\n"
+#~ "   float: right;\n"
+#~ "   width: 25em;\n"
+#~ "   text-align: center;\n"
+#~ "   margin: 0 1em 1em 1em;\n"
+#~ "}\n"
+#~ "blockquote#windows7sins p { margin: .3em 0 0 0; }\n"
+#~ "#windows7sins img { width: 100%; }\n"
+
+#~ msgid "<strong>Replacement for:</strong> Maya, 3DSMax"
+#~ msgstr "<i>Ersatz für:</i> <b>Maya</b>, <b>3DSMax</b>"
+
+#~ msgid "<strong>Replacement for:</strong> Microsoft Visio"
+#~ msgstr "<i>Ersatz für:</i> <b>Microsoft Visio</b>"
+
+#~ msgid "<strong>Replacement for:</strong> Photoshop, Paint Shop Pro"
+#~ msgstr "<i>Ersatz für:</i> <b>Photoshop</b>, <b>Paint Shop Pro</b>"
+
+#~ msgid "<strong>Replacement for:</strong> Napster, etc."
+#~ msgstr "<i>Ersatz für:</i> <b>Napster</b> usw."
+
+#~ msgid "<strong>Replacement for:</strong> Microsoft Visual C++"
+#~ msgstr "<i>Ersatz für:</i> <b>Microsoft Visual C++</b>"
+
+#~ msgid "<strong>Replacement for:</strong> Outlook, Outlook Express"
+#~ msgstr ""
+#~ "<i>Ersatz für:</i> <b>Microsoft Outlook</b>, <b>Microsoft Outlook "
+#~ "Express</b>"
+
+#~ msgid "<strong>Replacement for:</strong> Microsoft Office"
+#~ msgstr "<i>Ersatz für:</i> <b>Microsoft Office</b>"
+
+#~ msgid "<strong>Replacement for:</strong> BitTorrent"
+#~ msgstr "<i>Ersatz für:</i> <b>BitTorrent</b>"
+
+#~ msgid "<a href=\"/software/gnuzilla/\">GNU IceCat</a>"
+#~ msgstr "<a href=\"/software/icecat/\">GNU IceCat</a>"
+
+# Opera, Apple Safari
+#~ msgid ""
+#~ "<strong>Replacement for:</strong> Mozilla Firefox, Google Chrome, "
+#~ "Microsoft Internet Explorer"
+#~ msgstr ""
+#~ "<i>Ersatz für:</i> <b><ins>Apple Safari</ins></b>, <b>Google Chrome</b>, "
+#~ "<b>Microsoft Internet Explorer</b>, <b>Mozilla Firefox</b>, "
+#~ "<b><ins>Opera</ins></b>"
+
+#~ msgid ""
+#~ "IceCat is the GNU version of the Firefox browser. It is entirely free "
+#~ "software, which does not recommend non-free plugins and addons.  It also "
+#~ "features built-in privacy-protecting features."
+#~ msgstr ""
+#~ "<b>IceCat</b> ist die GNU-Variante des Firefox-Webbrowsers und voll und "
+#~ "ganz Freie Software. Unfreie Plug-ins und Add-ons werden nicht "
+#~ "weiterempfohlen. Außerdem sind Funktionen enthalten, die die 
Privatsphäre "
+#~ "schützen."
+
 #~ msgid "<b>Novell</b>,"
 #~ msgstr "Novell,"
 

Index: for-windows.fr.po
===================================================================
RCS file: /web/www/www/software/po/for-windows.fr.po,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- for-windows.fr.po   10 Mar 2015 20:43:39 -0000      1.21
+++ for-windows.fr.po   15 Jul 2015 13:27:32 -0000      1.22
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: for-windows.html\n"
-"POT-Creation-Date: 2015-03-09 21:55+0000\n"
+"POT-Creation-Date: 2015-07-15 13:25+0000\n"
 "PO-Revision-Date: 2015-03-10 21:41+0100\n"
 "Last-Translator: Romain GUERZEDER <address@hidden>\n"
 "Language-Team: French <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: 2015-07-15 13:25+0000\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Gtranslator 2.91.5\n"
 
@@ -21,27 +22,6 @@
 msgid "Free Software for Windows - GNU Project - Free Software Foundation"
 msgstr "Logiciels libres pour Windows - Projet GNU - Free Software Foundation"
 
-#. type: Content of: <style>
-#, no-wrap
-msgid ""
-"#windows7sins {\n"
-"   float: right;\n"
-"   width: 25em;\n"
-"   text-align: center;\n"
-"   margin: 0 1em 1em 1em;\n"
-"}\n"
-"blockquote#windows7sins p { margin: .3em 0 0 0; }\n"
-"#windows7sins img { width: 100%; }\n"
-msgstr ""
-"#windows7sins {\n"
-"   float: right;\n"
-"   width: 25em;\n"
-"   text-align: center;\n"
-"   margin: 0 1em 1em 1em;\n"
-"}\n"
-"blockquote#windows7sins p { margin: .3em 0 0 0; }\n"
-"#windows7sins img { width: 100%; }\n"
-
 #. type: Content of: <h2>
 msgid "Free Software for Windows"
 msgstr "Logiciels libres pour Windows"
@@ -75,10 +55,34 @@
 msgstr "Montez en gamme, remplacez Windows 8"
 
 #. type: Content of: <p>
-msgid ""
-"When we say these application programs are <a href= \"/philosophy/free-sw."
-"html\">free software</a>, we're talking about freedom, not price. It means "
-"that you are free to use these programs constructively, either alone or in a "
+# | When we say these application programs are <a href=[-
+# | -]\"/philosophy/free-sw.html\">free software</a>, we're talking about
+# | freedom, not price. It means that you are free to use these programs
+# | constructively, either alone or in a community, while respecting the
+# | freedom of others. The source code is available, so that you can study the
+# | software, adapt it to your needs, fix bugs, and release versions with new
+# | features. You can also convince or pay others to do these things for you.
+# | You are also free to give away and free to sell copies, under the terms of
+# | the applicable free software license. These programs are free software
+# | because <em>you have freedom</em> in using them. Free software develops
+# | under the control of its users.
+#, fuzzy
+#| msgid ""
+#| "When we say these application programs are <a href= \"/philosophy/free-sw."
+#| "html\">free software</a>, we're talking about freedom, not price. It "
+#| "means that you are free to use these programs constructively, either "
+#| "alone or in a community, while respecting the freedom of others. The "
+#| "source code is available, so that you can study the software, adapt it to "
+#| "your needs, fix bugs, and release versions with new features. You can "
+#| "also convince or pay others to do these things for you. You are also free "
+#| "to give away and free to sell copies, under the terms of the applicable "
+#| "free software license. These programs are free software because <em>you "
+#| "have freedom</em> in using them. Free software develops under the control "
+#| "of its users."
+msgid ""
+"When we say these application programs are <a href=\"/philosophy/free-sw.html"
+"\">free software</a>, we're talking about freedom, not price. It means that "
+"you are free to use these programs constructively, either alone or in a "
 "community, while respecting the freedom of others. The source code is "
 "available, so that you can study the software, adapt it to your needs, fix "
 "bugs, and release versions with new features. You can also convince or pay "
@@ -103,15 +107,34 @@
 "contrôle de ses utilisateurs."
 
 #. type: Content of: <p>
+# | Microsoft Windows is a clear and instructive example of nonfree software.
+# | Its source code is a secret, so programmers cannot learn from it, fix it,
+# | adapt it to their clients (your) needs, or even verify what it really
+# | does. If you share copies with your neighbors, you will be called a
+# | [-\"pirate\",-] {+&ldquo;pirate&rdquo;,+} and users have been threatened
+# | with imprisonment for this. Nonfree software is completely controlled by
+# | its developer, who also has power over the users. We started the free
+# | software movement because <a
+# | href=\"/philosophy/freedom-or-power.html\">this power is unjust</a>.
+#, fuzzy
+#| msgid ""
+#| "Microsoft Windows is a clear and instructive example of nonfree software. "
+#| "Its source code is a secret, so programmers cannot learn from it, fix it, "
+#| "adapt it to their clients (your) needs, or even verify what it really "
+#| "does. If you share copies with your neighbors, you will be called a "
+#| "\"pirate\", and users have been threatened with imprisonment for this. "
+#| "Nonfree software is completely controlled by its developer, who also has "
+#| "power over the users. We started the free software movement because <a "
+#| "href=\"/philosophy/freedom-or-power.html\">this power is unjust</a>."
 msgid ""
 "Microsoft Windows is a clear and instructive example of nonfree software. "
 "Its source code is a secret, so programmers cannot learn from it, fix it, "
 "adapt it to their clients (your) needs, or even verify what it really does. "
-"If you share copies with your neighbors, you will be called a \"pirate\", "
-"and users have been threatened with imprisonment for this. Nonfree software "
-"is completely controlled by its developer, who also has power over the "
-"users. We started the free software movement because <a href=\"/philosophy/"
-"freedom-or-power.html\">this power is unjust</a>."
+"If you share copies with your neighbors, you will be called a &ldquo;"
+"pirate&rdquo;, and users have been threatened with imprisonment for this. "
+"Nonfree software is completely controlled by its developer, who also has "
+"power over the users. We started the free software movement because <a href="
+"\"/philosophy/freedom-or-power.html\">this power is unjust</a>."
 msgstr ""
 "Microsoft Windows est un exemple clair et instructif de logiciel non libre. "
 "Son code source est tenu secret, les programmeurs ne peuvent donc rien en "
@@ -136,8 +159,14 @@
 "utiliserez Windows, vous serez toujours entre les mains de Microsoft."
 
 #. type: Content of: <p>
+# | So the next step is to replace Windows with a <a
+# | href=\"/distros{+/+}\">free operating system such as GNU/Linux</a>.
+#, fuzzy
+#| msgid ""
+#| "So the next step is to replace Windows with a <a href=\"/distros\">free "
+#| "operating system such as GNU/Linux</a>."
 msgid ""
-"So the next step is to replace Windows with a <a href=\"/distros\">free "
+"So the next step is to replace Windows with a <a href=\"/distros/\">free "
 "operating system such as GNU/Linux</a>."
 msgstr ""
 "La prochaine étape est donc de remplacer Windows par un <a href=\"/distros"
@@ -150,35 +179,240 @@
 "<strong>Cependant, sur cette page, nous nous concentrons sur la première "
 "étape.</strong>"
 
-#. type: Content of: <h3>
-msgid "<a href=\"http://directory.fsf.org/blender.html\";>Blender 3D</a>"
+#. type: Content of: <table><thead><tr><th>
+msgid "Category"
+msgstr ""
+
+#. type: Content of: <table><thead><tr><th>
+msgid "Free program<a href=\"#f1\"><sup>1</sup></a>"
+msgstr ""
+
+#. type: Content of: <table><thead><tr><th>
+msgid "Replacement for"
+msgstr ""
+
+#. type: Content of: <table><tbody><tr><td>
+msgid "Graphics and Design"
+msgstr ""
+
+#. type: Content of: <table><tbody><tr><td>
+msgid "<a href=\"#Dia\">Dia</a>"
+msgstr ""
+
+#. type: Content of: <table><tbody><tr><td>
+msgid "Microsoft Visio"
+msgstr ""
+
+#. type: Content of: <table><tbody><tr><td>
+msgid "<a href=\"#GIMP\">GIMP</a>"
+msgstr ""
+
+#. type: Content of: <table><tbody><tr><td>
+msgid "Photoshop, Paint Shop Pro"
+msgstr ""
+
+#. type: Content of: <table><tbody><tr><td>
+# | <a [-href=\"http://www.inkscape.org/\";>Inkscape</a>-]
+# | {+href=\"#Inkscape\">Inkscape</a>+}
+#, fuzzy
+#| msgid "<a href=\"http://www.inkscape.org/\";>Inkscape</a>"
+msgid "<a href=\"#Inkscape\">Inkscape</a>"
+msgstr "<a href=\"http://www.inkscape.org/\";>Inkscape</a>"
+
+#. type: Content of: <table><tbody><tr><td>
+# | [-<strong>Replacement for:</strong>-]Adobe Illustrator, Macromedia
+# | Freehand, [-CorelDraw or-] {+CorelDraw,+} Xara Xtreme
+#, fuzzy
+#| msgid ""
+#| "<strong>Replacement for:</strong> Adobe Illustrator, Macromedia Freehand, "
+#| "CorelDraw or Xara Xtreme"
+msgid "Adobe Illustrator, Macromedia Freehand, CorelDraw, Xara Xtreme"
+msgstr ""
+"<strong>Remplace :</strong> Adobe Illustrator, Macromedia Freehand, "
+"CorelDraw ou Xara Xtreme"
+
+#. type: Content of: <table><tbody><tr><td>
+msgid "Internet"
+msgstr ""
+
+#. type: Content of: <table><tbody><tr><td>
+# | <a [-href=\"http://www.claws-mail.org/\";>Claws-]
+# | {+href=\"#ClawsMail\">Claws+} Mail</a>
+#, fuzzy
+#| msgid "<a href=\"http://www.claws-mail.org/\";>Claws Mail</a>"
+msgid "<a href=\"#ClawsMail\">Claws Mail</a>"
+msgstr "<a href=\"http://www.claws-mail.org/\";>Claws Mail</a>"
+
+#. type: Content of: <table><tbody><tr><td>
+msgid "Outlook, Outlook Express"
+msgstr ""
+
+#. type: Content of: <table><tbody><tr><td>
+# | <a [-href=\"http://gnunet.org\";>GNUnet</a>-]
+# | {+href=\"#GNUnet\">GNUnet</a>+}
+#, fuzzy
+#| msgid "<a href=\"http://gnunet.org\";>GNUnet</a>"
+msgid "<a href=\"#GNUnet\">GNUnet</a>"
+msgstr "<a href=\"http://gnunet.org\";>GNUnet</a>"
+
+#. type: Content of: <table><tbody><tr><td>
+msgid "Napster, etc."
+msgstr ""
+
+#. type: Content of: <table><tbody><tr><td>
+# | <a [-href=\"http://directory.fsf.org/pidgin.html\";>Pidgin</a>-]
+# | {+href=\"#Pidgin\">Pidgin</a>+}
+#, fuzzy
+#| msgid "<a href=\"http://directory.fsf.org/pidgin.html\";>Pidgin</a>"
+msgid "<a href=\"#Pidgin\">Pidgin</a>"
+msgstr "<a href=\"http://directory.fsf.org/pidgin.html\";>Pidgin</a>"
+
+#. type: Content of: <table><tbody><tr><td>
+# | [-<strong>Replacement for:</strong>-]Trillian, AIM, MSN, [-Yahoo and-]
+# | {+Yahoo,+} ICQ chat clients
+#, fuzzy
+#| msgid ""
+#| "<strong>Replacement for:</strong> Trillian, AIM, MSN, Yahoo and ICQ chat "
+#| "clients"
+msgid "Trillian, AIM, MSN, Yahoo, ICQ chat clients"
+msgstr ""
+"<strong>Remplace :</strong> clients de messagerie instantanée Trillian, 
AIM, "
+"MSN, Yahoo et ICQ"
+
+#. type: Content of: <table><tbody><tr><td>
+# | <a [-href=\"http://www.qupzilla.com/\";>QupZilla</a>-]
+# | {+href=\"#QupZilla\">QupZilla</a>+}
+#, fuzzy
+#| msgid "<a href=\"http://www.qupzilla.com/\";>QupZilla</a>"
+msgid "<a href=\"#QupZilla\">QupZilla</a>"
+msgstr "<a href=\"http://www.qupzilla.com/\";>QupZilla</a>"
+
+#. type: Content of: <table><tbody><tr><td>
+msgid "Firefox<a href=\"#f2\"><sup>2</sup></a>, Chrome, Internet Explorer"
+msgstr ""
+
+#. type: Content of: <table><tbody><tr><td>
+# | <a [-href=\"http://www.tribler.org/\";>Tribler</a>-]
+# | {+href=\"#Tribler\">Tribler</a>+}
+#, fuzzy
+#| msgid "<a href=\"http://www.tribler.org/\";>Tribler</a>"
+msgid "<a href=\"#Tribler\">Tribler</a>"
+msgstr "<a href=\"http://www.tribler.org/\";>Tribler</a>"
+
+#. type: Content of: <table><tbody><tr><td>
+msgid "BitTorrent"
+msgstr ""
+
+#. type: Content of: <table><tbody><tr><td>
+msgid "Multimedia"
+msgstr ""
+
+#. type: Content of: <table><tbody><tr><td>
+# | <a [-href=\"http://directory.fsf.org/blender.html\";>Blender 3D</a>-]
+# | {+href=\"#Blender3D\">Blender3D</a>+}
+#, fuzzy
+#| msgid "<a href=\"http://directory.fsf.org/blender.html\";>Blender 3D</a>"
+msgid "<a href=\"#Blender3D\">Blender3D</a>"
 msgstr "<a href=\"http://directory.fsf.org/blender.html\";>Blender 3D</a>"
 
-#. type: Content of: <p>
-msgid "<strong>Replacement for:</strong> Maya, 3DSMax"
-msgstr "<strong>Remplace :</strong> Maya, 3DSMax"
+#. type: Content of: <table><tbody><tr><td>
+msgid "Maya, 3DSMax"
+msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <table><tbody><tr><td>
+# | <a [-href=\"http://videolan.org/vlc/\";>VideoLAN-]
+# | {+href=\"#VLC\">VideoLan+} Client (VLC)</a>
+#, fuzzy
+#| msgid "<a href=\"http://videolan.org/vlc/\";>VideoLAN Client (VLC)</a>"
+msgid "<a href=\"#VLC\">VideoLan Client (VLC)</a>"
+msgstr "<a href=\"http://videolan.org/vlc/\";>VideoLAN Client (VLC)</a>"
+
+#. type: Content of: <table><tbody><tr><td>
+# | [-<strong>Replacement for:</strong>-]Windows Media Player, PowerDVD
+#, fuzzy
+#| msgid "<strong>Replacement for:</strong> Windows Media Player, PowerDVD"
+msgid "Windows Media Player, PowerDVD"
+msgstr "<strong>Remplace :</strong> Windows Media Player, PowerDVD"
+
+#. type: Content of: <table><tbody><tr><td>
+msgid "Office and Productivity"
+msgstr ""
+
+#. type: Content of: <table><tbody><tr><td>
+# | <a [-href=\"http://www.libreoffice.org/\";>LibreOffice</a>-]
+# | {+href=\"#LibreOffice\">LibreOffice</a>+}
+#, fuzzy
+#| msgid "<a href=\"http://www.libreoffice.org/\";>LibreOffice</a>"
+msgid "<a href=\"#LibreOffice\">LibreOffice</a>"
+msgstr "<a href=\"http://www.libreoffice.org/\";>LibreOffice</a>"
+
+#. type: Content of: <table><tbody><tr><td>
+msgid "Microsoft Office"
+msgstr ""
+
+#. type: Content of: <table><tbody><tr><td>
+msgid "Publishing"
+msgstr ""
+
+#. type: Content of: <table><tbody><tr><td>
+# | <a [-href=\"http://www.scribus.net/\";>Scribus</a>-]
+# | {+href=\"#Scribus\">Scribus</a>+}
+#, fuzzy
+#| msgid "<a href=\"http://www.scribus.net/\";>Scribus</a>"
+msgid "<a href=\"#Scribus\">Scribus</a>"
+msgstr "<a href=\"http://www.scribus.net/\";>Scribus</a>"
+
+#. type: Content of: <table><tbody><tr><td>
+# | [-<strong>Replacement for:</strong>-]PageMaker, InDesign, QuarkXPress
+#, fuzzy
+#| msgid "<strong>Replacement for:</strong> PageMaker, InDesign, QuarkXPress"
+msgid "PageMaker, InDesign, QuarkXPress"
+msgstr "<strong>Remplace :</strong> PageMaker, InDesign, QuarkXPress"
+
+#. type: Content of: <table><tbody><tr><td>
+msgid "Programming Utilities"
+msgstr ""
+
+#. type: Content of: <table><tbody><tr><td>
+# | <a [-href=\"http://www.mingw.org\";>MinGW</a>-]
+# | {+href=\"#MinGW\">MinGW</a>+}
+#, fuzzy
+#| msgid "<a href=\"http://www.mingw.org\";>MinGW</a>"
+msgid "<a href=\"#MinGW\">MinGW</a>"
+msgstr "<a href=\"http://www.mingw.org\";>MinGW</a>"
+
+#. type: Content of: <table><tbody><tr><td>
+msgid "Microsoft Visual C++"
+msgstr ""
+
+#. type: Content of: <div><ol><li>
 msgid ""
-"Blender is the first and only fully integrated 3D graphics creation suite "
-"allowing modeling, animation, rendering, post-production, realtime "
-"interactive 3D and game creation and playback with cross-platform "
-"compatibility."
+"This is a selection of the more common free software applications available "
+"for the Microsoft Windows platform, and is nothing like a comprehensive list."
 msgstr ""
-"Blender est la première et unique suite totalement intégrée d'outils de "
-"création 3D, permettant de faire de la modélisation, de l'animation, du "
-"rendu, du post-traitement et de créer des applications 3D interactives temps 
"
-"réel ainsi que des jeux avec une compatibilité multiplateforme."
+"Ceci est une sélection des logiciels libres les plus répandus disponibles "
+"pour la plateforme Microsoft Windows. Ce n'est en rien une liste exhaustive."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><ol><li>
+msgid ""
+"Why not recommend Firefox? As explained in our <a href=\"/philosophy/free-sw."
+"html\">Free Software Definition</a>, all four freedoms must be available on "
+"both a commercial and non-commercial basis. Mozilla's trademark policy "
+"serves to limit Freedom 2 to gratis distribution only, making the software "
+"nonfree."
+msgstr ""
+"Pourquoi ne pas recommander Firefox ? Comme nous l'avons expliqué dans notre 
"
+"<a href=\"/philosophy/free-sw.html\">définition du logiciel libre</a>, les "
+"quatre libertés doivent être assurées autant d'un point de vue commercial "
+"que non commercial. Les spécificités de la politique de Mozilla 
restreignent "
+"la liberté numéro 2 à une distribution gratuite uniquement, ce qui rend 
le "
+"logiciel non libre."
+
+#. type: Content of: <dl><dt>
 msgid "<a href=\"http://directory.fsf.org/dia.html\";>Dia</a>"
 msgstr "<a href=\"http://directory.fsf.org/dia.html\";>Dia</a>"
 
-#. type: Content of: <p>
-msgid "<strong>Replacement for:</strong> Microsoft Visio"
-msgstr "<strong>Remplace :</strong> Microsoft Visio"
-
-#. type: Content of: <p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "Dia is designed to be much like the proprietary Microsoft program 'Visio'. "
 "It can be used to draw many different kinds of diagrams. It currently has "
@@ -195,7 +429,7 @@
 "d'ajouter de nouvelles formes au moyen de simples fichiers XML, la forme "
 "étant décrite dans un sous-ensemble de SVG."
 
-#. type: Content of: <p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "It can load and save diagrams to a custom XML format (gzipped by default, to "
 "save space), can export diagrams to EPS or SVG formats and can print "
@@ -206,76 +440,11 @@
 "les exporter aux formats EPS ou SVG et les imprimer (y compris ceux qui "
 "occupent plusieurs pages)."
 
-#. type: Content of: <h3>
-msgid "<a href=\"http://directory.fsf.org/pidgin.html\";>Pidgin</a>"
-msgstr "<a href=\"http://directory.fsf.org/pidgin.html\";>Pidgin</a>"
-
-#. type: Content of: <p>
-msgid ""
-"<strong>Replacement for:</strong> Trillian, AIM, MSN, Yahoo and ICQ chat "
-"clients"
-msgstr ""
-"<strong>Remplace :</strong> clients de messagerie instantanée Trillian, 
AIM, "
-"MSN, Yahoo et ICQ"
-
-#. type: Content of: <p>
-msgid ""
-"Pidgin (Gaim) is a multi-protocol instant messaging client, with support for:"
-msgstr ""
-"Pidgin (Gaim) est un client de messagerie instantanée multiprotocole, "
-"gérant :"
-
-#. type: Content of: <ul><li>
-msgid "AIM (Oscar and TOC protocols),"
-msgstr "AIM (protocoles Oscar et TOC),"
-
-#. type: Content of: <ul><li>
-msgid "ICQ,"
-msgstr "ICQ,"
-
-#. type: Content of: <ul><li>
-msgid "MSN Messenger,"
-msgstr "MSN Messenger,"
-
-#. type: Content of: <ul><li>
-msgid "Yahoo,"
-msgstr "Yahoo,"
-
-#. type: Content of: <ul><li>
-msgid "IRC,"
-msgstr "IRC,"
-
-#. type: Content of: <ul><li>
-msgid "Jabber,"
-msgstr "Jabber,"
-
-#. type: Content of: <ul><li>
-msgid "Novell,"
-msgstr "Novell,"
-
-#. type: Content of: <ul><li>
-msgid "Gadu-Gadu, and"
-msgstr "Gadu-Gadu, et"
-
-#. type: Content of: <ul><li>
-msgid "Zephyr networks."
-msgstr "les réseaux Zephyr."
-
-#. type: Content of: <p>
-msgid "Pidgin also supports plugins, for additional functionality."
-msgstr ""
-"Pidgin permet également l'ajout de fonctionnalités supplémentaires avec 
des "
-"greffons."
-
-#. type: Content of: <h3>
+#. type: Content of: <dl><dt>
 msgid "<a href=\"http://directory.fsf.org/gimp.html\";>GIMP</a>"
 msgstr "<a href=\"http://directory.fsf.org/gimp.html\";>GIMP</a>"
 
-#. type: Content of: <p>
-msgid "<strong>Replacement for:</strong> Photoshop, Paint Shop Pro"
-msgstr "<strong>Remplace :</strong> Photoshop, Paint Shop Pro"
-
-#. type: Content of: <p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "GIMP is an acronym for GNU Image Manipulation Program.  It can be used as a "
 "simple paint program, an expert quality photo retouching program, an online "
@@ -288,7 +457,7 @@
 "professionnelle, système en ligne de traitement par lot, moteur de rendu "
 "adapté à la production en masse d'images, convertisseur de formats, etc."
 
-#. type: Content of: <p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "GIMP is expandable and extensible. It is designed to be augmented with plug-"
 "ins and extensions to do just about anything."
@@ -296,7 +465,7 @@
 "GIMP est modulable et extensible. Il est conçu pour être complété par des 
"
 "greffons et des extensions pour faire à peu près n'importe quoi."
 
-#. type: Content of: <p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "<i>Anyone who is familiar with the GNU/Linux operating system has probably "
 "seen/used the GIMP at some stage. In terms of compatibility, GIMP can open/"
@@ -309,46 +478,11 @@
 "compatibilité, GIMP peut ouvrir ou manipuler les formats PhotoShop 
<b>(PSD)</"
 "b> et Paint Shop Pro <b>(PSP)</b>.</i>"
 
-#. type: Content of: <h3>
-msgid "<a href=\"http://gnunet.org\";>GNUnet</a>"
-msgstr "<a href=\"http://gnunet.org\";>GNUnet</a>"
-
-#. type: Content of: <p>
-msgid "<strong>Replacement for:</strong> Napster, etc."
-msgstr "<strong>Remplace :</strong> Napster, etc."
-
-#. type: Content of: <p>
-msgid ""
-"GNUnet is a framework for secure peer-to-peer networking that does not use "
-"any centralized or otherwise trusted services. A first service implemented "
-"on top of the networking layer allows anonymous censorship-resistant file-"
-"sharing. GNUnet uses a simple, excess-based economic model to allocate "
-"resources. Peers in GNUnet monitor each others behavior with respect to "
-"resource usage; peers that contribute to the network are rewarded with "
-"better service."
-msgstr ""
-"GNUnet est un cadre applicatif pour la communication dans un réseau pair à "
-"pair sécurisé n'utilisant ni service centralisé ni aucun autre service de "
-"confiance. Un premier service implémenté au-dessus de la couche réseau "
-"permet un partage de fichiers anonyme et résistant à la censure. GNUnet "
-"utilise un modèle économique d'allocation des ressources simple et basé 
sur "
-"l'excédent. Les nœuds GNUnet se surveillent les uns les autres en ce qui "
-"concerne l'utilisation des ressources ; ceux qui contribuent au réseau sont 
"
-"récompensés avec une meilleure qualité de service."
-
-#. type: Content of: <h3>
+#. type: Content of: <dl><dt>
 msgid "<a href=\"http://www.inkscape.org/\";>Inkscape</a>"
 msgstr "<a href=\"http://www.inkscape.org/\";>Inkscape</a>"
 
-#. type: Content of: <p>
-msgid ""
-"<strong>Replacement for:</strong> Adobe Illustrator, Macromedia Freehand, "
-"CorelDraw or Xara Xtreme"
-msgstr ""
-"<strong>Remplace :</strong> Adobe Illustrator, Macromedia Freehand, "
-"CorelDraw ou Xara Xtreme"
-
-#. type: Content of: <p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "Inkscape is an vector graphics editor, with capabilities similar to "
 "Illustrator, Freehand, CorelDraw, or Xara Xtreme using the W3C standard "
@@ -364,7 +498,7 @@
 "simulation de transparence <cite>[alpha blending]</cite>, les "
 "transformations, les gradients, les motifs et les groupements."
 
-#. type: Content of: <p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "Inkscape also supports Creative Commons meta-data, node editing, layers, "
 "complex path operations, bitmap tracing, text-on-path, flowed text, direct "
@@ -378,35 +512,11 @@
 "peut importer des formats tels que JPEG, PNG, TIFF et autres, et exporter "
 "aussi bien le format PNG que de multiples formats vectoriels."
 
-#. type: Content of: <h3>
-msgid "<a href=\"http://www.mingw.org\";>MinGW</a>"
-msgstr "<a href=\"http://www.mingw.org\";>MinGW</a>"
-
-#. type: Content of: <p>
-msgid "<strong>Replacement for:</strong> Microsoft Visual C++"
-msgstr "<strong>Remplace :</strong> Microsoft Visual C++"
-
-#. type: Content of: <p>
-msgid ""
-"MinGW (Minimalist GNU for Windows) provides many of the GNU programming "
-"utilities on Windows. It includes the GNU Compiler Collection (GCC), "
-"Binutils, GNU Debugger (GDB), Make, and more."
-msgstr ""
-"<abbr title=\"Minimalist GNU for Windows\">MinGW</abbr> (GNU minimaliste "
-"pour Windows) fournit de nombreux utilitaires GNU de programmation pour "
-"Windows. Sont inclus : <abbr title=\"GNU Compiler Collection\">GCC</abbr> "
-"(collection de compilateurs de GNU), Binutils, <abbr title=\"GNU Debugger"
-"\">GDB</abbr> (dégogueur de GNU), Make, et d'autres encore."
-
-#. type: Content of: <h3>
+#. type: Content of: <dl><dt>
 msgid "<a href=\"http://www.claws-mail.org/\";>Claws Mail</a>"
 msgstr "<a href=\"http://www.claws-mail.org/\";>Claws Mail</a>"
 
-#. type: Content of: <p>
-msgid "<strong>Replacement for:</strong> Outlook, Outlook Express"
-msgstr "<strong>Remplace :</strong> Outlook, Outlook Express"
-
-#. type: Content of: <p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "Claws Mail is designed to be familiar to new users coming from other popular "
 "email clients, as well as experienced users."
@@ -414,60 +524,133 @@
 "Claws Mail est conçu pour être familier aux nouveaux utilisateurs venant "
 "d'autres clients populaires de courriel, comme aux utilisateurs 
expérimentés."
 
-#. type: Content of: <h3>
-msgid "<a href=\"http://www.libreoffice.org/\";>LibreOffice</a>"
-msgstr "<a href=\"http://www.libreoffice.org/\";>LibreOffice</a>"
+#. type: Content of: <dl><dt>
+msgid "<a href=\"http://gnunet.org\";>GNUnet</a>"
+msgstr "<a href=\"http://gnunet.org\";>GNUnet</a>"
 
-#. type: Content of: <p>
-msgid "<strong>Replacement for:</strong> Microsoft Office"
-msgstr "<strong>Remplace :</strong> Microsoft Office"
+#. type: Content of: <dl><dd><p>
+msgid ""
+"GNUnet is a framework for secure peer-to-peer networking that does not use "
+"any centralized or otherwise trusted services. A first service implemented "
+"on top of the networking layer allows anonymous censorship-resistant file-"
+"sharing. GNUnet uses a simple, excess-based economic model to allocate "
+"resources. Peers in GNUnet monitor each others behavior with respect to "
+"resource usage; peers that contribute to the network are rewarded with "
+"better service."
+msgstr ""
+"GNUnet est un cadre applicatif pour la communication dans un réseau pair à "
+"pair sécurisé n'utilisant ni service centralisé ni aucun autre service de "
+"confiance. Un premier service implémenté au-dessus de la couche réseau "
+"permet un partage de fichiers anonyme et résistant à la censure. GNUnet "
+"utilise un modèle économique d'allocation des ressources simple et basé 
sur "
+"l'excédent. Les nœuds GNUnet se surveillent les uns les autres en ce qui "
+"concerne l'utilisation des ressources ; ceux qui contribuent au réseau sont 
"
+"récompensés avec une meilleure qualité de service."
 
-#. type: Content of: <p>
+#. type: Content of: <dl><dt>
+msgid "<a href=\"http://directory.fsf.org/pidgin.html\";>Pidgin</a>"
+msgstr "<a href=\"http://directory.fsf.org/pidgin.html\";>Pidgin</a>"
+
+#. type: Content of: <dl><dd><p>
 msgid ""
-"LibreOffice is a multi-platform office productivity suite compatible with "
-"all major file formats."
+"Pidgin (Gaim) is a multi-protocol instant messaging client, with support for:"
 msgstr ""
-"LibreOffice est une suite bureautique multiplateforme compatible avec tous "
-"les formats de fichier les plus répandus."
+"Pidgin (Gaim) est un client de messagerie instantanée multiprotocole, "
+"gérant :"
 
-#. type: Content of: <h3>
-msgid "<a href=\"http://www.scribus.net/\";>Scribus</a>"
-msgstr "<a href=\"http://www.scribus.net/\";>Scribus</a>"
+#. type: Content of: <dl><dd><ul><li>
+msgid "AIM (Oscar and TOC protocols),"
+msgstr "AIM (protocoles Oscar et TOC),"
 
-#. type: Content of: <p>
-msgid "<strong>Replacement for:</strong> PageMaker, InDesign, QuarkXPress"
-msgstr "<strong>Remplace :</strong> PageMaker, InDesign, QuarkXPress"
+#. type: Content of: <dl><dd><ul><li>
+msgid "ICQ,"
+msgstr "ICQ,"
 
-#. type: Content of: <p>
+#. type: Content of: <dl><dd><ul><li>
+msgid "MSN Messenger,"
+msgstr "MSN Messenger,"
+
+#. type: Content of: <dl><dd><ul><li>
+msgid "Yahoo,"
+msgstr "Yahoo,"
+
+#. type: Content of: <dl><dd><ul><li>
+msgid "IRC,"
+msgstr "IRC,"
+
+#. type: Content of: <dl><dd><ul><li>
+msgid "Jabber,"
+msgstr "Jabber,"
+
+#. type: Content of: <dl><dd><ul><li>
+msgid "Novell,"
+msgstr "Novell,"
+
+#. type: Content of: <dl><dd><ul><li>
+msgid "Gadu-Gadu, and"
+msgstr "Gadu-Gadu, et"
+
+#. type: Content of: <dl><dd><ul><li>
+msgid "Zephyr networks."
+msgstr "les réseaux Zephyr."
+
+#. type: Content of: <dl><dd><p>
+msgid "Pidgin also supports plugins, for additional functionality."
+msgstr ""
+"Pidgin permet également l'ajout de fonctionnalités supplémentaires avec 
des "
+"greffons."
+
+#. type: Content of: <dl><dt>
+msgid "<a href=\"http://www.qupzilla.com/\";>QupZilla</a>"
+msgstr "<a href=\"http://www.qupzilla.com/\";>QupZilla</a>"
+
+#. type: Content of: <dl><dd><p>
 msgid ""
-"Scribus is a desktop publishing application, like Adobe PageMaker or Adobe "
-"InDesign from the proprietary software world. It is free software, "
-"distributed under the terms of the Gnu General Public License."
+"QupZilla is a cross-platform web browser with a unified RSS reader, history "
+"and bookmarks in a single window."
 msgstr ""
-"Scribus est un logiciel de publication assistée par ordinateur (PAO), "
-"similaire à Adobe PageMaker ou Adobe InDesign du monde du logiciel "
-"privateur. C'est un logiciel libre, distribué suivant les termes de la GNU "
-"<abbr title=\"General Public License\">GPL</abbr> (licence publique 
générale "
-"GNU)."
+"QupZilla est un navigateur web multiplateforme avec un lecteur de flux RSS, "
+"un historique et des marque-pages rassemblés en une seule fenêtre."
 
-#. type: Content of: <p>
+#. type: Content of: <dl><dt>
+msgid "<a href=\"http://www.tribler.org/\";>Tribler</a>"
+msgstr "<a href=\"http://www.tribler.org/\";>Tribler</a>"
+
+#. type: Content of: <dl><dd><p>
+# | Tribler is an application that enables its users to find[-,-] enjoy and
+# | share video, audio, pictures, and other things.
+#, fuzzy
+#| msgid ""
+#| "Tribler is an application that enables its users to find, enjoy and share "
+#| "video, audio, pictures, and other things."
 msgid ""
-"Scribus supports many major graphic formats including most all of the "
-"standard ones used in DTP in addition to SVG import and export."
+"Tribler is an application that enables its users to find enjoy and share "
+"video, audio, pictures, and other things."
 msgstr ""
-"Scribus prend en charge bon nombre des principaux formats graphiques – ce "
-"qui inclut la majorité des formats standards utilisés en PAO – ainsi que 
"
-"l'import et export de format SVG."
+"Tribler est un logiciel qui permet à ses utilisateurs de trouver, apprécier 
"
+"et partager des vidéos, musiques, images et autres."
+
+#. type: Content of: <dl><dt>
+msgid "<a href=\"http://directory.fsf.org/blender.html\";>Blender 3D</a>"
+msgstr "<a href=\"http://directory.fsf.org/blender.html\";>Blender 3D</a>"
 
-#. type: Content of: <h3>
+#. type: Content of: <dl><dd><p>
+msgid ""
+"Blender is the first and only fully integrated 3D graphics creation suite "
+"allowing modeling, animation, rendering, post-production, realtime "
+"interactive 3D and game creation and playback with cross-platform "
+"compatibility."
+msgstr ""
+"Blender est la première et unique suite totalement intégrée d'outils de "
+"création 3D, permettant de faire de la modélisation, de l'animation, du "
+"rendu, du post-traitement et de créer des applications 3D interactives temps 
"
+"réel ainsi que des jeux avec une compatibilité multiplateforme."
+
+#. type: Content of: <dl><dt>
 msgid "<a href=\"http://videolan.org/vlc/\";>VideoLAN Client (VLC)</a>"
 msgstr "<a href=\"http://videolan.org/vlc/\";>VideoLAN Client (VLC)</a>"
 
-#. type: Content of: <p>
-msgid "<strong>Replacement for:</strong> Windows Media Player, PowerDVD"
-msgstr "<strong>Remplace :</strong> Windows Media Player, PowerDVD"
-
-#. type: Content of: <p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "VLC (initially VideoLAN Client) is a highly portable multimedia player for "
 "various audio and video formats (MPEG-1, MPEG-2, MPEG-4, DivX, MP3, OGG, "
@@ -482,79 +665,58 @@
 "serveur pour diffuser en unicast ou multicast, en IPv6 ou IPv4, sur un "
 "réseau à large bande passante."
 
-#. type: Content of: <h3>
-msgid "<a href=\"http://www.tribler.org/\";>Tribler</a>"
-msgstr "<a href=\"http://www.tribler.org/\";>Tribler</a>"
-
-#. type: Content of: <p>
-msgid "<strong>Replacement for:</strong> BitTorrent"
-msgstr "<strong>Remplace :</strong> BitTorrent"
+#. type: Content of: <dl><dt>
+msgid "<a href=\"http://www.libreoffice.org/\";>LibreOffice</a>"
+msgstr "<a href=\"http://www.libreoffice.org/\";>LibreOffice</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <dl><dd><p>
 msgid ""
-"Tribler is an application that enables its users to find, enjoy and share "
-"video, audio, pictures, and other things."
+"LibreOffice is a multi-platform office productivity suite compatible with "
+"all major file formats."
 msgstr ""
-"Tribler est un logiciel qui permet à ses utilisateurs de trouver, apprécier 
"
-"et partager des vidéos, musiques, images et autres."
+"LibreOffice est une suite bureautique multiplateforme compatible avec tous "
+"les formats de fichier les plus répandus."
 
-#. type: Content of: <h3>
-msgid "<a href=\"/software/gnuzilla/\">GNU IceCat</a>"
-msgstr "<a href=\"/software/gnuzilla/\">GNU IceCat</a>"
+#. type: Content of: <dl><dt>
+msgid "<a href=\"http://www.scribus.net/\";>Scribus</a>"
+msgstr "<a href=\"http://www.scribus.net/\";>Scribus</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <dl><dd><p>
 msgid ""
-"<strong>Replacement for:</strong> Mozilla Firefox, Google Chrome, Microsoft "
-"Internet Explorer"
+"Scribus is a desktop publishing application, like Adobe PageMaker or Adobe "
+"InDesign from the proprietary software world. It is free software, "
+"distributed under the terms of the Gnu General Public License."
 msgstr ""
-"<strong>Remplace :</strong> Mozilla Firefox, Google Chrome, Microsoft "
-"Internet Explorer"
-
-#. type: Content of: <p>
-msgid ""
-"IceCat is the GNU version of the Firefox browser. It is entirely free "
-"software, which does not recommend non-free plugins and addons.  It also "
-"features built-in privacy-protecting features."
-msgstr ""
-"IceCat est la version GNU du navigateur Firefox. C'est un logiciel "
-"entièrement libre, qui ne recommande aucun module ni aucune extension non "
-"libre. Des dispositifs de protection de la vie privée en font partie "
-"intégrante."
+"Scribus est un logiciel de publication assistée par ordinateur (PAO), "
+"similaire à Adobe PageMaker ou Adobe InDesign du monde du logiciel "
+"privateur. C'est un logiciel libre, distribué suivant les termes de la GNU "
+"<abbr title=\"General Public License\">GPL</abbr> (licence publique 
générale "
+"GNU)."
 
-#. type: Content of: <p>
+#. type: Content of: <dl><dd><p>
 msgid ""
-"Why not recommend Firefox? As explained in our <a href=\"/philosophy/free-sw."
-"html\">Free Software Definition</a>, all four freedoms must be available on "
-"both a commercial and non-commercial basis. Mozilla's trademark policy "
-"serves to limit Freedom 2 to gratis distribution only, making the software "
-"nonfree."
+"Scribus supports many major graphic formats including most all of the "
+"standard ones used in DTP in addition to SVG import and export."
 msgstr ""
-"Pourquoi ne pas recommander Firefox ? Comme nous l'avons expliqué dans notre 
"
-"<a href=\"/philosophy/free-sw.html\">définition du logiciel libre</a>, les "
-"quatre libertés doivent être assurées autant d'un point de vue commercial "
-"que non commercial. Les spécificités de la politique de Mozilla 
restreignent "
-"la liberté numéro 2 à une distribution gratuite uniquement, ce qui rend 
le "
-"logiciel non libre."
-
-#. type: Content of: <h3>
-msgid "<a href=\"http://www.qupzilla.com/\";>QupZilla</a>"
-msgstr "<a href=\"http://www.qupzilla.com/\";>QupZilla</a>"
+"Scribus prend en charge bon nombre des principaux formats graphiques – ce "
+"qui inclut la majorité des formats standards utilisés en PAO – ainsi que 
"
+"l'import et export de format SVG."
 
-#. type: Content of: <p>
-msgid ""
-"QupZilla is a cross-platform web browser with a unified RSS reader, history "
-"and bookmarks in a single window."
-msgstr ""
-"QupZilla est un navigateur web multiplateforme avec un lecteur de flux RSS, "
-"un historique et des marque-pages rassemblés en une seule fenêtre."
+#. type: Content of: <dl><dt>
+msgid "<a href=\"http://www.mingw.org\";>MinGW</a>"
+msgstr "<a href=\"http://www.mingw.org\";>MinGW</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <dl><dd><p>
 msgid ""
-"This is a selection of the more common free software applications available "
-"for the Microsoft Windows platform, and is nothing like a comprehensive list."
+"MinGW (Minimalist GNU for Windows) provides many of the GNU programming "
+"utilities on Windows. It includes the GNU Compiler Collection (GCC), "
+"Binutils, GNU Debugger (GDB), Make, and more."
 msgstr ""
-"Ceci est une sélection des logiciels libres les plus répandus disponibles "
-"pour la plateforme Microsoft Windows. Ce n'est en rien une liste exhaustive."
+"<abbr title=\"Minimalist GNU for Windows\">MinGW</abbr> (GNU minimaliste "
+"pour Windows) fournit de nombreux utilitaires GNU de programmation pour "
+"Windows. Sont inclus : <abbr title=\"GNU Compiler Collection\">GCC</abbr> "
+"(collection de compilateurs de GNU), Binutils, <abbr title=\"GNU Debugger"
+"\">GDB</abbr> (dégogueur de GNU), Make, et d'autres encore."
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
@@ -644,3 +806,66 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Dernière mise à jour :"
+
+#~ msgid ""
+#~ "#windows7sins {\n"
+#~ "   float: right;\n"
+#~ "   width: 25em;\n"
+#~ "   text-align: center;\n"
+#~ "   margin: 0 1em 1em 1em;\n"
+#~ "}\n"
+#~ "blockquote#windows7sins p { margin: .3em 0 0 0; }\n"
+#~ "#windows7sins img { width: 100%; }\n"
+#~ msgstr ""
+#~ "#windows7sins {\n"
+#~ "   float: right;\n"
+#~ "   width: 25em;\n"
+#~ "   text-align: center;\n"
+#~ "   margin: 0 1em 1em 1em;\n"
+#~ "}\n"
+#~ "blockquote#windows7sins p { margin: .3em 0 0 0; }\n"
+#~ "#windows7sins img { width: 100%; }\n"
+
+#~ msgid "<strong>Replacement for:</strong> Maya, 3DSMax"
+#~ msgstr "<strong>Remplace :</strong> Maya, 3DSMax"
+
+#~ msgid "<strong>Replacement for:</strong> Microsoft Visio"
+#~ msgstr "<strong>Remplace :</strong> Microsoft Visio"
+
+#~ msgid "<strong>Replacement for:</strong> Photoshop, Paint Shop Pro"
+#~ msgstr "<strong>Remplace :</strong> Photoshop, Paint Shop Pro"
+
+#~ msgid "<strong>Replacement for:</strong> Napster, etc."
+#~ msgstr "<strong>Remplace :</strong> Napster, etc."
+
+#~ msgid "<strong>Replacement for:</strong> Microsoft Visual C++"
+#~ msgstr "<strong>Remplace :</strong> Microsoft Visual C++"
+
+#~ msgid "<strong>Replacement for:</strong> Outlook, Outlook Express"
+#~ msgstr "<strong>Remplace :</strong> Outlook, Outlook Express"
+
+#~ msgid "<strong>Replacement for:</strong> Microsoft Office"
+#~ msgstr "<strong>Remplace :</strong> Microsoft Office"
+
+#~ msgid "<strong>Replacement for:</strong> BitTorrent"
+#~ msgstr "<strong>Remplace :</strong> BitTorrent"
+
+#~ msgid "<a href=\"/software/gnuzilla/\">GNU IceCat</a>"
+#~ msgstr "<a href=\"/software/gnuzilla/\">GNU IceCat</a>"
+
+#~ msgid ""
+#~ "<strong>Replacement for:</strong> Mozilla Firefox, Google Chrome, "
+#~ "Microsoft Internet Explorer"
+#~ msgstr ""
+#~ "<strong>Remplace :</strong> Mozilla Firefox, Google Chrome, Microsoft "
+#~ "Internet Explorer"
+
+#~ msgid ""
+#~ "IceCat is the GNU version of the Firefox browser. It is entirely free "
+#~ "software, which does not recommend non-free plugins and addons.  It also "
+#~ "features built-in privacy-protecting features."
+#~ msgstr ""
+#~ "IceCat est la version GNU du navigateur Firefox. C'est un logiciel "
+#~ "entièrement libre, qui ne recommande aucun module ni aucune extension non 
"
+#~ "libre. Des dispositifs de protection de la vie privée en font partie "
+#~ "intégrante."

Index: for-windows.hr-diff.html
===================================================================
RCS file: /web/www/www/software/po/for-windows.hr-diff.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- for-windows.hr-diff.html    22 May 2015 07:13:03 -0000      1.2
+++ for-windows.hr-diff.html    15 Jul 2015 13:27:32 -0000      1.3
@@ -17,14 +17,41 @@
 &lt;!--#include virtual="/software/po/for-windows.translist" --&gt;
 
 &lt;style type="text/css" media="print,screen"&gt;
+<span class="inserted"><ins><em>&lt;!--
+table#TOC {
+   width: 100%;
+   border-collapse: collapse;
+   margin: 2.5em auto 0em auto;
+}
+#TOC td, #TOC th {
+   border: 1px solid #6989b6;
+}
+#TOC thead {
+   background-color: #fff898;
+   border: 2px solid #6989b6;
+}
+#TOC tbody {
+   background-color: #f0f2f4;
+   border-left: 2px solid #6989b6;
+   border-right: 2px solid #6989b6;
+}
+div#notes {
+   border-top: 1px solid #6989b6;
+   border-left: 2px solid #6989b6;
+   border-right: 2px solid #6989b6;
+   border-bottom: 2px solid #6989b6;
+   margin-top: 0;
+}</em></ins></span>
 #windows7sins {
-   float: right;
-   width: 25em;
+   <span class="removed"><del><strong>float: right;</strong></del></span>
+   width: 25em; <span class="inserted"><ins><em>max-width: 
40%;</em></ins></span>
    text-align: center;
    margin: 0 1em 1em 1em;
 }
 blockquote#windows7sins p { margin: .3em 0 0 0; }
 #windows7sins img { width: 100%; }
+<span class="inserted"><ins><em>dt { font-size: 1.6em; }
+--&gt;</em></ins></span>
 &lt;/style&gt;
 
 &lt;!--#include virtual="/server/fs-gang-definitions.html" --&gt;
@@ -37,15 +64,16 @@
   they replace. If you are still a Windows user, you can take a first
   step towards free software by installing these applications.&lt;/p&gt;
 
-&lt;blockquote id="windows7sins"&gt;
+&lt;blockquote <span 
class="removed"><del><strong>id="windows7sins"&gt;</strong></del></span> <span 
class="inserted"><ins><em>id="windows7sins" 
class="imgright"&gt;</em></ins></span>
 &lt;p&gt;&lt;a href="http://www.upgradefromwindows8.com"&gt;&lt;img
 src="https://static.fsf.org/fsforg/graphics/windows-infographic_medium.png";
 alt="Close Windows, Open Doors" /&gt;&lt;/a&gt;&lt;/p&gt;
 &lt;p&gt;Upgrade from Windows 8&lt;/p&gt;
 &lt;/blockquote&gt;
 
-  &lt;p&gt;When we say these application programs are &lt;a href=
-  "/philosophy/free-sw.html"&gt;free software&lt;/a&gt;, we're talking about
+  &lt;p&gt;When we say these application programs are &lt;a <span 
class="removed"><del><strong>href=
+  "/philosophy/free-sw.html"&gt;free</strong></del></span>
+  <span 
class="inserted"><ins><em>href="/philosophy/free-sw.html"&gt;free</em></ins></span>
 software&lt;/a&gt;, we're talking about
   freedom, not price. It means that you are free to use these programs
   constructively, either alone or in a community, while respecting the
   freedom of others. The source code is available, so that you can
@@ -61,7 +89,7 @@
   software. Its source code is a secret, so programmers cannot learn
   from it, fix it, adapt it to their clients (your) needs, or even
   verify what it really does. If you share copies with your neighbors,
-  you will be called a "pirate", and users have been threatened with
+  you will be called a <span 
class="removed"><del><strong>"pirate",</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;pirate&rdquo;,</em></ins></span> and users 
have been threatened with
   imprisonment for this. Nonfree software is completely controlled by
   its developer, who also has power over the users. We started the
   free software movement because &lt;a
@@ -73,25 +101,106 @@
   get you all the way there. You're still under Microsoft's power as
   long as you use Windows.&lt;/p&gt;
 
-  &lt;p&gt;So the next step is to replace Windows with
-  a &lt;a href="/distros"&gt;free operating system such as 
GNU/Linux&lt;/a&gt;.&lt;/p&gt;
+  &lt;p&gt;So the next step is to replace Windows with a &lt;a <span 
class="removed"><del><strong>href="/distros"&gt;free</strong></del></span>
+  <span class="inserted"><ins><em>href="/distros/"&gt;free</em></ins></span> 
operating system such as GNU/Linux&lt;/a&gt;.&lt;/p&gt;
 
   &lt;p&gt;&lt;strong&gt;However, on this page we're concerned with the first 
step.&lt;/strong&gt;&lt;/p&gt;
 
-  &lt;h3&gt;&lt;a href="http://directory.fsf.org/blender.html"&gt;Blender 
3D&lt;/a&gt;&lt;/h3&gt;
+  <span class="removed"><del><strong>&lt;h3&gt;&lt;a 
href="http://directory.fsf.org/blender.html"&gt;Blender 3D&lt;/a&gt;&lt;/h3&gt;
 
   &lt;p&gt;&lt;strong&gt;Replacement for:&lt;/strong&gt; Maya, 3DSMax&lt;/p&gt;
 
-          &lt;p&gt;Blender is the first and only fully integrated 3D
+          &lt;p&gt;Blender</strong></del></span>
+
+
+<span class="inserted"><ins><em>&lt;table id="TOC"&gt;
+ &lt;thead&gt;
+  &lt;tr&gt;&lt;th&gt;Category&lt;/th&gt;
+      &lt;th&gt;Free program&lt;a 
href="#f1"&gt;&lt;sup&gt;1&lt;/sup&gt;&lt;/a&gt;&lt;/th&gt;
+      &lt;th&gt;Replacement for&lt;/th&gt;
+  &lt;/tr&gt;
+ &lt;/thead&gt;
+ &lt;tbody&gt;
+  &lt;tr&gt;&lt;td rowspan="3"&gt;Graphics and Design&lt;/td&gt;
+      &lt;td&gt;&lt;a href="#Dia"&gt;Dia&lt;/a&gt;&lt;/td&gt;
+      &lt;td&gt;Microsoft Visio&lt;/td&gt;
+  &lt;/tr&gt;
+  &lt;tr&gt;
+      &lt;td&gt;&lt;a href="#GIMP"&gt;GIMP&lt;/a&gt;&lt;/td&gt;
+      &lt;td&gt;Photoshop, Paint Shop Pro&lt;/td&gt;
+  &lt;/tr&gt;
+  &lt;tr&gt;
+      &lt;td&gt;&lt;a href="#Inkscape"&gt;Inkscape&lt;/a&gt;&lt;/td&gt;
+      &lt;td&gt;Adobe Illustrator, Macromedia Freehand, CorelDraw, Xara 
Xtreme&lt;/td&gt;
+  &lt;/tr&gt;
+  &lt;tr&gt;&lt;td rowspan="5"&gt;Internet&lt;/td&gt;
+      &lt;td&gt;&lt;a href="#ClawsMail"&gt;Claws Mail&lt;/a&gt;&lt;/td&gt;
+      &lt;td&gt;Outlook, Outlook Express&lt;/td&gt;
+  &lt;/tr&gt;
+  &lt;tr&gt;
+      &lt;td&gt;&lt;a href="#GNUnet"&gt;GNUnet&lt;/a&gt;&lt;/td&gt;
+      &lt;td&gt;Napster, etc.&lt;/td&gt;
+  &lt;/tr&gt;
+  &lt;tr&gt;
+      &lt;td&gt;&lt;a href="#Pidgin"&gt;Pidgin&lt;/a&gt;&lt;/td&gt;
+      &lt;td&gt;Trillian, AIM, MSN, Yahoo, ICQ chat clients&lt;/td&gt;
+  &lt;/tr&gt;
+  &lt;tr&gt;
+      &lt;td&gt;&lt;a href="#QupZilla"&gt;QupZilla&lt;/a&gt;&lt;/td&gt;
+      &lt;td&gt;Firefox&lt;a href="#f2"&gt;&lt;sup&gt;2&lt;/sup&gt;&lt;/a&gt;, 
Chrome, Internet Explorer&lt;/td&gt;
+  &lt;/tr&gt;
+  &lt;tr&gt;
+      &lt;td&gt;&lt;a href="#Tribler"&gt;Tribler&lt;/a&gt;&lt;/td&gt;
+      &lt;td&gt;BitTorrent&lt;/td&gt;
+  &lt;/tr&gt;
+  &lt;tr&gt;&lt;td rowspan="2"&gt;Multimedia&lt;/td&gt;
+      &lt;td&gt;&lt;a href="#Blender3D"&gt;Blender3D&lt;/a&gt;&lt;/td&gt;
+      &lt;td&gt;Maya, 3DSMax&lt;/td&gt;
+  &lt;/tr&gt;
+  &lt;tr&gt;
+      &lt;td&gt;&lt;a href="#VLC"&gt;VideoLan Client (VLC)&lt;/a&gt;&lt;/td&gt;
+      &lt;td&gt;Windows Media Player, PowerDVD&lt;/td&gt;
+  &lt;/tr&gt;
+  &lt;tr&gt;&lt;td&gt;Office and Productivity&lt;/td&gt;
+      &lt;td&gt;&lt;a href="#LibreOffice"&gt;LibreOffice&lt;/a&gt;&lt;/td&gt;
+      &lt;td&gt;Microsoft Office&lt;/td&gt;
+  &lt;/tr&gt;
+  &lt;tr&gt;&lt;td&gt;Publishing&lt;/td&gt;
+      &lt;td&gt;&lt;a href="#Scribus"&gt;Scribus&lt;/a&gt;&lt;/td&gt;
+      &lt;td&gt;PageMaker, InDesign, QuarkXPress&lt;/td&gt;
+  &lt;/tr&gt;
+  &lt;tr&gt;&lt;td&gt;Programming Utilities&lt;/td&gt;
+      &lt;td&gt;&lt;a href="#MinGW"&gt;MinGW&lt;/a&gt;&lt;/td&gt;
+      &lt;td&gt;Microsoft Visual C++&lt;/td&gt;
+  &lt;/tr&gt;
+ &lt;/tbody&gt;
+&lt;/table&gt;
+&lt;div id="notes"&gt;
+  &lt;ol&gt;
+    &lt;li id="f1"&gt;This</em></ins></span> is <span 
class="inserted"><ins><em>a selection of</em></ins></span> the <span 
class="removed"><del><strong>first and only fully integrated 3D
           graphics creation suite allowing modeling, animation,
-          rendering, post-production, realtime interactive 3D and
-          game creation and playback with cross-platform
+          rendering, post-production, realtime interactive 
3D</strong></del></span> <span class="inserted"><ins><em>more
+    common free software applications available for the Microsoft Windows
+    platform,</em></ins></span> and
+          <span class="removed"><del><strong>game 
creation</strong></del></span> <span class="inserted"><ins><em>is nothing like 
a comprehensive list.&lt;/li&gt;
+
+    &lt;li id="f2"&gt;Why not recommend Firefox? As explained in our &lt;a
+    href="/philosophy/free-sw.html"&gt;Free Software Definition&lt;/a&gt;, all
+    four freedoms must be available on both a commercial</em></ins></span> and 
<span class="removed"><del><strong>playback with cross-platform
           compatibility.&lt;/p&gt;
 
        &lt;h3&gt;&lt;a 
href="http://directory.fsf.org/dia.html"&gt;Dia&lt;/a&gt;&lt;/h3&gt;
 
-        &lt;p&gt;&lt;strong&gt;Replacement for:&lt;/strong&gt; Microsoft 
Visio&lt;/p&gt;
+        &lt;p&gt;&lt;strong&gt;Replacement for:&lt;/strong&gt; Microsoft 
Visio&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>non-commercial
+    basis. Mozilla's trademark policy serves to limit Freedom 2 to gratis
+    distribution only, making the software nonfree.&lt;/li&gt;
+  &lt;/ol&gt;
+&lt;/div&gt;
+
+&lt;dl&gt;
 
+&lt;dt id="Dia"&gt;&lt;a 
href="http://directory.fsf.org/dia.html"&gt;Dia&lt;/a&gt;&lt;/dt&gt;
+&lt;dd&gt;</em></ins></span>
           &lt;p&gt;Dia is designed to be much like the proprietary
           Microsoft program 'Visio'. It can be used to draw many
           different kinds of diagrams. It currently has special
@@ -106,7 +215,7 @@
           to EPS or SVG formats and can print diagrams (including
           ones that span multiple pages).&lt;/p&gt;
 
-       &lt;h3&gt;&lt;a 
href="http://directory.fsf.org/pidgin.html"&gt;Pidgin&lt;/a&gt;&lt;/h3&gt;
+       <span class="removed"><del><strong>&lt;h3&gt;&lt;a 
href="http://directory.fsf.org/pidgin.html"&gt;Pidgin&lt;/a&gt;&lt;/h3&gt;
          
         &lt;p&gt;&lt;strong&gt;Replacement for:&lt;/strong&gt; Trillian, AIM, 
MSN, Yahoo and ICQ chat clients&lt;/p&gt;
         
@@ -138,8 +247,12 @@
 
        &lt;h3&gt;&lt;a 
href="http://directory.fsf.org/gimp.html"&gt;GIMP&lt;/a&gt;&lt;/h3&gt;
          
-        &lt;p&gt;&lt;strong&gt;Replacement for:&lt;/strong&gt; Photoshop, 
Paint Shop Pro&lt;/p&gt;
+        &lt;p&gt;&lt;strong&gt;Replacement for:&lt;/strong&gt; Photoshop, 
Paint Shop Pro&lt;/p&gt;</strong></del></span>
+<span class="inserted"><ins><em>&lt;/dd&gt;
+
         
+&lt;dt id="GIMP"&gt;&lt;a 
href="http://directory.fsf.org/gimp.html"&gt;GIMP&lt;/a&gt;&lt;/dt&gt;
+&lt;dd&gt;</em></ins></span>
           &lt;p&gt;GIMP is an acronym for GNU Image Manipulation Program.
           It can be used as a simple paint program, an expert
           quality photo retouching program, an online batch
@@ -156,7 +269,7 @@
           PhotoShop &lt;b&gt;PSD&lt;/b&gt; format and the Paint Shop Pro
           &lt;b&gt;PSP&lt;/b&gt; format.&lt;/i&gt;&lt;/p&gt;
 
-         &lt;h3&gt;&lt;a 
href="http://gnunet.org"&gt;GNUnet&lt;/a&gt;&lt;/h3&gt;
+         <span class="removed"><del><strong>&lt;h3&gt;&lt;a 
href="http://gnunet.org"&gt;GNUnet&lt;/a&gt;&lt;/h3&gt;
         &lt;p&gt;&lt;strong&gt;Replacement for:&lt;/strong&gt; Napster, 
etc.&lt;/p&gt;
 
           &lt;p&gt;GNUnet is a framework for secure peer-to-peer
@@ -172,8 +285,12 @@
          &lt;h3&gt;&lt;a 
href="http://www.inkscape.org/"&gt;Inkscape&lt;/a&gt;&lt;/h3&gt;
 
          &lt;p&gt;&lt;strong&gt;Replacement for:&lt;/strong&gt; Adobe 
Illustrator,
-        Macromedia Freehand, CorelDraw or Xara Xtreme&lt;/p&gt;
+        Macromedia Freehand, CorelDraw or Xara 
Xtreme&lt;/p&gt;</strong></del></span>
+<span class="inserted"><ins><em>&lt;/dd&gt;
 
+
+&lt;dt id="Inkscape"&gt;&lt;a 
href="http://www.inkscape.org/"&gt;Inkscape&lt;/a&gt;&lt;/dt&gt;
+&lt;dd&gt;</em></ins></span>
           &lt;p&gt;Inkscape is an vector graphics editor, with
           capabilities similar to Illustrator, Freehand, CorelDraw,
           or Xara Xtreme using the W3C standard Scalable Vector
@@ -189,7 +306,7 @@
           others and exports PNG as well as multiple vector-based
           formats.&lt;/p&gt;
 
-&lt;h3&gt;&lt;a href="http://www.mingw.org"&gt;MinGW&lt;/a&gt;&lt;/h3&gt;
+<span class="removed"><del><strong>&lt;h3&gt;&lt;a 
href="http://www.mingw.org"&gt;MinGW&lt;/a&gt;&lt;/h3&gt;
 
         &lt;p&gt;&lt;strong&gt;Replacement for:&lt;/strong&gt; Microsoft 
Visual C++&lt;/p&gt;
 
@@ -198,15 +315,20 @@
           GNU Compiler Collection (GCC), Binutils, GNU Debugger
           (GDB), Make, and more.&lt;/p&gt;
 
-        <span 
class="removed"><del><strong>&lt;p&gt;&lt;b&gt;Application:&lt;/b&gt;&lt;/p&gt;</strong></del></span>
+        &lt;p&gt;&lt;b&gt;Application:&lt;/b&gt;&lt;/p&gt;
+
+        &lt;h3&gt;&lt;a</strong></del></span>
+<span class="inserted"><ins><em>&lt;/dd&gt;
 
-        &lt;h3&gt;&lt;a href="http://www.claws-mail.org/"&gt;Claws 
Mail&lt;/a&gt;&lt;/h3&gt;
 
-&lt;p&gt;&lt;strong&gt;Replacement for:&lt;/strong&gt; Outlook, Outlook 
Express&lt;/p&gt;
+&lt;dt id="ClawsMail"&gt;&lt;a</em></ins></span> 
href="http://www.claws-mail.org/"&gt;Claws <span 
class="removed"><del><strong>Mail&lt;/a&gt;&lt;/h3&gt;
 
-          &lt;p&gt;Claws Mail is designed to be familiar to new users coming 
from other popular email clients, as well as experienced users.&lt;/p&gt;
+&lt;p&gt;&lt;strong&gt;Replacement for:&lt;/strong&gt; Outlook, Outlook 
Express&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>Mail&lt;/a&gt;&lt;/dt&gt;
+&lt;dd&gt;</em></ins></span>
+  &lt;p&gt;Claws Mail is designed to be familiar to new users coming from other
+  popular email clients, as well as experienced users.&lt;/p&gt;
 
-&lt;h3&gt;&lt;a 
href="http://www.libreoffice.org/"&gt;LibreOffice&lt;/a&gt;&lt;/h3&gt;
+<span class="removed"><del><strong>&lt;h3&gt;&lt;a 
href="http://www.libreoffice.org/"&gt;LibreOffice&lt;/a&gt;&lt;/h3&gt;
         &lt;p&gt;&lt;strong&gt;Replacement for:&lt;/strong&gt; Microsoft 
Office&lt;/p&gt;
 
 &lt;p&gt;LibreOffice is a multi-platform office productivity
@@ -216,20 +338,90 @@
 
 &lt;p&gt;&lt;strong&gt;Replacement for:&lt;/strong&gt; PageMaker, InDesign, 
QuarkXPress&lt;/p&gt;
 
-&lt;p&gt;Scribus is a desktop publishing application, like Adobe PageMaker
-          or Adobe InDesign from the proprietary software world. It is
+&lt;p&gt;Scribus</strong></del></span>
+<span class="inserted"><ins><em>&lt;/dd&gt;
+
+
+&lt;dt id="GNUnet"&gt;&lt;a 
href="http://gnunet.org"&gt;GNUnet&lt;/a&gt;&lt;/dt&gt;
+&lt;dd&gt;
+  &lt;p&gt;GNUnet</em></ins></span> is a <span 
class="removed"><del><strong>desktop publishing application, like Adobe 
PageMaker</strong></del></span> <span class="inserted"><ins><em>framework for 
secure peer-to-peer
+  networking that does not use any centralized</em></ins></span> or <span 
class="removed"><del><strong>Adobe InDesign from the proprietary software 
world. It is
           free software, distributed under the terms of the Gnu
           General Public License.&lt;/p&gt;
 
           &lt;p&gt;Scribus supports many major graphic formats including
-          most all of the standard ones used in DTP in addition to
-          SVG import and export.&lt;/p&gt;
+          most all</strong></del></span> <span 
class="inserted"><ins><em>otherwise
+  trusted services. A first service implemented on top</em></ins></span> of
+  the <span class="removed"><del><strong>standard ones 
used</strong></del></span> <span class="inserted"><ins><em>networking layer 
allows anonymous
+  censorship-resistant file-sharing. GNUnet uses a simple,
+  excess-based economic model to allocate resources. Peers</em></ins></span>
+  in <span class="removed"><del><strong>DTP</strong></del></span> <span 
class="inserted"><ins><em>GNUnet monitor each others behavior with respect to
+  resource usage; peers that contribute to the network are
+  rewarded with better service.&lt;/p&gt;
+&lt;/dd&gt;
+
+
+&lt;dt id="Pidgin"&gt;&lt;a 
href="http://directory.fsf.org/pidgin.html"&gt;Pidgin&lt;/a&gt;&lt;/dt&gt;
+&lt;dd&gt;
+  &lt;p&gt;Pidgin (Gaim) is a multi-protocol instant messaging client,
+  with support for:&lt;/p&gt;
+
+  &lt;ul&gt;
+  &lt;li&gt;AIM (Oscar and TOC protocols),&lt;/li&gt;
 
-&lt;h3&gt;&lt;a href="http://videolan.org/vlc/"&gt;VideoLAN Client 
(VLC)&lt;/a&gt;&lt;/h3&gt;
+  &lt;li&gt;ICQ,&lt;/li&gt;
 
+  &lt;li&gt;MSN Messenger,&lt;/li&gt;
 
-        &lt;p&gt;&lt;strong&gt;Replacement for:&lt;/strong&gt; Windows Media 
Player, PowerDVD&lt;/p&gt;
+  &lt;li&gt;Yahoo,&lt;/li&gt;
 
+  &lt;li&gt;IRC,&lt;/li&gt;
+
+  &lt;li&gt;Jabber,&lt;/li&gt;
+
+  &lt;li&gt;Novell,&lt;/li&gt;
+
+  &lt;li&gt;Gadu-Gadu, and&lt;/li&gt;
+
+  &lt;li&gt;Zephyr networks.&lt;/li&gt;
+  &lt;/ul&gt;
+
+  &lt;p&gt;Pidgin also supports plugins, for additional 
functionality.&lt;/p&gt;
+&lt;/dd&gt;
+
+
+&lt;dt id="QupZilla"&gt;&lt;a 
href="http://www.qupzilla.com/"&gt;QupZilla&lt;/a&gt;&lt;/dt&gt;
+&lt;dd&gt;
+  &lt;p&gt;QupZilla is a cross-platform web browser with a unified RSS reader,
+  history and bookmarks</em></ins></span> in <span 
class="removed"><del><strong>addition</strong></del></span> <span 
class="inserted"><ins><em>a single window.&lt;/p&gt;
+&lt;/dd&gt;
+
+
+&lt;dt id="Tribler"&gt;&lt;a 
href="http://www.tribler.org/"&gt;Tribler&lt;/a&gt;&lt;/dt&gt;
+&lt;dd&gt;
+  &lt;p&gt;Tribler is an application that enables its users</em></ins></span> 
to
+          <span class="removed"><del><strong>SVG import</strong></del></span> 
<span class="inserted"><ins><em>find
+  enjoy</em></ins></span> and <span 
class="removed"><del><strong>export.&lt;/p&gt;
+
+&lt;h3&gt;&lt;a</strong></del></span> <span class="inserted"><ins><em>share 
video, audio, pictures, and other things.&lt;/p&gt;
+&lt;/dd&gt;
+
+
+&lt;dt id="Blender3D"&gt;&lt;a 
href="http://directory.fsf.org/blender.html"&gt;Blender 3D&lt;/a&gt;&lt;/dt&gt;
+&lt;dd&gt;
+  &lt;p&gt;Blender is the first and only fully integrated 3D
+  graphics creation suite allowing modeling, animation,
+  rendering, post-production, realtime interactive 3D and
+  game creation and playback with cross-platform
+  compatibility.&lt;/p&gt;
+&lt;/dd&gt;
+
+
+&lt;dt id="VLC"&gt;&lt;a</em></ins></span> 
href="http://videolan.org/vlc/"&gt;VideoLAN Client <span 
class="removed"><del><strong>(VLC)&lt;/a&gt;&lt;/h3&gt;
+
+
+        &lt;p&gt;&lt;strong&gt;Replacement for:&lt;/strong&gt; Windows Media 
Player, PowerDVD&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>(VLC)&lt;/a&gt;&lt;/dt&gt;
+&lt;dd&gt;</em></ins></span>
           &lt;p&gt;VLC (initially VideoLAN Client) is a highly portable
           multimedia player for various audio and video formats
           (MPEG-1, MPEG-2, MPEG-4, DivX, MP3, OGG, etc.) as well as
@@ -237,7 +429,7 @@
           be used as a server to stream in unicast or multicast in
           IPv4 or IPv6 on a high-bandwidth network.&lt;/p&gt;
 
-&lt;h3&gt;&lt;a href="http://www.tribler.org/"&gt;Tribler&lt;/a&gt;&lt;/h3&gt;
+<span class="removed"><del><strong>&lt;h3&gt;&lt;a 
href="http://www.tribler.org/"&gt;Tribler&lt;/a&gt;&lt;/h3&gt;
 
 
         &lt;p&gt;&lt;strong&gt;Replacement for:&lt;/strong&gt; 
BitTorrent&lt;/p&gt;
@@ -246,34 +438,53 @@
          enjoy and share video, audio, pictures, and other things.&lt;/p&gt;
 
 
-&lt;h3&gt;&lt;a <span 
class="removed"><del><strong>href="http://www.qupzilla.com/"&gt;QupZilla&lt;/a&gt;&lt;/h3&gt;</strong></del></span>
 <span class="inserted"><ins><em>href="/software/gnuzilla/"&gt;GNU 
IceCat&lt;/a&gt;&lt;/h3&gt;</em></ins></span>
-&lt;p&gt;&lt;strong&gt;Replacement for:&lt;/strong&gt; Mozilla Firefox, Google 
Chrome, 
-Microsoft Internet Explorer&lt;/p&gt;
-
-          <span 
class="removed"><del><strong>&lt;p&gt;QupZilla</strong></del></span>
-<span class="inserted"><ins><em>&lt;p&gt;IceCat</em></ins></span> is <span 
class="removed"><del><strong>a cross-platform web browser with a unified RSS 
reader, history</strong></del></span> <span class="inserted"><ins><em>the GNU 
version of the Firefox browser. It is entirely 
-free software, which does not recommend non-free plugins</em></ins></span> and 
<span class="removed"><del><strong>bookmarks in a single 
window.&lt;/p&gt;</strong></del></span> <span class="inserted"><ins><em>addons. 
-It also features built-in privacy-protecting 
features.&lt;/p&gt;</em></ins></span>
-
-        &lt;p&gt;Why not recommend Firefox? As explained in our &lt;a 
-href="/philosophy/free-sw.html"&gt;Free Software Definition&lt;/a&gt;, all
-four freedoms must be available on both a commercial and 
-non-commercial basis. Mozilla's trademark policy serves to limit
-Freedom 2 to gratis distribution only, making the software 
-nonfree.&lt;/p&gt;
-
-
-<span class="inserted"><ins><em>&lt;h3&gt;&lt;a 
href="http://www.qupzilla.com/"&gt;QupZilla&lt;/a&gt;&lt;/h3&gt;
+&lt;h3&gt;&lt;a 
href="http://www.qupzilla.com/"&gt;QupZilla&lt;/a&gt;&lt;/h3&gt;
 
 
         &lt;p&gt;&lt;strong&gt;Replacement for:&lt;/strong&gt; Mozilla 
Firefox, Google
           Chrome, Microsoft Internet Explorer&lt;/p&gt;
 
-          &lt;p&gt;QupZilla is a cross-platform web browser with a unified RSS 
reader, history and bookmarks in a single window.&lt;/p&gt;</em></ins></span>
+          &lt;p&gt;QupZilla</strong></del></span>
+<span class="inserted"><ins><em>&lt;/dd&gt;
+
+
+&lt;dt id="LibreOffice"&gt;&lt;a 
href="http://www.libreoffice.org/"&gt;LibreOffice&lt;/a&gt;&lt;/dt&gt;
+&lt;dd&gt;
+  &lt;p&gt;LibreOffice</em></ins></span> is a <span 
class="removed"><del><strong>cross-platform web browser</strong></del></span> 
<span class="inserted"><ins><em>multi-platform office productivity
+  suite compatible</em></ins></span> with <span class="removed"><del><strong>a 
unified RSS reader, history and bookmarks in a single window.&lt;/p&gt;
+       &lt;p&gt;Why not recommend Firefox? As explained in our &lt;a 
href="/philosophy/free-sw.html"&gt;Free Software 
Definition&lt;/a&gt;,</strong></del></span> all 
+<span class="removed"><del><strong>four freedoms must be available on 
both</strong></del></span> <span class="inserted"><ins><em>major file 
formats.&lt;/p&gt;
+&lt;/dd&gt;
+
+
+&lt;dt id="Scribus"&gt;&lt;a 
href="http://www.scribus.net/"&gt;Scribus&lt;/a&gt;&lt;/dt&gt;
+&lt;dd&gt;
+  &lt;p&gt;Scribus is</em></ins></span> a <span 
class="removed"><del><strong>commercial and non-commercial basis. Mozilla's 
trademark policy serves to limit 
+Freedom 2 to gratis distribution only, making</strong></del></span> <span 
class="inserted"><ins><em>desktop publishing application, like Adobe PageMaker
+  or Adobe InDesign from</em></ins></span> the <span 
class="inserted"><ins><em>proprietary</em></ins></span> software <span 
class="removed"><del><strong>nonfree.&lt;/p&gt;
+
+       &lt;p&gt;This</strong></del></span> <span 
class="inserted"><ins><em>world. It</em></ins></span> is <span 
class="removed"><del><strong>a selection</strong></del></span>
+  <span class="inserted"><ins><em>free software, distributed under the 
terms</em></ins></span> of the <span class="removed"><del><strong>more common 
free software
+  applications available</strong></del></span> <span 
class="inserted"><ins><em>Gnu
+  General Public License.&lt;/p&gt;
+
+  &lt;p&gt;Scribus supports many major graphic formats including
+  most all of the standard ones used in DTP in addition to
+  SVG import and export.&lt;/p&gt;
+&lt;/dd&gt;
+
+
+&lt;dt id="MinGW"&gt;&lt;a 
href="http://www.mingw.org"&gt;MinGW&lt;/a&gt;&lt;/dt&gt;
+&lt;dd&gt;
+  &lt;p&gt;MinGW (Minimalist GNU</em></ins></span> for <span 
class="inserted"><ins><em>Windows) provides many of</em></ins></span>
+  the <span class="removed"><del><strong>Microsoft Windows 
platform,</strong></del></span> <span class="inserted"><ins><em>GNU programming 
utilities on Windows. It includes the
+  GNU Compiler Collection (GCC), Binutils, GNU Debugger
+  (GDB), Make,</em></ins></span> and <span class="removed"><del><strong>is
+  nothing like a comprehensive list.&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>more.&lt;/p&gt;
+&lt;/dd&gt;
+
+&lt;/dl&gt;</em></ins></span>
 
-       &lt;p&gt;This is a selection of the more common free software
-  applications available for the Microsoft Windows platform, and is
-  nothing like a comprehensive list.&lt;/p&gt;
 
 &lt;/div&gt;&lt;!-- for id="content", starts in the include above --&gt;
 &lt;!--#include virtual="/server/footer.html" --&gt;
@@ -309,7 +520,7 @@
 
 &lt;!-- Regarding copyright, in general, standalone pages (as opposed to
      files generated as part of manuals) on the GNU web server should
-     be under CC BY-ND 3.0 US.  Please do NOT change or remove this
+     be under CC BY-ND <span class="removed"><del><strong>3.0 
US.</strong></del></span> <span 
class="inserted"><ins><em>4.0.</em></ins></span>  Please do NOT change or 
remove this
      without talking with the webmasters or licensing team first.
      Please make sure the copyright date is consistent with the
      document.  For web pages, it is ok to list just the latest year the
@@ -336,7 +547,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2015/05/22 07:13:03 $
+$Date: 2015/07/15 13:27:32 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: for-windows.hr.po
===================================================================
RCS file: /web/www/www/software/po/for-windows.hr.po,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- for-windows.hr.po   9 Mar 2015 21:56:58 -0000       1.14
+++ for-windows.hr.po   15 Jul 2015 13:27:32 -0000      1.15
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: for-windows.html\n"
-"POT-Creation-Date: 2015-03-09 21:55+0000\n"
+"POT-Creation-Date: 2015-07-15 13:25+0000\n"
 "PO-Revision-Date: 2014-04-13 23:19+0100\n"
 "Last-Translator: Martina Bebek <address@hidden>\n"
 "Language-Team: GNU Croatian Translation Team <address@hidden>\n"
@@ -24,27 +24,6 @@
 msgstr ""
 "Slobodni softver za Windowse - Projekt GNU - Zaklada za slobodni softver"
 
-#. type: Content of: <style>
-#, no-wrap
-msgid ""
-"#windows7sins {\n"
-"   float: right;\n"
-"   width: 25em;\n"
-"   text-align: center;\n"
-"   margin: 0 1em 1em 1em;\n"
-"}\n"
-"blockquote#windows7sins p { margin: .3em 0 0 0; }\n"
-"#windows7sins img { width: 100%; }\n"
-msgstr ""
-"#windows7sins {\n"
-"   float: right;\n"
-"   width: 25em;\n"
-"   text-align: center;\n"
-"   margin: 0 1em 1em 1em;\n"
-"}\n"
-"blockquote#windows7sins p { margin: .3em 0 0 0; }\n"
-"#windows7sins img { width: 100%; }\n"
-
 #. type: Content of: <h2>
 msgid "Free Software for Windows"
 msgstr "Slobodni softver za Windowse"
@@ -78,10 +57,34 @@
 msgstr "Nadogradnja s Windowsa 8"
 
 #. type: Content of: <p>
-msgid ""
-"When we say these application programs are <a href= \"/philosophy/free-sw."
-"html\">free software</a>, we're talking about freedom, not price. It means "
-"that you are free to use these programs constructively, either alone or in a "
+# | When we say these application programs are <a href=[-
+# | -]\"/philosophy/free-sw.html\">free software</a>, we're talking about
+# | freedom, not price. It means that you are free to use these programs
+# | constructively, either alone or in a community, while respecting the
+# | freedom of others. The source code is available, so that you can study the
+# | software, adapt it to your needs, fix bugs, and release versions with new
+# | features. You can also convince or pay others to do these things for you.
+# | You are also free to give away and free to sell copies, under the terms of
+# | the applicable free software license. These programs are free software
+# | because <em>you have freedom</em> in using them. Free software develops
+# | under the control of its users.
+#, fuzzy
+#| msgid ""
+#| "When we say these application programs are <a href= \"/philosophy/free-sw."
+#| "html\">free software</a>, we're talking about freedom, not price. It "
+#| "means that you are free to use these programs constructively, either "
+#| "alone or in a community, while respecting the freedom of others. The "
+#| "source code is available, so that you can study the software, adapt it to "
+#| "your needs, fix bugs, and release versions with new features. You can "
+#| "also convince or pay others to do these things for you. You are also free "
+#| "to give away and free to sell copies, under the terms of the applicable "
+#| "free software license. These programs are free software because <em>you "
+#| "have freedom</em> in using them. Free software develops under the control "
+#| "of its users."
+msgid ""
+"When we say these application programs are <a href=\"/philosophy/free-sw.html"
+"\">free software</a>, we're talking about freedom, not price. It means that "
+"you are free to use these programs constructively, either alone or in a "
 "community, while respecting the freedom of others. The source code is "
 "available, so that you can study the software, adapt it to your needs, fix "
 "bugs, and release versions with new features. You can also convince or pay "
@@ -102,15 +105,34 @@
 "korištenju. Razvoj slobodnog softvera kontroliraju njegovi korisnici."
 
 #. type: Content of: <p>
+# | Microsoft Windows is a clear and instructive example of nonfree software.
+# | Its source code is a secret, so programmers cannot learn from it, fix it,
+# | adapt it to their clients (your) needs, or even verify what it really
+# | does. If you share copies with your neighbors, you will be called a
+# | [-\"pirate\",-] {+&ldquo;pirate&rdquo;,+} and users have been threatened
+# | with imprisonment for this. Nonfree software is completely controlled by
+# | its developer, who also has power over the users. We started the free
+# | software movement because <a
+# | href=\"/philosophy/freedom-or-power.html\">this power is unjust</a>.
+#, fuzzy
+#| msgid ""
+#| "Microsoft Windows is a clear and instructive example of nonfree software. "
+#| "Its source code is a secret, so programmers cannot learn from it, fix it, "
+#| "adapt it to their clients (your) needs, or even verify what it really "
+#| "does. If you share copies with your neighbors, you will be called a "
+#| "\"pirate\", and users have been threatened with imprisonment for this. "
+#| "Nonfree software is completely controlled by its developer, who also has "
+#| "power over the users. We started the free software movement because <a "
+#| "href=\"/philosophy/freedom-or-power.html\">this power is unjust</a>."
 msgid ""
 "Microsoft Windows is a clear and instructive example of nonfree software. "
 "Its source code is a secret, so programmers cannot learn from it, fix it, "
 "adapt it to their clients (your) needs, or even verify what it really does. "
-"If you share copies with your neighbors, you will be called a \"pirate\", "
-"and users have been threatened with imprisonment for this. Nonfree software "
-"is completely controlled by its developer, who also has power over the "
-"users. We started the free software movement because <a href=\"/philosophy/"
-"freedom-or-power.html\">this power is unjust</a>."
+"If you share copies with your neighbors, you will be called a &ldquo;"
+"pirate&rdquo;, and users have been threatened with imprisonment for this. "
+"Nonfree software is completely controlled by its developer, who also has "
+"power over the users. We started the free software movement because <a href="
+"\"/philosophy/freedom-or-power.html\">this power is unjust</a>."
 msgstr ""
 "Microsoftovi Windowsi su jasan i poučan primjer neslobodnog softvera. "
 "Izvorni kod im je tajan, stoga ga programeri ne mogu proučavati, mijenjati "
@@ -134,8 +156,14 @@
 "Microsoftovom vlašću."
 
 #. type: Content of: <p>
+# | So the next step is to replace Windows with a <a
+# | href=\"/distros{+/+}\">free operating system such as GNU/Linux</a>.
+#, fuzzy
+#| msgid ""
+#| "So the next step is to replace Windows with a <a href=\"/distros\">free "
+#| "operating system such as GNU/Linux</a>."
 msgid ""
-"So the next step is to replace Windows with a <a href=\"/distros\">free "
+"So the next step is to replace Windows with a <a href=\"/distros/\">free "
 "operating system such as GNU/Linux</a>."
 msgstr ""
 "Stoga, sljedeći korak jest zamjena Windowsa s nekim <a href=\"/distros"
@@ -148,35 +176,238 @@
 "<strong>Međutim, na ovoj stranici, pozabavit ćemo se tim prvim korakom.</"
 "strong>"
 
-#. type: Content of: <h3>
-msgid "<a href=\"http://directory.fsf.org/blender.html\";>Blender 3D</a>"
+#. type: Content of: <table><thead><tr><th>
+msgid "Category"
+msgstr ""
+
+#. type: Content of: <table><thead><tr><th>
+msgid "Free program<a href=\"#f1\"><sup>1</sup></a>"
+msgstr ""
+
+#. type: Content of: <table><thead><tr><th>
+msgid "Replacement for"
+msgstr ""
+
+#. type: Content of: <table><tbody><tr><td>
+msgid "Graphics and Design"
+msgstr ""
+
+#. type: Content of: <table><tbody><tr><td>
+msgid "<a href=\"#Dia\">Dia</a>"
+msgstr ""
+
+#. type: Content of: <table><tbody><tr><td>
+msgid "Microsoft Visio"
+msgstr ""
+
+#. type: Content of: <table><tbody><tr><td>
+msgid "<a href=\"#GIMP\">GIMP</a>"
+msgstr ""
+
+#. type: Content of: <table><tbody><tr><td>
+msgid "Photoshop, Paint Shop Pro"
+msgstr ""
+
+#. type: Content of: <table><tbody><tr><td>
+# | <a [-href=\"http://www.inkscape.org/\";>Inkscape</a>-]
+# | {+href=\"#Inkscape\">Inkscape</a>+}
+#, fuzzy
+#| msgid "<a href=\"http://www.inkscape.org/\";>Inkscape</a>"
+msgid "<a href=\"#Inkscape\">Inkscape</a>"
+msgstr "<a href=\"http://www.inkscape.org/\";>Inkscape</a>"
+
+#. type: Content of: <table><tbody><tr><td>
+# | [-<strong>Replacement for:</strong>-]Adobe Illustrator, Macromedia
+# | Freehand, [-CorelDraw or-] {+CorelDraw,+} Xara Xtreme
+#, fuzzy
+#| msgid ""
+#| "<strong>Replacement for:</strong> Adobe Illustrator, Macromedia Freehand, "
+#| "CorelDraw or Xara Xtreme"
+msgid "Adobe Illustrator, Macromedia Freehand, CorelDraw, Xara Xtreme"
+msgstr ""
+"<strong>Zamjena za:</strong> Adobe Illustrator, Macromedia Freehand, "
+"CorelDraw or Xara Xtreme"
+
+#. type: Content of: <table><tbody><tr><td>
+msgid "Internet"
+msgstr ""
+
+#. type: Content of: <table><tbody><tr><td>
+# | <a [-href=\"http://www.claws-mail.org/\";>Claws-]
+# | {+href=\"#ClawsMail\">Claws+} Mail</a>
+#, fuzzy
+#| msgid "<a href=\"http://www.claws-mail.org/\";>Claws Mail</a>"
+msgid "<a href=\"#ClawsMail\">Claws Mail</a>"
+msgstr "<a href=\"http://www.claws-mail.org/\";>Claws Mail</a>"
+
+#. type: Content of: <table><tbody><tr><td>
+msgid "Outlook, Outlook Express"
+msgstr ""
+
+#. type: Content of: <table><tbody><tr><td>
+# | <a [-href=\"http://gnunet.org\";>GNUnet</a>-]
+# | {+href=\"#GNUnet\">GNUnet</a>+}
+#, fuzzy
+#| msgid "<a href=\"http://gnunet.org\";>GNUnet</a>"
+msgid "<a href=\"#GNUnet\">GNUnet</a>"
+msgstr "<a href=\"http://gnunet.org\";>GNUnet</a>"
+
+#. type: Content of: <table><tbody><tr><td>
+msgid "Napster, etc."
+msgstr ""
+
+#. type: Content of: <table><tbody><tr><td>
+# | <a [-href=\"http://directory.fsf.org/pidgin.html\";>Pidgin</a>-]
+# | {+href=\"#Pidgin\">Pidgin</a>+}
+#, fuzzy
+#| msgid "<a href=\"http://directory.fsf.org/pidgin.html\";>Pidgin</a>"
+msgid "<a href=\"#Pidgin\">Pidgin</a>"
+msgstr "<a href=\"http://directory.fsf.org/pidgin.html\";>Pidgin</a>"
+
+#. type: Content of: <table><tbody><tr><td>
+# | [-<strong>Replacement for:</strong>-]Trillian, AIM, MSN, [-Yahoo and-]
+# | {+Yahoo,+} ICQ chat clients
+#, fuzzy
+#| msgid ""
+#| "<strong>Replacement for:</strong> Trillian, AIM, MSN, Yahoo and ICQ chat "
+#| "clients"
+msgid "Trillian, AIM, MSN, Yahoo, ICQ chat clients"
+msgstr ""
+"<strong>Zamjena za:</strong> Trillian, AIM, MSN, chat klijente Yahoo i ICQ "
+
+#. type: Content of: <table><tbody><tr><td>
+# | <a [-href=\"http://www.qupzilla.com/\";>QupZilla</a>-]
+# | {+href=\"#QupZilla\">QupZilla</a>+}
+#, fuzzy
+#| msgid "<a href=\"http://www.qupzilla.com/\";>QupZilla</a>"
+msgid "<a href=\"#QupZilla\">QupZilla</a>"
+msgstr "<a href=\"http://www.qupzilla.com/\";>QupZilla</a>"
+
+#. type: Content of: <table><tbody><tr><td>
+msgid "Firefox<a href=\"#f2\"><sup>2</sup></a>, Chrome, Internet Explorer"
+msgstr ""
+
+#. type: Content of: <table><tbody><tr><td>
+# | <a [-href=\"http://www.tribler.org/\";>Tribler</a>-]
+# | {+href=\"#Tribler\">Tribler</a>+}
+#, fuzzy
+#| msgid "<a href=\"http://www.tribler.org/\";>Tribler</a>"
+msgid "<a href=\"#Tribler\">Tribler</a>"
+msgstr "<a href=\"http://www.tribler.org/\";>Tribler</a>"
+
+#. type: Content of: <table><tbody><tr><td>
+msgid "BitTorrent"
+msgstr ""
+
+#. type: Content of: <table><tbody><tr><td>
+msgid "Multimedia"
+msgstr ""
+
+#. type: Content of: <table><tbody><tr><td>
+# | <a [-href=\"http://directory.fsf.org/blender.html\";>Blender 3D</a>-]
+# | {+href=\"#Blender3D\">Blender3D</a>+}
+#, fuzzy
+#| msgid "<a href=\"http://directory.fsf.org/blender.html\";>Blender 3D</a>"
+msgid "<a href=\"#Blender3D\">Blender3D</a>"
 msgstr "<a href=\"http://directory.fsf.org/blender.html\";>Blender 3D</a>"
 
-#. type: Content of: <p>
-msgid "<strong>Replacement for:</strong> Maya, 3DSMax"
-msgstr "<strong>Zamjena za:</strong> Maya, 3DSMax"
+#. type: Content of: <table><tbody><tr><td>
+msgid "Maya, 3DSMax"
+msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <table><tbody><tr><td>
+# | <a [-href=\"http://videolan.org/vlc/\";>VideoLAN-]
+# | {+href=\"#VLC\">VideoLan+} Client (VLC)</a>
+#, fuzzy
+#| msgid "<a href=\"http://videolan.org/vlc/\";>VideoLAN Client (VLC)</a>"
+msgid "<a href=\"#VLC\">VideoLan Client (VLC)</a>"
+msgstr "<a href=\"http://videolan.org/vlc/\";>VideoLAN Client (VLC)</a>"
+
+#. type: Content of: <table><tbody><tr><td>
+# | [-<strong>Replacement for:</strong>-]Windows Media Player, PowerDVD
+#, fuzzy
+#| msgid "<strong>Replacement for:</strong> Windows Media Player, PowerDVD"
+msgid "Windows Media Player, PowerDVD"
+msgstr "<strong>Zamjena za:</strong> Windows Media Player, PowerDVD"
+
+#. type: Content of: <table><tbody><tr><td>
+msgid "Office and Productivity"
+msgstr ""
+
+#. type: Content of: <table><tbody><tr><td>
+# | <a [-href=\"http://www.libreoffice.org/\";>LibreOffice</a>-]
+# | {+href=\"#LibreOffice\">LibreOffice</a>+}
+#, fuzzy
+#| msgid "<a href=\"http://www.libreoffice.org/\";>LibreOffice</a>"
+msgid "<a href=\"#LibreOffice\">LibreOffice</a>"
+msgstr "<a href=\"http://www.libreoffice.org/\";>LibreOffice</a>"
+
+#. type: Content of: <table><tbody><tr><td>
+msgid "Microsoft Office"
+msgstr ""
+
+#. type: Content of: <table><tbody><tr><td>
+msgid "Publishing"
+msgstr ""
+
+#. type: Content of: <table><tbody><tr><td>
+# | <a [-href=\"http://www.scribus.net/\";>Scribus</a>-]
+# | {+href=\"#Scribus\">Scribus</a>+}
+#, fuzzy
+#| msgid "<a href=\"http://www.scribus.net/\";>Scribus</a>"
+msgid "<a href=\"#Scribus\">Scribus</a>"
+msgstr "<a href=\"http://www.scribus.net/\";>Scribus</a>"
+
+#. type: Content of: <table><tbody><tr><td>
+# | [-<strong>Replacement for:</strong>-]PageMaker, InDesign, QuarkXPress
+#, fuzzy
+#| msgid "<strong>Replacement for:</strong> PageMaker, InDesign, QuarkXPress"
+msgid "PageMaker, InDesign, QuarkXPress"
+msgstr "<strong>Zamjena za:</strong> PageMaker, InDesign, QuarkXPress"
+
+#. type: Content of: <table><tbody><tr><td>
+msgid "Programming Utilities"
+msgstr ""
+
+#. type: Content of: <table><tbody><tr><td>
+# | <a [-href=\"http://www.mingw.org\";>MinGW</a>-]
+# | {+href=\"#MinGW\">MinGW</a>+}
+#, fuzzy
+#| msgid "<a href=\"http://www.mingw.org\";>MinGW</a>"
+msgid "<a href=\"#MinGW\">MinGW</a>"
+msgstr "<a href=\"http://www.mingw.org\";>MinGW</a>"
+
+#. type: Content of: <table><tbody><tr><td>
+msgid "Microsoft Visual C++"
+msgstr ""
+
+#. type: Content of: <div><ol><li>
 msgid ""
-"Blender is the first and only fully integrated 3D graphics creation suite "
-"allowing modeling, animation, rendering, post-production, realtime "
-"interactive 3D and game creation and playback with cross-platform "
-"compatibility."
+"This is a selection of the more common free software applications available "
+"for the Microsoft Windows platform, and is nothing like a comprehensive list."
 msgstr ""
-"Blender je prvi i jedini u potpunosti integriran paket za stvaranje 3D "
-"grafike, koji se može koristiti za modeliranje, animaciju, renderiranje, "
-"post-produkciju, stvaranje i pokretanje interaktivnih igara i 3D-a u "
-"stvarnom vremenu, te posjeduje višeplatformsku kompatibilnost."
+"Ovo je samo odabir nekih poznatijih slobodnih programa dostupnih za "
+"Microsoftove Windowse, ne iscrpan popis."
+
+#. type: Content of: <div><ol><li>
+msgid ""
+"Why not recommend Firefox? As explained in our <a href=\"/philosophy/free-sw."
+"html\">Free Software Definition</a>, all four freedoms must be available on "
+"both a commercial and non-commercial basis. Mozilla's trademark policy "
+"serves to limit Freedom 2 to gratis distribution only, making the software "
+"nonfree."
+msgstr ""
+"Zašto ne preporučamo Firefox? Kao što je objašnjeno u našoj <a href=\"/"
+"philosophy/free-sw.html\">definiciji slobodnog softvera</a>, sve četiri "
+"slobode moraju biti omogućene i u komercijalnom i u nekomercijalnom "
+"korištenju. Mozillino štićenje <i>trademarka</i> ograničava 2. slobodu 
samo "
+"na besplatno distribuiranje, što čini program neslobodnim."
 
-#. type: Content of: <h3>
+#. type: Content of: <dl><dt>
 msgid "<a href=\"http://directory.fsf.org/dia.html\";>Dia</a>"
 msgstr "<a href=\"http://directory.fsf.org/dia.html\";>Dia</a>"
 
-#. type: Content of: <p>
-msgid "<strong>Replacement for:</strong> Microsoft Visio"
-msgstr "<strong>Zamjena za:</strong> Microsoft Visio"
-
-#. type: Content of: <p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "Dia is designed to be much like the proprietary Microsoft program 'Visio'. "
 "It can be used to draw many different kinds of diagrams. It currently has "
@@ -192,7 +423,7 @@
 "pišući jednostavne XML datoteke, koristeći podskup SVG-a kako bi se 
nacrtao "
 "oblik."
 
-#. type: Content of: <p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "It can load and save diagrams to a custom XML format (gzipped by default, to "
 "save space), can export diagrams to EPS or SVG formats and can print "
@@ -202,73 +433,11 @@
 "u, kako bi se sačuvao prostor), može eksportirati dijagrame u formate EPS "
 "ili SVG i može ispisivati dijagrame (uključujući i one na nekoliko 
stranica)."
 
-#. type: Content of: <h3>
-msgid "<a href=\"http://directory.fsf.org/pidgin.html\";>Pidgin</a>"
-msgstr "<a href=\"http://directory.fsf.org/pidgin.html\";>Pidgin</a>"
-
-#. type: Content of: <p>
-msgid ""
-"<strong>Replacement for:</strong> Trillian, AIM, MSN, Yahoo and ICQ chat "
-"clients"
-msgstr ""
-"<strong>Zamjena za:</strong> Trillian, AIM, MSN, chat klijente Yahoo i ICQ "
-
-#. type: Content of: <p>
-msgid ""
-"Pidgin (Gaim) is a multi-protocol instant messaging client, with support for:"
-msgstr ""
-"Pdigin (Gaim) je klijent za instantne poruke koji koristi više protokola, a "
-"podržava:"
-
-#. type: Content of: <ul><li>
-msgid "AIM (Oscar and TOC protocols),"
-msgstr "AIM (protokoli Oscar and TOC),"
-
-#. type: Content of: <ul><li>
-msgid "ICQ,"
-msgstr "ICQ,"
-
-#. type: Content of: <ul><li>
-msgid "MSN Messenger,"
-msgstr "MSN Messenger,"
-
-#. type: Content of: <ul><li>
-msgid "Yahoo,"
-msgstr "Yahoo,"
-
-#. type: Content of: <ul><li>
-msgid "IRC,"
-msgstr "IRC,"
-
-#. type: Content of: <ul><li>
-msgid "Jabber,"
-msgstr "Jabber,"
-
-#. type: Content of: <ul><li>
-msgid "Novell,"
-msgstr "Novell,"
-
-#. type: Content of: <ul><li>
-msgid "Gadu-Gadu, and"
-msgstr "Gadu-Gadu, i"
-
-#. type: Content of: <ul><li>
-msgid "Zephyr networks."
-msgstr "Zephyr networks."
-
-#. type: Content of: <p>
-msgid "Pidgin also supports plugins, for additional functionality."
-msgstr "Dodatna funkcionalnost se može dobiti koristeći dodatke za Pidgin."
-
-#. type: Content of: <h3>
+#. type: Content of: <dl><dt>
 msgid "<a href=\"http://directory.fsf.org/gimp.html\";>GIMP</a>"
 msgstr "<a href=\"http://directory.fsf.org/gimp.html\";>GIMP</a>"
 
-#. type: Content of: <p>
-msgid "<strong>Replacement for:</strong> Photoshop, Paint Shop Pro"
-msgstr "<strong>Zamjena za:</strong> Photoshop, Paint Shop Pro"
-
-#. type: Content of: <p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "GIMP is an acronym for GNU Image Manipulation Program.  It can be used as a "
 "simple paint program, an expert quality photo retouching program, an online "
@@ -280,7 +449,7 @@
 "kao profesionalni program za retuširanje fotografija, kao online sustav za "
 "skupnu obradu, za masovno renderiranje slika, kao konverter formata itd."
 
-#. type: Content of: <p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "GIMP is expandable and extensible. It is designed to be augmented with plug-"
 "ins and extensions to do just about anything."
@@ -288,7 +457,7 @@
 "GIMP je vrlo proširiv - osmišljen je kao program s kojim se uz ekstenzije i 
"
 "dodatke može napraviti gotovo sve."
 
-#. type: Content of: <p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "<i>Anyone who is familiar with the GNU/Linux operating system has probably "
 "seen/used the GIMP at some stage. In terms of compatibility, GIMP can open/"
@@ -300,44 +469,11 @@
 "otvarati i uređivati PhotoShopov format <b>PSD</b> i Paint Shop Proov "
 "format<b>PSP</b>.</i>"
 
-#. type: Content of: <h3>
-msgid "<a href=\"http://gnunet.org\";>GNUnet</a>"
-msgstr "<a href=\"http://gnunet.org\";>GNUnet</a>"
-
-#. type: Content of: <p>
-msgid "<strong>Replacement for:</strong> Napster, etc."
-msgstr "<strong>Zamjena za:</strong> Napster, etc."
-
-#. type: Content of: <p>
-msgid ""
-"GNUnet is a framework for secure peer-to-peer networking that does not use "
-"any centralized or otherwise trusted services. A first service implemented "
-"on top of the networking layer allows anonymous censorship-resistant file-"
-"sharing. GNUnet uses a simple, excess-based economic model to allocate "
-"resources. Peers in GNUnet monitor each others behavior with respect to "
-"resource usage; peers that contribute to the network are rewarded with "
-"better service."
-msgstr ""
-"GNUnet je okvir za sigurno <i>peer-to-peer</i> umrežavanje koji ne koristi "
-"niti jedan centraliziran ili inače pouzdan servis.  Prvi servis "
-"implementiran na mrežnom sloju omogućava anonimno dijeljenje datoteka "
-"otporno na cenzuru. GNUnet korisit jednostavan ekonomski model viškova pri "
-"raspodjeli resursa. Korisnici GNUneta međusobno prate potrošnju resursa, te 
"
-"su korisnici koji najviše doprinose mreži nagrađivani boljom uslugom."
-
-#. type: Content of: <h3>
+#. type: Content of: <dl><dt>
 msgid "<a href=\"http://www.inkscape.org/\";>Inkscape</a>"
 msgstr "<a href=\"http://www.inkscape.org/\";>Inkscape</a>"
 
-#. type: Content of: <p>
-msgid ""
-"<strong>Replacement for:</strong> Adobe Illustrator, Macromedia Freehand, "
-"CorelDraw or Xara Xtreme"
-msgstr ""
-"<strong>Zamjena za:</strong> Adobe Illustrator, Macromedia Freehand, "
-"CorelDraw or Xara Xtreme"
-
-#. type: Content of: <p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "Inkscape is an vector graphics editor, with capabilities similar to "
 "Illustrator, Freehand, CorelDraw, or Xara Xtreme using the W3C standard "
@@ -351,7 +487,7 @@
 "tekst, markeri, kloniranje, alfa blending, transformiranje, gradijenti, "
 "uzorci i grupiranje."
 
-#. type: Content of: <p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "Inkscape also supports Creative Commons meta-data, node editing, layers, "
 "complex path operations, bitmap tracing, text-on-path, flowed text, direct "
@@ -363,33 +499,11 @@
 "direktno uređivanje XML-ova itd. Importira formate JPEG, PNG, TIFF i druge, "
 "a ekportira PNG i nekoliko vektorskih formata."
 
-#. type: Content of: <h3>
-msgid "<a href=\"http://www.mingw.org\";>MinGW</a>"
-msgstr "<a href=\"http://www.mingw.org\";>MinGW</a>"
-
-#. type: Content of: <p>
-msgid "<strong>Replacement for:</strong> Microsoft Visual C++"
-msgstr "<strong>Zamjena za:</strong> Microsoft Visual C++"
-
-#. type: Content of: <p>
-msgid ""
-"MinGW (Minimalist GNU for Windows) provides many of the GNU programming "
-"utilities on Windows. It includes the GNU Compiler Collection (GCC), "
-"Binutils, GNU Debugger (GDB), Make, and more."
-msgstr ""
-"MinGW (Minimalist GNU for Windows) donosi mnoge GNU-ove programerske alate "
-"na Windowse, što uključuje GNU Compiler Collection (GCC), Binutils, Gnu "
-"Debugger (GDB), Make i mnoge druge."
-
-#. type: Content of: <h3>
+#. type: Content of: <dl><dt>
 msgid "<a href=\"http://www.claws-mail.org/\";>Claws Mail</a>"
 msgstr "<a href=\"http://www.claws-mail.org/\";>Claws Mail</a>"
 
-#. type: Content of: <p>
-msgid "<strong>Replacement for:</strong> Outlook, Outlook Express"
-msgstr "<strong>Zamjena za:</strong> Outlook, Outlook Express"
-
-#. type: Content of: <p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "Claws Mail is designed to be familiar to new users coming from other popular "
 "email clients, as well as experienced users."
@@ -397,58 +511,129 @@
 "Claws Mail je dizajniran i za nove korisnike koji prelaze s drugih poznatih "
 "klijenata e-pošte, ali i za iskusne korisnike."
 
-#. type: Content of: <h3>
-msgid "<a href=\"http://www.libreoffice.org/\";>LibreOffice</a>"
-msgstr "<a href=\"http://www.libreoffice.org/\";>LibreOffice</a>"
+#. type: Content of: <dl><dt>
+msgid "<a href=\"http://gnunet.org\";>GNUnet</a>"
+msgstr "<a href=\"http://gnunet.org\";>GNUnet</a>"
 
-#. type: Content of: <p>
-msgid "<strong>Replacement for:</strong> Microsoft Office"
-msgstr "<strong>Zamjena za:</strong> Microsoft Office"
+#. type: Content of: <dl><dd><p>
+msgid ""
+"GNUnet is a framework for secure peer-to-peer networking that does not use "
+"any centralized or otherwise trusted services. A first service implemented "
+"on top of the networking layer allows anonymous censorship-resistant file-"
+"sharing. GNUnet uses a simple, excess-based economic model to allocate "
+"resources. Peers in GNUnet monitor each others behavior with respect to "
+"resource usage; peers that contribute to the network are rewarded with "
+"better service."
+msgstr ""
+"GNUnet je okvir za sigurno <i>peer-to-peer</i> umrežavanje koji ne koristi "
+"niti jedan centraliziran ili inače pouzdan servis.  Prvi servis "
+"implementiran na mrežnom sloju omogućava anonimno dijeljenje datoteka "
+"otporno na cenzuru. GNUnet korisit jednostavan ekonomski model viškova pri "
+"raspodjeli resursa. Korisnici GNUneta međusobno prate potrošnju resursa, te 
"
+"su korisnici koji najviše doprinose mreži nagrađivani boljom uslugom."
 
-#. type: Content of: <p>
+#. type: Content of: <dl><dt>
+msgid "<a href=\"http://directory.fsf.org/pidgin.html\";>Pidgin</a>"
+msgstr "<a href=\"http://directory.fsf.org/pidgin.html\";>Pidgin</a>"
+
+#. type: Content of: <dl><dd><p>
 msgid ""
-"LibreOffice is a multi-platform office productivity suite compatible with "
-"all major file formats."
+"Pidgin (Gaim) is a multi-protocol instant messaging client, with support for:"
 msgstr ""
-"LibreOffice je višeplatformski paket uredskih programa kompatibilan sa svim "
-"poznatijim formatima datoteka."
+"Pdigin (Gaim) je klijent za instantne poruke koji koristi više protokola, a "
+"podržava:"
 
-#. type: Content of: <h3>
-msgid "<a href=\"http://www.scribus.net/\";>Scribus</a>"
-msgstr "<a href=\"http://www.scribus.net/\";>Scribus</a>"
+#. type: Content of: <dl><dd><ul><li>
+msgid "AIM (Oscar and TOC protocols),"
+msgstr "AIM (protokoli Oscar and TOC),"
 
-#. type: Content of: <p>
-msgid "<strong>Replacement for:</strong> PageMaker, InDesign, QuarkXPress"
-msgstr "<strong>Zamjena za:</strong> PageMaker, InDesign, QuarkXPress"
+#. type: Content of: <dl><dd><ul><li>
+msgid "ICQ,"
+msgstr "ICQ,"
 
-#. type: Content of: <p>
+#. type: Content of: <dl><dd><ul><li>
+msgid "MSN Messenger,"
+msgstr "MSN Messenger,"
+
+#. type: Content of: <dl><dd><ul><li>
+msgid "Yahoo,"
+msgstr "Yahoo,"
+
+#. type: Content of: <dl><dd><ul><li>
+msgid "IRC,"
+msgstr "IRC,"
+
+#. type: Content of: <dl><dd><ul><li>
+msgid "Jabber,"
+msgstr "Jabber,"
+
+#. type: Content of: <dl><dd><ul><li>
+msgid "Novell,"
+msgstr "Novell,"
+
+#. type: Content of: <dl><dd><ul><li>
+msgid "Gadu-Gadu, and"
+msgstr "Gadu-Gadu, i"
+
+#. type: Content of: <dl><dd><ul><li>
+msgid "Zephyr networks."
+msgstr "Zephyr networks."
+
+#. type: Content of: <dl><dd><p>
+msgid "Pidgin also supports plugins, for additional functionality."
+msgstr "Dodatna funkcionalnost se može dobiti koristeći dodatke za Pidgin."
+
+#. type: Content of: <dl><dt>
+msgid "<a href=\"http://www.qupzilla.com/\";>QupZilla</a>"
+msgstr "<a href=\"http://www.qupzilla.com/\";>QupZilla</a>"
+
+#. type: Content of: <dl><dd><p>
 msgid ""
-"Scribus is a desktop publishing application, like Adobe PageMaker or Adobe "
-"InDesign from the proprietary software world. It is free software, "
-"distributed under the terms of the Gnu General Public License."
+"QupZilla is a cross-platform web browser with a unified RSS reader, history "
+"and bookmarks in a single window."
 msgstr ""
-"Scribus je program za stolno izdavaštvo, poput vlasničkih programa Adobe "
-"PageMaker ili Adobe InDesign. Scribus je slobodan softver, distribuiran pod "
-"licencom Gnu General Public License."
+"QupZilla je višeplatformski pretraživač interneta s uključenim čitačem 
RSS-"
+"ova, poviješću pregledavanja i oznakama."
 
-#. type: Content of: <p>
+#. type: Content of: <dl><dt>
+msgid "<a href=\"http://www.tribler.org/\";>Tribler</a>"
+msgstr "<a href=\"http://www.tribler.org/\";>Tribler</a>"
+
+#. type: Content of: <dl><dd><p>
+# | Tribler is an application that enables its users to find[-,-] enjoy and
+# | share video, audio, pictures, and other things.
+#, fuzzy
+#| msgid ""
+#| "Tribler is an application that enables its users to find, enjoy and share "
+#| "video, audio, pictures, and other things."
 msgid ""
-"Scribus supports many major graphic formats including most all of the "
-"standard ones used in DTP in addition to SVG import and export."
+"Tribler is an application that enables its users to find enjoy and share "
+"video, audio, pictures, and other things."
 msgstr ""
-"Scribus podržava mnoge poznate grafičke formate, uključujući i većinu "
-"standardnih koji se koriste u DTP-u (uz mogućnost importiranja i "
-"eksportiranja SVG-a)."
+"Tribbler je program koji korisnicima omogućava pretraživanje, korištenje i 
"
+"dijeljenje videa, audija, slika i dr."
+
+#. type: Content of: <dl><dt>
+msgid "<a href=\"http://directory.fsf.org/blender.html\";>Blender 3D</a>"
+msgstr "<a href=\"http://directory.fsf.org/blender.html\";>Blender 3D</a>"
+
+#. type: Content of: <dl><dd><p>
+msgid ""
+"Blender is the first and only fully integrated 3D graphics creation suite "
+"allowing modeling, animation, rendering, post-production, realtime "
+"interactive 3D and game creation and playback with cross-platform "
+"compatibility."
+msgstr ""
+"Blender je prvi i jedini u potpunosti integriran paket za stvaranje 3D "
+"grafike, koji se može koristiti za modeliranje, animaciju, renderiranje, "
+"post-produkciju, stvaranje i pokretanje interaktivnih igara i 3D-a u "
+"stvarnom vremenu, te posjeduje višeplatformsku kompatibilnost."
 
-#. type: Content of: <h3>
+#. type: Content of: <dl><dt>
 msgid "<a href=\"http://videolan.org/vlc/\";>VideoLAN Client (VLC)</a>"
 msgstr "<a href=\"http://videolan.org/vlc/\";>VideoLAN Client (VLC)</a>"
 
-#. type: Content of: <p>
-msgid "<strong>Replacement for:</strong> Windows Media Player, PowerDVD"
-msgstr "<strong>Zamjena za:</strong> Windows Media Player, PowerDVD"
-
-#. type: Content of: <p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "VLC (initially VideoLAN Client) is a highly portable multimedia player for "
 "various audio and video formats (MPEG-1, MPEG-2, MPEG-4, DivX, MP3, OGG, "
@@ -463,78 +648,54 @@
 "klijenata (<i>multicast</i>) koristeći IPv4 ili IPv6 na širokopojasnim "
 "mrežama."
 
-#. type: Content of: <h3>
-msgid "<a href=\"http://www.tribler.org/\";>Tribler</a>"
-msgstr "<a href=\"http://www.tribler.org/\";>Tribler</a>"
-
-#. type: Content of: <p>
-msgid "<strong>Replacement for:</strong> BitTorrent"
-msgstr "<strong>Zamjena za:</strong> BitTorrent"
+#. type: Content of: <dl><dt>
+msgid "<a href=\"http://www.libreoffice.org/\";>LibreOffice</a>"
+msgstr "<a href=\"http://www.libreoffice.org/\";>LibreOffice</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <dl><dd><p>
 msgid ""
-"Tribler is an application that enables its users to find, enjoy and share "
-"video, audio, pictures, and other things."
+"LibreOffice is a multi-platform office productivity suite compatible with "
+"all major file formats."
 msgstr ""
-"Tribbler je program koji korisnicima omogućava pretraživanje, korištenje i 
"
-"dijeljenje videa, audija, slika i dr."
-
-#. type: Content of: <h3>
-# | <a [-href=\"http://gnunet.org\";>GNUnet</a>-]
-# | {+href=\"/software/gnuzilla/\">GNU IceCat</a>+}
-#, fuzzy
-#| msgid "<a href=\"http://gnunet.org\";>GNUnet</a>"
-msgid "<a href=\"/software/gnuzilla/\">GNU IceCat</a>"
-msgstr "<a href=\"http://gnunet.org\";>GNUnet</a>"
+"LibreOffice je višeplatformski paket uredskih programa kompatibilan sa svim "
+"poznatijim formatima datoteka."
 
-#. type: Content of: <p>
-msgid ""
-"<strong>Replacement for:</strong> Mozilla Firefox, Google Chrome, Microsoft "
-"Internet Explorer"
-msgstr ""
-"<strong>Zamjena za:</strong> Mozilla Firefox, Google Chrome i Microsoft "
-"Internet Explorer"
+#. type: Content of: <dl><dt>
+msgid "<a href=\"http://www.scribus.net/\";>Scribus</a>"
+msgstr "<a href=\"http://www.scribus.net/\";>Scribus</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <dl><dd><p>
 msgid ""
-"IceCat is the GNU version of the Firefox browser. It is entirely free "
-"software, which does not recommend non-free plugins and addons.  It also "
-"features built-in privacy-protecting features."
+"Scribus is a desktop publishing application, like Adobe PageMaker or Adobe "
+"InDesign from the proprietary software world. It is free software, "
+"distributed under the terms of the Gnu General Public License."
 msgstr ""
+"Scribus je program za stolno izdavaštvo, poput vlasničkih programa Adobe "
+"PageMaker ili Adobe InDesign. Scribus je slobodan softver, distribuiran pod "
+"licencom Gnu General Public License."
 
-#. type: Content of: <p>
+#. type: Content of: <dl><dd><p>
 msgid ""
-"Why not recommend Firefox? As explained in our <a href=\"/philosophy/free-sw."
-"html\">Free Software Definition</a>, all four freedoms must be available on "
-"both a commercial and non-commercial basis. Mozilla's trademark policy "
-"serves to limit Freedom 2 to gratis distribution only, making the software "
-"nonfree."
+"Scribus supports many major graphic formats including most all of the "
+"standard ones used in DTP in addition to SVG import and export."
 msgstr ""
-"Zašto ne preporučamo Firefox? Kao što je objašnjeno u našoj <a href=\"/"
-"philosophy/free-sw.html\">definiciji slobodnog softvera</a>, sve četiri "
-"slobode moraju biti omogućene i u komercijalnom i u nekomercijalnom "
-"korištenju. Mozillino štićenje <i>trademarka</i> ograničava 2. slobodu 
samo "
-"na besplatno distribuiranje, što čini program neslobodnim."
-
-#. type: Content of: <h3>
-msgid "<a href=\"http://www.qupzilla.com/\";>QupZilla</a>"
-msgstr "<a href=\"http://www.qupzilla.com/\";>QupZilla</a>"
+"Scribus podržava mnoge poznate grafičke formate, uključujući i većinu "
+"standardnih koji se koriste u DTP-u (uz mogućnost importiranja i "
+"eksportiranja SVG-a)."
 
-#. type: Content of: <p>
-msgid ""
-"QupZilla is a cross-platform web browser with a unified RSS reader, history "
-"and bookmarks in a single window."
-msgstr ""
-"QupZilla je višeplatformski pretraživač interneta s uključenim čitačem 
RSS-"
-"ova, poviješću pregledavanja i oznakama."
+#. type: Content of: <dl><dt>
+msgid "<a href=\"http://www.mingw.org\";>MinGW</a>"
+msgstr "<a href=\"http://www.mingw.org\";>MinGW</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <dl><dd><p>
 msgid ""
-"This is a selection of the more common free software applications available "
-"for the Microsoft Windows platform, and is nothing like a comprehensive list."
+"MinGW (Minimalist GNU for Windows) provides many of the GNU programming "
+"utilities on Windows. It includes the GNU Compiler Collection (GCC), "
+"Binutils, GNU Debugger (GDB), Make, and more."
 msgstr ""
-"Ovo je samo odabir nekih poznatijih slobodnih programa dostupnih za "
-"Microsoftove Windowse, ne iscrpan popis."
+"MinGW (Minimalist GNU for Windows) donosi mnoge GNU-ove programerske alate "
+"na Windowse, što uključuje GNU Compiler Collection (GCC), Binutils, Gnu "
+"Debugger (GDB), Make i mnoge druge."
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
@@ -619,6 +780,61 @@
 msgid "Updated:"
 msgstr "Vrijeme zadnje izmjene:"
 
+#~ msgid ""
+#~ "#windows7sins {\n"
+#~ "   float: right;\n"
+#~ "   width: 25em;\n"
+#~ "   text-align: center;\n"
+#~ "   margin: 0 1em 1em 1em;\n"
+#~ "}\n"
+#~ "blockquote#windows7sins p { margin: .3em 0 0 0; }\n"
+#~ "#windows7sins img { width: 100%; }\n"
+#~ msgstr ""
+#~ "#windows7sins {\n"
+#~ "   float: right;\n"
+#~ "   width: 25em;\n"
+#~ "   text-align: center;\n"
+#~ "   margin: 0 1em 1em 1em;\n"
+#~ "}\n"
+#~ "blockquote#windows7sins p { margin: .3em 0 0 0; }\n"
+#~ "#windows7sins img { width: 100%; }\n"
+
+#~ msgid "<strong>Replacement for:</strong> Maya, 3DSMax"
+#~ msgstr "<strong>Zamjena za:</strong> Maya, 3DSMax"
+
+#~ msgid "<strong>Replacement for:</strong> Microsoft Visio"
+#~ msgstr "<strong>Zamjena za:</strong> Microsoft Visio"
+
+#~ msgid "<strong>Replacement for:</strong> Photoshop, Paint Shop Pro"
+#~ msgstr "<strong>Zamjena za:</strong> Photoshop, Paint Shop Pro"
+
+#~ msgid "<strong>Replacement for:</strong> Napster, etc."
+#~ msgstr "<strong>Zamjena za:</strong> Napster, etc."
+
+#~ msgid "<strong>Replacement for:</strong> Microsoft Visual C++"
+#~ msgstr "<strong>Zamjena za:</strong> Microsoft Visual C++"
+
+#~ msgid "<strong>Replacement for:</strong> Outlook, Outlook Express"
+#~ msgstr "<strong>Zamjena za:</strong> Outlook, Outlook Express"
+
+#~ msgid "<strong>Replacement for:</strong> Microsoft Office"
+#~ msgstr "<strong>Zamjena za:</strong> Microsoft Office"
+
+#~ msgid "<strong>Replacement for:</strong> BitTorrent"
+#~ msgstr "<strong>Zamjena za:</strong> BitTorrent"
+
+#, fuzzy
+#~| msgid "<a href=\"http://gnunet.org\";>GNUnet</a>"
+#~ msgid "<a href=\"/software/gnuzilla/\">GNU IceCat</a>"
+#~ msgstr "<a href=\"http://gnunet.org\";>GNUnet</a>"
+
+#~ msgid ""
+#~ "<strong>Replacement for:</strong> Mozilla Firefox, Google Chrome, "
+#~ "Microsoft Internet Explorer"
+#~ msgstr ""
+#~ "<strong>Zamjena za:</strong> Mozilla Firefox, Google Chrome i Microsoft "
+#~ "Internet Explorer"
+
 #~ msgid "<b>Application:</b>"
 #~ msgstr "<b>Program:</b>"
 

Index: for-windows.pot
===================================================================
RCS file: /web/www/www/software/po/for-windows.pot,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- for-windows.pot     9 Mar 2015 21:56:58 -0000       1.28
+++ for-windows.pot     15 Jul 2015 13:27:32 -0000      1.29
@@ -7,31 +7,19 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: for-windows.html\n"
-"POT-Creation-Date: 2015-03-09 21:55+0000\n"
+"POT-Creation-Date: 2015-07-15 13:25+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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: ENCODING"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <title>
 msgid "Free Software for Windows - GNU Project - Free Software Foundation"
 msgstr ""
 
-#. type: Content of: <style>
-#, no-wrap
-msgid ""
-"#windows7sins {\n"
-"   float: right;\n"
-"   width: 25em;\n"
-"   text-align: center;\n"
-"   margin: 0 1em 1em 1em;\n"
-"}\n"
-"blockquote#windows7sins p { margin: .3em 0 0 0; }\n"
-"#windows7sins img { width: 100%; }\n"
-msgstr ""
-
 #. type: Content of: <h2>
 msgid "Free Software for Windows"
 msgstr ""
@@ -62,17 +50,17 @@
 
 #. type: Content of: <p>
 msgid ""
-"When we say these application programs are <a href= "
-"\"/philosophy/free-sw.html\">free software</a>, we're talking about freedom, "
-"not price. It means that you are free to use these programs constructively, "
-"either alone or in a community, while respecting the freedom of others. The "
-"source code is available, so that you can study the software, adapt it to "
-"your needs, fix bugs, and release versions with new features. You can also "
-"convince or pay others to do these things for you. You are also free to give "
-"away and free to sell copies, under the terms of the applicable free "
-"software license. These programs are free software because <em>you have "
-"freedom</em> in using them. Free software develops under the control of its "
-"users."
+"When we say these application programs are <a "
+"href=\"/philosophy/free-sw.html\">free software</a>, we're talking about "
+"freedom, not price. It means that you are free to use these programs "
+"constructively, either alone or in a community, while respecting the freedom "
+"of others. The source code is available, so that you can study the software, "
+"adapt it to your needs, fix bugs, and release versions with new "
+"features. You can also convince or pay others to do these things for "
+"you. You are also free to give away and free to sell copies, under the terms "
+"of the applicable free software license. These programs are free software "
+"because <em>you have freedom</em> in using them. Free software develops "
+"under the control of its users."
 msgstr ""
 
 #. type: Content of: <p>
@@ -81,7 +69,7 @@
 "software. Its source code is a secret, so programmers cannot learn from it, "
 "fix it, adapt it to their clients (your) needs, or even verify what it "
 "really does. If you share copies with your neighbors, you will be called a "
-"\"pirate\", and users have been threatened with imprisonment for "
+"&ldquo;pirate&rdquo;, and users have been threatened with imprisonment for "
 "this. Nonfree software is completely controlled by its developer, who also "
 "has power over the users. We started the free software movement because <a "
 "href=\"/philosophy/freedom-or-power.html\">this power is unjust</a>."
@@ -96,7 +84,7 @@
 
 #. type: Content of: <p>
 msgid ""
-"So the next step is to replace Windows with a <a href=\"/distros\">free "
+"So the next step is to replace Windows with a <a href=\"/distros/\">free "
 "operating system such as GNU/Linux</a>."
 msgstr ""
 
@@ -104,112 +92,188 @@
 msgid "<strong>However, on this page we're concerned with the first 
step.</strong>"
 msgstr ""
 
-#. type: Content of: <h3>
-msgid "<a href=\"http://directory.fsf.org/blender.html\";>Blender 3D</a>"
+#. type: Content of: <table><thead><tr><th>
+msgid "Category"
 msgstr ""
 
-#. type: Content of: <p>
-msgid "<strong>Replacement for:</strong> Maya, 3DSMax"
+#. type: Content of: <table><thead><tr><th>
+msgid "Free program<a href=\"#f1\"><sup>1</sup></a>"
 msgstr ""
 
-#. type: Content of: <p>
-msgid ""
-"Blender is the first and only fully integrated 3D graphics creation suite "
-"allowing modeling, animation, rendering, post-production, realtime "
-"interactive 3D and game creation and playback with cross-platform "
-"compatibility."
+#. type: Content of: <table><thead><tr><th>
+msgid "Replacement for"
 msgstr ""
 
-#. type: Content of: <h3>
-msgid "<a href=\"http://directory.fsf.org/dia.html\";>Dia</a>"
+#. type: Content of: <table><tbody><tr><td>
+msgid "Graphics and Design"
 msgstr ""
 
-#. type: Content of: <p>
-msgid "<strong>Replacement for:</strong> Microsoft Visio"
+#. type: Content of: <table><tbody><tr><td>
+msgid "<a href=\"#Dia\">Dia</a>"
 msgstr ""
 
-#. type: Content of: <p>
-msgid ""
-"Dia is designed to be much like the proprietary Microsoft program "
-"'Visio'. It can be used to draw many different kinds of diagrams. It "
-"currently has special objects to help draw entity relationship diagrams, UML "
-"diagrams, flowcharts, network diagrams, and simple circuits. It is also "
-"possible to add support for new shapes by writing simple XML files, using a "
-"subset of SVG to draw the shape."
+#. type: Content of: <table><tbody><tr><td>
+msgid "Microsoft Visio"
 msgstr ""
 
-#. type: Content of: <p>
-msgid ""
-"It can load and save diagrams to a custom XML format (gzipped by default, to "
-"save space), can export diagrams to EPS or SVG formats and can print "
-"diagrams (including ones that span multiple pages)."
+#. type: Content of: <table><tbody><tr><td>
+msgid "<a href=\"#GIMP\">GIMP</a>"
 msgstr ""
 
-#. type: Content of: <h3>
-msgid "<a href=\"http://directory.fsf.org/pidgin.html\";>Pidgin</a>"
+#. type: Content of: <table><tbody><tr><td>
+msgid "Photoshop, Paint Shop Pro"
 msgstr ""
 
-#. type: Content of: <p>
-msgid ""
-"<strong>Replacement for:</strong> Trillian, AIM, MSN, Yahoo and ICQ chat "
-"clients"
+#. type: Content of: <table><tbody><tr><td>
+msgid "<a href=\"#Inkscape\">Inkscape</a>"
 msgstr ""
 
-#. type: Content of: <p>
-msgid ""
-"Pidgin (Gaim) is a multi-protocol instant messaging client, with support "
-"for:"
+#. type: Content of: <table><tbody><tr><td>
+msgid "Adobe Illustrator, Macromedia Freehand, CorelDraw, Xara Xtreme"
 msgstr ""
 
-#. type: Content of: <ul><li>
-msgid "AIM (Oscar and TOC protocols),"
+#. type: Content of: <table><tbody><tr><td>
+msgid "Internet"
 msgstr ""
 
-#. type: Content of: <ul><li>
-msgid "ICQ,"
+#. type: Content of: <table><tbody><tr><td>
+msgid "<a href=\"#ClawsMail\">Claws Mail</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
-msgid "MSN Messenger,"
+#. type: Content of: <table><tbody><tr><td>
+msgid "Outlook, Outlook Express"
 msgstr ""
 
-#. type: Content of: <ul><li>
-msgid "Yahoo,"
+#. type: Content of: <table><tbody><tr><td>
+msgid "<a href=\"#GNUnet\">GNUnet</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
-msgid "IRC,"
+#. type: Content of: <table><tbody><tr><td>
+msgid "Napster, etc."
 msgstr ""
 
-#. type: Content of: <ul><li>
-msgid "Jabber,"
+#. type: Content of: <table><tbody><tr><td>
+msgid "<a href=\"#Pidgin\">Pidgin</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
-msgid "Novell,"
+#. type: Content of: <table><tbody><tr><td>
+msgid "Trillian, AIM, MSN, Yahoo, ICQ chat clients"
 msgstr ""
 
-#. type: Content of: <ul><li>
-msgid "Gadu-Gadu, and"
+#. type: Content of: <table><tbody><tr><td>
+msgid "<a href=\"#QupZilla\">QupZilla</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
-msgid "Zephyr networks."
+#. type: Content of: <table><tbody><tr><td>
+msgid "Firefox<a href=\"#f2\"><sup>2</sup></a>, Chrome, Internet Explorer"
 msgstr ""
 
-#. type: Content of: <p>
-msgid "Pidgin also supports plugins, for additional functionality."
+#. type: Content of: <table><tbody><tr><td>
+msgid "<a href=\"#Tribler\">Tribler</a>"
 msgstr ""
 
-#. type: Content of: <h3>
-msgid "<a href=\"http://directory.fsf.org/gimp.html\";>GIMP</a>"
+#. type: Content of: <table><tbody><tr><td>
+msgid "BitTorrent"
 msgstr ""
 
-#. type: Content of: <p>
-msgid "<strong>Replacement for:</strong> Photoshop, Paint Shop Pro"
+#. type: Content of: <table><tbody><tr><td>
+msgid "Multimedia"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <table><tbody><tr><td>
+msgid "<a href=\"#Blender3D\">Blender3D</a>"
+msgstr ""
+
+#. type: Content of: <table><tbody><tr><td>
+msgid "Maya, 3DSMax"
+msgstr ""
+
+#. type: Content of: <table><tbody><tr><td>
+msgid "<a href=\"#VLC\">VideoLan Client (VLC)</a>"
+msgstr ""
+
+#. type: Content of: <table><tbody><tr><td>
+msgid "Windows Media Player, PowerDVD"
+msgstr ""
+
+#. type: Content of: <table><tbody><tr><td>
+msgid "Office and Productivity"
+msgstr ""
+
+#. type: Content of: <table><tbody><tr><td>
+msgid "<a href=\"#LibreOffice\">LibreOffice</a>"
+msgstr ""
+
+#. type: Content of: <table><tbody><tr><td>
+msgid "Microsoft Office"
+msgstr ""
+
+#. type: Content of: <table><tbody><tr><td>
+msgid "Publishing"
+msgstr ""
+
+#. type: Content of: <table><tbody><tr><td>
+msgid "<a href=\"#Scribus\">Scribus</a>"
+msgstr ""
+
+#. type: Content of: <table><tbody><tr><td>
+msgid "PageMaker, InDesign, QuarkXPress"
+msgstr ""
+
+#. type: Content of: <table><tbody><tr><td>
+msgid "Programming Utilities"
+msgstr ""
+
+#. type: Content of: <table><tbody><tr><td>
+msgid "<a href=\"#MinGW\">MinGW</a>"
+msgstr ""
+
+#. type: Content of: <table><tbody><tr><td>
+msgid "Microsoft Visual C++"
+msgstr ""
+
+#. type: Content of: <div><ol><li>
+msgid ""
+"This is a selection of the more common free software applications available "
+"for the Microsoft Windows platform, and is nothing like a comprehensive "
+"list."
+msgstr ""
+
+#. type: Content of: <div><ol><li>
+msgid ""
+"Why not recommend Firefox? As explained in our <a "
+"href=\"/philosophy/free-sw.html\">Free Software Definition</a>, all four "
+"freedoms must be available on both a commercial and non-commercial "
+"basis. Mozilla's trademark policy serves to limit Freedom 2 to gratis "
+"distribution only, making the software nonfree."
+msgstr ""
+
+#. type: Content of: <dl><dt>
+msgid "<a href=\"http://directory.fsf.org/dia.html\";>Dia</a>"
+msgstr ""
+
+#. type: Content of: <dl><dd><p>
+msgid ""
+"Dia is designed to be much like the proprietary Microsoft program "
+"'Visio'. It can be used to draw many different kinds of diagrams. It "
+"currently has special objects to help draw entity relationship diagrams, UML "
+"diagrams, flowcharts, network diagrams, and simple circuits. It is also "
+"possible to add support for new shapes by writing simple XML files, using a "
+"subset of SVG to draw the shape."
+msgstr ""
+
+#. type: Content of: <dl><dd><p>
+msgid ""
+"It can load and save diagrams to a custom XML format (gzipped by default, to "
+"save space), can export diagrams to EPS or SVG formats and can print "
+"diagrams (including ones that span multiple pages)."
+msgstr ""
+
+#. type: Content of: <dl><dt>
+msgid "<a href=\"http://directory.fsf.org/gimp.html\";>GIMP</a>"
+msgstr ""
+
+#. type: Content of: <dl><dd><p>
 msgid ""
 "GIMP is an acronym for GNU Image Manipulation Program.  It can be used as a "
 "simple paint program, an expert quality photo retouching program, an online "
@@ -217,13 +281,13 @@
 "converter, etc."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "GIMP is expandable and extensible. It is designed to be augmented with "
 "plug-ins and extensions to do just about anything."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "<i>Anyone who is familiar with the GNU/Linux operating system has probably "
 "seen/used the GIMP at some stage. In terms of compatibility, GIMP can "
@@ -231,15 +295,42 @@
 "<b>PSP</b> format.</i>"
 msgstr ""
 
-#. type: Content of: <h3>
-msgid "<a href=\"http://gnunet.org\";>GNUnet</a>"
+#. type: Content of: <dl><dt>
+msgid "<a href=\"http://www.inkscape.org/\";>Inkscape</a>"
 msgstr ""
 
-#. type: Content of: <p>
-msgid "<strong>Replacement for:</strong> Napster, etc."
+#. type: Content of: <dl><dd><p>
+msgid ""
+"Inkscape is an vector graphics editor, with capabilities similar to "
+"Illustrator, Freehand, CorelDraw, or Xara Xtreme using the W3C standard "
+"Scalable Vector Graphics (SVG) file format. Supported SVG features include "
+"shapes, paths, text, markers, clones, alpha blending, transforms, gradients, "
+"patterns, and grouping."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <dl><dd><p>
+msgid ""
+"Inkscape also supports Creative Commons meta-data, node editing, layers, "
+"complex path operations, bitmap tracing, text-on-path, flowed text, direct "
+"XML editing, and more. It imports formats such as JPEG, PNG, TIFF, and "
+"others and exports PNG as well as multiple vector-based formats."
+msgstr ""
+
+#. type: Content of: <dl><dt>
+msgid "<a href=\"http://www.claws-mail.org/\";>Claws Mail</a>"
+msgstr ""
+
+#. type: Content of: <dl><dd><p>
+msgid ""
+"Claws Mail is designed to be familiar to new users coming from other popular "
+"email clients, as well as experienced users."
+msgstr ""
+
+#. type: Content of: <dl><dt>
+msgid "<a href=\"http://gnunet.org\";>GNUnet</a>"
+msgstr ""
+
+#. type: Content of: <dl><dd><p>
 msgid ""
 "GNUnet is a framework for secure peer-to-peer networking that does not use "
 "any centralized or otherwise trusted services. A first service implemented "
@@ -250,106 +341,93 @@
 "better service."
 msgstr ""
 
-#. type: Content of: <h3>
-msgid "<a href=\"http://www.inkscape.org/\";>Inkscape</a>"
+#. type: Content of: <dl><dt>
+msgid "<a href=\"http://directory.fsf.org/pidgin.html\";>Pidgin</a>"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <dl><dd><p>
 msgid ""
-"<strong>Replacement for:</strong> Adobe Illustrator, Macromedia Freehand, "
-"CorelDraw or Xara Xtreme"
+"Pidgin (Gaim) is a multi-protocol instant messaging client, with support "
+"for:"
 msgstr ""
 
-#. type: Content of: <p>
-msgid ""
-"Inkscape is an vector graphics editor, with capabilities similar to "
-"Illustrator, Freehand, CorelDraw, or Xara Xtreme using the W3C standard "
-"Scalable Vector Graphics (SVG) file format. Supported SVG features include "
-"shapes, paths, text, markers, clones, alpha blending, transforms, gradients, "
-"patterns, and grouping."
+#. type: Content of: <dl><dd><ul><li>
+msgid "AIM (Oscar and TOC protocols),"
 msgstr ""
 
-#. type: Content of: <p>
-msgid ""
-"Inkscape also supports Creative Commons meta-data, node editing, layers, "
-"complex path operations, bitmap tracing, text-on-path, flowed text, direct "
-"XML editing, and more. It imports formats such as JPEG, PNG, TIFF, and "
-"others and exports PNG as well as multiple vector-based formats."
+#. type: Content of: <dl><dd><ul><li>
+msgid "ICQ,"
 msgstr ""
 
-#. type: Content of: <h3>
-msgid "<a href=\"http://www.mingw.org\";>MinGW</a>"
+#. type: Content of: <dl><dd><ul><li>
+msgid "MSN Messenger,"
 msgstr ""
 
-#. type: Content of: <p>
-msgid "<strong>Replacement for:</strong> Microsoft Visual C++"
+#. type: Content of: <dl><dd><ul><li>
+msgid "Yahoo,"
 msgstr ""
 
-#. type: Content of: <p>
-msgid ""
-"MinGW (Minimalist GNU for Windows) provides many of the GNU programming "
-"utilities on Windows. It includes the GNU Compiler Collection (GCC), "
-"Binutils, GNU Debugger (GDB), Make, and more."
+#. type: Content of: <dl><dd><ul><li>
+msgid "IRC,"
 msgstr ""
 
-#. type: Content of: <h3>
-msgid "<a href=\"http://www.claws-mail.org/\";>Claws Mail</a>"
+#. type: Content of: <dl><dd><ul><li>
+msgid "Jabber,"
 msgstr ""
 
-#. type: Content of: <p>
-msgid "<strong>Replacement for:</strong> Outlook, Outlook Express"
+#. type: Content of: <dl><dd><ul><li>
+msgid "Novell,"
 msgstr ""
 
-#. type: Content of: <p>
-msgid ""
-"Claws Mail is designed to be familiar to new users coming from other popular "
-"email clients, as well as experienced users."
+#. type: Content of: <dl><dd><ul><li>
+msgid "Gadu-Gadu, and"
 msgstr ""
 
-#. type: Content of: <h3>
-msgid "<a href=\"http://www.libreoffice.org/\";>LibreOffice</a>"
+#. type: Content of: <dl><dd><ul><li>
+msgid "Zephyr networks."
 msgstr ""
 
-#. type: Content of: <p>
-msgid "<strong>Replacement for:</strong> Microsoft Office"
+#. type: Content of: <dl><dd><p>
+msgid "Pidgin also supports plugins, for additional functionality."
 msgstr ""
 
-#. type: Content of: <p>
-msgid ""
-"LibreOffice is a multi-platform office productivity suite compatible with "
-"all major file formats."
+#. type: Content of: <dl><dt>
+msgid "<a href=\"http://www.qupzilla.com/\";>QupZilla</a>"
 msgstr ""
 
-#. type: Content of: <h3>
-msgid "<a href=\"http://www.scribus.net/\";>Scribus</a>"
+#. type: Content of: <dl><dd><p>
+msgid ""
+"QupZilla is a cross-platform web browser with a unified RSS reader, history "
+"and bookmarks in a single window."
 msgstr ""
 
-#. type: Content of: <p>
-msgid "<strong>Replacement for:</strong> PageMaker, InDesign, QuarkXPress"
+#. type: Content of: <dl><dt>
+msgid "<a href=\"http://www.tribler.org/\";>Tribler</a>"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <dl><dd><p>
 msgid ""
-"Scribus is a desktop publishing application, like Adobe PageMaker or Adobe "
-"InDesign from the proprietary software world. It is free software, "
-"distributed under the terms of the Gnu General Public License."
+"Tribler is an application that enables its users to find enjoy and share "
+"video, audio, pictures, and other things."
 msgstr ""
 
-#. type: Content of: <p>
-msgid ""
-"Scribus supports many major graphic formats including most all of the "
-"standard ones used in DTP in addition to SVG import and export."
+#. type: Content of: <dl><dt>
+msgid "<a href=\"http://directory.fsf.org/blender.html\";>Blender 3D</a>"
 msgstr ""
 
-#. type: Content of: <h3>
-msgid "<a href=\"http://videolan.org/vlc/\";>VideoLAN Client (VLC)</a>"
+#. type: Content of: <dl><dd><p>
+msgid ""
+"Blender is the first and only fully integrated 3D graphics creation suite "
+"allowing modeling, animation, rendering, post-production, realtime "
+"interactive 3D and game creation and playback with cross-platform "
+"compatibility."
 msgstr ""
 
-#. type: Content of: <p>
-msgid "<strong>Replacement for:</strong> Windows Media Player, PowerDVD"
+#. type: Content of: <dl><dt>
+msgid "<a href=\"http://videolan.org/vlc/\";>VideoLAN Client (VLC)</a>"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <dl><dd><p>
 msgid ""
 "VLC (initially VideoLAN Client) is a highly portable multimedia player for "
 "various audio and video formats (MPEG-1, MPEG-2, MPEG-4, DivX, MP3, OGG, "
@@ -358,62 +436,42 @@
 "high-bandwidth network."
 msgstr ""
 
-#. type: Content of: <h3>
-msgid "<a href=\"http://www.tribler.org/\";>Tribler</a>"
-msgstr ""
-
-#. type: Content of: <p>
-msgid "<strong>Replacement for:</strong> BitTorrent"
+#. type: Content of: <dl><dt>
+msgid "<a href=\"http://www.libreoffice.org/\";>LibreOffice</a>"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <dl><dd><p>
 msgid ""
-"Tribler is an application that enables its users to find, enjoy and share "
-"video, audio, pictures, and other things."
-msgstr ""
-
-#. type: Content of: <h3>
-msgid "<a href=\"/software/gnuzilla/\">GNU IceCat</a>"
+"LibreOffice is a multi-platform office productivity suite compatible with "
+"all major file formats."
 msgstr ""
 
-#. type: Content of: <p>
-#:  
-msgid ""
-"<strong>Replacement for:</strong> Mozilla Firefox, Google Chrome, Microsoft "
-"Internet Explorer"
+#. type: Content of: <dl><dt>
+msgid "<a href=\"http://www.scribus.net/\";>Scribus</a>"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <dl><dd><p>
 msgid ""
-"IceCat is the GNU version of the Firefox browser. It is entirely free "
-"software, which does not recommend non-free plugins and addons.  It also "
-"features built-in privacy-protecting features."
+"Scribus is a desktop publishing application, like Adobe PageMaker or Adobe "
+"InDesign from the proprietary software world. It is free software, "
+"distributed under the terms of the Gnu General Public License."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <dl><dd><p>
 msgid ""
-"Why not recommend Firefox? As explained in our <a "
-"href=\"/philosophy/free-sw.html\">Free Software Definition</a>, all four "
-"freedoms must be available on both a commercial and non-commercial "
-"basis. Mozilla's trademark policy serves to limit Freedom 2 to gratis "
-"distribution only, making the software nonfree."
-msgstr ""
-
-#. type: Content of: <h3>
-msgid "<a href=\"http://www.qupzilla.com/\";>QupZilla</a>"
+"Scribus supports many major graphic formats including most all of the "
+"standard ones used in DTP in addition to SVG import and export."
 msgstr ""
 
-#. type: Content of: <p>
-msgid ""
-"QupZilla is a cross-platform web browser with a unified RSS reader, history "
-"and bookmarks in a single window."
+#. type: Content of: <dl><dt>
+msgid "<a href=\"http://www.mingw.org\";>MinGW</a>"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <dl><dd><p>
 msgid ""
-"This is a selection of the more common free software applications available "
-"for the Microsoft Windows platform, and is nothing like a comprehensive "
-"list."
+"MinGW (Minimalist GNU for Windows) provides many of the GNU programming "
+"utilities on Windows. It includes the GNU Compiler Collection (GCC), "
+"Binutils, GNU Debugger (GDB), Make, and more."
 msgstr ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.



reply via email to

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