www-commits
[Top][All Lists]
Advanced

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

www gnu/gnu-users-never-heard-of-gnu.sr.html gn...


From: GNUN
Subject: www gnu/gnu-users-never-heard-of-gnu.sr.html gn...
Date: Tue, 02 Dec 2014 11:01:50 +0000

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     14/12/02 11:01:50

Modified files:
        gnu            : gnu-users-never-heard-of-gnu.sr.html 
        gnu/po         : gnu-history.sr.po gnu-linux-faq.sr.po 
                         gnu-users-never-heard-of-gnu.sr.po gnu.sr.po 
                         linux-and-gnu.sr.po manifesto.sr.po 
                         why-gnu-linux.sr.po 
        licenses       : why-not-lgpl.sr.html 
        licenses/po    : why-not-lgpl.sr.po 
        philosophy     : linux-gnu-freedom.sr.html 
                         philosophy-menu.sr.html 
        philosophy/po  : categories.sr.po essays-and-articles.sr.po 
                         free-doc.sr.po free-software-for-freedom.sr.po 
                         free-sw.sr.po gif.sr.po java-trap.sr.po 
                         linux-gnu-freedom.sr.po not-ipr.sr.po 
                         philosophy-menu.sr.po philosophy.sr.po 
                         right-to-read.sr.po selling.sr.po 
                         shouldbefree.sr.po words-to-avoid.sr.po 
        server         : body-include-1.sr.html body-include-2.sr.html 
        server/po      : 08whatsnew.sr.po body-include-1.sr.po 
                         body-include-2.sr.po 
Added files:
        gnu/po         : gnu-users-never-heard-of-gnu.sr-diff.html 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/gnu-users-never-heard-of-gnu.sr.html?cvsroot=www&r1=1.22&r2=1.23
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-history.sr.po?cvsroot=www&r1=1.22&r2=1.23
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.sr.po?cvsroot=www&r1=1.37&r2=1.38
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-users-never-heard-of-gnu.sr.po?cvsroot=www&r1=1.17&r2=1.18
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu.sr.po?cvsroot=www&r1=1.25&r2=1.26
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.sr.po?cvsroot=www&r1=1.32&r2=1.33
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/manifesto.sr.po?cvsroot=www&r1=1.25&r2=1.26
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/why-gnu-linux.sr.po?cvsroot=www&r1=1.23&r2=1.24
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-users-never-heard-of-gnu.sr-diff.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/why-not-lgpl.sr.html?cvsroot=www&r1=1.24&r2=1.25
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/why-not-lgpl.sr.po?cvsroot=www&r1=1.15&r2=1.16
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/linux-gnu-freedom.sr.html?cvsroot=www&r1=1.28&r2=1.29
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/philosophy-menu.sr.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/categories.sr.po?cvsroot=www&r1=1.34&r2=1.35
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/essays-and-articles.sr.po?cvsroot=www&r1=1.50&r2=1.51
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-doc.sr.po?cvsroot=www&r1=1.16&r2=1.17
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-software-for-freedom.sr.po?cvsroot=www&r1=1.21&r2=1.22
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.sr.po?cvsroot=www&r1=1.53&r2=1.54
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/gif.sr.po?cvsroot=www&r1=1.16&r2=1.17
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/java-trap.sr.po?cvsroot=www&r1=1.25&r2=1.26
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/linux-gnu-freedom.sr.po?cvsroot=www&r1=1.14&r2=1.15
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/not-ipr.sr.po?cvsroot=www&r1=1.23&r2=1.24
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/philosophy-menu.sr.po?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/philosophy.sr.po?cvsroot=www&r1=1.70&r2=1.71
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/right-to-read.sr.po?cvsroot=www&r1=1.33&r2=1.34
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/selling.sr.po?cvsroot=www&r1=1.17&r2=1.18
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/shouldbefree.sr.po?cvsroot=www&r1=1.23&r2=1.24
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.sr.po?cvsroot=www&r1=1.94&r2=1.95
http://web.cvs.savannah.gnu.org/viewcvs/www/server/body-include-1.sr.html?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/server/body-include-2.sr.html?cvsroot=www&r1=1.58&r2=1.59
http://web.cvs.savannah.gnu.org/viewcvs/www/server/po/08whatsnew.sr.po?cvsroot=www&r1=1.12&r2=1.13
http://web.cvs.savannah.gnu.org/viewcvs/www/server/po/body-include-1.sr.po?cvsroot=www&r1=1.15&r2=1.16
http://web.cvs.savannah.gnu.org/viewcvs/www/server/po/body-include-2.sr.po?cvsroot=www&r1=1.55&r2=1.56

Patches:
Index: gnu/gnu-users-never-heard-of-gnu.sr.html
===================================================================
RCS file: /web/www/www/gnu/gnu-users-never-heard-of-gnu.sr.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- gnu/gnu-users-never-heard-of-gnu.sr.html    2 Dec 2014 10:53:44 -0000       
1.22
+++ gnu/gnu-users-never-heard-of-gnu.sr.html    2 Dec 2014 11:01:44 -0000       
1.23
@@ -1,7 +1,8 @@
 <!--#set var="PO_FILE"
  value='<a href="/gnu/po/gnu-users-never-heard-of-gnu.sr.po">
  http://www.gnu.org/gnu/po/gnu-users-never-heard-of-gnu.sr.po</a>'
- --><!--#set var="DIFF_FILE" value=""
+ --><!--#set var="ORIGINAL_FILE" value="/gnu/gnu-users-never-heard-of-gnu.html"
+ --><!--#set var="DIFF_FILE" 
value="/gnu/po/gnu-users-never-heard-of-gnu.sr-diff.html"
  --><!--#set var="OUTDATED_SINCE" value="2014-05-04" -->
 <!--#set var="ENGLISH_PAGE" value="/gnu/gnu-users-never-heard-of-gnu.en.html" 
-->
 
@@ -14,6 +15,7 @@
 
 <!--#include virtual="/gnu/po/gnu-users-never-heard-of-gnu.translist" -->
 <!--#include virtual="/server/banner.sr.html" -->
+<!--#include virtual="/server/outdated.sr.html" -->
 <h2>ГНУ корисници који никада нису чули о 
ГНУ</h2>
 
 <p><strong>написао <a href="http://www.stallman.org/";>Ричард
@@ -135,7 +137,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Ажурирано:
 
-$Date: 2014/12/02 10:53:44 $
+$Date: 2014/12/02 11:01:44 $
 
 <!-- timestamp end -->
 </p>

Index: gnu/po/gnu-history.sr.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-history.sr.po,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- gnu/po/gnu-history.sr.po    2 Dec 2014 10:53:03 -0000       1.22
+++ gnu/po/gnu-history.sr.po    2 Dec 2014 11:01:44 -0000       1.23
@@ -19,8 +19,6 @@
 
 # type: Content of: <title>
 #. type: Content of: <title>
-#| msgid ""
-#| "Overview of the GNU System - GNU Project - Free Software Foundation (FSF)"
 msgid "Overview of the GNU System - GNU Project - Free Software Foundation"
 msgstr "Преглед система ГНУ — Пројекат ГНУ — 
Задужбина за слободан софтвер"
 
@@ -101,12 +99,11 @@
 "износ да бисте добавили ГНУ-ов софтвер. 
Али, ма како га набавили, када "
 "једном набавите софтвер, даће вам се 
четири посебне слободе у његовом "
 "коришћењу: слободa покретања програма по 
вашој жељи; слобода умножавања "
-"програма и давања програма вашим "
-"пријатељима и сарадницима; слобода да 
мењате програм по вашој жељи, "
-"тако што добијате потпун пристун изворном 
коду; слобода расподеле "
-"побољшане верзије, и на тај начин, 
доприноса заједници. (Уколико "
-"расподељујете ГНУ-ов софтвер, можете да 
наплатите физички чин преноса "
-"примерка, а можете и да поклањате 
примерке.)"
+"програма и давања програма вашим 
пријатељима и сарадницима; слобода да "
+"мењате програм по вашој жељи, тако што 
добијате потпун пристун изворном "
+"коду; слобода расподеле побољшане 
верзије, и на тај начин, доприноса "
+"заједници. (Уколико расподељујете ГНУ-ов 
софтвер, можете да наплатите "
+"физички чин преноса примерка, а можете и 
да поклањате примерке.)"
 
 # type: Content of: <p>
 #. type: Content of: <p>
@@ -210,8 +207,8 @@
 #| "with the almost-complete GNU system resulted in a complete operating "
 #| "system: the GNU/Linux system.  Estimates are that tens of millions of "
 #| "people now use GNU/Linux systems, typically via <a href=\"/distros"
-#| "\">distributions</a> such as Slackware, Debian, Red Hat, and others."
-#| "(The principal version of Linux now contains non-free firmware &ldquo;"
+#| "\">distributions</a> such as Slackware, Debian, Red Hat, and others.(The "
+#| "principal version of Linux now contains non-free firmware &ldquo;"
 #| "blobs&rdquo;.  Free software activists now maintain a modified <a href="
 #| "\"http://directory.fsf.org/project/linux\";>free version</a> of Linux.)"
 msgid ""
@@ -233,9 +230,8 @@
 "Процењено је да до данас стотине хиљада 
људи користе системе ГНУ са језгром "
 "Линукс, укључујући ту и <a 
href=\"/distros\">дистрибуције</a> Слеквер "
 "(<em>Slackware</em>), Дебијан (<em>Debian</em>), Ред Хет 
(<em>Red Hat</em>), "
-"и многе друге. "
-"Основна верзија Линукса сада садржи 
неслободне фирмверске „мрље“; "
-"активисти слободног софтвера одржавају 
измењену <a href=\"http://";
+"и многе друге. Основна верзија Линукса 
сада садржи неслободне фирмверске "
+"„мрље“; активисти слободног софтвера 
одржавају измењену <a href=\"http://";
 "directory.fsf.org/project/linux\">слободну верзију</a> 
Линукса."
 
 # type: Content of: <p>
@@ -266,10 +262,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "We also want to provide games and other recreations.  Plenty of <a href="
-#| "\"http://directory.fsf.org/category/games/\";>free games</a> are already "
-#| "available."
 msgid ""
 "We also want to provide games and other recreations.  Plenty of <a href="
 "\"http://directory.fsf.org/wiki/Category/Game\";>free games</a> are already "
@@ -279,8 +271,8 @@
 "href=\"http://directory.fsf.org/wiki/Category/Game/\";>слободних 
игара</a>."
 
 # type: Content of: <p>
-#, fuzzy
 #. type: Content of: <p>
+#, fuzzy
 #| msgid ""
 #| "How far can free software go? There are no limits, except when <a href=\"/"
 #| "philosophy/fighting-software-patents.html\">laws such as the patent "
@@ -349,8 +341,8 @@
 "panel of your PO editor (or above the msgid if you are using a simple text "
 "editor). All the Serbian POs need to be treated similarly; this can be done "
 "by simply modifying the two variants of this string in a master compendium "
-"(to be created). If you need any technical help, please contact "
-"address@hidden"
+"(to be created). If you need any technical help, please contact web-"
+"address@hidden"
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>

Index: gnu/po/gnu-linux-faq.sr.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.sr.po,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- gnu/po/gnu-linux-faq.sr.po  2 Dec 2014 10:53:04 -0000       1.37
+++ gnu/po/gnu-linux-faq.sr.po  2 Dec 2014 11:01:44 -0000       1.38
@@ -20,10 +20,8 @@
 
 # type: Content of: <title>
 #. type: Content of: <title>
-#| msgid "GNU/Linux FAQ - GNU Project - Free Software Foundation (FSF)"
 msgid "GNU/Linux FAQ - GNU Project - Free Software Foundation"
-msgstr ""
-"ЧПП ГНУ-а са Линуксом — Пројекат ГНУ — 
Задужбина за слободни софтвер"
+msgstr "ЧПП ГНУ-а са Линуксом — Пројекат ГНУ — 
Задужбина за слободни софтвер"
 
 # type: Content of: <h2>
 #. type: Content of: <h2>
@@ -166,10 +164,6 @@
 
 # type: Content of: <ul><li>
 #. type: Content of: <ul><li>
-#| msgid ""
-#| "<a href=\"#house\" id=\"TOChouse\">The kernel of a system is like the "
-#| "foundation of a house? How can a house be almost complete when it doesn't "
-#| "have a foundation?</a>"
 msgid ""
 "<a href=\"#house\" id=\"TOChouse\">The kernel of a system is like the "
 "foundation of a house.  How can a house be almost complete when it doesn't "
@@ -244,10 +238,6 @@
 
 # type: Content of: <ul><li>
 #. type: Content of: <ul><li>
-#| msgid ""
-#| "<a href=\"#justgnu\" id=\"TOCjustgnu\">Since Linux is a secondary "
-#| "contribution, would it be false to the facts to call the system simply "
-#| "\"GNU\"?</a>"
 msgid ""
 "<a href=\"#justgnu\" id=\"TOCjustgnu\">Since Linux is a secondary "
 "contribution, would it be false to the facts to call the system simply "
@@ -305,10 +295,6 @@
 
 # type: Content of: <ul><li>
 #. type: Content of: <ul><li>
-#| msgid ""
-#| "<a href=\"#manycompanies\" id=\"TOCmanycompanies\">Many companies "
-#| "contributed to the system as it is today; doesn't that mean we ought to "
-#| "call it GNU/Redhat/Novell/Linux?</a>"
 msgid ""
 "<a href=\"#manycompanies\" id=\"TOCmanycompanies\">Many companies "
 "contributed to the system as it is today; doesn't that mean we ought to call "
@@ -659,8 +645,8 @@
 "Why do you call it GNU/Linux and not Linux? <span class=\"anchor-reference-id"
 "\">(<a href=\"#why\">#why</a>)</span>"
 msgstr ""
-"Зашто га зовете ГНУ са Линуксом а не 
Линукс? <span class=\"anchor-reference-id"
-"\">(<a href=\"#why\">#why</a>)</span>"
+"Зашто га зовете ГНУ са Линуксом а не 
Линукс? <span class=\"anchor-reference-"
+"id\">(<a href=\"#why\">#why</a>)</span>"
 
 # type: Content of: <dl><dd>
 #. type: Content of: <dl><dd>
@@ -688,11 +674,6 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
-#| msgid ""
-#| "See <a href=\"/gnu/linux-and-gnu.html\">Linux and the GNU Project</a> and "
-#| "<a href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have "
-#| "Never Heard of GNU</a> for more explanation, and <a href=\"/gnu/the-gnu-"
-#| "project.html\">The GNU Project</a> for the history."
 msgid ""
 "See <a href=\"/gnu/linux-and-gnu.html\">Linux and the GNU System</a> and <a "
 "href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never "
@@ -710,8 +691,8 @@
 "Why is the name important? <span class=\"anchor-reference-id\">(<a href="
 "\"#whycare\">#whycare</a>)</span>"
 msgstr ""
-"Зашто је назив битан? <span 
class=\"anchor-reference-id\">(<a href="
-"\"#whycare\">#whycare</a>)</span>"
+"Зашто је назив битан? <span 
class=\"anchor-reference-id\">(<a href=\"#whycare"
+"\">#whycare</a>)</span>"
 
 # type: Content of: <dl><dd>
 #. type: Content of: <dl><dd>
@@ -741,16 +722,13 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
-#| msgid ""
-#| "How did it come about that most people call the system &ldquo;"
-#| "Linux&rdquo;?"
 msgid ""
 "How did it come about that most people call the system &ldquo;Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#howerror\">#howerror</a>)</"
 "span>"
-msgstr "Како је дошло до тога да већина људи 
назива систем „Линуксом“? "
-"<span class=\"anchor-reference-id\">(<a href=\"#howerror\">#howerror</a>)</"
-"span>"
+msgstr ""
+"Како је дошло до тога да већина људи 
назива систем „Линуксом“? <span class="
+"\"anchor-reference-id\">(<a href=\"#howerror\">#howerror</a>)</span>"
 
 # type: Content of: <dl><dd>
 #. type: Content of: <dl><dd>
@@ -809,14 +787,12 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
-#| msgid ""
-#| "Should we always say &ldquo;GNU/Linux&rdquo; instead of &ldquo;"
-#| "Linux&rdquo;?"
 msgid ""
 "Should we always say &ldquo;GNU/Linux&rdquo; instead of &ldquo;Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#always\">#always</a>)</span>"
-msgstr "Треба ли увек да говоримо „ГНУ са 
Линуксом“ уместо „Линукс“? "
-"<span class=\"anchor-reference-id\">(<a href=\"#always\">#always</a>)</span>"
+msgstr ""
+"Треба ли увек да говоримо „ГНУ са 
Линуксом“ уместо „Линукс“? <span class="
+"\"anchor-reference-id\">(<a href=\"#always\">#always</a>)</span>"
 
 # type: Content of: <dl><dd>
 #. type: Content of: <dl><dd>
@@ -846,14 +822,13 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
-#| msgid "Would Linux have achieved the same success if there had been no GNU?"
 msgid ""
 "Would Linux have achieved the same success if there had been no GNU? <span "
 "class=\"anchor-reference-id\">(<a href=\"#linuxalone\">#linuxalone</a>)</"
 "span>"
-msgstr "Да ли би Линукс постигао исти успех да 
ГНУ није ни настао? <span "
-"class=\"anchor-reference-id\">(<a href=\"#linuxalone\">#linuxalone</a>)</"
-"span>"
+msgstr ""
+"Да ли би Линукс постигао исти успех да ГНУ 
није ни настао? <span class="
+"\"anchor-reference-id\">(<a href=\"#linuxalone\">#linuxalone</a>)</span>"
 
 # type: Content of: <dl><dd>
 #. type: Content of: <dl><dd>
@@ -900,15 +875,13 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
-#| msgid ""
-#| "Wouldn't it be better for the community if you did not divide people with "
-#| "this request?"
 msgid ""
 "Wouldn't it be better for the community if you did not divide people with "
 "this request? <span class=\"anchor-reference-id\">(<a href=\"#divide"
 "\">#divide</a>)</span>"
-msgstr "Зар не би било боље по заједницу не 
делити људе овим захтевом? <span 
class=\"anchor-reference-id\">(<a href=\"#divide"
-"\">#divide</a>)</span>"
+msgstr ""
+"Зар не би било боље по заједницу не делити 
људе овим захтевом? <span class="
+"\"anchor-reference-id\">(<a href=\"#divide\">#divide</a>)</span>"
 
 # type: Content of: <dl><dd>
 #. type: Content of: <dl><dd>
@@ -996,17 +969,14 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
-#| msgid ""
-#| "Doesn't the GNU project support an individual's free speech rights to "
-#| "call the system by any name that individual chooses?"
 msgid ""
 "Doesn't the GNU project support an individual's free speech rights to call "
 "the system by any name that individual chooses? <span class=\"anchor-"
 "reference-id\">(<a href=\"#freespeech\">#freespeech</a>)</span>"
 msgstr ""
 "Зар Пројекат ГНУ не подржава права 
слободе говора појединаца да називају "
-"систем по свом избору? <span class=\"anchor-"
-"reference-id\">(<a href=\"#freespeech\">#freespeech</a>)</span>"
+"систем по свом избору? <span 
class=\"anchor-reference-id\">(<a href="
+"\"#freespeech\">#freespeech</a>)</span>"
 
 # type: Content of: <dl><dd>
 #. type: Content of: <dl><dd>
@@ -1025,17 +995,14 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
-#| msgid ""
-#| "Since everyone knows GNU's role in developing the system, doesn't the "
-#| "&ldquo;GNU/&rdquo; in the name go without saying?"
 msgid ""
 "Since everyone knows GNU's role in developing the system, doesn't the &ldquo;"
 "GNU/&rdquo; in the name go without saying? <span class=\"anchor-reference-id"
 "\">(<a href=\"#everyoneknows\">#everyoneknows</a>)</span>"
 msgstr ""
 "Пошто је свакоме позната улога ГНУ-а у 
развоју система, зар се „ГНУ са“ у "
-"имену не подразумева? <span class=\"anchor-reference-id"
-"\">(<a href=\"#everyoneknows\">#everyoneknows</a>)</span>"
+"имену не подразумева? <span 
class=\"anchor-reference-id\">(<a href="
+"\"#everyoneknows\">#everyoneknows</a>)</span>"
 
 # type: Content of: <dl><dd>
 #. type: Content of: <dl><dd>
@@ -1082,9 +1049,6 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
-#| msgid ""
-#| "Since I know the role of GNU in this system, why does it matter what name "
-#| "I use?"
 msgid ""
 "Since I know the role of GNU in this system, why does it matter what name I "
 "use? <span class=\"anchor-reference-id\">(<a href="
@@ -1109,17 +1073,14 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
-#| msgid ""
-#| "Isn't shortening &ldquo;GNU/Linux&rdquo; to &ldquo;Linux&rdquo; just like "
-#| "shortening &ldquo;Microsoft Windows&rdquo; to &ldquo;Windows&rdquo;?"
 msgid ""
 "Isn't shortening &ldquo;GNU/Linux&rdquo; to &ldquo;Linux&rdquo; just like "
 "shortening &ldquo;Microsoft Windows&rdquo; to &ldquo;Windows&rdquo;? <span "
 "class=\"anchor-reference-id\">(<a href=\"#windows\">#windows</a>)</span>"
 msgstr ""
 "Није ли скраћивање назива „ГНУ са 
Линуксом“ на „Линукс“ исто што и "
-"скраћивање назива „Микрософтов Виндовс“ 
на „Виндовс“? <span "
-"class=\"anchor-reference-id\">(<a href=\"#windows\">#windows</a>)</span>"
+"скраћивање назива „Микрософтов Виндовс“ 
на „Виндовс“? <span class=\"anchor-"
+"reference-id\">(<a href=\"#windows\">#windows</a>)</span>"
 
 # type: Content of: <dl><dd>
 #. type: Content of: <dl><dd>
@@ -1132,13 +1093,6 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
-#| msgid ""
-#| "Most everyone in developed countries really does know that the &ldquo;"
-#| "Windows&rdquo; system is made by Microsoft, so shortening &ldquo;"
-#| "Microsoft Windows&rdquo; to &ldquo;Windows&rdquo; does not mislead anyone "
-#| "as to that system's nature and origin.  Shortening &ldquo;GNU/"
-#| "Linux&rdquo; to &ldquo;Linux&rdquo; does give the wrong idea of where the "
-#| "system comes from."
 msgid ""
 "Almost everyone in developed countries really does know that the &ldquo;"
 "Windows&rdquo; system is made by Microsoft, so shortening &ldquo;Microsoft "
@@ -1163,8 +1117,6 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
-#| msgid ""
-#| "Isn't GNU a collection of programming tools that were included in Linux?"
 msgid ""
 "Isn't GNU a collection of programming tools that were included in Linux? "
 "<span class=\"anchor-reference-id\">(<a href=\"#tools\">#tools</a>)</span>"
@@ -1221,12 +1173,12 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
-#| msgid "What is the difference between an operating system and a kernel?"
 msgid ""
 "What is the difference between an operating system and a kernel? <span class="
 "\"anchor-reference-id\">(<a href=\"#osvskernel\">#osvskernel</a>)</span>"
-msgstr "Каква је разлика између оперативног 
система и језгра? <span class="
-"\"anchor-reference-id\">(<a href=\"#osvskernel\">#osvskernel</a>)</span>"
+msgstr ""
+"Каква је разлика између оперативног 
система и језгра? <span class=\"anchor-"
+"reference-id\">(<a href=\"#osvskernel\">#osvskernel</a>)</span>"
 
 # type: Content of: <dl><dd>
 #. type: Content of: <dl><dd>
@@ -1305,16 +1257,13 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
-#| msgid ""
-#| "The kernel of a system is like the foundation of a house? How can a house "
-#| "be almost complete when it doesn't have a foundation?"
 msgid ""
 "The kernel of a system is like the foundation of a house.  How can a house "
 "be almost complete when it doesn't have a foundation? <span class=\"anchor-"
 "reference-id\">(<a href=\"#house\">#house</a>)</span>"
 msgstr ""
-"Језгро система је као темељ куће. Како 
кућа може бити потпуна без темеља? <span 
class=\"anchor-"
-"reference-id\">(<a href=\"#house\">#house</a>)</span>"
+"Језгро система је као темељ куће. Како 
кућа може бити потпуна без темеља? "
+"<span class=\"anchor-reference-id\">(<a href=\"#house\">#house</a>)</span>"
 
 # type: Content of: <dl><dd>
 #. type: Content of: <dl><dd>
@@ -1438,17 +1387,14 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
-#| msgid ""
-#| "We're calling the whole system after the kernel, Linux.  Isn't it normal "
-#| "to name an operating system after a kernel?"
 msgid ""
 "We're calling the whole system after the kernel, Linux.  Isn't it normal to "
 "name an operating system after a kernel? <span class=\"anchor-reference-id\">"
 "(<a href=\"#afterkernel\">#afterkernel</a>)</span>"
 msgstr ""
 "Ми називамо цео систем по језгру — Линукс. 
Није ли уобичајено назвати "
-"оперативни систем по језгру? <span 
class=\"anchor-reference-id\">"
-"(<a href=\"#afterkernel\">#afterkernel</a>)</span>"
+"оперативни систем по језгру? <span 
class=\"anchor-reference-id\">(<a href="
+"\"#afterkernel\">#afterkernel</a>)</span>"
 
 # type: Content of: <dl><dd>
 #. type: Content of: <dl><dd>
@@ -1499,17 +1445,14 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
-#| msgid ""
-#| "The problem with &ldquo;GNU/Linux&rdquo; is that it is too long.  How "
-#| "about recommending a shorter name?"
 msgid ""
 "The problem with &ldquo;GNU/Linux&rdquo; is that it is too long.  How about "
 "recommending a shorter name? <span class=\"anchor-reference-id\">(<a href="
 "\"#long\">#long</a>)</span>"
 msgstr ""
 "Оно што смета код назива „ГНУ са 
Линуксом“ је то што је предугачак. Како би "
-"било да предложите неки краћи назив? <span 
class=\"anchor-reference-id\">(<a href="
-"\"#long\">#long</a>)</span>"
+"било да предложите неки краћи назив? <span 
class=\"anchor-reference-id\">(<a "
+"href=\"#long\">#long</a>)</span>"
 
 # type: Content of: <dl><dd>
 #. type: Content of: <dl><dd>
@@ -1524,9 +1467,6 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
-#| msgid ""
-#| "The shortest legitimate name for this system is &ldquo;GNU&rdquo;, but we "
-#| "call it &ldquo;GNU/Linux&rdquo; for the reasons given below."
 msgid ""
 "The shortest legitimate name for this system is &ldquo;GNU&rdquo;, but we "
 "call it &ldquo;GNU/Linux&rdquo; <a href=\"#justgnu\"> for the reasons given "
@@ -1567,17 +1507,14 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
-#| msgid ""
-#| "Since Linux is a secondary contribution, would it be false to the facts "
-#| "to call the system simply &ldquo;GNU&rdquo;?"
 msgid ""
 "Since Linux is a secondary contribution, would it be false to the facts to "
 "call the system simply &ldquo;GNU&rdquo;? <span class=\"anchor-reference-id"
 "\">(<a href=\"#justgnu\">#justgnu</a>)</span>"
 msgstr ""
 "Пошто је Линукс споредни допринос, да ли 
би било неистинито називати систем "
-"просто „ГНУ-ом“? <span class=\"anchor-reference-id"
-"\">(<a href=\"#justgnu\">#justgnu</a>)</span>"
+"просто „ГНУ-ом“? <span class=\"anchor-reference-id\">(<a 
href=\"#justgnu"
+"\">#justgnu</a>)</span>"
 
 # type: Content of: <dl><dd>
 #. type: Content of: <dl><dd>
@@ -1632,11 +1569,6 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
-#| msgid ""
-#| "I would have to pay a fee if I use &ldquo;Linux&rdquo; in the name of a "
-#| "product, and that would also apply if I say &ldquo;GNU/Linux&rdquo;.  Is "
-#| "it wrong if I use &ldquo;GNU&rdquo; without &ldquo;Linux&rdquo;, to save "
-#| "the fee?"
 msgid ""
 "I would have to pay a fee if I use &ldquo;Linux&rdquo; in the name of a "
 "product, and that would also apply if I say &ldquo;GNU/Linux&rdquo;.  Is it "
@@ -1646,7 +1578,8 @@
 msgstr ""
 "Уколико користим назив „Линукс“ у називу 
производа, морам да за то платим. "
 "Исто важи и ако користим назив „ГНУ са 
Линуксом“. Да ли је погрешно да "
-"користим само назив „ГНУ“ без назива 
„Линукс“ како бих избегао плаћање? <span 
class=\"anchor-reference-id\">(<a href=\"#trademarkfee"
+"користим само назив „ГНУ“ без назива 
„Линукс“ како бих избегао плаћање? "
+"<span class=\"anchor-reference-id\">(<a href=\"#trademarkfee"
 "\">#trademarkfee</a>)</span>"
 
 # type: Content of: <dl><dd>
@@ -1671,11 +1604,6 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
-#| msgid ""
-#| "Many other projects contributed to the system as it is today; it includes "
-#| "TeX, X11, Apache, Perl, and many more programs.  Don't your arguments "
-#| "imply we have to give them credit too? (But that would lead to a name so "
-#| "long it is absurd.)"
 msgid ""
 "Many other projects contributed to the system as it is today; it includes "
 "TeX, X11, Apache, Perl, and many more programs.  Don't your arguments imply "
@@ -1686,8 +1614,8 @@
 "До данас су многи пројекти помогли 
систему какав је он данас. Он укључује "
 "ТеХ, Икс11, Апаш, Перл, и много других 
програма. Зар ваши аргументи не "
 "наводе на то да и њима треба одати 
признање? (Али би то довело до назива "
-"који би био толико дугачак да би то било 
смешно.) <span class=\"anchor-reference-id\">(<a 
href=\"#many\">#many</a>)"
-"</span>"
+"који би био толико дугачак да би то било 
смешно.) <span class=\"anchor-"
+"reference-id\">(<a href=\"#many\">#many</a>)</span>"
 
 # type: Content of: <dl><dd>
 #. type: Content of: <dl><dd>
@@ -1748,17 +1676,14 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
-#| msgid ""
-#| "Many other projects contributed to the system as it is today, but they "
-#| "don't insist on calling it XYZ/Linux.  Why should we treat GNU specially?"
 msgid ""
 "Many other projects contributed to the system as it is today, but they don't "
 "insist on calling it XYZ/Linux.  Why should we treat GNU specially? <span "
 "class=\"anchor-reference-id\">(<a href=\"#others\">#others</a>)</span>"
 msgstr ""
 "Многи други пројекти су допринели томе да 
систем буде онакав какав је данас, "
-"али они не инсистирају на називу АБВ са 
Линуксом. Зашто бисмо издвајали ГНУ? <span "
-"class=\"anchor-reference-id\">(<a href=\"#others\">#others</a>)</span>"
+"али они не инсистирају на називу АБВ са 
Линуксом. Зашто бисмо издвајали ГНУ? "
+"<span class=\"anchor-reference-id\">(<a href=\"#others\">#others</a>)</span>"
 
 # type: Content of: <dl><dd>
 #. type: Content of: <dl><dd>
@@ -1785,16 +1710,13 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
-#| msgid ""
-#| "GNU is a small fraction of the system nowadays, so why should we mention "
-#| "it?"
 msgid ""
 "GNU is a small fraction of the system nowadays, so why should we mention it? "
 "<span class=\"anchor-reference-id\">(<a href=\"#allsmall\">#allsmall</a>)</"
 "span>"
-msgstr "ГНУ је данас мали део система. Зашто 
бисмо га онда помињали? "
-"<span class=\"anchor-reference-id\">(<a href=\"#allsmall\">#allsmall</a>)</"
-"span>"
+msgstr ""
+"ГНУ је данас мали део система. Зашто бисмо 
га онда помињали? <span class="
+"\"anchor-reference-id\">(<a href=\"#allsmall\">#allsmall</a>)</span>"
 
 # type: Content of: <dl><dd>
 #. type: Content of: <dl><dd>
@@ -1822,17 +1744,15 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
-#| msgid ""
-#| "Many companies contributed to the system as it is today; doesn't that "
-#| "mean we ought to call it GNU/Redhat/Novell/Linux?"
 msgid ""
 "Many companies contributed to the system as it is today; doesn't that mean "
 "we ought to call it GNU/Red&nbsp;Hat/Novell/Linux? <span class=\"anchor-"
 "reference-id\">(<a href=\"#manycompanies\">#manycompanies</a>)</span>"
 msgstr ""
 "Многе фирме су допринеле томе да систем 
буде онакав какав је данас. Зар то "
-"не значи да би требало да га називамо Ред 
Хетов и Новелов ГНУ са Линуксом? <span 
class=\"anchor-"
-"reference-id\">(<a href=\"#manycompanies\">#manycompanies</a>)</span>"
+"не значи да би требало да га називамо Ред 
Хетов и Новелов ГНУ са Линуксом? "
+"<span class=\"anchor-reference-id\">(<a href=\"#manycompanies"
+"\">#manycompanies</a>)</span>"
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
@@ -1863,16 +1783,13 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
-#| msgid ""
-#| "Why do you write &ldquo;GNU/Linux&rdquo; instead of &ldquo;GNU "
-#| "Linux&rdquo;?"
 msgid ""
 "Why do you write &ldquo;GNU/Linux&rdquo; instead of &ldquo;GNU Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#whyslash\">#whyslash</a>)</"
 "span>"
-msgstr "Зашто пишете „ГНУ са Линуксом“ 
уместо „ГНУ Линукс“? "
-"<span class=\"anchor-reference-id\">(<a href=\"#whyslash\">#whyslash</a>)</"
-"span>"
+msgstr ""
+"Зашто пишете „ГНУ са Линуксом“ уместо 
„ГНУ Линукс“? <span class=\"anchor-"
+"reference-id\">(<a href=\"#whyslash\">#whyslash</a>)</span>"
 
 # type: Content of: <dl><dd>
 #. type: Content of: <dl><dd>
@@ -1946,12 +1863,12 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
-#| msgid "Why &ldquo;GNU/Linux&rdquo; rather than &ldquo;Linux/GNU&rdquo;?"
 msgid ""
 "Why &ldquo;GNU/Linux&rdquo; rather than &ldquo;Linux/GNU&rdquo;? <span class="
 "\"anchor-reference-id\">(<a href=\"#whyorder\">#whyorder</a>)</span>"
-msgstr "Зашто „ГНУ са Линуксом“ уместо 
„Линукс са ГНУ-ом“? <span class="
-"\"anchor-reference-id\">(<a href=\"#whyorder\">#whyorder</a>)</span>"
+msgstr ""
+"Зашто „ГНУ са Линуксом“ уместо „Линукс 
са ГНУ-ом“? <span class=\"anchor-"
+"reference-id\">(<a href=\"#whyorder\">#whyorder</a>)</span>"
 
 # type: Content of: <dl><dd>
 #. type: Content of: <dl><dd>
@@ -1977,9 +1894,6 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
-#| msgid ""
-#| "My distro is called &ldquo;Foobar Linux&rdquo;; doesn't that show it's "
-#| "really Linux?"
 msgid ""
 "My distro is called &ldquo;Foobar Linux&rdquo;; doesn't that show it's "
 "really Linux? <span class=\"anchor-reference-id\">(<a href=\"#distronames"
@@ -2001,22 +1915,19 @@
 "their official name, and we hope that if you are involved with a different "
 "distribution, you will encourage it to do the same."
 msgstr ""
-"То само значи да људи који праве 
дистрибуцију „Нештонешто Линукс“ "
-"понављају честу грешку."
+"То само значи да људи који праве 
дистрибуцију „Нештонешто Линукс“ 
понављају "
+"честу грешку."
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
-#| msgid ""
-#| "My distro's official name is &ldquo;Foobar Linux&rdquo;; isn't it wrong "
-#| "to call the distro anything but &ldquo;Linux&rdquo;?"
 msgid ""
 "My distro's official name is &ldquo;Foobar Linux&rdquo;; isn't it wrong to "
 "call the distro anything but &ldquo;Linux&rdquo;? <span class=\"anchor-"
 "reference-id\">(<a href=\"#distronames1\">#distronames1</a>)</span>"
 msgstr ""
 "Званичан назив моје дистрибуције је 
„Нештонешто Линукс“. Зар није погрешно "
-"не називати је „Линуксом“? <span class=\"anchor-"
-"reference-id\">(<a href=\"#distronames1\">#distronames1</a>)</span>"
+"не називати је „Линуксом“? <span 
class=\"anchor-reference-id\">(<a href="
+"\"#distronames1\">#distronames1</a>)</span>"
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
@@ -2038,10 +1949,6 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
-#| msgid ""
-#| "Wouldn't it be more effective to ask companies such as Mandrake, Red Hat "
-#| "and IBM to call their distributions &ldquo;GNU/Linux&rdquo; rather than "
-#| "asking individuals?"
 msgid ""
 "Wouldn't it be more effective to ask companies such as Mandrake, Red Hat and "
 "IBM to call their distributions &ldquo;GNU/Linux&rdquo; rather than asking "
@@ -2104,10 +2011,6 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
-#| msgid ""
-#| "Wouldn't it be better to reserve the name &ldquo;GNU/Linux&rdquo; for "
-#| "distributions that are purely free software? After all, that is the ideal "
-#| "of GNU."
 msgid ""
 "Wouldn't it be better to reserve the name &ldquo;GNU/Linux&rdquo; for "
 "distributions that are purely free software? After all, that is the ideal of "
@@ -2116,8 +2019,8 @@
 msgstr ""
 "Зар не би било боље да се назив „ГНУ са 
Линуксом“ задржи само за "
 "дистрибуције које су начињене чисто од 
слободног софтвера? Зар то није идеал "
-"ГНУ-а? <span class=\"anchor-reference-id\">(<a 
href=\"#reserve\">#reserve</a>)"
-"</span>"
+"ГНУ-а? <span class=\"anchor-reference-id\">(<a 
href=\"#reserve\">#reserve</"
+"a>)</span>"
 
 # type: Content of: <dl><dd>
 #. type: Content of: <dl><dd>
@@ -2182,14 +2085,6 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
-#| msgid ""
-#| "It is very useful to start GNU/Linux User Groups, which call the system "
-#| "GNU/Linux and adopt the ideals of the GNU Project as a basis for their "
-#| "activities.  If the Linux User Group in your area has the problems "
-#| "describe above, we suggest you either campaign within the group to change "
-#| "its orientation (and name) or start a new group.  The people who focus on "
-#| "the more superficial goals have a right to their views, but don't let "
-#| "them drag you along!"
 msgid ""
 "It is very useful to start GNU/Linux User Groups, which call the system GNU/"
 "Linux and adopt the ideals of the GNU Project as a basis for their "
@@ -2209,17 +2104,14 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
-#| msgid ""
-#| "Why not make a GNU distribution of Linux (sic) and call that GNU/Linux?"
 msgid ""
 "Why not make a GNU distribution of Linux (sic) and call that GNU/Linux? "
 "<span class=\"anchor-reference-id\">(<a href=\"#gnudist\">#gnudist</a>)</"
 "span>"
 msgstr ""
 "Зашто не учинити ГНУ дистрибуцијом 
Линукса (sic) и то називати ГНУ-ом са "
-"Линуксом? "
-"<span class=\"anchor-reference-id\">(<a href=\"#gnudist\">#gnudist</a>)</"
-"span>"
+"Линуксом? <span class=\"anchor-reference-id\">(<a href=\"#gnudist"
+"\">#gnudist</a>)</span>"
 
 # type: Content of: <dl><dd>
 #. type: Content of: <dl><dd>
@@ -2261,17 +2153,14 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
-#| msgid ""
-#| "Why not just say &ldquo;Linux is the GNU kernel&rdquo; and release some "
-#| "existing version of GNU/Linux under the name &ldquo;GNU&rdquo;?"
 msgid ""
 "Why not just say &ldquo;Linux is the GNU kernel&rdquo; and release some "
 "existing version of GNU/Linux under the name &ldquo;GNU&rdquo;? <span class="
 "\"anchor-reference-id\">(<a href=\"#linuxgnu\">#linuxgnu</a>)</span>"
 msgstr ""
 "Зашто не рећи „Линукс је језгро ГНУ-а“ и 
објавити неку постојећу верзију ГНУ-"
-"а са Линуксом под именом „ГНУ“? <span class="
-"\"anchor-reference-id\">(<a href=\"#linuxgnu\">#linuxgnu</a>)</span>"
+"а са Линуксом под именом „ГНУ“? <span 
class=\"anchor-reference-id\">(<a href="
+"\"#linuxgnu\">#linuxgnu</a>)</span>"
 
 # type: Content of: <dl><dd>
 #. type: Content of: <dl><dd>
@@ -2300,14 +2189,13 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
-#| msgid ""
-#| "Did the GNU Project condemn and oppose use of Linux in the early days?"
 msgid ""
 "Did the GNU Project condemn and oppose use of Linux in the early days? <span "
 "class=\"anchor-reference-id\">(<a href=\"#condemn\">#condemn</a>)</span>"
 msgstr ""
-"Да ли је Пројекат ГНУ од почетка осуђивао 
и противио се употреби Линукса? <span "
-"class=\"anchor-reference-id\">(<a href=\"#condemn\">#condemn</a>)</span>"
+"Да ли је Пројекат ГНУ од почетка осуђивао 
и противио се употреби Линукса? "
+"<span class=\"anchor-reference-id\">(<a href=\"#condemn\">#condemn</a>)</"
+"span>"
 
 # type: Content of: <dl><dd>
 #. type: Content of: <dl><dd>
@@ -2364,15 +2252,13 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
-#| msgid ""
-#| "Why did you wait so long before asking people to use the name GNU/Linux?"
 msgid ""
 "Why did you wait so long before asking people to use the name GNU/Linux? "
 "<span class=\"anchor-reference-id\">(<a href=\"#wait\">#wait</a>)</span>"
 msgstr ""
 "Зашто вам је било потребно толико много 
времена да почнете да тражите од "
-"људи да користе назив ГНУ са Линуксом? "
-"<span class=\"anchor-reference-id\">(<a href=\"#wait\">#wait</a>)</span>"
+"људи да користе назив ГНУ са Линуксом? <span 
class=\"anchor-reference-id\">"
+"(<a href=\"#wait\">#wait</a>)</span>"
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
@@ -2387,16 +2273,14 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
-#| msgid ""
-#| "Should the GNU/<i>name</i> convention be applied to all programs that are "
-#| "GPL'ed?"
 msgid ""
 "Should the GNU/<i>name</i> convention be applied to all programs that are "
 "GPL'ed? <span class=\"anchor-reference-id\">(<a href=\"#allgpled"
 "\">#allgpled</a>)</span>"
 msgstr ""
-"Треба ли правило ГНУ са [назив] 
примењивати на све програме који су под 
ОЈЛ? <span class=\"anchor-reference-id\">(<a href=\"#allgpled"
-"\">#allgpled</a>)</span>"
+"Треба ли правило ГНУ са [назив] 
примењивати на све програме који су под 
ОЈЛ? "
+"<span class=\"anchor-reference-id\">(<a href=\"#allgpled\">#allgpled</a>)</"
+"span>"
 
 # type: Content of: <dl><dd>
 #. type: Content of: <dl><dd>
@@ -2496,17 +2380,14 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
-#| msgid ""
-#| "Since much of GNU comes from Unix, shouldn't GNU give credit to Unix by "
-#| "using &ldquo;Unix&rdquo; in its name?"
 msgid ""
 "Since much of GNU comes from Unix, shouldn't GNU give credit to Unix by "
 "using &ldquo;Unix&rdquo; in its name? <span class=\"anchor-reference-id\">"
 "(<a href=\"#unix\">#unix</a>)</span>"
 msgstr ""
 "Пошто велики део ГНУ-а потиче од Уникса, 
зар не би требало да ГНУ ода "
-"признање Униксу додавши Уникс свом 
називу? <span class=\"anchor-reference-id\">"
-"(<a href=\"#unix\">#unix</a>)</span>"
+"признање Униксу додавши Уникс свом 
називу? <span class=\"anchor-reference-id"
+"\">(<a href=\"#unix\">#unix</a>)</span>"
 
 # type: Content of: <dl><dd>
 #. type: Content of: <dl><dd>
@@ -2542,13 +2423,6 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
-#| msgid ""
-#| "The first such recursive acronym was TINT, &ldquo;TINT Is Not "
-#| "TECO&rdquo;.  The author of TINT wrote another implementation of TECO "
-#| "(there were already many of them, for various systems), but instead of "
-#| "calling it by a dull name like &ldquo;somethingorother TECO&rdquo;, he "
-#| "thought of a clever amusing name.  (That's what hacking means: <a href="
-#| "\"http://stallman.org/articles/on-hacking.html\";>playful cleverness</a>.)"
 msgid ""
 "The first such recursive acronym was TINT, &ldquo;TINT Is Not TECO&rdquo;.  "
 "The author of TINT wrote another implementation of TECO (there were already "
@@ -2605,8 +2479,9 @@
 msgid ""
 "Should we say &ldquo;GNU/BSD&rdquo; too? <span class=\"anchor-reference-id\">"
 "(<a href=\"#bsd\">#bsd</a>)</span>"
-msgstr "Треба ли користити и назив „ГНУ са 
БСД-ом“? <span class=\"anchor-reference-id\">"
-"(<a href=\"#bsd\">#bsd</a>)</span>"
+msgstr ""
+"Треба ли користити и назив „ГНУ са 
БСД-ом“? <span class=\"anchor-reference-id"
+"\">(<a href=\"#bsd\">#bsd</a>)</span>"
 
 # type: Content of: <dl><dd>
 #. type: Content of: <dl><dd>
@@ -2684,17 +2559,14 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
-#| msgid ""
-#| "If I install the GNU tools on Windows, does that mean I am running a GNU/"
-#| "Windows system?"
 msgid ""
 "If I install the GNU tools on Windows, does that mean I am running a GNU/"
 "Windows system? <span class=\"anchor-reference-id\">(<a href=\"#othersys"
 "\">#othersys</a>)</span>"
 msgstr ""
 "Уколико инсталирам ГНУ-ове алате под 
Виндовсом, да ли то значи да имам "
-"систем ГНУ са Виндовсом? <span 
class=\"anchor-reference-id\">(<a href=\"#othersys"
-"\">#othersys</a>)</span>"
+"систем ГНУ са Виндовсом? <span 
class=\"anchor-reference-id\">(<a href="
+"\"#othersys\">#othersys</a>)</span>"
 
 # type: Content of: <dl><dd>
 #. type: Content of: <dl><dd>
@@ -2718,8 +2590,9 @@
 msgid ""
 "Can't Linux be used without GNU? <span class=\"anchor-reference-id\">(<a "
 "href=\"#justlinux\">#justlinux</a>)</span>"
-msgstr "Може ли постојати систем Линукс без 
ГНУ-а? <span class=\"anchor-reference-id\">(<a "
-"href=\"#justlinux\">#justlinux</a>)</span>"
+msgstr ""
+"Може ли постојати систем Линукс без ГНУ-а? 
<span class=\"anchor-reference-id"
+"\">(<a href=\"#justlinux\">#justlinux</a>)</span>"
 
 #. type: Content of: <dl><dd>
 msgid ""
@@ -2770,17 +2643,14 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
-#| msgid ""
-#| "Why not call the system &ldquo;Linux&rdquo; anyway, and strengthen Linus "
-#| "Torvalds' role as posterboy for our community?"
 msgid ""
 "Why not call the system &ldquo;Linux&rdquo; anyway, and strengthen Linus "
 "Torvalds' role as posterboy for our community? <span class=\"anchor-"
 "reference-id\">(<a href=\"#helplinus\">#helplinus</a>)</span>"
 msgstr ""
 "Зашто да и поред свега не називамо систем 
„Линуксом“ и тако ојачамо улогу "
-"Линуса Торвалдса као маскоте наше 
заједнице? <span class=\"anchor-"
-"reference-id\">(<a href=\"#helplinus\">#helplinus</a>)</span>"
+"Линуса Торвалдса као маскоте наше 
заједнице? <span class=\"anchor-reference-"
+"id\">(<a href=\"#helplinus\">#helplinus</a>)</span>"
 
 # type: Content of: <dl><dd>
 #. type: Content of: <dl><dd>
@@ -2873,12 +2743,6 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
-#| msgid ""
-#| "He recognized this at the beginning.  The earliest Linux release notes "
-#| "said, <a href=\"http://www.kernel.org/pub/linux/kernel/Historic/old-";
-#| "versions/RELNOTES-0.01\"> &ldquo;Most of the tools used with linux are "
-#| "GNU software and are under the GNU copyleft. These tools aren't in the "
-#| "distribution - ask me (or GNU)  for more info&rdquo;</a>."
 msgid ""
 "He recognized this at the beginning.  The earliest Linux release notes said, "
 "<a href=\"http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/";
@@ -2887,8 +2751,8 @@
 "me (or GNU)  for more info&rdquo;</a>."
 msgstr ""
 "Он је ово схватао у почетку. У његовим 
најранијим објавним белешкама је "
-"стајало: <a 
href=\"http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/";
-"RELNOTES-0.01\">„Већина алата који се користе уз 
Линукс су ГНУ-ов "
+"стајало: <a 
href=\"http://ftp.funet.fi/pub/linux/historical/kernel/old-";
+"versions/RELNOTES-0.01\">„Већина алата који се 
користе уз Линукс су ГНУ-ов "
 "софтвер, и они су под ГНУ-овим копилефтом. 
Ти алати нису у дистрибуцији. За "
 "више података се обратите мени или 
ГНУ-у</a>.“"
 
@@ -2917,17 +2781,14 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
-#| msgid ""
-#| "The battle is already lost&mdash;society has made its decision and we "
-#| "can't change it, so why even think about it?"
 msgid ""
 "The battle is already lost&mdash;society has made its decision and we can't "
 "change it, so why even think about it? <span class=\"anchor-reference-id\">"
 "(<a href=\"#lost\">#lost</a>)</span>"
 msgstr ""
 "Битка је већ изгубљена — друштво је 
одлучило и ми то не можемо променити. "
-"Зашто бисмо чак и помишљали на то? <span 
class=\"anchor-reference-id\">"
-"(<a href=\"#lost\">#lost</a>)</span>"
+"Зашто бисмо чак и помишљали на то? <span 
class=\"anchor-reference-id\">(<a "
+"href=\"#lost\">#lost</a>)</span>"
 
 # type: Content of: <dl><dd>
 #. type: Content of: <dl><dd>
@@ -2947,17 +2808,14 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
-#| msgid ""
-#| "Society has made its decision and we can't change it, so what good does "
-#| "it do if I say &ldquo;GNU/Linux&rdquo;?"
 msgid ""
 "Society has made its decision and we can't change it, so what good does it "
 "do if I say &ldquo;GNU/Linux&rdquo;? <span class=\"anchor-reference-id\">(<a "
 "href=\"#whatgood\">#whatgood</a>)</span>"
 msgstr ""
 "Друштво је одлучило и ми то не можемо 
променити. Шта би променило уколико "
-"бих говорио „ГНУ са Линуксом“? <span 
class=\"anchor-reference-id\">(<a "
-"href=\"#whatgood\">#whatgood</a>)</span>"
+"бих говорио „ГНУ са Линуксом“? <span 
class=\"anchor-reference-id\">(<a href="
+"\"#whatgood\">#whatgood</a>)</span>"
 
 # type: Content of: <dl><dd>
 #. type: Content of: <dl><dd>
@@ -2981,17 +2839,14 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
-#| msgid ""
-#| "Wouldn't it be better to call the system &ldquo;Linux&rdquo; and teach "
-#| "people its real origin with a ten-minute explanation?"
 msgid ""
 "Wouldn't it be better to call the system &ldquo;Linux&rdquo; and teach "
 "people its real origin with a ten-minute explanation? <span class=\"anchor-"
 "reference-id\">(<a href=\"#explain\">#explain</a>)</span>"
 msgstr ""
 "Зар не би било боље звати систем „Линукс“ 
и подучавати људе о његовом правом "
-"пореклу десетоминутним објашњењем? <span 
class=\"anchor-"
-"reference-id\">(<a href=\"#explain\">#explain</a>)</span>"
+"пореклу десетоминутним објашњењем? <span 
class=\"anchor-reference-id\">(<a "
+"href=\"#explain\">#explain</a>)</span>"
 
 # type: Content of: <dl><dd>
 #. type: Content of: <dl><dd>
@@ -3037,17 +2892,14 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
-#| msgid ""
-#| "Some people laugh at you when you ask them to call the system GNU/Linux.  "
-#| "Why do you subject yourself to this treatment?"
 msgid ""
 "Some people laugh at you when you ask them to call the system GNU/Linux.  "
 "Why do you subject yourself to this treatment? <span class=\"anchor-"
 "reference-id\">(<a href=\"#treatment\">#treatment</a>)</span>"
 msgstr ""
 "Неки људи се смеју када их замолите да 
називају систем ГНУ-ом са Линуксом. "
-"Зашто се излагати томе? <span class=\"anchor-"
-"reference-id\">(<a href=\"#treatment\">#treatment</a>)</span>"
+"Зашто се излагати томе? <span 
class=\"anchor-reference-id\">(<a href="
+"\"#treatment\">#treatment</a>)</span>"
 
 # type: Content of: <dl><dd>
 #. type: Content of: <dl><dd>
@@ -3090,17 +2942,14 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
-#| msgid ""
-#| "Some people condemn you when you ask them to call the system GNU/Linux.  "
-#| "Don't you lose by alienating them?"
 msgid ""
 "Some people condemn you when you ask them to call the system GNU/Linux.  "
 "Don't you lose by alienating them? <span class=\"anchor-reference-id\">(<a "
 "href=\"#alienate\">#alienate</a>)</span>"
 msgstr ""
 "Неки људи вас отписују када их замолите да 
називају систем ГНУ-ом са "
-"Линуксом. Зар отуђивање од њих не 
представља губитак? <span class=\"anchor-reference-id\">(<a "
-"href=\"#alienate\">#alienate</a>)</span>"
+"Линуксом. Зар отуђивање од њих не 
представља губитак? <span class=\"anchor-"
+"reference-id\">(<a href=\"#alienate\">#alienate</a>)</span>"
 
 # type: Content of: <dl><dd>
 #. type: Content of: <dl><dd>
@@ -3134,15 +2983,13 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
-#| msgid ""
-#| "Whatever you contributed, is it legitimate to rename the operating system?"
 msgid ""
 "Whatever you contributed, is it legitimate to rename the operating system? "
 "<span class=\"anchor-reference-id\">(<a href=\"#rename\">#rename</a>)</span>"
 msgstr ""
 "Да ли је легитимно преименовати 
оперативни систем, без обзира на то чиме 
сте "
-"допринели? "
-"<span class=\"anchor-reference-id\">(<a href=\"#rename\">#rename</a>)</span>"
+"допринели? <span class=\"anchor-reference-id\">(<a 
href=\"#rename\">#rename</"
+"a>)</span>"
 
 # type: Content of: <dl><dd>
 #. type: Content of: <dl><dd>
@@ -3157,8 +3004,6 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
-#| msgid ""
-#| "Isn't it wrong to force people to call the system &ldquo;GNU/Linux&rdquo;?"
 msgid ""
 "Isn't it wrong to force people to call the system &ldquo;GNU/Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#force\">#force</a>)</span>"
@@ -3177,12 +3022,12 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
-#| msgid "Why not sue people who call the whole system &ldquo;Linux&rdquo;?"
 msgid ""
 "Why not sue people who call the whole system &ldquo;Linux&rdquo;? <span "
 "class=\"anchor-reference-id\">(<a href=\"#whynotsue\">#whynotsue</a>)</span>"
-msgstr "Зашто не тужити људе који називају цео 
систем „Линуксом“? <span "
-"class=\"anchor-reference-id\">(<a href=\"#whynotsue\">#whynotsue</a>)</span>"
+msgstr ""
+"Зашто не тужити људе који називају цео 
систем „Линуксом“? <span class="
+"\"anchor-reference-id\">(<a href=\"#whynotsue\">#whynotsue</a>)</span>"
 
 # type: Content of: <dl><dd>
 #. type: Content of: <dl><dd>
@@ -3197,17 +3042,14 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
-#| msgid ""
-#| "Shouldn't you put something in the GNU GPL to require people to call the "
-#| "system &ldquo;GNU&rdquo;?"
 msgid ""
 "Shouldn't you put something in the GNU GPL to require people to call the "
 "system &ldquo;GNU&rdquo;? <span class=\"anchor-reference-id\">(<a href="
 "\"#require\">#require</a>)</span>"
 msgstr ""
 "Зашто не ставите нешто у ГНУ-ову ОЈЛ што би 
захтевало да се систем назива "
-"„ГНУ-ом“? <span class=\"anchor-reference-id\">(<a href="
-"\"#require\">#require</a>)</span>"
+"„ГНУ-ом“? <span class=\"anchor-reference-id\">(<a href=\"#require"
+"\">#require</a>)</span>"
 
 # type: Content of: <dl><dd>
 #. type: Content of: <dl><dd>
@@ -3231,10 +3073,6 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
-#| msgid ""
-#| "Since you objected to the original BSD license's advertising requirement "
-#| "to give credit to the University of California, isn't it hypocritical to "
-#| "demand credit for the GNU project?"
 msgid ""
 "Since you objected to the original BSD license's advertising requirement to "
 "give credit to the University of California, isn't it hypocritical to demand "
@@ -3265,10 +3103,6 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
-#| msgid ""
-#| "Since you failed to put something in the GNU GPL to require people to "
-#| "call the system &ldquo;GNU&rdquo;, you deserve what happened; why are you "
-#| "complaining now?"
 msgid ""
 "Since you failed to put something in the GNU GPL to require people to call "
 "the system &ldquo;GNU&rdquo;, you deserve what happened; why are you "
@@ -3276,8 +3110,8 @@
 "\">#deserve</a>)</span>"
 msgstr ""
 "Пошто нисте ставили нешто у ГНУ-ову ОЈЛ 
што би захтевало да се систем назива "
-"„ГНУ-ом“, заслужили сте оно што вам се 
десило. Што се сада жалите? <span 
class=\"anchor-reference-id\">(<a href=\"#deserve"
-"\">#deserve</a>)</span>"
+"„ГНУ-ом“, заслужили сте оно што вам се 
десило. Што се сада жалите? <span "
+"class=\"anchor-reference-id\">(<a href=\"#deserve\">#deserve</a>)</span>"
 
 # type: Content of: <dl><dd>
 #. type: Content of: <dl><dd>
@@ -3301,15 +3135,14 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
-#| msgid ""
-#| "Wouldn't you be better off not contradicting what so many people believe?"
 msgid ""
 "Wouldn't you be better off not contradicting what so many people believe? "
 "<span class=\"anchor-reference-id\">(<a href=\"#contradict\">#contradict</a>)"
 "</span>"
-msgstr "Зар вам не би било боље да се не 
супротстављате ставу толиких људи? "
-"<span class=\"anchor-reference-id\">(<a href=\"#contradict\">#contradict</a>)"
-"</span>"
+msgstr ""
+"Зар вам не би било боље да се не 
супротстављате ставу толиких људи? <span "
+"class=\"anchor-reference-id\">(<a href=\"#contradict\">#contradict</a>)</"
+"span>"
 
 # type: Content of: <dl><dd>
 #. type: Content of: <dl><dd>
@@ -3333,17 +3166,14 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
-#| msgid ""
-#| "Since many people call it &ldquo;Linux&rdquo;, doesn't that make it right?"
 msgid ""
 "Since many people call it &ldquo;Linux&rdquo;, doesn't that make it right? "
 "<span class=\"anchor-reference-id\">(<a href=\"#somanyright\">#somanyright</"
 "a>)</span>"
 msgstr ""
 "Пошто има доста људи који називају систем 
„Линуксом“, зар то не значи да је "
-"то исправно? "
-"<span class=\"anchor-reference-id\">(<a href=\"#somanyright\">#somanyright</"
-"a>)</span>"
+"то исправно? <span class=\"anchor-reference-id\">(<a 
href=\"#somanyright"
+"\">#somanyright</a>)</span>"
 
 # type: Content of: <dl><dd>
 #. type: Content of: <dl><dd>
@@ -3351,6 +3181,7 @@
 msgstr "Ми не сматрамо да популарност грешку 
претвара у истину."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "Isn't it better to call the system by the name most users already know? "
 "<span class=\"anchor-reference-id\">(<a href=\"#knownname\">#somanyright</a>)"
@@ -3367,10 +3198,6 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
-#| msgid ""
-#| "Many people care about what's convenient or who's winning, not about "
-#| "arguments of right or wrong.  Couldn't you get more of their support by a "
-#| "different road?"
 msgid ""
 "Many people care about what's convenient or who's winning, not about "
 "arguments of right or wrong.  Couldn't you get more of their support by a "
@@ -3378,8 +3205,8 @@
 "\">#winning</a>)</span>"
 msgstr ""
 "Многим људима је битно само шта је 
згодније или ко је победник, а не шта је "
-"исправно. Зар не бисте задобили више 
подршке другачијим приступом? <span 
class=\"anchor-reference-id\">(<a href=\"#winning"
-"\">#winning</a>)</span>"
+"исправно. Зар не бисте задобили више 
подршке другачијим приступом? <span "
+"class=\"anchor-reference-id\">(<a href=\"#winning\">#winning</a>)</span>"
 
 # type: Content of: <dl><dd>
 #. type: Content of: <dl><dd>
@@ -3462,8 +3289,8 @@
 "panel of your PO editor (or above the msgid if you are using a simple text "
 "editor). All the Serbian POs need to be treated similarly; this can be done "
 "by simply modifying the two variants of this string in a master compendium "
-"(to be created). If you need any technical help, please contact "
-"address@hidden"
+"(to be created). If you need any technical help, please contact web-"
+"address@hidden"
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>

Index: gnu/po/gnu-users-never-heard-of-gnu.sr.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-users-never-heard-of-gnu.sr.po,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- gnu/po/gnu-users-never-heard-of-gnu.sr.po   2 Dec 2014 10:53:04 -0000       
1.17
+++ gnu/po/gnu-users-never-heard-of-gnu.sr.po   2 Dec 2014 11:01:44 -0000       
1.18
@@ -49,9 +49,9 @@
 "\">Linux and the GNU Project</a>."
 msgstr ""
 "Да бисте научили више о овој теми, можете 
прочитати <a href=\"/gnu/gnu-linux-"
-"faq.html\">ГНУ са Линуксом ЧПП (Честа 
Постављана Питања)</a>, страну <a "
-"href=\"/gnu/why-gnu-linux.html\">Зашто ГНУ са Линуксом?</a> 
и нашу страну "
-"о  <a href=\"/gnu/linux-and-gnu.html\">Линукс и Пројекат 
ГНУ</a>."
+"faq.html\">ГНУ са Линуксом ЧПП (Честа 
Постављана Питања)</a>, страну <a href="
+"\"/gnu/why-gnu-linux.html\">Зашто ГНУ са Линуксом?</a> и 
нашу страну о  <a "
+"href=\"/gnu/linux-and-gnu.html\">Линукс и Пројекат ГНУ</a>."
 
 # type: Content of: <p>
 #. type: Content of: <p>
@@ -183,8 +183,8 @@
 "panel of your PO editor (or above the msgid if you are using a simple text "
 "editor). All the Serbian POs need to be treated similarly; this can be done "
 "by simply modifying the two variants of this string in a master compendium "
-"(to be created). If you need any technical help, please contact "
-"address@hidden"
+"(to be created). If you need any technical help, please contact web-"
+"address@hidden"
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>

Index: gnu/po/gnu.sr.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu.sr.po,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- gnu/po/gnu.sr.po    2 Dec 2014 10:53:04 -0000       1.25
+++ gnu/po/gnu.sr.po    2 Dec 2014 11:01:44 -0000       1.26
@@ -20,12 +20,8 @@
 
 # type: Content of: <title>
 #. type: Content of: <title>
-#| msgid ""
-#| "About the GNU Operating System - GNU project - Free Software Foundation "
-#| "(FSF)"
 msgid "The GNU Operating System - GNU project - Free Software Foundation"
-msgstr ""
-"Оперативни систем ГНУ – Пројекат ГНУ – 
Задужбина за слободни софтвер"
+msgstr "Оперативни систем ГНУ – Пројекат ГНУ 
– Задужбина за слободни софтвер"
 
 #. type: Content of: <style>
 #, no-wrap
@@ -72,7 +68,6 @@
 
 # type: Content of: <h2>
 #. type: Content of: <h2>
-#| msgid "About the GNU Operating System"
 msgid "The GNU Operating System"
 msgstr "Оперативни систем ГНУ"
 
@@ -90,7 +85,6 @@
 
 # type: Content of: <body><div><div>
 #. type: Content of: <blockquote><p>
-#| msgid "</a>"
 msgid "</a>"
 msgstr "</a>"
 
@@ -151,20 +145,6 @@
 
 # type: Content of: <ul><li>
 #. type: Content of: <ul><li>
-#| msgid ""
-#| "<a href=\"http://query.nytimes.com/gst/fullpage.html?";
-#| "res=950DEFDE123AF932A25752C0A96F948260&amp;sec=&amp;spon=&amp;"
-#| "pagewanted=1\"> One Man's Fight for Free Software</a>, an article about "
-#| "Richard Stallman and the early GNU development, published at <cite>The "
-#| "New York Times</cite> on January 11, 1989"
-#| "One problem with the article is that it uses the propaganda term &ldquo;"
-#| "intellectual property&rdquo; as if that referred to something coherent.  "
-#| "The term is such a confusion that talking about it <a href=\"/philosophy/"
-#| "not-ipr.html\">makes no sense</a>."
-#| "The article is somewhat confused in regard to Symbolics.  What Stallman "
-#| "did, while still working at MIT, was to write, independently, replacement "
-#| "improvements comparable to the improvements that Symbolics made in its "
-#| "version of the MIT Lisp Machine System."
 msgid ""
 "<a href=\"http://query.nytimes.com/gst/fullpage.html?";
 "res=950DEFDE123AF932A25752C0A96F948260&amp;sec=&amp;spon=&amp;"
@@ -183,15 +163,14 @@
 "res=950DEFDE123AF932A25752C0A96F948260&amp;sec=&amp;spon=&amp;"
 "pagewanted=1\"> Борба једног човека за слободни 
софтвер</a>, чланак о "
 "Ричарду Сталману и раном развоју ГНУ-а, 
који је објављен у <cite>Њу Јорк "
-"тајмсу</cite> 11. јануара 1989. "
-"Један од проблема у вези са овим чланком 
је то што он користи пропагандни "
-"израз „интелектуална својина“ као да он 
означава нешто јединствено. Овај "
-"израз је толико збуњујући да чак и 
разговор о њему <a href=\"/philosophy/"
-"not-ipr.html\">нема смисла</a>."
-"Овај чланак је донекле конфузан што се 
тиче Симболике. Оно што је Сталман "
-"урадио док је још радио у МИТ-у је да је 
независно од других написао "
-"замене за побољшања које су упоредиве са 
побољшањима која је направила "
-"Симболика у њеној верзији МИТ-овог 
система „Лисп машина“."
+"тајмсу</cite> 11. јануара 1989. Један од проблема 
у вези са овим чланком је "
+"то што он користи пропагандни израз 
„интелектуална својина“ као да он "
+"означава нешто јединствено. Овај израз је 
толико збуњујући да чак и разговор "
+"о њему <a href=\"/philosophy/not-ipr.html\">нема 
смисла</a>.Овај чланак је "
+"донекле конфузан што се тиче Симболике. 
Оно што је Сталман урадио док је још "
+"радио у МИТ-у је да је независно од других 
написао замене за побољшања које "
+"су упоредиве са побољшањима која је 
направила Симболика у њеној верзији МИТ-"
+"овог система „Лисп машина“."
 
 #. type: Content of: <ul><li>
 msgid ""
@@ -201,7 +180,6 @@
 
 # type: Content of: <h2>
 #. type: Content of: <h3>
-#| msgid "<a name=\"gnulinux\"></a>GNU and Linux"
 msgid "<a id=\"gnulinux\"></a>GNU and Linux"
 msgstr "<a id=\"gnulinux\"></a>ГНУ и Линукс"
 
@@ -210,8 +188,7 @@
 msgid ""
 "<a href=\"/gnu/linux-and-gnu.html\">The relationship between GNU and Linux</"
 "a>"
-msgstr ""
-"<a href=\"/gnu/linux-and-gnu.html\">Веза између ГНУ-а и 
Линукса</a>"
+msgstr "<a href=\"/gnu/linux-and-gnu.html\">Веза између ГНУ-а и 
Линукса</a>"
 
 # type: Content of: <ul><li>
 #. type: Content of: <ul><li>
@@ -238,7 +215,6 @@
 
 # type: Content of: <h2>
 #. type: Content of: <h3>
-#| msgid "<a name=\"misc\"></a>Other GNU-related resources"
 msgid "<a id=\"misc\"></a>Other GNU-related resources"
 msgstr "<a id=\"misc\"></a>Други ресурси у вези са 
ГНУ-ом"
 
@@ -299,8 +275,8 @@
 "panel of your PO editor (or above the msgid if you are using a simple text "
 "editor). All the Serbian POs need to be treated similarly; this can be done "
 "by simply modifying the two variants of this string in a master compendium "
-"(to be created). If you need any technical help, please contact "
-"address@hidden"
+"(to be created). If you need any technical help, please contact web-"
+"address@hidden"
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>

Index: gnu/po/linux-and-gnu.sr.po
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.sr.po,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- gnu/po/linux-and-gnu.sr.po  2 Dec 2014 10:53:04 -0000       1.32
+++ gnu/po/linux-and-gnu.sr.po  2 Dec 2014 11:01:45 -0000       1.33
@@ -19,7 +19,6 @@
 
 # type: Content of: <title>
 #. type: Content of: <title>
-#| msgid "Linux and GNU - GNU Project - Free Software Foundation (FSF)"
 msgid "Linux and GNU - GNU Project - Free Software Foundation"
 msgstr "Линукс и ГНУ — Пројекат ГНУ — 
Задужбина за слободни софтвер"
 
@@ -79,12 +78,12 @@
 "history.html\">GNU Project</a>."
 msgstr ""
 "Многи корисници рачунара свакодневно 
користе измењену верзију <a href=\"/"
-"philosophy/categories.html#TheGNUsystem\">система ГНУ</a>, а да 
тога нису "
-"ни свесни. Захваљујући чудном сплету 
околности, верзија ГНУ-а која је данас "
+"philosophy/categories.html#TheGNUsystem\">система ГНУ</a>, а да 
тога нису ни "
+"свесни. Захваљујући чудном сплету 
околности, верзија ГНУ-а која је данас "
 "веома распрострањена се често назива 
„Линуксом“, а многи корисници <a href="
 "\"/gnu/gnu-users-never-heard-of-gnu.html\">нису ни свесни</a> 
да је она у "
-"основи систем ГНУ, кога изграђује <a 
href=\"/gnu/gnu-history.html"
-"\">Пројекат ГНУ</a>."
+"основи систем ГНУ, кога изграђује <a 
href=\"/gnu/gnu-history.html\">Пројекат "
+"ГНУ</a>."
 
 # type: Content of: <p>
 #. type: Content of: <p>
@@ -154,13 +153,13 @@
 "for the GNU system. By the time Linux was started, GNU was almost finished."
 msgstr ""
 "То што су открили није било случајно — то 
је био тада још недовршен систем "
-"ГНУ. Доступан <a 
href=\"/philosophy/free-sw.html\">слободни софтвер</a> "
-"је допунио систем, јер је у оквиру 
Пројекта ГНУ од 1984. развијан такав, "
-"потпун систем. <a 
href=\"/gnu/manifesto.html\">Манифестом ГНУ-а</a> је "
-"зацртан циљ — развој слободног 
униксоликог система, који се зове ГНУ. <a "
-"href=\"/gnu/initial-announcement.html\">Првобитна најава</a> 
Пројекта ГНУ "
-"такође илуструје неке од првобитних 
планова за систем ГНУ. Цео систем је био "
-"скоро готов до времена када је започет 
Линукс."
+"ГНУ. Доступан <a 
href=\"/philosophy/free-sw.html\">слободни софтвер</a> је "
+"допунио систем, јер је у оквиру Пројекта 
ГНУ од 1984. развијан такав, потпун "
+"систем. <a href=\"/gnu/manifesto.html\">Манифестом 
ГНУ-а</a> је зацртан циљ "
+"— развој слободног униксоликог система, 
који се зове ГНУ. <a href=\"/gnu/"
+"initial-announcement.html\">Првобитна најава</a> 
Пројекта ГНУ такође "
+"илуструје неке од првобитних планова за 
систем ГНУ. Цео систем је био скоро "
+"готов до времена када је започет Линукс."
 
 # type: Content of: <p>
 #. type: Content of: <p>
@@ -358,8 +357,8 @@
 "често називају „дистрибуцијама“). Већина 
њих садржи неслободни софтвер. "
 "Њихови градитељи прате филозофију која се 
повезује са Линуксом, а не ГНУ-ову "
 "филозофију. Али, постоје и <a 
href=\"/distros\">потпуно слободне "
-"дистрибуције ГНУ-а са Линуксом</a>. ЗСС 
обезбеђује рачунарске ресурс "
-"<a href=\"http://gnewsense.org/\";><em>gNewSense</em>-у</a>."
+"дистрибуције ГНУ-а са Линуксом</a>. ЗСС 
обезбеђује рачунарске ресурс <a href="
+"\"http://gnewsense.org/\";><em>gNewSense</em>-у</a>."
 
 # type: Content of: <p>
 #. type: Content of: <p>
@@ -397,13 +396,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "If you want to make a link on &ldquo;GNU/Linux&rdquo; for further "
-#| "reference, this page and <a href=\"/gnu/the-gnu-project.html\"> http://";
-#| "www.gnu.org/gnu/the-gnu-project.html</a> are good choices.  If you "
-#| "mention Linux, the kernel, and want to add a link for further reference, "
-#| "<a href=\"http://foldoc.doc.ic.ac.uk/foldoc/foldoc.cgi?Linux\";> http://";
-#| "foldoc.doc.ic.ac.uk/foldoc/foldoc.cgi?Linux</a> is a good URL to use."
 msgid ""
 "If you want to make a link on &ldquo;GNU/Linux&rdquo; for further reference, "
 "this page and <a href=\"/gnu/the-gnu-project.html\"> http://www.gnu.org/gnu/";
@@ -415,8 +407,7 @@
 "Линуксом“, добри избори су ова страница и 
страница <a href=\"/gnu/the-gnu-"
 "project.html\">http://www.gnu.org/gnu/the-gnu-project.html</a>. 
Уколико "
 "помињете само језгро Линукс, и желите да 
поменете везу за даље информације, "
-"добар УРЛ је <a href=\"http://";
-"foldoc.org/linux\">http://foldoc.org/linux</a>."
+"добар УРЛ је <a 
href=\"http://foldoc.org/linux\";>http://foldoc.org/linux</a>."
 
 # type: Content of: <p>
 #. type: Content of: <p>
@@ -465,11 +456,6 @@
 
 # type: Content of: <ol><li>
 #. type: Content of: <ol><li>
-#| msgid ""
-#| "<a id=\"unexciting\"></a>These unexciting but essential components "
-#| "include the GNU assembler, GAS and the linker, GLD, both are now part of "
-#| "the <a href=\"/software/binutils/\">GNU Binutils</a> package, <a href=\"/"
-#| "software/tar/\">GNU tar</a>, and more."
 msgid ""
 "<a id=\"unexciting\"></a>These unexciting but essential components include "
 "the GNU assembler (GAS) and the linker (GLD), both are now part of the <a "
@@ -603,8 +589,8 @@
 "panel of your PO editor (or above the msgid if you are using a simple text "
 "editor). All the Serbian POs need to be treated similarly; this can be done "
 "by simply modifying the two variants of this string in a master compendium "
-"(to be created). If you need any technical help, please contact "
-"address@hidden"
+"(to be created). If you need any technical help, please contact web-"
+"address@hidden"
 
 #. type: Content of: <div><p>
 #, fuzzy

Index: gnu/po/manifesto.sr.po
===================================================================
RCS file: /web/www/www/gnu/po/manifesto.sr.po,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- gnu/po/manifesto.sr.po      2 Dec 2014 10:53:04 -0000       1.25
+++ gnu/po/manifesto.sr.po      2 Dec 2014 11:01:45 -0000       1.26
@@ -19,7 +19,6 @@
 
 # type: Content of: <title>
 #. type: Content of: <title>
-#| msgid "The GNU Manifesto - GNU Project - Free Software Foundation (FSF)"
 msgid "The GNU Manifesto - GNU Project - Free Software Foundation"
 msgstr "Манифест ГНУ-а — Пројекат ГНУ — 
Задужбина за слободни софтвер"
 
@@ -61,12 +60,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "For up-to-date information about the available GNU software, please see "
-#| "the information available on our <a href=\"/home.html\">web server</a>, "
-#| "in particular our <a href=\"/software/software.html\">list of software</"
-#| "a>.  For how to contribute, see <a href=\"/help/\">http://www.gnu.org/";
-#| "help</a>."
 msgid ""
 "For up-to-date information about the available GNU software, please see the "
 "information available on our <a href=\"/home.html\">web server</a>, in "
@@ -87,12 +80,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "GNU, which stands for Gnu's Not Unix, is the name for the complete Unix-"
-#| "compatible software system which I am writing so that I can give it away "
-#| "free to everyone who can use it. <a href=\"#f1\">(1)</a> Several other "
-#| "volunteers are helping me.  Contributions of time, money, programs and "
-#| "equipment are greatly needed."
 msgid ""
 "GNU, which stands for Gnu's Not Unix, is the name for the complete Unix-"
 "compatible software system which I am writing so that I can give it away "
@@ -186,9 +173,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "To avoid horrible confusion, please pronounce the &lsquo;G&rsquo; in the "
-#| "word &lsquo;GNU&rsquo; when it is the name of this project."
 msgid ""
 "To avoid horrible confusion, please pronounce the <em>g</em> in the word "
 "&ldquo;GNU&rdquo; when it is the name of this project."
@@ -204,16 +188,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "I consider that the golden rule requires that if I like a program I must "
-#| "share it with other people who like it.  Software sellers want to divide "
-#| "the users and conquer them, making each user agree not to share with "
-#| "others.  I refuse to break solidarity with other users in this way.  I "
-#| "cannot in good conscience sign a nondisclosure agreement or a software "
-#| "license agreement.  For years I worked within the Artificial Intelligence "
-#| "Lab to resist such tendencies and other inhospitalities, but eventually "
-#| "they had gone too far: I could not remain in an institution where such "
-#| "things are done for me against my will."
 msgid ""
 "I consider that the Golden Rule requires that if I like a program I must "
 "share it with other people who like it.  Software sellers want to divide the "
@@ -368,12 +342,12 @@
 "<a href=\"/help/help.html\">the guide to helping the GNU operating system</"
 "a>.)"
 msgstr ""
-"(У данашње време, да бисте видели списак 
задатака на којима можете "
-"радити, погледајте <a href=\"http://fsf.org/";
-"campaigns/priority-projects\">http://fsf.org/campaigns/priority-projects</"
-"a> и <a "
-"href=\"http://savannah.gnu.org/people/?type_id=1\";>http://savannah.gnu.org/people/?type_id=1</a>.
 За друге начине на које можете помоћи, "
-"погледајте <a 
href=\"/help/help.html\">http://www.gnu.org/help/help.html</a>.)"
+"(У данашње време, да бисте видели списак 
задатака на којима можете радити, "
+"погледајте <a 
href=\"http://fsf.org/campaigns/priority-projects\";>http://fsf.";
+"org/campaigns/priority-projects</a> и <a href=\"http://savannah.gnu.org/";
+"people/?type_id=1\">http://savannah.gnu.org/people/?type_id=1</a>. За 
друге "
+"начине на које можете помоћи, погледајте <a 
href=\"/help/help.html\">http://";
+"www.gnu.org/help/help.html</a>.)"
 
 # type: Content of: <p>
 #. type: Content of: <p>
@@ -399,20 +373,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "I have found very many programmers eager to contribute part-time work for "
-#| "GNU.  For most projects, such part-time distributed work would be very "
-#| "hard to coordinate; the independently-written parts would not work "
-#| "together.  But for the particular task of replacing Unix, this problem is "
-#| "absent.  A complete Unix system contains hundreds of utility programs, "
-#| "each of which is documented separately.  Most interface specifications "
-#| "are fixed by Unix compatibility.  If each contributor can write a "
-#| "compatible replacement for a single Unix utility, and make it work "
-#| "properly in place of the original on a Unix system, then these utilities "
-#| "will work right when put together.  Even allowing for Murphy to create a "
-#| "few unexpected problems, assembling these components will be a feasible "
-#| "task.  (The kernel will require closer communication and will be worked "
-#| "on by a small, tight group.)"
 msgid ""
 "I have found very many programmers eager to contribute part-time work for "
 "GNU.  For most projects, such part-time distributed work would be very hard "
@@ -647,14 +607,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "Such services could be provided by companies that sell just hand-holding "
-#| "and repair service.  If it is true that users would rather spend money "
-#| "and get a product with service, they will also be willing to buy the "
-#| "service having got the product free.  The service companies will compete "
-#| "in quality and price; users will not be tied to any particular one.  "
-#| "Meanwhile, those of us who don't need the service should be able to use "
-#| "the program without paying for the service."
 msgid ""
 "Such services could be provided by companies that sell just handholding and "
 "repair service.  If it is true that users would rather spend money and get a "
@@ -980,15 +932,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "The idea of copyright did not exist in ancient times, when authors "
-#| "frequently copied other authors at length in works of non-fiction.  This "
-#| "practice was useful, and is the only way many authors' works have "
-#| "survived even in part.  The copyright system was created expressly for "
-#| "the purpose of encouraging authorship.  In the domain for which it was "
-#| "invented&mdash;books, which could be copied economically only on a "
-#| "printing press&mdash;it did little harm, and did not obstruct most of the "
-#| "individuals who read the books."
 msgid ""
 "The idea of copyright did not exist in ancient times, when authors "
 "frequently copied other authors at length in works of nonfiction.  This "
@@ -1116,12 +1059,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "For more than ten years, many of the world's best programmers worked at "
-#| "the Artificial Intelligence Lab for far less money than they could have "
-#| "had anywhere else.  They got many kinds of non-monetary rewards: fame and "
-#| "appreciation, for example.  And creativity is also fun, a reward in "
-#| "itself."
 msgid ""
 "For more than ten years, many of the world's best programmers worked at the "
 "Artificial Intelligence Lab for far less money than they could have had "
@@ -1209,9 +1146,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "The sale of teaching, hand-holding and maintenance services could also "
-#| "employ programmers."
 msgid ""
 "The sale of teaching, handholding and maintenance services could also employ "
 "programmers."
@@ -1312,14 +1246,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "In the long run, making programs free is a step toward the post-scarcity "
-#| "world, where nobody will have to work very hard just to make a living.  "
-#| "People will be free to devote themselves to activities that are fun, such "
-#| "as programming, after spending the necessary ten hours a week on required "
-#| "tasks such as legislation, family counseling, robot repair and asteroid "
-#| "prospecting.  There will be no need to be able to make a living from "
-#| "programming."
 msgid ""
 "In the long run, making programs free is a step toward the postscarcity "
 "world, where nobody will have to work very hard just to make a living.  "
@@ -1364,20 +1290,6 @@
 
 # type: Content of: <ol><li>
 #. type: Content of: <ol><li>
-#| msgid ""
-#| "<a name=\"f1\"></a>The wording here was careless.  The intention was that "
-#| "nobody would have to pay for <b>permission</b> to use the GNU system.  "
-#| "But the words don't make this clear, and people often interpret them as "
-#| "saying that copies of GNU should always be distributed at little or no "
-#| "charge.  That was never the intent; later on, the manifesto mentions the "
-#| "possibility of companies providing the service of distribution for a "
-#| "profit.  Subsequently I have learned to distinguish carefully between "
-#| "&ldquo;free&rdquo; in the sense of freedom and &ldquo;free&rdquo; in the "
-#| "sense of price.  Free software is software that users have the freedom to "
-#| "distribute and change.  Some users may obtain copies at no charge, while "
-#| "others pay to obtain copies&mdash;and if the funds help support improving "
-#| "the software, so much the better.  The important thing is that everyone "
-#| "who has a copy has the freedom to cooperate with others in using it."
 msgid ""
 "The wording here was careless.  The intention was that nobody would have to "
 "pay for <b>permission</b> to use the GNU system.  But the words don't make "
@@ -1393,18 +1305,18 @@
 "important thing is that everyone who has a copy has the freedom to cooperate "
 "with others in using it."
 msgstr ""
-"Овде је избор речи био непажљив. Намера је 
била да нико "
-"неће морати да плати за <strong>дозволу</strong> 
да користи систем ГНУ-а. "
-"Али речи ово не стављају до знања, и људи их
 често интерпретирају као да "
-"неће морати или ће морати веома мало да 
плате за примерке ГНУ-а. Ово никад "
-"није била жељена замисао. Касније, 
манифест помиње могућност постојања фирми "
-"које нуде услугу расподеле зарад профита. 
Касније сам научио да пажљиво "
-"разликујем „слободно“ (енгл. <em>free</em>) у 
смислу слободе и "
-"„бесплатно“ (енгл. <em>free</em>) у смислу цене. 
Слободни софтвер је софтвер "
-"који корисници могу да расподељују и 
мењају. Неки корисници могу да добију "
-"примерке бесплатно, док други плаћају за 
добијање примерака, и ако плаћање "
-"помаже унапређењу софтвера, тим боље. 
Битно је да свако ко поседује примерак "
-"има слободу да сарађује у његовом 
коришћењу са другима."
+"Овде је избор речи био непажљив. Намера је 
била да нико неће морати да плати "
+"за <strong>дозволу</strong> да користи систем 
ГНУ-а. Али речи ово не "
+"стављају до знања, и људи их често 
интерпретирају као да неће морати или ће "
+"морати веома мало да плате за примерке 
ГНУ-а. Ово никад није била жељена "
+"замисао. Касније, манифест помиње 
могућност постојања фирми које нуде услугу 
"
+"расподеле зарад профита. Касније сам 
научио да пажљиво разликујем "
+"„слободно“ (енгл. <em>free</em>) у смислу 
слободе и „бесплатно“ (енгл. "
+"<em>free</em>) у смислу цене. Слободни софтвер је 
софтвер који корисници "
+"могу да расподељују и мењају. Неки 
корисници могу да добију примерке "
+"бесплатно, док други плаћају за добијање 
примерака, и ако плаћање помаже "
+"унапређењу софтвера, тим боље. Битно је да 
свако ко поседује примерак има "
+"слободу да сарађује у његовом коришћењу 
са другима."
 
 # type: Content of: <ol><li>
 #. type: Content of: <ol><li>
@@ -1418,59 +1330,43 @@
 
 # type: Content of: <ol><li>
 #. type: Content of: <ol><li>
-#| msgid ""
-#| "<a name=\"f2\"></a>This is another place I failed to distinguish "
-#| "carefully between the two different meanings of &ldquo;free&rdquo;.  The "
-#| "statement as it stands is not false&mdash;you can get copies of GNU "
-#| "software at no charge, from your friends or over the net.  But it does "
-#| "suggest the wrong idea."
 msgid ""
 "This is another place I failed to distinguish carefully between the two "
 "different meanings of &ldquo;free&rdquo;.  The statement as it stands is not "
 "false&mdash;you can get copies of GNU software at no charge, from your "
 "friends or over the net.  But it does suggest the wrong idea."
 msgstr ""
-"Ово је друго место на коме нисам пажљиво 
направио разлику "
-"између два различита значења речи 
„слободно“ (енгл. <em>free</em> = "
-"„слободно“ или „бесплатно“). Реченица 
таква каква је није погрешна — можете "
-"да набавите примерке ГНУ-овог софтвера 
бесплатно, од ваших пријатеља или "
-"преко мреже. Али она наводи на погрешан 
закључак."
+"Ово је друго место на коме нисам пажљиво 
направио разлику између два "
+"различита значења речи „слободно“ (енгл. 
<em>free</em> = „слободно“ или "
+"„бесплатно“). Реченица таква каква је 
није погрешна — можете да набавите "
+"примерке ГНУ-овог софтвера бесплатно, од 
ваших пријатеља или преко мреже. "
+"Али она наводи на погрешан закључак."
 
 # type: Content of: <ol><li>
 #. type: Content of: <ol><li>
-#| msgid "<a name=\"f3\"></a>Several such companies now exist."
 msgid "Several such companies now exist."
 msgstr "Данас постоји неколико таквих фирми."
 
 # type: Content of: <ol><li>
 #. type: Content of: <ol><li>
-#| msgid ""
-#| "<a name=\"f4\"></a>The Free Software Foundation for 10 years raised most "
-#| "of its funds from a distribution service, although it is a charity rather "
-#| "than a company.  You can <a href=\"/order/order.html\">order things from "
-#| "the FSF</a>."
 msgid ""
 "Although it is a charity rather than a company, the Free Software Foundation "
 "for 10 years raised most of its funds from its distribution service.  You "
 "can <a href=\"/order/order.html\">order things from the FSF</a> to support "
 "its work."
 msgstr ""
-"Задужбина за слободни софтвер се 10 година 
углавном "
-"финансира из службе за расподелу, иако је 
добротворна организација, а не "
-"фирма. Можете и да <a 
href=\"/order/order.html\">наручујете ствари од ЗСС-а</"
-"a>."
+"Задужбина за слободни софтвер се 10 година 
углавном финансира из службе за "
+"расподелу, иако је добротворна 
организација, а не фирма. Можете и да <a href="
+"\"/order/order.html\">наручујете ствари од ЗСС-а</a>."
 
 # type: Content of: <ol><li>
 #. type: Content of: <ol><li>
-#| msgid ""
-#| "<a name=\"f5\"></a>A group of computer companies pooled funds around 1991 "
-#| "to support maintenance of the GNU C Compiler."
 msgid ""
 "A group of computer companies pooled funds around 1991 to support "
 "maintenance of the GNU C Compiler."
 msgstr ""
-"Неколико рачунарских фирми је 1991. 
спонзорисало "
-"одржавање ГНУ-овог преводиоца за Це."
+"Неколико рачунарских фирми је 1991. 
спонзорисало одржавање ГНУ-овог "
+"преводиоца за Це."
 
 #. type: Content of: <ol><li>
 msgid ""
@@ -1486,17 +1382,6 @@
 
 # type: Content of: <ol><li>
 #. type: Content of: <ol><li>
-#| msgid ""
-#| "<a name=\"f6\"></a>In the 80s I had not yet realized how confusing it was "
-#| "to speak of &ldquo;the issue&rdquo; of &ldquo;intellectual "
-#| "property&rdquo;.  That term is obviously biased; more subtle is the fact "
-#| "that it lumps together various disparate laws which raise very different "
-#| "issues.  Nowadays I urge people to reject the term &ldquo;intellectual "
-#| "property&rdquo; entirely, lest it lead others to suppose that those laws "
-#| "form one coherent issue.  The way to be clear is to discuss patents, "
-#| "copyrights, and trademarks separately.  See <a href=\"/philosophy/not-ipr."
-#| "html\">further explanation</a> of how this term spreads confusion and "
-#| "bias."
 msgid ""
 "In the 1980s I had not yet realized how confusing it was to speak of &ldquo;"
 "the issue&rdquo; of &ldquo;intellectual property&rdquo;.  That term is "
@@ -1508,25 +1393,18 @@
 "href=\"/philosophy/not-ipr.html\">further explanation</a> of how this term "
 "spreads confusion and bias."
 msgstr ""
-"Осамдесетих још увек нисам схватао колико 
је збуњујуће "
-"говорити о „питању“ „интелектуалне 
својине“. Тај израз је очито настао из "
-"предрасуде. Чињеница да он изједначава 
многе различите законе, који покрећу "
-"сасвим различита питања, је тананија. Сада 
свима тражим да у потпуности "
-"одбаце израз „интелектуална својина“, 
како не би некога навели да закључе да "
-"ови закони чине једно целовито питање. 
Начин на који се може бити јаснији је "
-"да се о патентима, ауторским правима и 
робним маркама расправља одвојено. "
+"Осамдесетих још увек нисам схватао колико 
је збуњујуће говорити о "
+"„питању“ „интелектуалне својине“. Тај 
израз је очито настао из предрасуде. "
+"Чињеница да он изједначава многе 
различите законе, који покрећу сасвим "
+"различита питања, је тананија. Сада свима 
тражим да у потпуности одбаце "
+"израз „интелектуална својина“, како не 
би некога навели да закључе да ови "
+"закони чине једно целовито питање. Начин 
на који се може бити јаснији је да "
+"се о патентима, ауторским правима и робним 
маркама расправља одвојено. "
 "Погледајте <a href=\"/philosophy/not-ipr.html\">даље 
објашњење</a> начина на "
 "који овај израз шири конфузију и 
двосмисленост."
 
 # type: Content of: <ol><li>
 #. type: Content of: <ol><li>
-#| msgid ""
-#| "<a name=\"f7\"></a>Subsequently we have learned to distinguish between "
-#| "&ldquo;free software&rdquo; and &ldquo;freeware&rdquo;.  The term &ldquo;"
-#| "freeware&rdquo; means software you are free to redistribute, but usually "
-#| "you are not free to study and change the source code, so most of it is "
-#| "not free software.  See <a href=\"/philosophy/words-to-avoid.html#Freeware"
-#| "\"> the Confusing Words and Phrases page</a> for more explanation."
 msgid ""
 "Subsequently we learned to distinguish between &ldquo;free software&rdquo; "
 "and &ldquo;freeware&rdquo;.  The term &ldquo;freeware&rdquo; means software "
@@ -1535,12 +1413,12 @@
 "href=\"/philosophy/words-to-avoid.html#Freeware\">Confusing Words and "
 "Phrases</a>&rdquo; for more explanation."
 msgstr ""
-"Накнадно смо научили да разликујемо 
„слободан софтвер“ и "
-"„фривер“. Израз „фривер“ означава 
софтвер који можете да поново "
-"расподељујете, али обично вам није 
дозвољено да га проучавате и мењате његов "
-"изворни код, па већина фривера није 
слободан софтвер. Погледајте <a href=\"/"
-"philosophy/words-to-avoid.html#Freeware\">страницу 
„збуњујуће речи и "
-"синтагме“</a> за више информација."
+"Накнадно смо научили да разликујемо 
„слободан софтвер“ и „фривер“. Израз "
+"„фривер“ означава софтвер који можете да 
поново расподељујете, али обично "
+"вам није дозвољено да га проучавате и 
мењате његов изворни код, па већина "
+"фривера није слободан софтвер. Погледајте 
<a href=\"/philosophy/words-to-"
+"avoid.html#Freeware\">страницу „збуњујуће речи и 
синтагме“</a> за више "
+"информација."
 
 # type: Content of: <div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -1591,8 +1469,8 @@
 "panel of your PO editor (or above the msgid if you are using a simple text "
 "editor). All the Serbian POs need to be treated similarly; this can be done "
 "by simply modifying the two variants of this string in a master compendium "
-"(to be created). If you need any technical help, please contact "
-"address@hidden"
+"(to be created). If you need any technical help, please contact web-"
+"address@hidden"
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
@@ -1609,12 +1487,6 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
-#| msgid ""
-#| "Permission is granted to anyone to make or distribute verbatim copies of "
-#| "this document, in any medium, provided that the copyright notice and "
-#| "permission notice are preserved, and that the distributor grants the "
-#| "recipient permission for further redistribution as permitted by this "
-#| "notice.  <br /> Modified versions may not be made."
 msgid ""
 "Permission is granted to anyone to make or distribute verbatim copies of "
 "this document, in any medium, provided that the copyright notice and "

Index: gnu/po/why-gnu-linux.sr.po
===================================================================
RCS file: /web/www/www/gnu/po/why-gnu-linux.sr.po,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- gnu/po/why-gnu-linux.sr.po  2 Dec 2014 10:53:04 -0000       1.23
+++ gnu/po/why-gnu-linux.sr.po  2 Dec 2014 11:01:45 -0000       1.24
@@ -20,14 +20,11 @@
 
 # type: Content of: <title>
 #. type: Content of: <title>
-#| msgid "Why GNU/Linux? - GNU Project - Free Software Foundation (FSF)"
 msgid "Why GNU/Linux? - GNU Project - Free Software Foundation"
-msgstr ""
-"Зашто ГНУ са Линуксом - Пројекат ГНУ - 
Задужбина за слободан софтвер"
+msgstr "Зашто ГНУ са Линуксом - Пројекат ГНУ - 
Задужбина за слободан софтвер"
 
 # type: Content of: <h2>
 #. type: Content of: <h2>
-#| msgid "What's in a name?"
 msgid "What's in a Name?"
 msgstr "Шта је у имену?"
 
@@ -56,24 +53,14 @@
 "gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
 "a>."
 msgstr ""
-"Да научите више о овој теми, можете 
прочитати наша <a href=\"/gnu/gnu-"
-"linux-faq.html\">ГНУ са Линуксом ЧПП-а</a>, нашу 
страну о <a href=\"/gnu/"
-"linux-and-gnu.html\">Линуксу и Пројекту ГНУ</a> и 
нашу страну о <a href="
-"\"/gnu/gnu-users-never-heard-of-gnu.html\">ГНУ корисницима 
који никада "
-"нису чули о ГНУ</a>."
+"Да научите више о овој теми, можете 
прочитати наша <a href=\"/gnu/gnu-linux-"
+"faq.html\">ГНУ са Линуксом ЧПП-а</a>, нашу страну 
о <a href=\"/gnu/linux-and-"
+"gnu.html\">Линуксу и Пројекту ГНУ</a> и нашу 
страну о <a href=\"/gnu/gnu-"
+"users-never-heard-of-gnu.html\">ГНУ корисницима који 
никада нису чули о ГНУ</"
+"a>."
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "Names convey meanings; our choice of names determines the meaning of what "
-#| "we say.  An inappropriate name gives people the wrong idea.  A rose by "
-#| "any name would smell as sweet&mdash;but if you call it a pen, people will "
-#| "be rather disappointed when they try to write with it.  And if you call "
-#| "pens &ldquo;roses&rdquo;, people may not realize what they are good for.  "
-#| "If you call our operating system &ldquo;Linux&rdquo;, that conveys a "
-#| "mistaken idea of the system's origin, history, and purpose.  If you call "
-#| "it <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a>, that conveys "
-#| "(though not in detail) an accurate idea."
 msgid ""
 "Names convey meanings; our choice of names determines the meaning of what we "
 "say.  An inappropriate name gives people the wrong idea.  A rose by any "
@@ -90,9 +77,9 @@
 "мирисала слатко&mdash; али ако је назовете 
оловком, људи ће се поприлично "
 "разочарати ако покушају да пишу са њом. И 
ако назовете оловке &ldquo;"
 "ружама&rdquo;, људи можда неће схватити зашта 
су оне добре. Ако зовете наш "
-"оперативни систем Линуксом, то преноси 
погрешно значење о "
-"пореклу, историји, и сврси система. Ако га 
зовете <a href=\"/gnu/linux-and-"
-"gnu.html\">ГНУ са Линуксом</a>, то преноси тачну 
слику (мада не детаљну)."
+"оперативни систем Линуксом, то преноси 
погрешно значење о пореклу, историји, "
+"и сврси система. Ако га зовете <a 
href=\"/gnu/linux-and-gnu.html\">ГНУ са "
+"Линуксом</a>, то преноси тачну слику (мада 
не детаљну)."
 
 # type: Content of: <p>
 #. type: Content of: <p>
@@ -121,16 +108,12 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "When I explain why it's appropriate to call the operating system &ldquo;"
-#| "GNU/Linux&rdquo; rather than &ldquo;Linux&rdquo;, people sometimes "
-#| "respond this way:"
 msgid ""
 "When I explain why it's appropriate to call the operating system GNU/Linux "
 "rather than Linux, people sometimes respond this way:"
 msgstr ""
-"Када ја објашњавам зашто је примереније 
звати оперативни систем ГНУ "
-"са Линуксом него Линуксом, људи понекад 
одговоре овако:"
+"Када ја објашњавам зашто је примереније 
звати оперативни систем ГНУ са "
+"Линуксом него Линуксом, људи понекад 
одговоре овако:"
 
 # type: Content of: <blockquote><p>
 #. type: Content of: <blockquote><p>
@@ -159,8 +142,8 @@
 "одрађен и да је време за опуштање. Да је 
само то истина! Али изазови су "
 "многи, и ово није време да се будућност 
олако схвати. Снага наше заједнице "
 "је у посвећености слободи и сарадњи. 
Коришћење имена <a href=\"/gnu/linux-"
-"and-gnu.html\">ГНУ са Линуксом</a> је начин да људи 
подсете сами себе и "
-"да информишу друге о овим циљевима."
+"and-gnu.html\">ГНУ са Линуксом</a> је начин да људи 
подсете сами себе и да "
+"информишу друге о овим циљевима."
 
 # type: Content of: <p>
 #. type: Content of: <p>
@@ -190,16 +173,16 @@
 #. type: Content of: <p>
 #, fuzzy
 #| msgid ""
-#| "A great challenge to the future of free software comes from the "
-#| "tendency of the &ldquo;Linux&rdquo; distribution companies to add "
-#| "non-free software to <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> "
-#| "in the name of convenience and power.  All the major commercial "
-#| "distribution developers do this; none produces a distribution that is "
-#| "entirely free.  Most of them do not clearly identify the non-free "
-#| "packages in their distributions.  Many even develop non-free software "
-#| "and add it to the system.  Some outrageously advertise "
-#| "&ldquo;Linux&rdquo; systems that are &ldquo;licensed per seat&rdquo;, "
-#| "which give the user as much freedom as Microsoft Windows."
+#| "A great challenge to the future of free software comes from the tendency "
+#| "of the &ldquo;Linux&rdquo; distribution companies to add non-free "
+#| "software to <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> in the name "
+#| "of convenience and power.  All the major commercial distribution "
+#| "developers do this; none produces a distribution that is entirely free.  "
+#| "Most of them do not clearly identify the non-free packages in their "
+#| "distributions.  Many even develop non-free software and add it to the "
+#| "system.  Some outrageously advertise &ldquo;Linux&rdquo; systems that are "
+#| "&ldquo;licensed per seat&rdquo;, which give the user as much freedom as "
+#| "Microsoft Windows."
 msgid ""
 "A great challenge to the future of free software comes from the tendency of "
 "the &ldquo;Linux&rdquo; distribution companies to add nonfree software to <a "
@@ -213,8 +196,8 @@
 msgstr ""
 "Велики изазов будућности слободног 
софтвера долази од тежње компаније &ldquo;"
 "Линукс&rdquo; дистрибуција да додају 
не-слободан софтвер <a href=\"/gnu/"
-"linux-and-gnu.html\">ГНУ-у са Линуксом</a> због 
једноставности и моћи.  "
-"Сви главни комерцијални ствараоци 
дистрибуција раде то; нико не прави "
+"linux-and-gnu.html\">ГНУ-у са Линуксом</a> због 
једноставности и моћи.  Сви "
+"главни комерцијални ствараоци 
дистрибуција раде то; нико не прави "
 "дистрибуцију која је тотално слободна. 
Многи од њих не означе јасно не-"
 "слободне пакете у својим дистрибуцијама. 
Многи чак развијају не-слободан "
 "софтвер и додају га систему. Неки га 
безобразно рекламирају као &ldquo;"
@@ -223,16 +206,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "People justify adding non-free software in the name of the &ldquo;"
-#| "popularity of Linux&rdquo;&mdash;in effect, valuing popularity above "
-#| "freedom.  Sometimes this is openly admitted.  For instance, Wired "
-#| "Magazine says Robert McMillan, editor of Linux Magazine, &ldquo;feels "
-#| "that the move toward open source software should be fueled by technical, "
-#| "rather than political, decisions.&rdquo; And Caldera's <acronym title="
-#| "\"Chief Executive Officer\">CEO</acronym> openly urged users to drop the "
-#| "goal of freedom and work instead for the &ldquo;popularity of "
-#| "Linux&rdquo;."
 msgid ""
 "People try to justify adding nonfree software in the name of the &ldquo;"
 "popularity of Linux&rdquo;&mdash;in effect, valuing popularity above "
@@ -252,20 +225,12 @@
 "отвореног кода требао да се подстакне тех
ничким, пре него политичким, "
 "одлукама.&rdquo; И Колдерин <acronym title=\"Главни 
Извршни Директор\">ГИД</"
 "acronym> отворено подстиче кориснике да 
одустану од циља слободе и да уместо "
-"тога раде на &ldquo;популарности Линукса&rdquo;. 
 <a href=\"http://";
-"www.zdnet.com/stallman-love-is-not-free-3002091004/\"> (http://www.zdnet.com/";
-"stallman-love-is-not-free-3002091004/)  </a>"
+"тога раде на &ldquo;популарности Линукса&rdquo;. 
 <a href=\"http://www.zdnet.";
+"com/stallman-love-is-not-free-3002091004/\"> (http://www.zdnet.com/stallman-";
+"love-is-not-free-3002091004/)  </a>"
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "Adding non-free software to the <a href=\"/gnu/linux-and-gnu.html\">GNU/"
-#| "Linux</a> system may increase the popularity, if by popularity we mean "
-#| "the number of people using some of <a href=\"/gnu/linux-and-gnu.html"
-#| "\">GNU/Linux</a> in combination with non-free software.  But at the same "
-#| "time, it implicitly encourages the community to accept non-free software "
-#| "as a good thing, and forget the goal of freedom.  It is no use driving "
-#| "faster if you can't stay on the road."
 msgid ""
 "Adding nonfree software to the <a href=\"/gnu/linux-and-gnu.html\">GNU/"
 "Linux</a> system may increase the popularity, if by popularity we mean the "
@@ -277,10 +242,10 @@
 msgstr ""
 "Додавање не-слободног софтвера систему <a 
href=\"/gnu/linux-and-gnu.html"
 "\">ГНУ са Линуксом</a> би можда повећао 
популарност, ако би популарношћу "
-"сматрали број људи који користе неки <a 
href=\"/gnu/linux-and-gnu.html"
-"\">ГНУ са Линуксом</a> у комбинацији са 
не-слободним софтвером. Али у исто "
-"време, то имплицитно охрабрује заједницу 
да прихвати не-слободан софтвер као "
-"добру ствар, и да заборави слободу као циљ. 
Нема сврхе да возите брже ако не "
+"сматрали број људи који користе неки <a 
href=\"/gnu/linux-and-gnu.html\">ГНУ "
+"са Линуксом</a> у комбинацији са 
не-слободним софтвером. Али у исто време, "
+"то имплицитно охрабрује заједницу да прих
вати не-слободан софтвер као добру "
+"ствар, и да заборави слободу као циљ. Нема 
сврхе да возите брже ако не "
 "можете да останете на путу."
 
 # type: Content of: <p>
@@ -323,13 +288,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "If our community keeps moving in this direction, it could redirect the "
-#| "future of <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> into a mosaic "
-#| "of free and non-free components.  Five years from now, we will surely "
-#| "still have plenty of free software; but if we are not careful, it will "
-#| "hardly be usable without the non-free software that users expect to find "
-#| "with it.  If this happens, our campaign for freedom will have failed."
 msgid ""
 "If our community keeps moving in this direction, it could redirect the "
 "future of <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> into a mosaic of "
@@ -339,9 +297,9 @@
 "happens, our campaign for freedom will have failed."
 msgstr ""
 "Ако наша заједница настави да се креће у 
овом правцу, то би могло променити "
-"будућност <a href=\"/gnu/linux-and-gnu.html\">ГНУ-а са 
Линуксом</a> у "
-"мозаик слободних и не-слободних 
компоненти. Пет година од сада, ми ћемо "
-"сигурно имати доста слободног софтвера; 
али ако нисмо пажљиви, тешко ће бити "
+"будућност <a href=\"/gnu/linux-and-gnu.html\">ГНУ-а са 
Линуксом</a> у мозаик "
+"слободних и не-слободних компоненти. Пет 
година од сада, ми ћемо сигурно "
+"имати доста слободног софтвера; али ако 
нисмо пажљиви, тешко ће бити "
 "користан без не-слободног софтвера који 
ће корисници очекивати да нађу уз "
 "њега. Ако се ово деси, наша кампања за 
слободу ће бити неуспела."
 
@@ -362,24 +320,15 @@
 "будућих проблема би могло бити лакше како 
се програмерски потенцијал наше "
 "заједнице повећева. Али ми се суочавамо са 
препрекама које прете да отежају "
 "ово: закони који забрањују слободан 
софтвер. Како се софтверски патенти "
-"нагомилавају, и "
-"како се закони као што је <abbr title=\"Акт 
ауторских права дигиталног "
-"миленијума\">ААПДМ</abbr> користе да забране 
развој слободног софтвера за "
-"важне послове као што је гледање 
ДеВеДе-ова или слушање РиалАудио стримова, "
-"наћи ћемо се без јасног начина борбе 
против патентираних и тајних формата "
-"података, осим да <strong>одбацимо 
не-слободне програме који их користе</"
-"strong>."
+"нагомилавају, и како се закони као што је 
<abbr title=\"Акт ауторских права "
+"дигиталног миленијума\">ААПДМ</abbr> користе 
да забране развој слободног "
+"софтвера за важне послове као што је 
гледање ДеВеДе-ова или слушање "
+"РиалАудио стримова, наћи ћемо се без 
јасног начина борбе против патентираних "
+"и тајних формата података, осим да 
<strong>одбацимо не-слободне програме "
+"који их користе</strong>."
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "Meeting these challenges will require many different kinds of effort.  "
-#| "But what we need above all, to confront any kind of challenge, is to "
-#| "remember the goal of freedom to cooperate.  We can't expect a mere desire "
-#| "for powerful, reliable software to motivate people to make great "
-#| "efforts.  We need the kind of determination that people have when they "
-#| "fight for their freedom and their community, determination to keep on for "
-#| "years and not give up."
 msgid ""
 "Meeting these challenges will require many different kinds of effort.  But "
 "what we need above all, to confront any kind of challenge, is to remember "
@@ -398,18 +347,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "In our community, this goal and this determination emanate mainly from "
-#| "the GNU Project.  We're the ones who talk about freedom and community as "
-#| "something to stand firm for; the organizations that speak of &ldquo;"
-#| "Linux&rdquo; normally don't say this.  The magazines about &ldquo;"
-#| "Linux&rdquo; are typically full of ads for non-free software; the "
-#| "companies that package &ldquo;Linux&rdquo; add non-free software to the "
-#| "system; other companies &ldquo;support Linux&rdquo; with non-free "
-#| "applications; the user groups for &ldquo;Linux&rdquo; typically invite "
-#| "salesman to present those applications.  The main place people in our "
-#| "community are likely to come across the idea of freedom and determination "
-#| "is in the GNU Project."
 msgid ""
 "In our community, this goal and this determination emanate mainly from the "
 "GNU Project.  We're the ones who talk about freedom and community as "
@@ -548,8 +485,8 @@
 "panel of your PO editor (or above the msgid if you are using a simple text "
 "editor). All the Serbian POs need to be treated similarly; this can be done "
 "by simply modifying the two variants of this string in a master compendium "
-"(to be created). If you need any technical help, please contact "
-"address@hidden"
+"(to be created). If you need any technical help, please contact web-"
+"address@hidden"
 
 #. type: Content of: <div><p>
 #, fuzzy

Index: licenses/why-not-lgpl.sr.html
===================================================================
RCS file: /web/www/www/licenses/why-not-lgpl.sr.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- licenses/why-not-lgpl.sr.html       2 Dec 2014 10:53:46 -0000       1.24
+++ licenses/why-not-lgpl.sr.html       2 Dec 2014 11:01:45 -0000       1.25
@@ -1,6 +1,7 @@
 <!--#set var="PO_FILE"
  value='<a href="/licenses/po/why-not-lgpl.sr.po">
  http://www.gnu.org/licenses/po/why-not-lgpl.sr.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/licenses/why-not-lgpl.html"
  --><!--#set var="DIFF_FILE" value=""
  --><!--#set var="OUTDATED_SINCE" value="2011-09-20" -->
 <!--#set var="ENGLISH_PAGE" value="/licenses/why-not-lgpl.en.html" -->
@@ -14,6 +15,7 @@
 
 <!--#include virtual="/licenses/po/why-not-lgpl.translist" -->
 <!--#include virtual="/server/banner.sr.html" -->
+<!--#include virtual="/server/outdated.sr.html" -->
 <h2>Зашто не треба да користите Мању ОЈЛ за 
вашу следећу библиотеку</h2>
 
 <p>
@@ -154,7 +156,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Ажурирано:
 
-$Date: 2014/12/02 10:53:46 $
+$Date: 2014/12/02 11:01:45 $
 
 <!-- timestamp end -->
 </p>

Index: licenses/po/why-not-lgpl.sr.po
===================================================================
RCS file: /web/www/www/licenses/po/why-not-lgpl.sr.po,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- licenses/po/why-not-lgpl.sr.po      2 Dec 2014 10:53:05 -0000       1.15
+++ licenses/po/why-not-lgpl.sr.po      2 Dec 2014 11:01:45 -0000       1.16
@@ -19,9 +19,6 @@
 
 # type: Content of: <title>
 #. type: Content of: <title>
-#| msgid ""
-#| "Why you shouldn't use the Lesser GPL for your next library - GNU Project "
-#| "- Free Software Foundation (FSF)"
 msgid ""
 "Why you shouldn't use the Lesser GPL for your next library - GNU Project - "
 "Free Software Foundation"
@@ -229,15 +226,15 @@
 "panel of your PO editor (or above the msgid if you are using a simple text "
 "editor). All the Serbian POs need to be treated similarly; this can be done "
 "by simply modifying the two variants of this string in a master compendium "
-"(to be created). If you need any technical help, please contact "
-"address@hidden"
+"(to be created). If you need any technical help, please contact web-"
+"address@hidden"
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
 msgid "Copyright &copy; 1999, 2007, 2013, 2014 Free Software Foundation, Inc."
 msgstr ""
-"<b>Ауторска права:</b><br />Copyright &copy; 1999, 2007, 2013, 
2014 Free Software "
-"Foundation, Inc."
+"<b>Ауторска права:</b><br />Copyright &copy; 1999, 2007, 2013, 
2014 Free "
+"Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -246,8 +243,8 @@
 "NoDerivs 3.0 United States License</a>."
 msgstr ""
 "Ова страна је лиценцирана под условима 
лиценце <a rel=\"license\" href="
-"\"http://creativecommons.org/licenses/by-nd/3.0/us/\";>Creative "
-"Commons Ауторство-Без прерада 3.0 САД</a>."
+"\"http://creativecommons.org/licenses/by-nd/3.0/us/\";>Creative Commons "
+"Ауторство-Без прерада 3.0 САД</a>."
 
 # type: Content of: <div><div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.

Index: philosophy/linux-gnu-freedom.sr.html
===================================================================
RCS file: /web/www/www/philosophy/linux-gnu-freedom.sr.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- philosophy/linux-gnu-freedom.sr.html        2 Dec 2014 10:53:48 -0000       
1.28
+++ philosophy/linux-gnu-freedom.sr.html        2 Dec 2014 11:01:46 -0000       
1.29
@@ -1,6 +1,7 @@
 <!--#set var="PO_FILE"
  value='<a href="/philosophy/po/linux-gnu-freedom.sr.po">
  http://www.gnu.org/philosophy/po/linux-gnu-freedom.sr.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/philosophy/linux-gnu-freedom.html"
  --><!--#set var="DIFF_FILE" value=""
  --><!--#set var="OUTDATED_SINCE" value="2011-09-12" -->
 <!--#set var="ENGLISH_PAGE" value="/philosophy/linux-gnu-freedom.en.html" -->
@@ -18,6 +19,7 @@
 
 <!--#include virtual="/philosophy/po/linux-gnu-freedom.translist" -->
 <!--#include virtual="/server/banner.sr.html" -->
+<!--#include virtual="/server/outdated.sr.html" -->
 <h2>Линукс, ГНУ и слобода</h2>
 
 <p>
@@ -281,7 +283,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Ажурирано:
 
-$Date: 2014/12/02 10:53:48 $
+$Date: 2014/12/02 11:01:46 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/philosophy-menu.sr.html
===================================================================
RCS file: /web/www/www/philosophy/philosophy-menu.sr.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- philosophy/philosophy-menu.sr.html  20 Nov 2011 13:02:29 -0000      1.1
+++ philosophy/philosophy-menu.sr.html  2 Dec 2014 11:01:46 -0000       1.2
@@ -3,14 +3,15 @@
 <!-- begin philosophy/philosophy-menu.html -->
 <!-- begin edu navigation bar -->
 <ul id="edu-navigation">
-       <li><a href="/philosophy/philosophy.html">Introduction</a></li>
-       <li><a href="http://audio-video.gnu.org/";>Audio and video</a></li>
-       <li><a href="/philosophy/essays-and-articles.html">Essays and 
articles</a></li>
-       <li><a href="/philosophy/speeches-and-interview.html">Speeches and
-interviews</a></li>
-       <li><a href="/philosophy/third-party-ideas.html">Third party 
ideas</a></li>
-       <li><a href="/server/sitemap.html#directory-philosophy">All philosophy
-articles</a></li>
+       <li><a href="/philosophy/philosophy.html">Увод</a></li>
+       <li><a 
href="http://audio-video.gnu.org/";>Аудио&nbsp;и&nbsp;видео</a></li>
+       <li><a 
href="/philosophy/essays-and-articles.html">Есеји&nbsp;и&nbsp;чланци</a></li>
+       <li><a
+href="/philosophy/speeches-and-interview.html">Говори&nbsp;и&nbsp;интервјуи</a></li>
+       <li><a
+href="/philosophy/third-party-ideas.html">Идеје&nbsp;трећих
&nbsp;страна</a></li>
+       <li><a
+href="/server/sitemap.html#directory-philosophy">Сви&nbsp;чланци&nbsp;o&nbsp;филозофији</a></li>
 </ul>
 
 <!-- end edu navigation bar -->

Index: philosophy/po/categories.sr.po
===================================================================
RCS file: /web/www/www/philosophy/po/categories.sr.po,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- philosophy/po/categories.sr.po      2 Dec 2014 10:53:05 -0000       1.34
+++ philosophy/po/categories.sr.po      2 Dec 2014 11:01:46 -0000       1.35
@@ -19,9 +19,6 @@
 
 # type: Content of: <title>
 #. type: Content of: <title>
-#| msgid ""
-#| "Categories of Free and Non-Free Software - GNU Project - Free Software "
-#| "Foundation (FSF)"
 msgid ""
 "Categories of Free and Nonfree Software - GNU Project - Free Software "
 "Foundation"
@@ -31,7 +28,6 @@
 
 # type: Content of: <h2>
 #. type: Content of: <h2>
-#| msgid "Categories of Free and Non-Free Software"
 msgid "Categories of free and nonfree software"
 msgstr "Врсте слободног и неслободног 
софтвера"
 
@@ -132,13 +128,6 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <p>
-#| msgid ""
-#| "Free software is a matter of freedom, not price. But proprietary software "
-#| "companies sometimes use the term &ldquo;free software&rdquo; to refer to "
-#| "price. Sometimes they mean that you can obtain a binary copy at no "
-#| "charge; sometimes they mean that a copy is bundled with a computer that "
-#| "you are buying, and the price includes both.  Either way, this has "
-#| "nothing to do with what we mean by free software in the GNU project."
 msgid ""
 "Free software is a matter of freedom, not price. But proprietary software "
 "companies typically use the term &ldquo;free software&rdquo; to refer to "
@@ -171,16 +160,6 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <p>
-#| msgid ""
-#| "Many languages have two separate words for &ldquo;free&rdquo; as in "
-#| "freedom and &ldquo;free&rdquo; as in zero price. For example, French has "
-#| "&ldquo;libre&rdquo; and &ldquo;gratuit&rdquo;. Not so English; there is a "
-#| "word &ldquo;gratis&rdquo; that refers unambiguously to price, but no "
-#| "common adjective that refers unambiguously to freedom. So if you are "
-#| "speaking another language, we suggest you translate &ldquo;free&rdquo; "
-#| "into your language to make it clearer. See our list of <a href= \"/"
-#| "philosophy/fs-translations.html\">translations of the term &ldquo;free "
-#| "software&rdquo;</a> into various other languages."
 msgid ""
 "Many languages have two separate words for &ldquo;free&rdquo; as in freedom "
 "and &ldquo;free&rdquo; as in zero price. For example, French has &ldquo;"
@@ -204,9 +183,6 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <p>
-#| msgid ""
-#| "Free software is often <a href=\"/software/reliability.html\">more "
-#| "reliable</a> than non-free software."
 msgid ""
 "Free software is often <a href=\"/software/reliability.html\">more reliable</"
 "a> than nonfree software."
@@ -216,7 +192,6 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <h3>
-#| msgid "<strong>Open Source software</strong>"
 msgid "Open source software"
 msgstr "Софтвер отвореног изворног кода"
 
@@ -251,17 +226,11 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <h3>
-#| msgid "<strong>Public domain software</strong>"
 msgid "Public domain software"
 msgstr "Софтвер у јавном власништву"
 
 # type: Content of: <dl><dd>
 #. type: Content of: <p>
-#| msgid ""
-#| "Public domain software is software that is not copyrighted. If the source "
-#| "code is in the public domain, that is a special case of <a href=\"#Non-"
-#| "CopyleftedFreeSoftware\">non-copylefted free software</a>, which means "
-#| "that some copies or modified versions may not be free at all."
 msgid ""
 "Public domain software is software that is not copyrighted. If the source "
 "code is in the public domain, that is a special case of <a href=\"#Non-"
@@ -325,7 +294,6 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <h3>
-#| msgid "<strong>Copylefted software</strong>"
 msgid "Copylefted software"
 msgstr "Копилефтован софтвер"
 
@@ -421,15 +389,11 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <h3>
-#| msgid "<strong>Non-copylefted free software</strong>"
 msgid "Noncopylefted free software"
 msgstr "Некопилефтован слободни софтвер"
 
 # type: Content of: <dl><dd>
 #. type: Content of: <p>
-#| msgid ""
-#| "Non-copylefted free software comes from the author with permission to "
-#| "redistribute and modify, and also to add additional restrictions to it."
 msgid ""
 "Noncopylefted free software comes from the author with permission to "
 "redistribute and modify, and also to add additional restrictions to it."
@@ -439,12 +403,6 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <p>
-#| msgid ""
-#| "If a program is free but not copylefted, then some copies or modified "
-#| "versions may not be free at all. A software company can compile the "
-#| "program, with or without modifications, and distribute the executable "
-#| "file as a <a href= \"#ProprietarySoftware\">proprietary</a> software "
-#| "product."
 msgid ""
 "If a program is free but not copylefted, then some copies or modified "
 "versions may not be free at all. A software company can compile the program, "
@@ -458,17 +416,6 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <p>
-#| msgid ""
-#| "The <a href=\"http://www.x.org\";>X Window System</a> illustrates this. "
-#| "The X Consortium releases X11 with distribution terms that make it non-"
-#| "copylefted free software. If you wish, you can get a copy which has those "
-#| "distribution terms and is free. However, there are non-free versions as "
-#| "well, and there are (or at least were) popular workstations and PC "
-#| "graphics boards for which non-free versions are the only ones that work. "
-#| "If you are using this hardware, X11 is not free software for you. <a href="
-#| "\"/philosophy/x.html\">The developers of X11 even made X11 non-free</a> "
-#| "for a while; they were able to do this because others had contributed "
-#| "their code under the same non-copyleft license."
 msgid ""
 "The <a href=\"http://www.x.org\";>X Window System</a> illustrates this. The X "
 "Consortium releases X11 with distribution terms that make it noncopylefted "
@@ -509,7 +456,6 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <h3>
-#| msgid "<strong>GPL-covered software</strong>"
 msgid "GPL-covered software"
 msgstr "Софтвер под ОЈЛ"
 
@@ -538,18 +484,14 @@
 
 # type: Content of: <dl><dd>
 #. type: Content of: <p>
-#| msgid ""
-#| "The <a href=\"/gnu/gnu-history.html\">GNU system</a> is the Unix-like "
-#| "operating system, which is entirely free software, that we in the GNU "
-#| "Project have developed since 1984."
 msgid ""
 "The <a href=\"/gnu/gnu-history.html\">GNU operating system</a> is the Unix-"
 "like operating system, which is entirely free software, that we in the GNU "
 "Project have developed since 1984."
 msgstr ""
-"<a href=\"/gnu/gnu-history.html\">Оперативни систем 
ГНУ</a> је униксолики оперативни "
-"систем, и у потпуности је слободни софтвер 
који смо ми из Пројекта ГНУ "
-"градили од 1984."
+"<a href=\"/gnu/gnu-history.html\">Оперативни систем 
ГНУ</a> је униксолики "
+"оперативни систем, и у потпуности је 
слободни софтвер који смо ми из "
+"Пројекта ГНУ градили од 1984."
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <p>
@@ -647,13 +589,6 @@
 
 # type: Content of: <dl><dd>
 #. type: Content of: <p>
-#| msgid ""
-#| "<a href=\"/software/software.html\">GNU software</a> is software that is "
-#| "released under the auspices of the <a href= \"/gnu/gnu-history.html\">GNU "
-#| "Project</a>. If a program is GNU software, we also say that it is a GNU "
-#| "program or a GNU package.  The README or manual of a GNU package should "
-#| "say it is one; also, the <a href=\"/directory\">Free Software Directory</"
-#| "a> indentifies all GNU packages."
 msgid ""
 "<a href=\"/software/software.html\">GNU software</a> is software that is "
 "released under the auspices of the <a href= \"/gnu/gnu-history.html\">GNU "
@@ -671,10 +606,6 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <p>
-#| msgid ""
-#| "Most GNU software is <a href= \"/copyleft/copyleft.html\">copylefted</"
-#| "a> , but not all; however, all GNU software must be <a href=\"/philosophy/"
-#| "free-sw.html\">free software</a>."
 msgid ""
 "Most GNU software is <a href= \"/copyleft/copyleft.html\">copylefted</a>, "
 "but not all; however, all GNU software must be <a href=\"/philosophy/free-sw."
@@ -703,13 +634,15 @@
 "contributed software is copyrighted by the Free Software Foundation; some is "
 "copyrighted by the contributors who wrote it."
 msgstr ""
-"Неки ГНУ-ов софтвер су написали људи из <a 
href= \"http://www.fsf.org/about/staff/";
-"\">особља</a> <a href=\"http://www.fsf.org/\";>Задужбине за 
слободни софтвер</a>, "
-"али су већину ГНУ-овог софтвера приложили 
<a href=\"/people/people.html"
-"\">добровољци</a>. Неки приложени софтвер је 
ставила под „ауторска права“ "
-"Задужбина за слободни софтвер, а неки 
други прилагачи који су га написали."
+"Неки ГНУ-ов софтвер су написали људи из <a 
href= \"http://www.fsf.org/about/";
+"staff/\">особља</a> <a href=\"http://www.fsf.org/\";>Задужбине 
за слободни "
+"софтвер</a>, али су већину ГНУ-овог софтвера 
приложили <a href=\"/people/"
+"people.html\">добровољци</a>. Неки приложени 
софтвер је ставила под "
+"„ауторска права“ Задужбина за слободни 
софтвер, а неки други прилагачи који "
+"су га написали."
 
 # type: Content of: <dl><dt>
+#. type: Content of: <h3>
 msgid "FSF-copyrighted GNU software"
 msgstr ""
 
@@ -736,7 +669,6 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <h3>
-#| msgid "<strong>Non-free software</strong>"
 msgid "Nonfree software"
 msgstr "Неслободни софтвер"
 
@@ -753,14 +685,12 @@
 "or modification is prohibited, or requires you to ask for permission, or is "
 "restricted so much that you effectively can't do it freely."
 msgstr ""
-"Неслободни софтвер је сав софтвер који 
није слободан. Његово "
-"коришћење, расподела или измена су 
забрањени, или од вас захтевају да "
-"тражите дозволу, или су ограничени у 
толикој мери да то ефективно не можете "
-"да урадите."
+"Неслободни софтвер је сав софтвер који 
није слободан. Његово коришћење, "
+"расподела или измена су забрањени, или од 
вас захтевају да тражите дозволу, "
+"или су ограничени у толикој мери да то 
ефективно не можете да урадите."
 
 # type: Content of: <dl><dt>
 #. type: Content of: <h3>
-#| msgid "<strong>Proprietary software</strong>"
 msgid "Proprietary software"
 msgstr "Власнички софтвер"
 
@@ -867,9 +797,6 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <p>
-#| msgid ""
-#| "Shareware is not free software, or even semi-free. There are two reasons "
-#| "it is not:"
 msgid ""
 "Shareware is not free software, or even semifree. There are two reasons it "
 "is not:"
@@ -901,7 +828,6 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <h3>
-#| msgid "<strong>Private software</strong>"
 msgid "Private software"
 msgstr "Приватни софтвер"
 
@@ -973,7 +899,6 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <h3>
-#| msgid "<strong>Commercial Software</strong>"
 msgid "Commercial software"
 msgstr "Комерцијални софтвер"
 
@@ -994,10 +919,9 @@
 "\">proprietary</a>, but there is commercial free software, and there is "
 "noncommercial nonfree software."
 msgstr ""
-"„Комерцијално“ и „власничко“ нису иста 
ствар! Већина "
-"комерцијалног софтвера је <a 
href=\"#ProprietarySoftware\">власничка</a>, "
-"али постоји и комерцијални слободни 
софтвер, као и некомерцијални неслободни "
-"софтвер."
+"„Комерцијално“ и „власничко“ нису иста 
ствар! Већина комерцијалног софтвера "
+"је <a href=\"#ProprietarySoftware\">власничка</a>, али 
постоји и "
+"комерцијални слободни софтвер, као и 
некомерцијални неслободни софтвер."
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <p>
@@ -1101,8 +1025,8 @@
 "panel of your PO editor (or above the msgid if you are using a simple text "
 "editor). All the Serbian POs need to be treated similarly; this can be done "
 "by simply modifying the two variants of this string in a master compendium "
-"(to be created). If you need any technical help, please contact "
-"address@hidden"
+"(to be created). If you need any technical help, please contact web-"
+"address@hidden"
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
@@ -1249,8 +1173,8 @@
 #~ msgid ""
 #~ "The Free Software Foundation itself is non-commercial, and therefore we "
 #~ "would be legally permitted to use a semi-free program &ldquo;"
-#~ "internally&rdquo;. But we don't do that, because that would undermine "
-#~ "our efforts to obtain a program which we could also include in GNU."
+#~ "internally&rdquo;. But we don't do that, because that would undermine our "
+#~ "efforts to obtain a program which we could also include in GNU."
 #~ msgstr ""
 #~ "Сама Задужбина за слободни софтвер је 
некомерцијална, и стога би нама "
 #~ "могло бити дозвољено (од стране аутора 
програма) да користимо "

Index: philosophy/po/essays-and-articles.sr.po
===================================================================
RCS file: /web/www/www/philosophy/po/essays-and-articles.sr.po,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- philosophy/po/essays-and-articles.sr.po     2 Dec 2014 10:53:05 -0000       
1.50
+++ philosophy/po/essays-and-articles.sr.po     2 Dec 2014 11:01:46 -0000       
1.51
@@ -25,8 +25,7 @@
 #| "Philosophy of the GNU Project - GNU Project - Free Software Foundation "
 #| "(FSF)"
 msgid "Essays and Articles - GNU Project - Free Software Foundation"
-msgstr ""
-"Есеји и чланци — Пројекат ГНУ — Задужбина 
за слободни софтвер"
+msgstr "Есеји и чланци — Пројекат ГНУ — 
Задужбина за слободни софтвер"
 
 # type: Content of: <h2>
 #. type: Content of: <h2>
@@ -132,6 +131,7 @@
 "софтвера</a>"
 
 # type: Content of: <ul><li>
+#. type: Content of: <ul><li>
 msgid "<a href=\"/philosophy/floss-and-foss.html\"> FLOSS and FOSS</a>"
 msgstr ""
 
@@ -411,8 +411,7 @@
 "<a href=\"/philosophy/microsoft.html\">Is Microsoft the Great Satan?</a> (An "
 "<a href=\"/philosophy/microsoft-old.html\">older version</a> of this article "
 "is also available.)"
-msgstr ""
-"<a href=\"/philosophy/microsoft.html\">Да ли је Микрософт 
Сотона?</a>"
+msgstr "<a href=\"/philosophy/microsoft.html\">Да ли је 
Микрософт Сотона?</a>"
 
 # type: Content of: <ul><li>
 #. type: Content of: <ul><li>
@@ -440,6 +439,7 @@
 "монопол</a>"
 
 # type: Content of: <ul><li>
+#. type: Content of: <ul><li>
 msgid ""
 "<a href=\"/philosophy/lest-codeplex-perplex.html\">Lest CodePlex perplex</a>"
 msgstr ""
@@ -703,7 +703,8 @@
 "<a href=\"/philosophy/copyright-versus-community.html\" id=\"StallmanTalkLSM"
 "\"> Ауторска права против друштва у ери 
рачунарских мрежа</a>: дословни "
 "препис говора <a href=\"http://www.stallman.org\";>Ричарда 
Сталмана</a> на "
-"конференцији <em>LIANZA</em> (<em>Christchurch</em>, Нови 
Зеланд, 12. октобар 2009)."
+"конференцији <em>LIANZA</em> (<em>Christchurch</em>, Нови 
Зеланд, 12. "
+"октобар 2009)."
 
 # type: Content of: <ul><li>
 #. type: Content of: <ul><li>
@@ -861,8 +862,8 @@
 "Property&rdquo;? It's a Seductive Mirage</a>.  An essay on the true meaning "
 "of the phrase &ldquo;Intellectual Property&rdquo;, by Richard M. Stallman"
 msgstr ""
-"<a href=\"/philosophy/not-ipr.html\">Рекосте ли 
„интелектуална својина“? "
-"То је заводљива илузија</a>. Есеј о правом 
значењу фразе „интелектуална "
+"<a href=\"/philosophy/not-ipr.html\">Рекосте ли 
„интелектуална својина“? То "
+"је заводљива илузија</a>. Есеј о правом 
значењу фразе „интелектуална "
 "својина“, од Ричарда М. Сталмана"
 
 # type: Content of: <h4>
@@ -918,31 +919,20 @@
 
 # type: Content of: <ul><li>
 #. type: Content of: <ul><li>
-#| msgid ""
-#| "In <a href=\"http://www.eff.org/IP/DMCA/";
-#| "Felten_v_RIAA/20010606_eff_felten_pr.html\"> Felten v. RIAA</a>, "
-#| "scientists are asking a court to rule that the Digital Millennium "
-#| "Copyright Act (DMCA) does not prohibit them from publishing their "
-#| "research."
 msgid ""
 "In <a href=\"https://www.eff.org/press/releases/princeton-scientists-sue-";
 "over-squelched-research\"> Felten v. RIAA</a>, scientists are asking a court "
 "to rule that the Digital Millennium Copyright Act (DMCA) does not prohibit "
 "them from publishing their research."
 msgstr ""
-"У случају <a 
href=\"https://www.eff.org/press/releases/princeton-scientists-sue-";
-"over-squelched-research\">Фелтен против <em>RIAA</em> "
-"(<em>Felten v. RIAA</em>)</a>, научници захтевају од 
суда да донесе одлуку "
-"по којој им Уредба о дигиталним ауторским 
правима — УДАП (<em>Digital "
-"Millennium Copyright Act (DMCA)</em>) не може бранити 
објављивање њиховог "
-"рада."
+"У случају <a 
href=\"https://www.eff.org/press/releases/princeton-scientists-";
+"sue-over-squelched-research\">Фелтен против <em>RIAA</em> 
(<em>Felten v. "
+"RIAA</em>)</a>, научници захтевају од суда да 
донесе одлуку по којој им "
+"Уредба о дигиталним ауторским правима — 
УДАП (<em>Digital Millennium "
+"Copyright Act (DMCA)</em>) не може бранити 
објављивање њиховог рада."
 
 # type: Content of: <ul><li>
 #. type: Content of: <ul><li>
-#| msgid ""
-#| "<a href=\"http://www.eff.org/IP/Video/MPAA_DVD_cases/\";>EFF &ldquo;"
-#| "Intellectual Property: MPAA (Motion Picture Association of America) DVD "
-#| "Cases&rdquo; Archive</a>"
 msgid ""
 "<a href=\"https://www.eff.org/search/site/dvd cases/\">EFF &ldquo;"
 "Intellectual Property&rdquo;: MPAA (Motion Picture Association of America) "
@@ -1175,11 +1165,6 @@
 
 # type: Content of: <ul><li>
 #. type: Content of: <ul><li>
-#| msgid ""
-#| "<a href=\"http://www.insnet.org/ins_headlines.rxml?cust=212&amp;id=967\";> "
-#| "Free Software and Sustainable Development</a> &mdash; A short article by "
-#| "Richard Stallman regarding the use of proprietary software in cultural "
-#| "development."
 msgid ""
 "<a href=\"http://web.archive.org/web/20070806183422/http://www.insnet.org/";
 "ins_headlines.rxml?cust=212&amp;id=967\"> Free Software and Sustainable "
@@ -1187,8 +1172,9 @@
 "use of proprietary software in cultural development."
 msgstr ""
 "<a href=\"http://web.archive.org/web/20070806183422/http://www.insnet.org/";
-"ins_headlines.rxml?cust=212&amp;id=967\"> Слободни софтвер и 
одрживи развој</a> — кратак чланак др 
Сталмана о "
-"употреби власничког софтвера у културном 
развоју."
+"ins_headlines.rxml?cust=212&amp;id=967\"> Слободни софтвер и 
одрживи развој</"
+"a> — кратак чланак др Сталмана о употреби 
власничког софтвера у културном "
+"развоју."
 
 # type: Content of: <h4>
 #. type: Content of: <h4>
@@ -1203,9 +1189,6 @@
 
 # type: Content of: <ul><li>
 #. type: Content of: <ul><li>
-#| msgid ""
-#| "<a href=\"/philosophy/social-inertia.html\">Overcoming Social Inertia</"
-#| "a>, by Richard M. Stallman"
 msgid ""
 "<a href=\"/philosophy/bug-nobody-allowed-to-understand.html\">The Bug Nobody "
 "is Allowed to Understand</a>, By Richard Stallman."
@@ -1401,15 +1384,14 @@
 
 # type: Content of: <ul><li>
 #. type: Content of: <ul><li>
-#| msgid "<a href=\"speeches-and-interview.html\">Speeches and interviews</a>"
 msgid ""
 "<a href=\"/philosophy/speeches-and-interview.html\">Speeches and interviews</"
 "a>"
-msgstr "<a href=\"/philosophy/speeches-and-interview.html\">Говори и 
интервјуи</a>"
+msgstr ""
+"<a href=\"/philosophy/speeches-and-interview.html\">Говори и 
интервјуи</a>"
 
 # type: Content of: <ul><li>
 #. type: Content of: <ul><li>
-#| msgid "<a href=\"third-party-ideas.html\">Third party ideas</a>"
 msgid "<a href=\"/philosophy/third-party-ideas.html\">Third party ideas</a>"
 msgstr "<a href=\"/philosophy/third-party-ideas.html\">Идеје трећих 
страна</a>"
 
@@ -1469,8 +1451,8 @@
 "panel of your PO editor (or above the msgid if you are using a simple text "
 "editor). All the Serbian POs need to be treated similarly; this can be done "
 "by simply modifying the two variants of this string in a master compendium "
-"(to be created). If you need any technical help, please contact "
-"address@hidden"
+"(to be created). If you need any technical help, please contact web-"
+"address@hidden"
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>

Index: philosophy/po/free-doc.sr.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-doc.sr.po,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- philosophy/po/free-doc.sr.po        2 Dec 2014 10:53:05 -0000       1.16
+++ philosophy/po/free-doc.sr.po        2 Dec 2014 11:01:46 -0000       1.17
@@ -94,15 +94,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "That wasn't the first time this sort of thing has happened, and (to our "
-#| "community's great loss) it was far from the last.  Proprietary manual "
-#| "publishers have enticed a great many authors to restrict their manuals "
-#| "since then.  Many times I have heard a GNU user eagerly tell me about a "
-#| "manual that he is writing, with which he expects to help the GNU "
-#| "project&mdash;and then had my hopes dashed, as he proceeded to explain "
-#| "that he had signed a contract with a publisher that would restrict it so "
-#| "that we cannot use it."
 msgid ""
 "That wasn't the first time this sort of thing has happened, and (to our "
 "community's great loss) it was far from the last.  Proprietary manual "
@@ -153,12 +144,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "The criterion for a free manual is pretty much the same as for free "
-#| "software: it is a matter of giving all users certain freedoms.  "
-#| "Redistribution (including commercial redistribution) must be permitted, "
-#| "so that the manual can accompany every copy of the program, on-line or on "
-#| "paper.  Permission for modification is crucial too."
 msgid ""
 "The criterion for a free manual is pretty much the same as for free "
 "software: it is a matter of giving all users certain freedoms.  "
@@ -189,15 +174,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "But there is a particular reason why the freedom to modify is crucial for "
-#| "documentation for free software.  When people exercise their right to "
-#| "modify the software, and add or change its features, if they are "
-#| "conscientious they will change the manual too&mdash;so they can provide "
-#| "accurate and usable documentation with the modified program.  A manual "
-#| "which forbids programmers to be conscientious and finish the job, or more "
-#| "precisely requires them to write a new manual from scratch if they change "
-#| "the program, does not fill our community's needs."
 msgid ""
 "But there is a particular reason why the freedom to modify is crucial for "
 "documentation for free software.  When people exercise their right to modify "
@@ -218,15 +194,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "While a blanket prohibition on modification is unacceptable, some kinds "
-#| "of limits on the method of modification pose no problem.  For example, "
-#| "requirements to preserve the original author's copyright notice, the "
-#| "distribution terms, or the list of authors, are ok.  It is also no "
-#| "problem to require modified versions to include notice that they were "
-#| "modified, even to have entire sections that may not be deleted or "
-#| "changed, as long as these sections deal with nontechnical topics.  (Some "
-#| "GNU manuals have them.)"
 msgid ""
 "While a blanket prohibition on modification is unacceptable, some kinds of "
 "limits on the method of modification pose no problem.  For example, "
@@ -259,11 +226,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "However, it must be possible to modify all the <em>technical</em> content "
-#| "of the manual, and then distribute the result in all the usual media, "
-#| "through all the usual channels; otherwise, the restrictions do block the "
-#| "community, the manual is not free, and so we need another manual."
 msgid ""
 "However, it must be possible to modify all the <em>technical</em> content of "
 "the manual, and then distribute the result through all the usual media, "
@@ -333,11 +295,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "We can also encourage commercial publishers to sell free, copylefted "
-#| "manuals instead of proprietary ones.  One way you can help this is to "
-#| "check the distribution terms of a manual before you buy it, and prefer "
-#| "copylefted manuals to non-copylefted ones."
 msgid ""
 "We can also encourage commercial publishers to sell free, copylefted manuals "
 "instead of proprietary ones.  One way you can help this is to check the "
@@ -408,8 +365,8 @@
 "panel of your PO editor (or above the msgid if you are using a simple text "
 "editor). All the Serbian POs need to be treated similarly; this can be done "
 "by simply modifying the two variants of this string in a master compendium "
-"(to be created). If you need any technical help, please contact "
-"address@hidden"
+"(to be created). If you need any technical help, please contact web-"
+"address@hidden"
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>

Index: philosophy/po/free-software-for-freedom.sr.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-software-for-freedom.sr.po,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- philosophy/po/free-software-for-freedom.sr.po       2 Dec 2014 10:53:05 
-0000       1.21
+++ philosophy/po/free-software-for-freedom.sr.po       2 Dec 2014 11:01:46 
-0000       1.22
@@ -243,19 +243,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "The official definition of &ldquo;open source software,&rdquo; as "
-#| "published by the Open Source Initiative, is very close to our definition "
-#| "of free software; however, it is a little looser in some respects, and "
-#| "they have accepted a few licenses that we consider unacceptably "
-#| "restrictive of the users.  However, the obvious meaning for the "
-#| "expression &ldquo;open source software&rdquo; is &ldquo;You can look at "
-#| "the source code.&rdquo; This is a much weaker criterion than free "
-#| "software; it includes free software, but also includes <a href=\"/"
-#| "philosophy/categories.html#semi-freeSoftware\">semi-free</a> programs "
-#| "such as Xv, and even some <a href=\"/philosophy/categories."
-#| "html#ProprietarySoftware\"> proprietary</a> programs, including Qt under "
-#| "its original license (before the QPL)."
 msgid ""
 "The official definition of &ldquo;open source software,&rdquo; as published "
 "by the Open Source Initiative, is very close to our definition of free "
@@ -274,8 +261,8 @@
 "прихватили неке лиценце које ми сматрамо 
неприхватљиво рестриктивним према "
 "корисницима. Међутим, очито значење 
израза „софтвер отвореног изворног кода“ "
 "је: „Можете да погледате изворни код“. 
Ово је много слабији критеријум него "
-"онај слободног софтвера; он укључује 
слободни софтвер, али и неке <a href="
-"\"/philosophy/categories.html#ProprietarySoftware\">власничке</a> 
програме, "
+"онај слободног софтвера; он укључује 
слободни софтвер, али и неке <a href=\"/"
+"philosophy/categories.html#ProprietarySoftware\">власничке</a> 
програме, "
 "укључујући Иксве (<em>Xv</em>) и Куте (<em>Qt</em>) 
под његовом првобитном "
 "лиценцом (пре КЈЛ — <em>QPL</em>)."
 
@@ -796,13 +783,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "Lakhani and Wolf's <a href=\"http://freesoftware.mit.edu/papers/";
-#| "lakhaniwolf.pdf\">paper on the motivation of free software developers</a> "
-#| "says that a considerable fraction are motivated by the view that software "
-#| "should be free.  This was despite the fact that they surveyed the "
-#| "developers on SourceForge, a site that does not support the view that "
-#| "this is an ethical issue."
 msgid ""
 "Lakhani and Wolf's <a href=\"http://ocw.mit.edu/courses/sloan-school-of-";
 "management/15-352-managing-innovation-emerging-trends-spring-2005/readings/"
@@ -812,12 +792,12 @@
 "on SourceForge, a site that does not support the view that this is an "
 "ethical issue."
 msgstr ""
-"Лаханијево (<em>Lakhani</em>) и Волфово (<em>Wolf</em>) <a 
href=\"http://ocw.mit.edu/courses/sloan-school-of-";
-"management/15-352-managing-innovation-emerging-trends-spring-2005/readings/"
-"lakhaniwolf.pdf\">истраживање о мотивацији "
-"градитеља слободног софтвера</a> говори да 
је значајан проценат људи "
-"мотивисан ставом да би софтвер требало да 
буде слободан. И све то упркос "
-"чињеници да су анкетирали градитеље на 
Ковачници изворног кода "
+"Лаханијево (<em>Lakhani</em>) и Волфово (<em>Wolf</em>) <a 
href=\"http://ocw.";
+"mit.edu/courses/sloan-school-of-management/15-352-managing-innovation-"
+"emerging-trends-spring-2005/readings/lakhaniwolf.pdf\">истраживање 
о "
+"мотивацији градитеља слободног 
софтвера</a> говори да је значајан проценат "
+"људи мотивисан ставом да би софтвер 
требало да буде слободан. И све то "
+"упркос чињеници да су анкетирали 
градитеље на Ковачници изворног кода "
 "(<em>SourceForge</em>), еместу које не подржава 
гледиште да је ово питање "
 "етике."
 
@@ -882,14 +862,11 @@
 "panel of your PO editor (or above the msgid if you are using a simple text "
 "editor). All the Serbian POs need to be treated similarly; this can be done "
 "by simply modifying the two variants of this string in a master compendium "
-"(to be created). If you need any technical help, please contact "
-"address@hidden"
+"(to be created). If you need any technical help, please contact web-"
+"address@hidden"
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
-#| msgid ""
-#| "Copyright &copy; 1998, 1999, 2000, 2001, 2007 Free Software Foundation, "
-#| "Inc.,"
 msgid ""
 "Copyright &copy; 1998, 1999, 2000, 2001, 2007 Free Software Foundation, Inc."
 msgstr ""

Index: philosophy/po/free-sw.sr.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.sr.po,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- philosophy/po/free-sw.sr.po 2 Dec 2014 10:53:06 -0000       1.53
+++ philosophy/po/free-sw.sr.po 2 Dec 2014 11:01:46 -0000       1.54
@@ -19,9 +19,6 @@
 
 # type: Content of: <title>
 #. type: Content of: <title>
-#| msgid ""
-#| "The Free Software Definition - GNU Project - Free Software Foundation "
-#| "(FSF)"
 msgid "What is free software? - GNU Project - Free Software Foundation"
 msgstr ""
 "Шта је слободни софтвер? — Пројекат ГНУ — 
Задужбина за слободни софтвер"
@@ -106,10 +103,10 @@
 #. type: Content of: <p>
 #, fuzzy
 #| msgid ""
-#| "Free software is a matter of the users' freedom to run, copy, "
-#| "distribute, study, change and improve the software.  More precisely, it "
-#| "refers to four kinds of freedom, for the users of the software:"
-#| "distribute, study, change and improve the software</b>."
+#| "Free software is a matter of the users' freedom to run, copy, distribute, "
+#| "study, change and improve the software.  More precisely, it refers to "
+#| "four kinds of freedom, for the users of the software:distribute, study, "
+#| "change and improve the software</b>."
 msgid ""
 "A program is free software if the program's users have the four essential "
 "freedoms:"
@@ -124,7 +121,9 @@
 #| msgid "The freedom to run the program, for any purpose (freedom 0)."
 msgid ""
 "The freedom to run the program as you wish, for any purpose (freedom 0)."
-msgstr "Слободу покретања програма по вашој 
жељи, за било коју сврху (слобода број 0)."
+msgstr ""
+"Слободу покретања програма по вашој жељи, 
за било коју сврху (слобода број "
+"0)."
 
 # type: Content of: <ul><li>
 #. type: Content of: <ul><li>
@@ -211,15 +210,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "The freedom to run the program means the freedom for any kind of person "
-#| "or organization to use it on any kind of computer system, for any kind of "
-#| "overall job and purpose, without being required to communicate about it "
-#| "with the developer or any other specific entity.  In this freedom, it is "
-#| "the <em>user's</em> purpose that matters, not the <em>developer's</em> "
-#| "purpose; you as a user are free to run a program for your purposes, and "
-#| "if you distribute it to someone else, she is then free to run it for her "
-#| "purposes, but you are not entitled to impose your purposes on her."
 msgid ""
 "The freedom to run the program means the freedom for any kind of person or "
 "organization to use it on any kind of computer system, for any kind of "
@@ -247,15 +237,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "The freedom to redistribute copies must include binary or executable "
-#| "forms of the program, as well as source code, for both modified and "
-#| "unmodified versions.  (Distributing programs in runnable form is "
-#| "necessary for conveniently installable free operating systems.)  It is ok "
-#| "if there is no way to produce a binary or executable form for a certain "
-#| "program (since some languages don't support that feature), but you must "
-#| "have the freedom to redistribute such forms should you find or develop a "
-#| "way to make them."
 msgid ""
 "The freedom to redistribute copies must include binary or executable forms "
 "of the program, as well as source code, for both modified and unmodified "
@@ -347,13 +328,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "However, certain kinds of rules about the manner of distributing free "
-#| "software are acceptable, when they don't conflict with the central "
-#| "freedoms.  For example, copyleft (very simply stated) is the rule that "
-#| "when redistributing the program, you cannot add restrictions to deny "
-#| "other people the central freedoms.  This rule does not conflict with the "
-#| "central freedoms; rather it protects them."
 msgid ""
 "However, certain kinds of rules about the manner of distributing free "
 "software are acceptable, when they don't conflict with the central "
@@ -364,10 +338,10 @@
 msgstr ""
 "Међутим, прихватљиве су одређене врсте 
правила о начину расподеле слободног "
 "софтвера, али само ако не долазе у сукоб са 
основним слободама. На пример, "
-"<a href=\"/copyleft/copyleft.html\">копилефт</a> је (просто 
речено) правило које налаже да приликом 
расподеле "
-"програма не можете да додате ограничења 
која би другима ускратиле основне "
-"слободе. Ово правило не долази у сукоб са 
основним слободама, већ их, "
-"напротив, штити."
+"<a href=\"/copyleft/copyleft.html\">копилефт</a> је (просто 
речено) правило "
+"које налаже да приликом расподеле 
програма не можете да додате ограничења "
+"која би другима ускратиле основне 
слободе. Ово правило не долази у сукоб са "
+"основним слободама, већ их, напротив, 
штити."
 
 # type: Content of: <p>
 #. type: Content of: <p>
@@ -388,9 +362,9 @@
 "слободни софтвер</a>. Ми сматрамо да 
постоје битни разлози зашто је <a href="
 "\"/philosophy/pragmatic.html\">боље користити 
копилефт</a>, али уколико је "
 "ваш програм некопилефтован слободни 
софтвер, ми ћемо га и тада користити. "
-"Погледајте <a href=\"/philosophy/categories.html\">Врсте 
слободног "
-"софтвера</a> за опис односа између 
„слободног софтвера“, „копилефотваног "
-"софтвера“ и других категорија софтвера."
+"Погледајте <a href=\"/philosophy/categories.html\">Врсте 
слободног софтвера</"
+"a> за опис односа између „слободног 
софтвера“, „копилефотваног софтвера“ и "
+"других категорија софтвера."
 
 # type: Content of: <p>
 #. type: Content of: <p>
@@ -407,11 +381,11 @@
 "„Слободни софтвер“ није и 
„некомерцијалан“. Слободни програм мора 
бити "
 "доступан за комерцијалну употребу, 
комерцијални развој програма и "
 "комерцијалну расподелу. Комерцијални 
развој слободног софтвера више није "
-"неуобичајен. Такав, слободан, 
комерцијални софтвер је веома битан. "
-"Стога, можда ћете плаћати новчани износ за 
примерке слободног софтвера, "
-"или ћете их набављати бесплатно. Али без 
обзира на то како сте дошли до "
-"вашег примерка, увек ћете моћи да 
умножавате и мењате софтвер, па чак и "
-"да га <a href=\"/philosophy/selling.html\">продајете</a>."
+"неуобичајен. Такав, слободан, 
комерцијални софтвер је веома битан. Стога, 
"
+"можда ћете плаћати новчани износ за 
примерке слободног софтвера, или ћете их "
+"набављати бесплатно. Али без обзира на то 
како сте дошли до вашег примерка, "
+"увек ћете моћи да умножавате и мењате 
софтвер, па чак и да га <a href=\"/"
+"philosophy/selling.html\">продајете</a>."
 
 #. type: Content of: <p>
 msgid ""
@@ -426,13 +400,13 @@
 #| msgid ""
 #| "Rules about how to package a modified version are acceptable, if they "
 #| "don't substantively block your freedom to release modified versions. "
-#| "Rules that ``if you make the program available in this way, you must "
-#| "make it available in that way also'' can be acceptable too, on the "
-#| "same condition.  (Note that such a rule still leaves you the choice of "
-#| "whether to publish the program or not.)  It is also acceptable for the "
-#| "license to require that, if you have distributed a modified version "
-#| "and a previous developer asks for a copy of it, you must send one, "
-#| "or that you identify yourself on your modifications."
+#| "Rules that ``if you make the program available in this way, you must make "
+#| "it available in that way also'' can be acceptable too, on the same "
+#| "condition.  (Note that such a rule still leaves you the choice of whether "
+#| "to publish the program or not.)  It is also acceptable for the license to "
+#| "require that, if you have distributed a modified version and a previous "
+#| "developer asks for a copy of it, you must send one, or that you identify "
+#| "yourself on your modifications."
 msgid ""
 "However, rules about how to package a modified version are acceptable, if "
 "they don't substantively limit your freedom to release modified versions, or "
@@ -446,13 +420,13 @@
 msgstr ""
 "Евентуално постојање правила о начину 
паковања измењене верзије је "
 "прихватљиво, али само уколико не 
зауставља слободу објављивања измењених "
-"верзија. Правила која прописују да „ако 
објавите програм на тај-и-тај "
-"начин, морате да га објавите и на 
такав-и-такав начин“ такође могу да "
-"буду прихватљива, али опет само под истим 
условом. (Приметите да и такво "
-"правило оставља избор да ли ћете објавити 
вашу верзију програма или не.) "
-"Такође је прихватљиво да се у лиценци зах
тева да обезбедите измењени "
-"примерак, уколико сте расподелили 
измењену верзију и претходни градитељ "
-"га затражи, или да ваше име додате на ваше 
измењене верзије."
+"верзија. Правила која прописују да „ако 
објавите програм на тај-и-тај начин, "
+"морате да га објавите и на такав-и-такав 
начин“ такође могу да буду "
+"прихватљива, али опет само под истим 
условом. (Приметите да и такво правило "
+"оставља избор да ли ћете објавити вашу 
верзију програма или не.) Такође је "
+"прихватљиво да се у лиценци захтева да 
обезбедите измењени примерак, уколико "
+"сте расподелили измењену верзију и претх
одни градитељ га затражи, или да "
+"ваше име додате на ваше измењене верзије."
 
 # type: Content of: <p>
 #. type: Content of: <p>
@@ -525,15 +499,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "Most free software licenses are based on copyright, and there are limits "
-#| "on what kinds of requirements can be imposed through copyright.  If a "
-#| "copyright-based license respects freedom in the ways described above, it "
-#| "is unlikely to have some other sort of problem that we never anticipated "
-#| "(though this does happen occasionally).  However, some free software "
-#| "licenses are based on contracts, and contracts can impose a much larger "
-#| "range of possible restrictions.  That means there are many possible ways "
-#| "such a license could be unacceptably restrictive and non-free."
 msgid ""
 "Most free software licenses are based on copyright, and there are limits on "
 "what kinds of requirements can be imposed through copyright.  If a copyright-"
@@ -556,11 +521,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "We can't possibly list all the ways that might happen.  If a contract-"
-#| "based license restricts the user in an unusual way that copyright-based "
-#| "licenses cannot, and which isn't mentioned here as legitimate, we will "
-#| "have to think about it, and we will probably conclude it is non-free."
 msgid ""
 "We can't possibly list all the ways that might happen.  If a contract-based "
 "license restricts the user in an unusual way that copyright-based licenses "
@@ -575,15 +535,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "When talking about free software, it is best to avoid using terms like "
-#| "<q>give away</q> or <q>for free,</q> because those terms imply that the "
-#| "issue is about price, not freedom.  Some common terms such as <q>piracy</"
-#| "q> embody opinions we hope you won't endorse.  See <a href=\"/philosophy/"
-#| "words-to-avoid.html\">Confusing Words and Phrases that are Worth "
-#| "Avoiding</a> for a discussion of these terms.  We also have a list of <a "
-#| "href=\"/philosophy/fs-translations.html\">translations of <q>free "
-#| "software</q></a> into various languages."
 msgid ""
 "When talking about free software, it is best to avoid using terms like "
 "&ldquo;give away&rdquo; or &ldquo;for free,&rdquo; because those terms imply "
@@ -671,10 +622,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "If that isn't possible, if you really need a new license, with our help "
-#| "you can ensure that the license really is a Free Software license and "
-#| "avoid various practical problems."
 msgid ""
 "If that isn't possible, if you really need a new license, with our help you "
 "can ensure that the license really is a free software license and avoid "
@@ -702,11 +649,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "The same arguments also make sense for other kinds of works of practical "
-#| "use &mdash; that is to say, works that embody useful knowledge, such as "
-#| "educational works and reference works.  <a href=\"http://wikipedia.org";
-#| "\">Wikipedia</a> is the best known example."
 msgid ""
 "The same arguments also make sense for other kinds of works of practical use "
 "&mdash; that is to say, works that embody useful knowledge, such as "
@@ -735,13 +677,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "Another group has started using the term <q>open source</q> to mean "
-#| "something close (but not identical) to <q>free software.</q> We prefer "
-#| "the term <q>free software</q> because, once you have heard that it refers "
-#| "to freedom rather than price, it calls to mind freedom.  The word "
-#| "<q>open</q> <a href=\"/philosophy/open-source-misses-the-point.html\"> "
-#| "never refers to freedom</a>."
 msgid ""
 "Another group has started using the term &ldquo;open source&rdquo; to mean "
 "something close (but not identical) to &ldquo;free software&rdquo;.  We "
@@ -1037,8 +972,8 @@
 "panel of your PO editor (or above the msgid if you are using a simple text "
 "editor). All the Serbian POs need to be treated similarly; this can be done "
 "by simply modifying the two variants of this string in a master compendium "
-"(to be created). If you need any technical help, please contact "
-"address@hidden"
+"(to be created). If you need any technical help, please contact web-"
+"address@hidden"
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
@@ -1083,10 +1018,10 @@
 
 # type: Content of: <p>
 #~ msgid ""
-#~ "Free software is a matter of the users' freedom to run, copy, "
-#~ "distribute, study, change and improve the software.  More precisely, it "
-#~ "refers to four kinds of freedom, for the users of the software:"
-#~ "distribute, study, change and improve the software</b>."
+#~ "Free software is a matter of the users' freedom to run, copy, distribute, "
+#~ "study, change and improve the software.  More precisely, it refers to "
+#~ "four kinds of freedom, for the users of the software:distribute, study, "
+#~ "change and improve the software</b>."
 #~ msgstr ""
 #~ "Слободни софтвер је ствар слободе 
корисника да покрећу, умножавају, "
 #~ "расподељују, проучавају, мењају и 
побољшавају софтвер. Прецизније, он се "
@@ -1128,8 +1063,8 @@
 # type: Content of: <p>
 #~ msgid ""
 #~ "See <a href=\"/philosophy/categories.html\">Categories of Free Software</"
-#~ "a> for a description of how <q>free software,</q> <q>copylefted "
-#~ "software</q> and other categories of software relate to each other."
+#~ "a> for a description of how <q>free software,</q> <q>copylefted software</"
+#~ "q> and other categories of software relate to each other."
 #~ msgstr ""
 #~ "Погледајте <a href=\"/philosophy/categories.html\">Врсте 
слободног "
 #~ "софтвера</a> за опис односа између 
„слободног софтвера“, „копилефотваног "

Index: philosophy/po/gif.sr.po
===================================================================
RCS file: /web/www/www/philosophy/po/gif.sr.po,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- philosophy/po/gif.sr.po     2 Dec 2014 10:53:06 -0000       1.16
+++ philosophy/po/gif.sr.po     2 Dec 2014 11:01:47 -0000       1.17
@@ -19,28 +19,27 @@
 
 # type: Content of: <title>
 #. type: Content of: <title>
-#| msgid "Why There Are No GIF files on GNU Web Pages"
 msgid ""
 "Why There Are No GIF Files on GNU Web Pages - GNU Project - Free Software "
 "Foundation"
-msgstr "Зашто на ГНУ-овим веб страницама нема 
GIF датотека — Пројекат ГНУ "
-"— Задужбина за слободни софтвер"
+msgstr ""
+"Зашто на ГНУ-овим веб страницама нема GIF 
датотека — Пројекат ГНУ — "
+"Задужбина за слободни софтвер"
 
 # type: Content of: <title>
 #. type: Content of: <h2>
-#| msgid "Why There Are No GIF files on GNU Web Pages"
 msgid "Why There Are No GIF Files on GNU Web Pages"
 msgstr "Зашто на ГНУ-овим веб страницама нема 
GIF датотека"
 
 #. type: Content of: <blockquote><p>
 #, fuzzy
 #| msgid ""
-#| "While this story is a historical illustration of the danger of "
-#| "software patents, these particular patents are now no longer a concern "
-#| "(see <a href=\"#venuenote\">footnote</a> below).  For details of our "
-#| "website <a href=\"/server/fsf-html-style-sheet.html#UseofGraphics"
-#| "\">policies regarding GIFs</a>, see our <a href=\"/server/"
-#| "standards/\">web guidelines</a>."
+#| "While this story is a historical illustration of the danger of software "
+#| "patents, these particular patents are now no longer a concern (see <a "
+#| "href=\"#venuenote\">footnote</a> below).  For details of our website <a "
+#| "href=\"/server/fsf-html-style-sheet.html#UseofGraphics\">policies "
+#| "regarding GIFs</a>, see our <a href=\"/server/standards/\">web "
+#| "guidelines</a>."
 msgid ""
 "There is no special patent threat to GIF format nowadays as far as we know; "
 "<a href=\"#venuenote\">the patents that were used to attack GIF have "
@@ -50,22 +49,14 @@
 "html#UseofGraphics\"> our web site policies regarding GIFs</a>, and our <a "
 "href=\"/server/standards/\">web guidelines</a>."
 msgstr ""
-"Иако је ова прича историјска илустрација 
опасности софтверских "
-"патената, ови конкретни патенти више нису 
опасни (погледајте доњу <a href="
-"\"#venuenote\">фусноту</a>). За више детаља о <a 
href=\"/server/fsf-html-"
-"style-sheet.html#UseofGraphics\">правилима нашег 
вебместа у вези са "
-"<em>GIF</em>-овима</a>, погледајте наше <a href=\"/server/"
-"standards/\">веб смернице</a>."
+"Иако је ова прича историјска илустрација 
опасности софтверских патената, ови "
+"конкретни патенти више нису опасни 
(погледајте доњу <a href=\"#venuenote"
+"\">фусноту</a>). За више детаља о <a 
href=\"/server/fsf-html-style-sheet."
+"html#UseofGraphics\">правилима нашег вебместа у 
вези са <em>GIF</em>-овима</"
+"a>, погледајте наше <a href=\"/server/standards/\">веб 
смернице</a>."
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "There are no GIFs on the GNU web site because of the patents "
-#| "(Unisys and IBM) covering the <abbr title=\"Lempel-Ziv-Welch\">LZW</abbr> "
-#| "compression algorithm which is used in making GIF files.  "
-#| "These patents make it impossible to have free software to generate proper "
-#| "GIFs.  They also apply to the <strong>compress</strong> "
-#| "program, which is why GNU does not use it or its format."
 msgid ""
 "There are no GIFs on the GNU web site because of the patents (Unisys and "
 "IBM) covering the LZW compression algorithm which is used in making GIF "
@@ -73,24 +64,15 @@
 "proper GIFs.  They also apply to the <strong>compress</strong> program, "
 "which is why GNU does not use it or its format."
 msgstr ""
-"На ГНУ-овом еместу нема <em>GIF</em>-ова због 
Унисисових "
-"(<em>Unisys</em>) и ИБМ-ових (<em>IBM</em>) патената 
алгоритма за "
-"компримовање <em>LZW</em>, који се "
-"користи при прављењу <em>GIF</em> датотека. Ови 
патенти "
+"На ГНУ-овом еместу нема <em>GIF</em>-ова због 
Унисисових (<em>Unisys</em>) и "
+"ИБМ-ових (<em>IBM</em>) патената алгоритма за 
компримовање <em>LZW</em>, "
+"који се користи при прављењу <em>GIF</em> 
датотека. Ови патенти "
 "онемогућавају слободни софтвер да на 
прави начин ствара <em>GIF</em>-ове. "
-"Они се такође односе на програм 
<strong>compress</strong>, "
-"због чега ГНУ не користи ни њега, ни његов 
формат."
+"Они се такође односе на програм 
<strong>compress</strong>, због чега ГНУ не "
+"користи ни њега, ни његов формат."
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "Unisys and IBM both applied for patents in 1983.  Unisys (and perhaps "
-#| "IBM) applied for these patents in a number of countries.  Of the places "
-#| "whose patent databases we were able to search, the latest expiration date "
-#| "seems to be 1 October 2006.  <a name=\"returnnote\" href=\"#venuenote"
-#| "\"><sup>1</sup></a> Until then, anyone who releases a free program for "
-#| "making GIF files is likely to be sued.  We don't know any "
-#| "reason to think that the patent owners would lose these lawsuits."
 msgid ""
 "Unisys and IBM both applied for patents in 1983.  Unisys (and perhaps IBM) "
 "applied for these patents in a number of countries.  Of the places whose "
@@ -104,9 +86,9 @@
 "поднео захтев у више земаља. Од свих места 
чије смо базе патената успели да "
 "претражимо, најкаснији датум истека 
патента је изгледа петак, 11. август "
 "2006. <sup><a id=\"returnnote\" href=\"#venuenote\">1</a></sup> До 
тада, "
-"било ко ко изда слободни програм који 
ствара <em>GIF</em> "
-"датотеке ће највероватније бити тужен. Не 
знамо ниједан разлог због кога би "
-"власници патената изгубили своје парнице."
+"било ко ко изда слободни програм који 
ствара <em>GIF</em> датотеке ће "
+"највероватније бити тужен. Не знамо 
ниједан разлог због кога би власници "
+"патената изгубили своје парнице."
 
 # type: Content of: <p>
 #. type: Content of: <p>
@@ -124,31 +106,17 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "Many people think that Unisys has given permission for distributing free "
-#| "software to make GIF format.  Unfortunately that is not what "
-#| "Unisys has actually done.  Here is what Unisys actually said about the "
-#| "matter in 1995:"
 msgid ""
 "Many people think that Unisys has given permission for distributing free "
 "software to make GIF format.  Unfortunately that is not what Unisys has "
 "actually done.  Here is what Unisys actually said about the matter in 1995:"
 msgstr ""
 "Многи људи мисле да је Унисис дао дозволе 
за расподелу слободног софтвера за "
-"стварање у <em>GIF</em> формату. На несрећу, то 
није оно што је "
-"Унисис заиста урадио. Ево шта је Унисис 
рекао о овој ствари 1995.:"
+"стварање у <em>GIF</em> формату. На несрећу, то 
није оно што је Унисис "
+"заиста урадио. Ево шта је Унисис рекао о 
овој ствари 1995.:"
 
 # type: Content of: <p><blockquote>
 #. type: Content of: <blockquote><p>
-#| msgid ""
-#| "Unisys does not require licensing, or fees to be paid, for non-"
-#| "commercial, non-profit GIF-based applications, including "
-#| "those for use on the on-line services.  Concerning developers of software "
-#| "for the Internet network, the same principle applies.  Unisys will not "
-#| "pursue previous inadvertent infringement by developers producing versions "
-#| "of software products for the Internet prior to 1995. The company does not "
-#| "require licensing, or fees to be paid for non-commercial, non-profit "
-#| "offerings on the Internet, including &ldquo;Freeware&rdquo;."
 msgid ""
 "Unisys does not require licensing, or fees to be paid, for non-commercial, "
 "non-profit GIF-based applications, including those for use on the on-line "
@@ -160,33 +128,23 @@
 "&ldquo;Freeware&rdquo;."
 msgstr ""
 "Unisys does not require licensing, or fees to be paid, for non-commercial, "
-"non-profit GIF-based applications, including those for use on "
-"the on-line services.  Concerning developers of software for the Internet "
-"network, the same principle applies.  Unisys will not pursue previous "
-"inadvertent infringement by developers producing versions of software "
-"products for the Internet prior to 1995. The company does not require "
-"licensing, or fees to be paid for non-commercial, non-profit offerings on "
-"the Internet, including &ldquo;Freeware&rdquo;.<br />(Унисис не зах
тева "
-"лиценцирање, или плаћање новчаних износа 
за некомерцијалне, непрофитне "
-"апликације засноване на <em>GIF</em>-у, 
укључујући оне које су "
-"намењене за коришћење у сервисима на вези. 
Исто важи за градитеље софтвера "
-"на мрежи Интернет. Унисис неће правно 
гонити градитеље који су ненамерно "
-"прекршили лиценцу производећи верзије 
софтверских производа за Интернет пре "
-"1995. Ова фирма не захтева лиценцирање или 
плаћање новчаних износа за "
-"некомерцијалне, непрофитне понуде на 
Интернету, укључујући „фривер“.)"
+"non-profit GIF-based applications, including those for use on the on-line "
+"services.  Concerning developers of software for the Internet network, the "
+"same principle applies.  Unisys will not pursue previous inadvertent "
+"infringement by developers producing versions of software products for the "
+"Internet prior to 1995. The company does not require licensing, or fees to "
+"be paid for non-commercial, non-profit offerings on the Internet, including "
+"&ldquo;Freeware&rdquo;.<br />(Унисис не захтева 
лиценцирање, или плаћање "
+"новчаних износа за некомерцијалне, 
непрофитне апликације засноване на "
+"<em>GIF</em>-у, укључујући оне које су намењене 
за коришћење у сервисима на "
+"вези. Исто важи за градитеље софтвера на 
мрежи Интернет. Унисис неће правно "
+"гонити градитеље који су ненамерно 
прекршили лиценцу производећи верзије "
+"софтверских производа за Интернет пре 1995. 
Ова фирма не захтева лиценцирање "
+"или плаћање новчаних износа за 
некомерцијалне, непрофитне понуде на "
+"Интернету, укључујући „фривер“.)"
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "Unfortunately, this doesn't permit <a href=\"/philosophy/free-sw.html"
-#| "\">free software</a>, only <a href=\"/philosophy/categories.html#semi-"
-#| "freeSoftware\">semi-free software</a> which cannot be used in a free "
-#| "operating system such as GNU.  It also does not permit <em>at all</em> "
-#| "the use of LZW for other purposes such as compression of "
-#| "files.  This is why we think it is still best to reject LZW, "
-#| "and switch to alternatives such as <a href=\"/software/gzip/gzip.html"
-#| "\">GNU zip</a> and <abbr title=\"Portable Network Graphics\">PNG</abbr> "
-#| "format."
 msgid ""
 "Unfortunately, this doesn't permit <a href=\"/philosophy/free-sw.html\">free "
 "software</a> which can be used in a free operating system such as GNU.  It "
@@ -196,20 +154,14 @@
 "\">GNU Gzip</a> and PNG."
 msgstr ""
 "Нажалост, ово не дозвољава постојање <a 
href=\"/philosophy/free-sw.html"
-"\">слободног софтвера</a> који се може "
-"користити у слободном оперативном 
систему као што је ГНУ. То такође "
-"<em>уопште</em> не дозвољава употребу 
<em>LZW</em>-а у друге "
-"сврхе, као што је компримовање датотека. 
Зато смо морали да развијемо "
-"замене, као што су <a 
href=\"/software/gzip/gzip.html\">ГНУ-ов <em>zip</em></"
-"a> и формат <em>PNG</em>."
+"\">слободног софтвера</a> који се може 
користити у слободном оперативном "
+"систему као што је ГНУ. То такође 
<em>уопште</em> не дозвољава употребу "
+"<em>LZW</em>-а у друге сврхе, као што је 
компримовање датотека. Зато смо "
+"морали да развијемо замене, као што су <a 
href=\"/software/gzip/gzip.html"
+"\">ГНУ-ов <em>zip</em></a> и формат <em>PNG</em>."
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "<a href=\"/philosophy/selling.html\">Commercial redistribution of free "
-#| "software</a> is very important, and we want the GNU system as a whole to "
-#| "be redistributed commercially.  This means we can't add a <abbr>GIF</"
-#| "abbr>-generating program to GNU, not under the Unisys terms."
 msgid ""
 "<a href=\"/philosophy/selling.html\">Commercial redistribution of free "
 "software</a> is very important, and we want the GNU system as a whole to be "
@@ -218,20 +170,11 @@
 msgstr ""
 "<a href=\"/philosophy/selling.html\">Комерцијална 
расподела слободног "
 "софтвера</a> је веома важна; ми желимо да се 
цео систем ГНУ комерцијално "
-"расподељује. Ово значи да не можемо да 
додамо програм који ствара "
-"<em>GIF</em>-ове у ГНУ, бар не под Унисисовим 
условима."
+"расподељује. Ово значи да не можемо да 
додамо програм који ствара <em>GIF</"
+"em>-ове у ГНУ, бар не под Унисисовим 
условима."
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "The <a href=\"http://www.fsf.org\";>Free Software Foundation</a> is a non-"
-#| "commercial, non-profit organization, so strictly speaking the income from "
-#| "our sales of <a href=\"http://shop.fsf.org/\";>CD-ROMs</a> is not &ldquo;"
-#| "profit&rdquo;.  Perhaps this means we could include a GIF "
-#| "program on our CD-ROM and claim to be acting within the scope of the "
-#| "Unisys permission&mdash;or perhaps not.  But since we know that other "
-#| "redistributors of GNU would be unable to include it, doing this would not "
-#| "be very useful."
 msgid ""
 "The <a href=\"http://www.fsf.org\";>Free Software Foundation</a> is a non-"
 "commercial, non-profit organization, so strictly speaking the income from "
@@ -245,18 +188,12 @@
 "некомерцијална, непрофитна организација, 
па стога, строго говорећи, приход "
 "од наше продаје <a 
href=\"http://shop.fsf.org/\";><em>CD-ROM</em>-ова</a> "
 "није „профит“. Можда ово значи да бисмо 
могли да укључимо програм за "
-"<em>GIF</em>-ове на нашем <em>CD-ROM</em>-у и да тврдимо 
да "
-"чинимо све под Унисисовом дозволом — а 
можда и не. Али, пошто знамо да би "
-"други расподељивачи ГНУ-а били спречени 
да га укључе, то не би било веома "
-"корисно."
+"<em>GIF</em>-ове на нашем <em>CD-ROM</em>-у и да тврдимо 
да чинимо све под "
+"Унисисовом дозволом — а можда и не. Али, 
пошто знамо да би други "
+"расподељивачи ГНУ-а били спречени да га 
укључе, то не би било веома корисно."
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "Shortly after Unisys made its announcement, when the net in general was "
-#| "reassured thinking that Unisys had given permission for free <abbr>GIF</"
-#| "abbr>-generating software, we wrote to the Unisys legal department asking "
-#| "for clarification of these issues.  We did not receive a response."
 msgid ""
 "Shortly after Unisys made its announcement, when the net in general was "
 "reassured thinking that Unisys had given permission for free GIF-generating "
@@ -264,19 +201,12 @@
 "of these issues.  We did not receive a response."
 msgstr ""
 "Скоро одмах пошто је Унисис ово изјавио, 
када су сви на мрежи поново били "
-"уверени да је Унисис дао дозволу за 
слободни софтвер за стварање "
-"<em>GIF</em>-ова, писали смо правној служби 
Унисиса, тражећи да "
-"нам разјасне ове ствари. Још нисмо добили 
одговор."
+"уверени да је Унисис дао дозволу за 
слободни софтвер за стварање <em>GIF</"
+"em>-ова, писали смо правној служби Унисиса, 
тражећи да нам разјасне ове "
+"ствари. Још нисмо добили одговор."
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "Even if Unisys really did give permission for free software to generate "
-#| "GIFs, we would still have to deal with the IBM patent.  Both "
-#| "the IBM and the Unisys patents cover the same &ldquo;invention&rdquo;"
-#| "&mdash;the LZW compression algorithm.  (This could reflect "
-#| "an error on the part of the US Patent and Trademark Office, which is "
-#| "famous for incompetence and poor judgment.)"
 msgid ""
 "Even if Unisys really did give permission for free software to generate "
 "GIFs, we would still have to deal with the IBM patent.  Both the IBM and the "
@@ -285,57 +215,40 @@
 "Patent and Trademark Office, which is famous for incompetence and poor "
 "judgment.)"
 msgstr ""
-"Чак и да је Унисис стварно дао дозволу да 
слободни софтвер ствара "
-"<em>GIF</em>-ове, и даље бисмо морали да се 
изборимо са ИБМ-"
-"овим патентом. И ИБМ-ов и Унисисов патент 
се односе на исти „изум“ - "
-"алгоритам за компримовање <em>LZW</em>. (Ово би 
могло да буде "
-"илустрација за грешку у делу америчке 
Канцеларије за патенте и робне марке, "
-"која је позната по својој нестручности и 
лошем расуђивању.)"
+"Чак и да је Унисис стварно дао дозволу да 
слободни софтвер ствара <em>GIF</"
+"em>-ове, и даље бисмо морали да се изборимо 
са ИБМ-овим патентом. И ИБМ-ов и "
+"Унисисов патент се односе на исти „изум“ 
- алгоритам за компримовање "
+"<em>LZW</em>. (Ово би могло да буде илустрација 
за грешку у делу америчке "
+"Канцеларије за патенте и робне марке, која 
је позната по својој нестручности "
+"и лошем расуђивању.)"
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "Decoding GIFs is a different issue.  The Unisys and IBM "
-#| "patents are both written in such a way that they do not apply to a "
-#| "program which can only uncompress LZW format and cannot "
-#| "compress.  Therefore we can and will include support for displaying "
-#| "GIF files in GNU software."
 msgid ""
 "Decoding GIFs is a different issue.  The Unisys and IBM patents are both "
 "written in such a way that they do not apply to a program which can only "
 "uncompress LZW format and cannot compress.  Therefore we can and will "
 "include support for displaying GIF files in GNU software."
 msgstr ""
-"Декодирање <em>GIF</em>-ова је друга ствар. И 
Унисисов и ИБМ-ов "
-"патент су написани на такав начин да се не 
односе на програм који само може "
-"да декомпримује у формату <em>LZW</em>, а не 
може да компримује "
-"у њему. Зато можемо да укључимо и 
укључићемо подршку за приказ "
-"<em>GIF</em> датотека у ГНУ-ов софтвер."
+"Декодирање <em>GIF</em>-ова је друга ствар. И 
Унисисов и ИБМ-ов патент су "
+"написани на такав начин да се не односе на 
програм који само може да "
+"декомпримује у формату <em>LZW</em>, а не може 
да компримује у њему. Зато "
+"можемо да укључимо и укључићемо подршку 
за приказ <em>GIF</em> датотека у "
+"ГНУ-ов софтвер."
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "Given this situation, we could still include GIF files in "
-#| "our web pages if we wanted to.  Many other people would be happy to "
-#| "generate them for us, and we would not be sued for having <abbr>GIF</"
-#| "abbr> files on our server."
 msgid ""
 "Given this situation, we could still include GIF files in our web pages if "
 "we wanted to.  Many other people would be happy to generate them for us, and "
 "we would not be sued for having GIF files on our server."
 msgstr ""
-"Сходно томе, наше веб странице би могле да 
садрже <em>GIF</em> "
-"датотеке, ако бисмо то ми хтели. Многи 
други би нам радо направили такве "
-"датотеке, а ми не бисмо били тужени због 
њиховог поседовања."
+"Сходно томе, наше веб странице би могле да 
садрже <em>GIF</em> датотеке, ако "
+"бисмо то ми хтели. Многи други би нам радо 
направили такве датотеке, а ми не "
+"бисмо били тужени због њиховог 
поседовања."
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "But we feel that if we can't distribute the software to enable people to "
-#| "generate GIF files properly, then we should not have other "
-#| "people run such software for us.  Besides, if we can't provide software "
-#| "in GNU to generate GIF files, we have to recommend an "
-#| "alternative.  We ourselves should use the alternative that we recommend."
 msgid ""
 "But we feel that if we can't distribute the software to enable people to "
 "generate GIF files properly, then we should not have other people run such "
@@ -344,11 +257,11 @@
 "alternative that we recommend."
 msgstr ""
 "Али ми сматрамо да уколико не можемо да 
расподељујемо софтвер који би "
-"омогућио људима да на прави начин 
стварају <em>GIF</em> "
-"датотеке, онда не можемо ни да тражимо од 
других људи да покрећу такав "
-"софтвер за нас. Осим тога, ако не можемо да 
обезбедимо софтвер за прављење "
-"<em>GIF</em> датотека у ГНУ-у, морамо да 
предложимо "
-"алтернативу, коју бисмо ми сами морали да 
користимо."
+"омогућио људима да на прави начин 
стварају <em>GIF</em> датотеке, онда не "
+"можемо ни да тражимо од других људи да 
покрећу такав софтвер за нас. Осим "
+"тога, ако не можемо да обезбедимо софтвер 
за прављење <em>GIF</em> датотека "
+"у ГНУ-у, морамо да предложимо алтернативу, 
коју бисмо ми сами морали да "
+"користимо."
 
 # type: Content of: <p>
 #. type: Content of: <p>
@@ -358,15 +271,6 @@
 
 # type: Content of: <p><blockquote>
 #. type: Content of: <blockquote><p>
-#| msgid ""
-#| "Unisys has frequently been asked whether a Unisys license is required in "
-#| "order to use LZW software obtained by downloading from the "
-#| "Internet or from other sources. The answer is simple. In all cases, a "
-#| "written license agreement or statement signed by an authorized Unisys "
-#| "representative is required from Unisys for all use, sale or distribution "
-#| "of any software (including so-called &ldquo;freeware&rdquo;) and/or "
-#| "hardware providing LZW conversion capability (for example, "
-#| "downloaded software)."
 msgid ""
 "Unisys has frequently been asked whether a Unisys license is required in "
 "order to use LZW software obtained by downloading from the Internet or from "
@@ -377,20 +281,19 @@
 "conversion capability (for example, downloaded software)."
 msgstr ""
 "Unisys has frequently been asked whether a Unisys license is required in "
-"order to use LZW software obtained by downloading from the "
-"Internet or from other sources. The answer is simple. In all cases, a "
-"written license agreement or statement signed by an authorized Unisys "
-"representative is required from Unisys for all use, sale or distribution of "
-"any software (including so-called &ldquo;freeware&rdquo;) and/or hardware "
-"providing LZW conversion capability (for example, downloaded "
-"software).<br />(Унисис је у последње време 
добијао питања о томе да ли се "
-"за коришћење <em>LZW</em> софтвера добављеног 
преузимањем са "
-"Интернета или из других извора захтева 
Унисисова лиценца. Одговор је "
-"једноставан. У свим случајевима, за 
употребу, продају или расподелу било ког "
-"софтвера (укључујући тзв. „фривер“) и/или 
хардвера који пружа могућност "
-"претварања <em>LZW</em> (на пример, преузетог 
софтвера), "
-"захтева се писани уговор о лиценци или 
изјава потписана од стране Унисисовог "
-"представника.)"
+"order to use LZW software obtained by downloading from the Internet or from "
+"other sources. The answer is simple. In all cases, a written license "
+"agreement or statement signed by an authorized Unisys representative is "
+"required from Unisys for all use, sale or distribution of any software "
+"(including so-called &ldquo;freeware&rdquo;) and/or hardware providing LZW "
+"conversion capability (for example, downloaded software).<br />(Унисис 
је у "
+"последње време добијао питања о томе да ли 
се за коришћење <em>LZW</em> "
+"софтвера добављеног преузимањем са 
Интернета или из других извора захтева "
+"Унисисова лиценца. Одговор је 
једноставан. У свим случајевима, за 
употребу, "
+"продају или расподелу било ког софтвера 
(укључујући тзв. „фривер“) и/или "
+"хардвера који пружа могућност претварања 
<em>LZW</em> (на пример, преузетог "
+"софтвера), захтева се писани уговор о 
лиценци или изјава потписана од стране "
+"Унисисовог представника.)"
 
 # type: Content of: <p>
 #. type: Content of: <p>
@@ -406,28 +309,22 @@
 #. type: Content of: <p>
 #, fuzzy
 #| msgid ""
-#| "A further issue is that the LZW patents&mdash;and software "
-#| "patents in general&mdash;are an offense against the freedom of "
-#| "programmers generally, and all programmers need to work together against "
-#| "software patents."
+#| "A further issue is that the LZW patents&mdash;and software patents in "
+#| "general&mdash;are an offense against the freedom of programmers "
+#| "generally, and all programmers need to work together against software "
+#| "patents."
 msgid ""
 "A further issue is that the LZW patents&mdash;and computational idea patents "
 "in general&mdash;are an offense against the freedom of programmers "
 "generally, and all programmers need to work together to <a href=\"/"
 "philosophy/limit-patent-effect.html\">protect software from patents.</a>"
 msgstr ""
-"Још један проблем је да су патенти <em>LZW</em>, 
и софтверски "
-"патенти уопште, прекршај против слободе 
програмера уопште, па би програмери "
-"требало да се <a 
href=\"/philosophy/limit-patent-effect.html\">удруже против "
-"њих</a>."
+"Још један проблем је да су патенти <em>LZW</em>, 
и софтверски патенти "
+"уопште, прекршај против слободе 
програмера уопште, па би програмери 
требало "
+"да се <a href=\"/philosophy/limit-patent-effect.html\">удруже 
против њих</a>."
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "So even if we could find a solution to enable the free software community "
-#| "to generate GIFs, that isn't really a solution, not for the "
-#| "problem as a whole.  The solution is switching to another format and not "
-#| "using GIF any more."
 msgid ""
 "So even if we could find a solution to enable the free software community to "
 "generate GIFs, that isn't really a solution, not for the problem as a "
@@ -435,68 +332,50 @@
 "more."
 msgstr ""
 "Зато, чак иако пронађемо начин да 
омогућимо заједници слободног софтвера да "
-"ствара <em>GIF</em>-ове, то не би заиста било 
решење, бар не "
-"проблема у целини. Право решење је 
прелазак на други формат и престанак "
-"употребе <em>GIF</em>-ова."
+"ствара <em>GIF</em>-ове, то не би заиста било 
решење, бар не проблема у "
+"целини. Право решење је прелазак на други 
формат и престанак употребе "
+"<em>GIF</em>-ова."
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "Therefore, we don't use GIF, and we hope you won't use it "
-#| "either."
 msgid "Therefore, we don't use GIF, and we hope you won't use it either."
 msgstr ""
-"Стога, ми не употребљавамо <em>GIF</em> и надамо 
се да га ни ви "
-"нећете користити."
+"Стога, ми не употребљавамо <em>GIF</em> и надамо 
се да га ни ви нећете "
+"користити."
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "It is possible to make non-compressed images that act like <abbr>GIF</"
-#| "abbr>s, in that they work with programs that decode GIF "
-#| "format.  This can be done without infringing patents.  These pseudo-"
-#| "GIFs are useful for some purposes."
 msgid ""
 "It is possible to make non-compressed images that act like GIFs, in that "
 "they work with programs that decode GIF format.  This can be done without "
 "infringing patents.  These pseudo-GIFs are useful for some purposes."
 msgstr ""
-"Постоји могућност да се праве 
некомпресоване слике које имају улогу "
-"<em>GIF</em>-ова, у смислу да функционишу у 
програмима који "
-"декодирају формат <em>GIF</em>. То се може 
урадити без кршења "
-"патената. Овакви псеудо-<em>GIF</em>-ови су за 
неке употребе "
-"корисни."
+"Постоји могућност да се праве 
некомпресоване слике које имају улогу 
<em>GIF</"
+"em>-ова, у смислу да функционишу у 
програмима који декодирају формат "
+"<em>GIF</em>. То се може урадити без кршења 
патената. Овакви псеудо-<em>GIF</"
+"em>-ови су за неке употребе корисни."
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "It is also possible to create GIFs using a patent-free run "
-#| "length encoding but this doesn't achieve the compression that one "
-#| "normally expects in a GIF."
 msgid ""
 "It is also possible to create GIFs using a patent-free run length encoding "
 "but this doesn't achieve the compression that one normally expects in a GIF."
 msgstr ""
-"Могуће је и створити <em>GIF</em>-ове користећи 
кодирање дужине "
-"трајања (<em>run length encoding, RLE</em>), које је 
ослобођено патената, "
-"али њим се не постиже степен компресије 
који се очекује од <em>GIF</em>-а."
+"Могуће је и створити <em>GIF</em>-ове користећи 
кодирање дужине трајања "
+"(<em>run length encoding, RLE</em>), које је ослобођено 
патената, али њим се "
+"не постиже степен компресије који се 
очекује од <em>GIF</em>-а."
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "We decided not to use these pseudo-GIFs on our web site "
-#| "because they are not a satisfactory solution to the community's problem.  "
-#| "They work, but they are very large.  What the web needs is a patent-free "
-#| "compressed format, not large pseudo-GIFs."
 msgid ""
 "We decided not to use these pseudo-GIFs on our web site because they are not "
 "a satisfactory solution to the community's problem.  They work, but they are "
 "very large.  What the web needs is a patent-free compressed format, not "
 "large pseudo-GIFs."
 msgstr ""
-"Одлучили смо да не користимо овакве 
псеудо-<em>GIF</em>-ове на "
-"нашем вебместу јер они нису 
задовољавајуће решење овог друштвеног 
проблема. "
-"Они функционишу, али су веома велики. Оно 
што је потребно вебу је формат "
+"Одлучили смо да не користимо овакве 
псеудо-<em>GIF</em>-ове на нашем "
+"вебместу јер они нису задовољавајуће 
решење овог друштвеног проблема. Они "
+"функционишу, али су веома велики. Оно што 
је потребно вебу је формат "
 "компресије ослобођен патената, а не 
псеудо-<em>GIF</em>-ови."
 
 # type: Content of: <p>
@@ -515,42 +394,33 @@
 "of the <a href=\"/graphics/graphics.html\">images on this server</a>."
 msgstr ""
 "<a 
href=\"http://en.wikipedia.org/wiki/Portable_Network_Graphics\";>Формат "
-"<em>PNG</em></a> је формат компресије који је 
ослобођен патената. Надамо се да "
-"ће постати широко подржан, а онда ћемо га 
употребљавати. Ми на овом серверу "
-"поседујемо и верзије наших слика у <a 
href=\"/graphics/graphics.html"
+"<em>PNG</em></a> је формат компресије који је 
ослобођен патената. Надамо се "
+"да ће постати широко подржан, а онда ћемо 
га употребљавати. Ми на овом "
+"серверу поседујемо и верзије наших слика 
у <a href=\"/graphics/graphics.html"
 "\">формату <em>PNG</em></a>."
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "For more information about the GIF patent problems, see <a "
-#| "href=\"http://progfree.org/Patents/Gif/Gif.html\";>the League for "
-#| "Programming Freedom GIF page</a>.  Through that page you can "
-#| "find more information about the problem of software patents in general."
 msgid ""
 "For more information about the GIF patent problems, see <a href=\"http://www.";
 "progfree.org/Patents/Gif/Gif.html\">the League for Programming Freedom GIF "
 "page</a>.  Through that page you can find more information about the <a href="
 "\"http://endsoftpatents.org/\";>problem of software patents in general.</a>"
 msgstr ""
-"За више информација о проблемима са 
<em>GIF</em>-овим патентом, "
-"погледајте <a 
href=\"http://progfree.org/Patents/Gif/Gif.html\";>страницу о "
-"<em>GIF</em>-у Лиге за слободу програмирања</a>. 
На тој страни "
-"можете наћи више информација о <a href="
-"\"http://endsoftpatents.org/\";>проблему софтверских 
патената уопште</a>."
+"За више информација о проблемима са 
<em>GIF</em>-овим патентом, погледајте "
+"<a href=\"http://progfree.org/Patents/Gif/Gif.html\";>страницу о 
<em>GIF</em>-"
+"у Лиге за слободу програмирања</a>. На тој 
страни можете наћи више "
+"информација о <a 
href=\"http://endsoftpatents.org/\";>проблему софтверских "
+"патената уопште</a>."
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "There's a library called <a href=\"http://ca.geocities.com/libungif/";
-#| "\">libungif</a> that reads gif files and writes uncompressed gifs to "
-#| "circumvent the Unisys patent."
 msgid ""
 "There is a library called libungif that reads gif files and writes "
 "uncompressed gifs to circumvent the Unisys patent."
 msgstr ""
-"Постоји и библиотека звана <em>libungif</em> која 
чита <em>gif</em> датотеке и уписује "
-"некомпримоване <em>GIF</em>-ове да се 
супротстави Унисисовом "
+"Постоји и библиотека звана <em>libungif</em> која 
чита <em>gif</em> датотеке "
+"и уписује некомпримоване <em>GIF</em>-ове да се 
супротстави Унисисовом "
 "патенту."
 
 # type: Content of: <p>
@@ -558,15 +428,14 @@
 #, fuzzy
 #| msgid ""
 #| "<a href=\"http://burnallgifs.org\";>http://burnallgifs.org</a> is a "
-#| "website devoted to discouraging the use of GIF files on your "
-#| "website."
+#| "website devoted to discouraging the use of GIF files on your website."
 msgid ""
 "<a href=\"http://burnallgifs.org\";>http://burnallgifs.org</a> is a web site "
 "devoted to discouraging the use of GIF files on the web."
 msgstr ""
 "<a href=\"http://burnallgifs.org\";>http://burnallgifs.org</a> је 
вебместо "
-"које је посвећено подстицању 
неупотребљавања <em>GIF</em> "
-"датотека на вашем вебместу."
+"које је посвећено подстицању 
неупотребљавања <em>GIF</em> датотека на вашем "
+"вебместу."
 
 # type: Content of: <h3>
 #. type: Content of: <h3>
@@ -655,8 +524,8 @@
 "panel of your PO editor (or above the msgid if you are using a simple text "
 "editor). All the Serbian POs need to be treated similarly; this can be done "
 "by simply modifying the two variants of this string in a master compendium "
-"(to be created). If you need any technical help, please contact "
-"address@hidden"
+"(to be created). If you need any technical help, please contact web-"
+"address@hidden"
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
@@ -705,15 +574,15 @@
 #~ "software patents, these particular patents are now no longer a concern "
 #~ "(see <a href=\"#venuenote\">footnote</a> below).  For details of our "
 #~ "website <a href=\"/server/fsf-html-style-sheet.html#UseofGraphics"
-#~ "\">policies regarding GIFs</a>, see our <a href=\"/server/"
-#~ "standards/\">web guidelines</a>.</strong>"
+#~ "\">policies regarding GIFs</a>, see our <a href=\"/server/standards/"
+#~ "\">web guidelines</a>.</strong>"
 #~ msgstr ""
 #~ "<strong>Иако је ова прича историјска 
илустрација опасности софтверских "
 #~ "патената, ови конкретни патенти више 
нису опасни (погледајте доњу <a href="
 #~ "\"#venuenote\">фусноту</a>). За више детаља о <a 
href=\"/server/fsf-html-"
 #~ "style-sheet.html#UseofGraphics\">правилима нашег 
вебместа у вези са "
-#~ "<em>GIF</em>-овима</a>, погледајте наше <a 
href=\"/server/"
-#~ "standards/\">веб смернице</a>.</strong>"
+#~ "<em>GIF</em>-овима</a>, погледајте наше <a 
href=\"/server/standards/"
+#~ "\">веб смернице</a>.</strong>"
 
 # type: Content of: <title>
 #~ msgid "Why There Are No GIF files on GNU Web Pages"

Index: philosophy/po/java-trap.sr.po
===================================================================
RCS file: /web/www/www/philosophy/po/java-trap.sr.po,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- philosophy/po/java-trap.sr.po       2 Dec 2014 10:53:06 -0000       1.25
+++ philosophy/po/java-trap.sr.po       2 Dec 2014 11:01:47 -0000       1.26
@@ -19,15 +19,14 @@
 
 # type: Content of: <h2>
 #. type: Content of: <title>
-#| msgid "Free But Shackled - The Java Trap"
 msgid ""
 "Free but Shackled - The Java Trap - GNU Project - Free Software Foundation"
-msgstr "Слобода у оковима – замка језика Јава 
— Пројекат ГНУ "
-"— Задужбина за слободни софтвер"
+msgstr ""
+"Слобода у оковима – замка језика Јава — 
Пројекат ГНУ — Задужбина за слободни "
+"софтвер"
 
 # type: Content of: <h2>
 #. type: Content of: <h2>
-#| msgid "Free But Shackled - The Java Trap"
 msgid "Free but Shackled - The Java Trap"
 msgstr "Слобода у оковима – замка језика Јава"
 
@@ -112,12 +111,12 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><blockquote><p>
-#| msgid ""
-#| "Please also see: <a href=\"javascript-trap.html\">The Javascript Trap</a>"
 msgid ""
 "Please also see: <a href=\"/philosophy/javascript-trap.html\"> The "
 "JavaScript Trap</a>."
-msgstr "Погледајте и: <a 
href=\"/philosophy/javascript-trap.html\">Замка ЈаваСписа</a>"
+msgstr ""
+"Погледајте и: <a 
href=\"/philosophy/javascript-trap.html\">Замка ЈаваСписа</"
+"a>"
 
 # type: Content of: <p>
 #. type: Content of: <p>
@@ -126,12 +125,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "If your program is free software, it is basically ethical&mdash;but there "
-#| "is a trap you must be on guard for. Your program, though in itself free, "
-#| "may be restricted by non-free software that it depends on. Since the "
-#| "problem is most prominent today for Java programs, we call it the Java "
-#| "Trap."
 msgid ""
 "If your program is free software, it is basically ethical&mdash;but there is "
 "a trap you must be on guard for. Your program, though in itself free, may be "
@@ -216,13 +209,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "If some of a program's dependencies are non-free, this means that all or "
-#| "part of the program is unable to run in an entirely free system&mdash;it "
-#| "is unusable in the Free World. Sure, we could redistribute the program "
-#| "and have copies on our machines, but that's not much good if it won't "
-#| "run. That program is free software, but it is effectively shackled by its "
-#| "non-free dependencies."
 msgid ""
 "If some of a program's dependencies are nonfree, this means that all or part "
 "of the program is unable to run in an entirely free system&mdash;it is "
@@ -240,18 +226,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "This problem can occur in any kind of software, in any language. For "
-#| "instance, a free program that only runs on Microsoft Windows is clearly "
-#| "useless in the Free World. But software that runs on GNU/Linux can also "
-#| "be useless if it depends on other non-free software. In the past, Motif "
-#| "(before we had LessTif) and Qt (before its developers made it free "
-#| "software) were major causes of this problem. Most 3D video cards work "
-#| "fully only with non-free drivers, which also cause this problem. But the "
-#| "major source of this problem today is Java, because people who write free "
-#| "software often feel Java is sexy. Blinded by their attraction to the "
-#| "language, they overlook the issue of dependencies, and they fall into the "
-#| "Java Trap."
 msgid ""
 "This problem can occur in any kind of software, in any language. For "
 "instance, a free program that only runs on Microsoft Windows is clearly "
@@ -279,12 +253,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "Sun's implementation of Java is non-free. The standard Java libraries are "
-#| "non-free also. We do have free implementations of Java, such as the <a "
-#| "href=\"http://gcc.gnu.org/java/\";>GNU Compiler for Java</a> (GCJ) and <a "
-#| "href=\"/software/classpath\">GNU Classpath</a>, but they don't support "
-#| "all the features yet. We are still catching up."
 msgid ""
 "Sun's implementation of Java is nonfree. The standard Java libraries are "
 "nonfree also. We do have free implementations of Java, such as the <a href="
@@ -332,17 +300,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "Sun continues to develop additional &ldquo;standard&rdquo; Java "
-#| "libraries, and nearly all of them are non-free; in many cases, even a "
-#| "library's specification is a trade secret, and Sun's latest license for "
-#| "these specifications prohibits release of anything less than a full "
-#| "implementation of the specification. (See <a href=\"http://jcp.org/";
-#| "aboutJava/communityprocess/JSPA2.pdf\">http://jcp.org/aboutJava/";
-#| "communityprocess/JSPA2.pdf</a> and <a href=\"http://jcp.org/aboutJava/";
-#| "communityprocess/final/jsr129/j2me_pb-1_0-fr-spec-license.html\">http://";
-#| "jcp.org/aboutJava/communityprocess/final/jsr129/j2me_pb-1_0-fr-spec-"
-#| "license.html</a>, for examples)."
 msgid ""
 "Sun continues to develop additional &ldquo;standard&rdquo; Java libraries, "
 "and nearly all of them are nonfree; in many cases, even a library's "
@@ -366,14 +323,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "Fortunately, that specification license does permit releasing an "
-#| "implementation as free software; others who receive the library can be "
-#| "allowed to change it and are not required to adhere to the "
-#| "specification.  But the requirement has the effect of prohibiting the use "
-#| "of a collaborative development model to produce the free implementation. "
-#| "Use of that model would entail publishing incomplete versions, which "
-#| "those who have read the spec are not allowed to do."
 msgid ""
 "Fortunately, that specification license does permit releasing an "
 "implementation as free software; others who receive the library can be "
@@ -393,20 +342,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "In the early days of the Free Software Movement, it was impossible to "
-#| "avoid depending on non-free programs. Before we had the GNU C compiler, "
-#| "every C program (free or not) depended on a non-free C compiler. Before "
-#| "we had the GNU C library, every program depended on a non-free C library. "
-#| "Before we had Linux, the first free kernel, every program depended on a "
-#| "non-free kernel.  Before we had Bash, every shell script had to be "
-#| "interpreted by a non-free shell. It was inevitable that our first "
-#| "programs would initially be hampered by these dependencies, but we "
-#| "accepted this because our plan included rescuing them subsequently. Our "
-#| "overall goal, a self-hosting GNU operating system, included free "
-#| "replacements for all those dependencies; if we reached the goal, all our "
-#| "programs would be rescued. Thus it happened: with the GNU/Linux system, "
-#| "we can now run these programs on free platforms."
 msgid ""
 "In the early days of the free software movement, it was impossible to avoid "
 "depending on nonfree programs. Before we had the GNU C compiler, every C "
@@ -487,16 +422,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "We are trying to rescue the trapped Java programs, so if you like the "
-#| "Java language, we invite you to help in developing GNU Classpath. Trying "
-#| "your programs with the the GCJ Compiler and GNU Classpath, and reporting "
-#| "any problems you encounter in classes already implemented, is also "
-#| "useful.  However, finishing GNU Classpath will take time; if more non-"
-#| "free libraries continue to be added, we may never have all the latest "
-#| "ones. So please don't put your free software in shackles. When you write "
-#| "an application program today, write it to run on free facilities from the "
-#| "start."
 msgid ""
 "We are trying to rescue the trapped Java programs, so if you like the Java "
 "language, we invite you to help in developing GNU Classpath. Trying your "
@@ -539,12 +464,6 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><div><p>
-#| msgid ""
-#| "Please send FSF &amp; GNU inquiries to <a href=\"mailto:address@hidden";
-#| "\"><em>address@hidden</em></a>.  There are also <a 
href=\"/contact/\">other "
-#| "ways to contact</a> the FSF.  <br /> Please send broken links and other "
-#| "corrections or suggestions to <a href=\"mailto:address@hidden";
-#| "\"><em>address@hidden</em></a>."
 msgid ""
 "Please send general FSF &amp; GNU inquiries to <a 
href=\"mailto:address@hidden";
 "\">&lt;address@hidden&gt;</a>.  There are also <a href=\"/contact/\">other 
ways "
@@ -581,12 +500,11 @@
 "panel of your PO editor (or above the msgid if you are using a simple text "
 "editor). All the Serbian POs need to be treated similarly; this can be done "
 "by simply modifying the two variants of this string in a master compendium "
-"(to be created). If you need any technical help, please contact "
-"address@hidden"
+"(to be created). If you need any technical help, please contact web-"
+"address@hidden"
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
-#| msgid "Copyright &copy; 2004 Richard Stallman"
 msgid "Copyright &copy; 2004, 2010 Richard Stallman"
 msgstr "<b>Ауторска права:</b><br />Copyright &copy; 2004 Richard 
Stallman"
 

Index: philosophy/po/linux-gnu-freedom.sr.po
===================================================================
RCS file: /web/www/www/philosophy/po/linux-gnu-freedom.sr.po,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- philosophy/po/linux-gnu-freedom.sr.po       2 Dec 2014 10:53:06 -0000       
1.14
+++ philosophy/po/linux-gnu-freedom.sr.po       2 Dec 2014 11:01:47 -0000       
1.15
@@ -19,11 +19,8 @@
 
 # type: Content of: <title>
 #. type: Content of: <title>
-#| msgid ""
-#| "Linux, GNU, and freedom - GNU Project - Free Software Foundation (FSF)"
 msgid "Linux, GNU, and freedom - GNU Project - Free Software Foundation"
-msgstr ""
-"Линукс, ГНУ и слобода — Пројекат ГНУ — 
Задужбина за слободни софтвер"
+msgstr "Линукс, ГНУ и слобода — Пројекат ГНУ — 
Задужбина за слободни софтвер"
 
 # type: Attribute 'content' of: <meta>
 #. type: Attribute 'content' of: <meta>
@@ -248,19 +245,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "We have partial freedom today, but our freedom is not secure.  It is "
-#| "threatened by the <abbr title=\"Consumer Broadband and Digital Television "
-#| "Promotion Act\">CBDTPA</abbr> (formerly <abbr title=\"Security Systems "
-#| "and Standards Certification Act\">SSSCA</abbr>), by the Broadcast &ldquo;"
-#| "Protection&rdquo; Discussion Group (see <a href=\"http://www.eff.org/";
-#| "\">http://www.eff.org/</a>) which proposes to prohibit free software to "
-#| "access digital TV broadcasts, by software patents (Europe is now "
-#| "considering whether to have software patents), by Microsoft nondisclosure "
-#| "agreements for vital protocols, and by everyone who tempts us with a non-"
-#| "free program that is &ldquo;better&rdquo; (technically) than available "
-#| "free programs.  We can lose our freedom again just as we lost it the "
-#| "first time, if we don't care enough to protect it."
 msgid ""
 "We have partial freedom today, but our freedom is not secure.  It is "
 "threatened by the <abbr title=\"Consumer Broadband and Digital Television "
@@ -287,20 +271,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "Will enough of us care? That depends on many things; among them, how much "
-#| "influence the GNU Project has, and how much influence Linus Torvalds "
-#| "has.  The GNU Project says, &ldquo;Value your freedom!&rdquo;.  Joe Barr "
-#| "says, &ldquo;Choose between non-free and free programs on technical "
-#| "grounds alone!&rdquo;.  If people credit Torvalds as the main developer "
-#| "of the GNU/Linux system, that's not just inaccurate, it also makes his "
-#| "message more influential&mdash;and that message says, &ldquo;Non-free "
-#| "software is ok; I use it and develop it myself.&rdquo; If they recognize "
-#| "our role, they will listen to us more, and the message we will give them "
-#| "is, &ldquo;This system exists because of people who care about freedom. "
-#| "Join us, value your freedom, and together we can preserve it.&rdquo; See "
-#| "<a href=\"http://www.gnu.org/gnu/thegnuproject.html\";>http://www.gnu.org/";
-#| "gnu/thegnuproject.html</a> for the history."
 msgid ""
 "Will enough of us care? That depends on many things; among them, how much "
 "influence the GNU Project has, and how much influence Linus Torvalds has.  "
@@ -325,9 +295,9 @@
 "„Неслободни софтвер је исправан; и сам га 
користим и изграђујем.“ Ако "
 "признају нашу улогу, слушаће нас више, а 
порука коју им ми дајемо је: „Овај "
 "систем постоји ради људи којима је 
слобода важна. Придружите нам се, цените "
-"своју слободу, и заједно ћемо је очувати.“ 
Погледајте страну <a href="
-"\"/gnu/the-gnu-project.html\">http://www.gnu.org/gnu/the-";
-"gnu-project.html</a> о историји."
+"своју слободу, и заједно ћемо је очувати.“ 
Погледајте страну <a href=\"/gnu/"
+"the-gnu-project.html\">http://www.gnu.org/gnu/the-gnu-project.html</a> о "
+"историји."
 
 # type: Content of: <p>
 #. type: Content of: <p>
@@ -546,12 +516,6 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><div><p>
-#| msgid ""
-#| "Please send FSF &amp; GNU inquiries to <a href=\"mailto:address@hidden";
-#| "\"><em>address@hidden</em></a>.  There are also <a 
href=\"/contact/\">other "
-#| "ways to contact</a> the FSF.  <br /> Please send broken links and other "
-#| "corrections or suggestions to <a href=\"mailto:address@hidden";
-#| "\"><em>address@hidden</em></a>."
 msgid ""
 "Please send general FSF &amp; GNU inquiries to <a 
href=\"mailto:address@hidden";
 "\">&lt;address@hidden&gt;</a>.  There are also <a href=\"/contact/\">other 
ways "
@@ -588,8 +552,8 @@
 "panel of your PO editor (or above the msgid if you are using a simple text "
 "editor). All the Serbian POs need to be treated similarly; this can be done "
 "by simply modifying the two variants of this string in a master compendium "
-"(to be created). If you need any technical help, please contact "
-"address@hidden"
+"(to be created). If you need any technical help, please contact web-"
+"address@hidden"
 
 #. type: Content of: <div><p>
 msgid "Copyright &copy; 2002 Richard M. Stallman"

Index: philosophy/po/not-ipr.sr.po
===================================================================
RCS file: /web/www/www/philosophy/po/not-ipr.sr.po,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- philosophy/po/not-ipr.sr.po 2 Dec 2014 10:53:06 -0000       1.23
+++ philosophy/po/not-ipr.sr.po 2 Dec 2014 11:01:47 -0000       1.24
@@ -19,9 +19,6 @@
 
 # type: Content of: <title>
 #. type: Content of: <title>
-#| msgid ""
-#| "Did You Say &ldquo;Intellectual Property&rdquo;? It's a Seductive Mirage "
-#| "- GNU Project - Free Software Foundation (FSF)"
 msgid ""
 "Did You Say &ldquo;Intellectual Property&rdquo;? It's a Seductive Mirage - "
 "GNU Project - Free Software Foundation"
@@ -320,11 +317,6 @@
 
 # type: Content of: <blockquote><p>
 #. type: Content of: <blockquote><p>
-#| msgid ""
-#| "Unlike their descendants who now work the floor at WIPO, the framers of "
-#| "the US constitution had a principled, pro-competitive attitude to "
-#| "intellectual property.  They knew rights might be necessary, but&hellip;"
-#| "they tied congress's hands, restricting its power in multiple ways."
 msgid ""
 "Unlike their descendants who now work the floor at WIPO, the framers of the "
 "US constitution had a principled, procompetitive attitude to intellectual "
@@ -483,8 +475,8 @@
 "projects/wipo/wiwo.en.html\">one proposal for changing the name and "
 "substance of WIPO</a>."
 msgstr ""
-"А што се тиче реформисања СОИС-а, хајде да, 
између осталог, <a href=\"http://fsfe.org/";
-"projects/wipo/wiwo.en.html\">затражимо промену његовог 
назива</a>."
+"А што се тиче реформисања СОИС-а, хајде да, 
између осталог, <a href=\"http://";
+"fsfe.org/projects/wipo/wiwo.en.html\">затражимо промену 
његовог назива</a>."
 
 #. type: Content of: <p>
 msgid ""
@@ -555,8 +547,8 @@
 "panel of your PO editor (or above the msgid if you are using a simple text "
 "editor). All the Serbian POs need to be treated similarly; this can be done "
 "by simply modifying the two variants of this string in a master compendium "
-"(to be created). If you need any technical help, please contact "
-"address@hidden"
+"(to be created). If you need any technical help, please contact web-"
+"address@hidden"
 
 #. type: Content of: <div><p>
 msgid "Copyright &copy; 2004, 2006, 2010, 2013 Richard M. Stallman"

Index: philosophy/po/philosophy-menu.sr.po
===================================================================
RCS file: /web/www/www/philosophy/po/philosophy-menu.sr.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- philosophy/po/philosophy-menu.sr.po 2 Dec 2014 10:53:06 -0000       1.4
+++ philosophy/po/philosophy-menu.sr.po 2 Dec 2014 11:01:47 -0000       1.5
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: philosophy-menu.html\n"
-"POT-Creation-Date: 2011-11-20 08:01-0500\n"
+"POT-Creation-Date: 2012-10-05 13:02-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -14,7 +14,6 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Outdated-Since: 2011-11-20 08:01-0500\n"
 
 #. type: Content of: <ul><li>
 msgid "<a href=\"/philosophy/philosophy.html\">Introduction</a>"
@@ -27,24 +26,27 @@
 #. type: Content of: <ul><li>
 msgid ""
 "<a href=\"/philosophy/essays-and-articles.html\">Essays and articles</a>"
-msgstr "<a 
href=\"/philosophy/essays-and-articles.html\">Есеји&nbsp;и&nbsp;чланци</a>"
+msgstr ""
+"<a 
href=\"/philosophy/essays-and-articles.html\">Есеји&nbsp;и&nbsp;чланци</a>"
 
 #. type: Content of: <ul><li>
 msgid ""
 "<a href=\"/philosophy/speeches-and-interview.html\">Speeches and interviews</"
 "a>"
 msgstr ""
-"<a 
href=\"/philosophy/speeches-and-interview.html\">Говори&nbsp;и&nbsp;интервјуи</a>"
+"<a 
href=\"/philosophy/speeches-and-interview.html\">Говори&nbsp;и&nbsp;"
+"интервјуи</a>"
 
 #. type: Content of: <ul><li>
 msgid "<a href=\"/philosophy/third-party-ideas.html\">Third party ideas</a>"
-msgstr "<a 
href=\"/philosophy/third-party-ideas.html\">Идеје&nbsp;трећих
&nbsp;страна</a>"
+msgstr ""
+"<a href=\"/philosophy/third-party-ideas.html\">Идеје&nbsp;трећих
&nbsp;"
+"страна</a>"
 
 #. type: Content of: <ul><li>
 msgid ""
 "<a href=\"/server/sitemap.html#directory-philosophy\">All philosophy "
 "articles</a>"
 msgstr ""
-"<a href=\"/server/"
-"sitemap.html#directory-philosophy\">Сви&nbsp;чланци&nbsp;o&nbsp;филозофији</a>"
-
+"<a 
href=\"/server/sitemap.html#directory-philosophy\">Сви&nbsp;чланци&nbsp;"
+"o&nbsp;филозофији</a>"

Index: philosophy/po/philosophy.sr.po
===================================================================
RCS file: /web/www/www/philosophy/po/philosophy.sr.po,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -b -r1.70 -r1.71
--- philosophy/po/philosophy.sr.po      2 Dec 2014 10:53:06 -0000       1.70
+++ philosophy/po/philosophy.sr.po      2 Dec 2014 11:01:47 -0000       1.71
@@ -19,12 +19,8 @@
 
 # type: Content of: <title>
 #. type: Content of: <title>
-#| msgid ""
-#| "Philosophy of the GNU Project - GNU Project - Free Software Foundation "
-#| "(FSF)"
 msgid "Philosophy of the GNU Project - GNU Project - Free Software Foundation"
-msgstr ""
-"Филозофија Пројекта ГНУ — Пројекат ГНУ — 
Задужбина за слободни софтвер"
+msgstr "Филозофија Пројекта ГНУ — Пројекат 
ГНУ — Задужбина за слободни софтвер"
 
 # type: Content of: <h2>
 #. type: Content of: <h2>
@@ -91,7 +87,6 @@
 
 # type: Content of: <h3>
 #. type: Content of: <h3>
-#| msgid "Introduction"
 msgid "Introduction"
 msgstr "Увод"
 
@@ -160,9 +155,6 @@
 
 # type: Content of: <ul><li>
 #. type: Content of: <ul><li>
-#| msgid ""
-#| "<a href=\"/philosophy/open-source-misses-the-point.html\">Why &ldquo;Open "
-#| "Source&rdquo; misses the point of Free Software</a>"
 msgid ""
 "<a href=\"/philosophy/open-source-misses-the-point.html\">Why \"Open Source"
 "\" misses the point of Free Software</a>"
@@ -255,8 +247,8 @@
 "panel of your PO editor (or above the msgid if you are using a simple text "
 "editor). All the Serbian POs need to be treated similarly; this can be done "
 "by simply modifying the two variants of this string in a master compendium "
-"(to be created). If you need any technical help, please contact "
-"address@hidden"
+"(to be created). If you need any technical help, please contact web-"
+"address@hidden"
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
@@ -305,15 +297,14 @@
 
 # type: Content of: <ul><li>
 #~ msgid ""
-#~ "<a href=\"/philosophy/linux-gnu-freedom.html\">Linux, GNU, and Freedom</"
-#~ "a>"
+#~ "<a href=\"/philosophy/linux-gnu-freedom.html\">Linux, GNU, and Freedom</a>"
 #~ msgstr ""
 #~ "<a href=\"/philosophy/linux-gnu-freedom.html\">Линукс, ГНУ и 
слобода</a>"
 
 # type: Content of: <ul><li>
 #~ msgid ""
-#~ "<a href=\"/philosophy/open-source-misses-the-point.html\">Why &ldquo;"
-#~ "Open Source&rdquo; misses the point of Free Software</a>"
+#~ "<a href=\"/philosophy/open-source-misses-the-point.html\">Why &ldquo;Open "
+#~ "Source&rdquo; misses the point of Free Software</a>"
 #~ msgstr ""
 #~ "<a href=\"/philosophy/open-source-misses-the-point.html\">Зашто је 
појмом "
 #~ "„отворени изворни код“ избегнута 
суштина слободног софтвера</a>"

Index: philosophy/po/right-to-read.sr.po
===================================================================
RCS file: /web/www/www/philosophy/po/right-to-read.sr.po,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- philosophy/po/right-to-read.sr.po   2 Dec 2014 10:53:06 -0000       1.33
+++ philosophy/po/right-to-read.sr.po   2 Dec 2014 11:01:47 -0000       1.34
@@ -20,7 +20,6 @@
 
 # type: Content of: <title>
 #. type: Content of: <title>
-#| msgid "The Right to Read - GNU Project - Free Software Foundation (FSF)"
 msgid "The Right to Read - GNU Project - Free Software Foundation"
 msgstr "Право на читање — Пројекат ГНУ — 
Задужбина за слободни софтвер"
 
@@ -54,15 +53,12 @@
 
 # type: Content of: <blockquote><p>
 #. type: Content of: <blockquote><p>
-#| msgid ""
-#| "(from &ldquo;The Road To Tycho&rdquo;, a collection of articles about the "
-#| "antecedents of the Lunarian Revolution, published in Luna City in 2096)"
 msgid ""
 "From <cite>The Road To Tycho</cite>, a collection of articles about the "
 "antecedents of the Lunarian Revolution, published in Luna City in 2096."
 msgstr ""
-"Из <cite>Пута за Тихо</cite>, збирке чланака о 
претходницима Лунарне револуције, "
-"објављене у Луна Ситију 2096."
+"Из <cite>Пута за Тихо</cite>, збирке чланака о 
претходницима Лунарне "
+"револуције, објављене у Луна Ситију 2096."
 
 # type: Content of: <p>
 #. type: Content of: <p>
@@ -117,16 +113,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "Of course, Lissa did not necessarily intend to read his books.  She might "
-#| "want the computer only to write her midterm.  But Dan knew she came from "
-#| "a middle-class family and could hardly afford the tuition, let alone her "
-#| "reading fees.  Reading his books might be the only way she could "
-#| "graduate.  He understood this situation; he himself had had to borrow to "
-#| "pay for all the research papers he read.  (10% of those fees went to the "
-#| "researchers who wrote the papers; since Dan aimed for an academic career, "
-#| "he could hope that his own research papers, if frequently referenced, "
-#| "would bring in enough to repay this loan.)"
 msgid ""
 "Of course, Lissa did not necessarily intend to read his books.  She might "
 "want the computer only to write her midterm.  But Dan knew she came from a "
@@ -341,22 +327,10 @@
 msgid ""
 "[This note has been updated several times since the first publication of the "
 "story.]"
-msgstr ""
-"[Ова белешка је освежена 2007.]"
+msgstr "[Ова белешка је освежена 2007.]"
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "The right to read is a battle being fought today.  Although it may take "
-#| "50 years for our present way of life to fade into obscurity, most of the "
-#| "specific laws and practices described above have already been proposed; "
-#| "many have been enacted into law in the US and elsewhere.  In the US, the "
-#| "1998 Digital Millenium Copyright Act established the legal basis to "
-#| "restrict the reading and lending of computerized books (and other works "
-#| "as well).  The European Union imposed similar restrictions in a 2001 "
-#| "copyright directive.  In France, under the DADVSI law adopted in 2006, "
-#| "mere possession of a copy of DeCSS, the free program to decrypt video on "
-#| "a DVD, is a crime."
 msgid ""
 "The right to read is a battle being fought today.  Although it may take 50 "
 "years for our present way of life to fade into obscurity, most of the "
@@ -417,14 +391,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "In 2001 the US began attempting to use the proposed Free Trade Area of "
-#| "the Americas treaty to impose the same rules on all the countries in the "
-#| "Western Hemisphere.  The FTAA is one of the so-called &ldquo;free "
-#| "trade&rdquo; treaties, which are actually designed to give business "
-#| "increased power over democratic governments; imposing laws like the DMCA "
-#| "is typical of this spirit.  The FTAA was effectively killed by Lula, "
-#| "President of Brazil, who rejected the DMCA requirement and others."
 msgid ""
 "In 2001 the US began attempting to use the proposed Free Trade Area of the "
 "Americas (FTAA) treaty to impose the same rules on all the countries in the "
@@ -481,15 +447,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "The proponents of this scheme have given it names such as &ldquo;trusted "
-#| "computing&rdquo; and &ldquo;palladium&rdquo;.  We call it <a href=\"/"
-#| "philosophy/can-you-trust.html\">&ldquo;treacherous computing&rdquo;</a>, "
-#| "because the effect is to make your computer obey companies instead of "
-#| "you.  This was implemented in 2007 as part of <a href=\"http://badvista.";
-#| "org/\">Windows Vista</a>; we expect Apple to do something similar.  In "
-#| "this scheme, it is the manufacturer that keeps the secret code, but the "
-#| "<abbr>FBI</abbr> would have little trouble getting it."
 msgid ""
 "The proponents of this scheme have given it names such as &ldquo;trusted "
 "computing&rdquo; and &ldquo;Palladium&rdquo;.  We call it <a href=\"/"
@@ -550,14 +507,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "When this story was first written, the SPA was threatening small Internet "
-#| "service providers, demanding they permit the SPA to monitor all users.  "
-#| "Most ISPs surrendered when threatened, because they cannot afford to "
-#| "fight back in court.  (Atlanta Journal-Constitution, 1 Oct 96, D3.)  At "
-#| "least one ISP, Community ConneXion in Oakland CA, refused the demand and "
-#| "was actually sued.  The SPA later dropped the suit, but obtained the DMCA "
-#| "which gave them the power they sought."
 msgid ""
 "When this story was first written, the SPA was threatening small Internet "
 "service providers, demanding they permit the SPA to monitor all users.  Most "
@@ -576,14 +525,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "The SPA, which actually stands for Software Publisher's Association, has "
-#| "been replaced in this police-like role by the BSA or Business Software "
-#| "Alliance.  It is not, today, an official police force; unofficially, it "
-#| "acts like one.  Using methods reminiscent of the erstwhile Soviet Union, "
-#| "it invites people to inform on their coworkers and friends.  A BSA terror "
-#| "campaign in Argentina in 2001 made slightly-veiled threats that people "
-#| "sharing software would be raped."
 msgid ""
 "The SPA, which actually stands for Software Publishers Association, has been "
 "replaced in its police-like role by the Business Software Alliance.  The BSA "
@@ -669,9 +610,9 @@
 "article."
 msgstr ""
 "<br /><a href=\"#AuthorsNote\">Ауторова белешка</a> прича 
о бици за право на "
-"читање и електронском надзору. Битка 
почиње данас; овде су везе према "
-"двама чланцима о технологијама које се 
управо развијају да би вам "
-"ускратиле право на читање."
+"читање и електронском надзору. Битка 
почиње данас; овде су везе према двама "
+"чланцима о технологијама које се управо 
развијају да би вам ускратиле право "
+"на читање."
 
 #. type: Content of: <ul><li>
 msgid ""
@@ -689,10 +630,6 @@
 
 # type: Content of: <ul><li>
 #. type: Content of: <ul><li>
-#| msgid ""
-#| "<a href=\"http://www.zdnet.com/zdnn/stories/news/0,4586,2324939,00.html";
-#| "\">Electronic Publishing:</a> An article about distribution of books in "
-#| "electronic form, and copyright issues affecting the right to read a copy."
 msgid ""
 "<a href=\"http://www.zdnet.com/news/seybold-opens-chapter-on-digital-";
 "books/103151\">Electronic Publishing:</a> An article about distribution of "
@@ -773,8 +710,9 @@
 "people.org/archives/interesting-people/199611/msg00012.html\">Public Data or "
 "Private Data</a>, Washington Post, 4 Nov 1996."
 msgstr ""
-"<em><a 
href=\"http://web.archive.org/web/20130508120533/http://www.interesting-";
-"people.org/archives/interesting-people/199611/msg00012.html\">Public Data or 
Private Data</a></em>, Вашингтон пост, 4. новембар 1996."
+"<em><a href=\"http://web.archive.org/web/20130508120533/http://www.";
+"interesting-people.org/archives/interesting-people/199611/msg00012.html"
+"\">Public Data or Private Data</a></em>, Вашингтон пост, 4. 
новембар 1996."
 
 # type: Content of: <ul><li>
 #. type: Content of: <ul><li>
@@ -800,7 +738,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <h5>
-#| msgid "<strong>Other Texts to Read</strong>"
 msgid "Other Texts to Read"
 msgstr "Остали текстови за читање"
 
@@ -812,18 +749,14 @@
 
 # type: Content of: <ul><li>
 #. type: Content of: <ul><li>
-#| msgid ""
-#| "<a href=\"http://www.computerworld.com/managementtopics/management/";
-#| "opinion/story/0,10801,49358,00.html\" id=\"COPYPROCTECTION\">Copy "
-#| "Protection: Just Say No</a>, Published in Computer World."
 msgid ""
 "<a href=\"http://www.computerworld.com/s/article/49358/";
 "Copy_Protection_Just_Say_No\" id=\"COPYPROCTECTION\">Copy Protection: Just "
 "Say No</a>, Published in Computer World."
 msgstr ""
 "<em><a href=\"http://www.computerworld.com/s/article/49358/";
-"Copy_Protection_Just_Say_No\" id=\"COPYPROCTECTION\">Copy "
-"Protection: Just Say No</a></em>, Објављено у Компјутер 
ворлду."
+"Copy_Protection_Just_Say_No\" id=\"COPYPROCTECTION\">Copy Protection: Just "
+"Say No</a></em>, Објављено у Компјутер ворлду."
 
 # type: Content of: <div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -869,8 +802,8 @@
 "panel of your PO editor (or above the msgid if you are using a simple text "
 "editor). All the Serbian POs need to be treated similarly; this can be done "
 "by simply modifying the two variants of this string in a master compendium "
-"(to be created). If you need any technical help, please contact "
-"address@hidden"
+"(to be created). If you need any technical help, please contact web-"
+"address@hidden"
 
 #. type: Content of: <div><p>
 #, fuzzy
@@ -916,10 +849,10 @@
 
 # type: Content of: <ul><li>
 #~ msgid ""
-#~ "Public Data or Private Data, Washington Post, 4 Nov 1996. We used to "
-#~ "have a link to this, but Washinton Post has decided to start charging "
-#~ "users who wishes to read articles on the web site and therefore we have "
-#~ "decided to remove the link."
+#~ "Public Data or Private Data, Washington Post, 4 Nov 1996. We used to have "
+#~ "a link to this, but Washinton Post has decided to start charging users "
+#~ "who wishes to read articles on the web site and therefore we have decided "
+#~ "to remove the link."
 #~ msgstr ""
 #~ "<em>Public Data or Private Data</em>, Вашингтон пост, 4. 
новембар 1996. "
 #~ "Имали смо везу према овом документу, али 
је Вашингтон пост одлучио да "

Index: philosophy/po/selling.sr.po
===================================================================
RCS file: /web/www/www/philosophy/po/selling.sr.po,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- philosophy/po/selling.sr.po 2 Dec 2014 10:53:06 -0000       1.17
+++ philosophy/po/selling.sr.po 2 Dec 2014 11:01:47 -0000       1.18
@@ -19,7 +19,6 @@
 
 # type: Content of: <title>
 #. type: Content of: <title>
-#| msgid "Selling Free Software - GNU Project - Free Software Foundation (FSF)"
 msgid "Selling Free Software - GNU Project - Free Software Foundation"
 msgstr ""
 "Продаја слободног софтвера — Пројекат 
ГНУ — Задужбина за слободни софтвер"
@@ -56,10 +55,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "Actually we encourage people who redistribute <a href=\"/philosophy/free-"
-#| "sw.html\">free software</a> to charge as much as they wish or can.  If "
-#| "this seems surprising to you, please read on."
 msgid ""
 "Actually, we encourage people who redistribute <a href=\"/philosophy/free-sw."
 "html\">free software</a> to charge as much as they wish or can.  If this "
@@ -184,12 +179,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "People sometimes worry that a high distribution fee will put free "
-#| "software out of range for users who don't have a lot of money.  With <a "
-#| "href=\"/philosophy/categories.html#ProprietarySoftware\">proprietary "
-#| "software</a>, a high price does exactly that &mdash; but free software is "
-#| "different."
 msgid ""
 "People sometimes worry that a high distribution fee will put free software "
 "out of range for users who don't have a lot of money.  With <a href=\"/"
@@ -256,10 +245,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "This is true for proprietary software &mdash; but free software is "
-#| "different.  With so many ways to get copies, the price of distribution "
-#| "service has less effect on popularity."
 msgid ""
 "This is true for proprietary software&mdash;but free software is different.  "
 "With so many ways to get copies, the price of distribution service has less "
@@ -331,10 +316,10 @@
 "doing it the way most companies do it: making the software proprietary "
 "rather than free."
 msgstr ""
-"Међутим, када људи размишљају о <a 
href=\"/philosophy/words-to-avoid.html#SellSoftware\">"
-"„продаји софтвера“</a>, они обично 
замишљају да се она обавља на начин на "
-"који је већина фирми спроводи: 
претварањем софтвера у власнички, уместо у "
-"слободни."
+"Међутим, када људи размишљају о <a 
href=\"/philosophy/words-to-avoid."
+"html#SellSoftware\">„продаји софтвера“</a>, они 
обично замишљају да се она "
+"обавља на начин на који је већина фирми 
спроводи: претварањем софтвера у "
+"власнички, уместо у слободни."
 
 # type: Content of: <p>
 #. type: Content of: <p>
@@ -374,16 +359,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "The one exception is in the case where binaries are distributed without "
-#| "the corresponding complete source code.  Those who do this are required "
-#| "by the GNU GPL to provide source code on subsequent request.  Without a "
-#| "limit on the fee for the source code, they would be able set a fee too "
-#| "large for anyone to pay&mdash;such as a billion dollars&mdash;and thus "
-#| "pretend to release source code while in truth concealing it.  So in this "
-#| "case we have to limit the fee for source, to ensure the user's freedom.  "
-#| "In ordinary situations, however, there is no such justification for "
-#| "limiting distribution fees, so we do not limit them."
 msgid ""
 "The one exception is in the case where binaries are distributed without the "
 "corresponding complete source code.  Those who do this are required by the "
@@ -401,11 +376,10 @@
 "да обезбеде изворни код на захтев. Без 
ограничења цене изворног кода, они би "
 "могли да поставе цену која је превисока за 
било кога, на пример милијарду "
 "динара, и на тај начин се претварају да 
објављују изворни код, у стварности "
-"га скривајући. Зато <a href=\"/licenses/"
-"gpl.html#section6\">у оваквим случајевима постоји 
ограничење цене</a> изворног "
-"кода, како би се осигурала слобода 
корисника. Међутим, у обичним ситуацијама "
-"не постоје таква оправдања за 
ограничавање цена расподеле, па их зато не "
-"ограничавамо."
+"га скривајући. Зато <a 
href=\"/licenses/gpl.html#section6\">у оваквим "
+"случајевима постоји ограничење цене</a> 
изворног кода, како би се осигурала "
+"слобода корисника. Међутим, у обичним 
ситуацијама не постоје таква оправдања "
+"за ограничавање цена расподеле, па их зато 
не ограничавамо."
 
 # type: Content of: <p>
 #. type: Content of: <p>
@@ -483,8 +457,8 @@
 "panel of your PO editor (or above the msgid if you are using a simple text "
 "editor). All the Serbian POs need to be treated similarly; this can be done "
 "by simply modifying the two variants of this string in a master compendium "
-"(to be created). If you need any technical help, please contact "
-"address@hidden"
+"(to be created). If you need any technical help, please contact web-"
+"address@hidden"
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>

Index: philosophy/po/shouldbefree.sr.po
===================================================================
RCS file: /web/www/www/philosophy/po/shouldbefree.sr.po,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- philosophy/po/shouldbefree.sr.po    2 Dec 2014 10:53:07 -0000       1.23
+++ philosophy/po/shouldbefree.sr.po    2 Dec 2014 11:01:48 -0000       1.24
@@ -19,8 +19,6 @@
 
 # type: Content of: <title>
 #. type: Content of: <title>
-#| msgid ""
-#| "Why Software Should Be Free - GNU Project - Free Software Foundation (FSF)"
 msgid "Why Software Should Be Free - GNU Project - Free Software Foundation"
 msgstr ""
 "Зашто софтвер треба да буде слободан — 
Пројекат ГНУ — Задужбина за слободни "
@@ -190,13 +188,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "This formulation starts by comparing the social utility of a proprietary "
-#| "program with that of no program, and then concludes that proprietary "
-#| "software development is, on the whole, beneficial, and should be "
-#| "encouraged.  The fallacy here is in comparing only two outcomes&mdash;"
-#| "proprietary software vs. no software&mdash;and assuming there are no "
-#| "other possibilities."
 msgid ""
 "This formulation starts by comparing the social utility of a proprietary "
 "program with that of no program, and then concludes that proprietary "
@@ -213,15 +204,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "Given a system of software copyright, software development is usually "
-#| "linked with the existence of an owner who controls the software's use.  "
-#| "As long as this linkage exists, we are often faced with the choice of "
-#| "proprietary software or none.  However, this linkage is not inherent or "
-#| "inevitable; it is a consequence of the specific social/legal policy "
-#| "decision that we are questioning: the decision to have owners.  To "
-#| "formulate the choice as between proprietary software vs. no software is "
-#| "begging the question."
 msgid ""
 "Given a system of software copyright, software development is usually linked "
 "with the existence of an owner who controls the software's use.  As long as "
@@ -522,12 +504,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "The first level of harm impedes the simple use of a program.  A copy of a "
-#| "program has nearly zero marginal cost (and you can pay this cost by doing "
-#| "the work yourself), so in a free market, it would have nearly zero "
-#| "price.  A license fee is a significant disincentive to use the program.  "
-#| "If a widely-useful program is proprietary, far fewer people will use it."
 msgid ""
 "The first level of harm impedes the simple use of a program.  A copy of a "
 "program has nearly zero marginal cost (and you can pay this cost by doing "
@@ -543,14 +519,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "It is easy to show that the total contribution of a program to society is "
-#| "reduced by assigning an owner to it.  Each potential user of the program, "
-#| "faced with the need to pay to use it, may choose to pay, or may forego "
-#| "use of the program.  When a user chooses to pay, this is a zero-sum "
-#| "transfer of wealth between two parties.  But each time someone chooses to "
-#| "forego use of the program, this harms that person without benefitting "
-#| "anyone.  The sum of negative numbers and zeros must be negative."
 msgid ""
 "It is easy to show that the total contribution of a program to society is "
 "reduced by assigning an owner to it.  Each potential user of the program, "
@@ -616,10 +584,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "However, imposing a price on something that would otherwise be free is a "
-#| "qualitative change.  A centrally-imposed fee for software distribution "
-#| "becomes a powerful disincentive."
 msgid ""
 "However, imposing a price on something that would otherwise be free is a "
 "qualitative change.  A centrally imposed fee for software distribution "
@@ -786,16 +750,6 @@
 # type: Content of: <pre>
 #. type: Content of: <pre>
 #, no-wrap
-#| msgid ""
-#| "\n"
-#| "     float\n"
-#| "     distance (p0, p1)\n"
-#| "          struct point p0, p1;\n"
-#| "     {\n"
-#| "       float xdist = p1.x - p0.x;\n"
-#| "       float ydist = p1.y - p0.y;\n"
-#| "       return sqrt (xdist * xdist + ydist * ydist);\n"
-#| "     }\n"
 msgid ""
 "     float\n"
 "     distance (p0, p1)\n"
@@ -832,13 +786,6 @@
 # type: Content of: <pre>
 #. type: Content of: <pre>
 #, no-wrap
-#| msgid ""
-#| "\n"
-#| "     1314258944      -232267772      -231844864      1634862\n"
-#| "     1411907592      -231844736      2159150         1420296208\n"
-#| "     -234880989      -234879837      -234879966      -232295424\n"
-#| "     1644167167      -3214848        1090581031      1962942495\n"
-#| "     572518958       -803143692      1314803317\n"
 msgid ""
 "     1314258944      -232267772      -231844864      1634862\n"
 "     1411907592      -231844736      2159150         1420296208\n"
@@ -1298,10 +1245,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "The question, &ldquo;How can we pay programmers?&rdquo; becomes an easier "
-#| "question when we realize that it's not a matter of paying them a "
-#| "fortune.  A mere living is easier to raise."
 msgid ""
 "The question &ldquo;How can we pay programmers?&rdquo; becomes an easier "
 "question when we realize that it's not a matter of paying them a fortune.  A "
@@ -1586,11 +1529,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "Those who object to cooperation claiming it would result in the "
-#| "employment of fewer programmers are actually objecting to increased "
-#| "productivity.  Yet these people usually accept the widely-held belief "
-#| "that the software industry needs increased productivity.  How is this?"
 msgid ""
 "Those who object to cooperation claiming it would result in the employment "
 "of fewer programmers are actually objecting to increased productivity.  Yet "
@@ -1706,14 +1644,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "Business ideology does not prepare people to resist the temptation to "
-#| "combat the competition.  Some forms of combat have been banned with anti-"
-#| "trust laws, truth in advertising laws, and so on, but rather than "
-#| "generalizing this to a principled rejection of combat in general, "
-#| "executives invent other forms of combat which are not specifically "
-#| "prohibited.  Society's resources are squandered on the economic "
-#| "equivalent of factional civil war."
 msgid ""
 "Business ideology does not prepare people to resist the temptation to combat "
 "the competition.  Some forms of combat have been banned with antitrust laws, "
@@ -1873,13 +1803,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "Thus, the Constitution says that the purpose of copyright is to &ldquo;"
-#| "promote the progress of science and the useful arts.&rdquo; The Supreme "
-#| "Court has elaborated on this, stating in &lsquo;Fox Film vs. Doyal&rsquo; "
-#| "that &ldquo;The sole interest of the United States and the primary object "
-#| "in conferring the [copyright] monopoly lie in the general benefits "
-#| "derived by the public from the labors of authors.&rdquo;"
 msgid ""
 "Thus, the Constitution says that the purpose of copyright is to &ldquo;"
 "promote the Progress of Science and the useful Arts.&rdquo; The Supreme "
@@ -2017,10 +1940,6 @@
 
 # type: Content of: <h4>
 #. type: Content of: <blockquote><p>
-#| msgid ""
-#| "This essay is published in <a href=\"http://shop.fsf.org/product/free-";
-#| "software-free-society/\"><cite>Free Software, Free Society: The Selected "
-#| "Essays of Richard M. Stallman</cite></a>"
 msgid ""
 "This essay is published in <a href=\"http://shop.fsf.org/product/free-";
 "software-free-society/\"><cite>Free Software, Free Society: The Selected "
@@ -2080,8 +1999,8 @@
 "panel of your PO editor (or above the msgid if you are using a simple text "
 "editor). All the Serbian POs need to be treated similarly; this can be done "
 "by simply modifying the two variants of this string in a master compendium "
-"(to be created). If you need any technical help, please contact "
-"address@hidden"
+"(to be created). If you need any technical help, please contact web-"
+"address@hidden"
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>

Index: philosophy/po/words-to-avoid.sr.po
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.sr.po,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -b -r1.94 -r1.95
--- philosophy/po/words-to-avoid.sr.po  2 Dec 2014 10:53:07 -0000       1.94
+++ philosophy/po/words-to-avoid.sr.po  2 Dec 2014 11:01:48 -0000       1.95
@@ -71,12 +71,8 @@
 
 # type: Content of: <div>
 #. type: Content of: <p>
-#| msgid ""
-#| "Also note <a href=\"/philosophy/categories.html\">Categories of Free "
-#| "Software</a>."
 msgid "<a href=\"/philosophy/philosophy.html\">Other Texts to Read</a> |"
-msgstr ""
-"<a href=\"/philosophy/philosophy.html\">Други текстови</a> |"
+msgstr "<a href=\"/philosophy/philosophy.html\">Други 
текстови</a> |"
 
 # type: Content of: <h4>
 #. type: Content of: <p>
@@ -96,7 +92,9 @@
 # type: Content of: <h4>
 #. type: Content of: <p>
 msgid "&ldquo;<a href=\"#CloudComputing\">Cloud Computing</a>&rdquo; |"
-msgstr "„<a href=\"#CloudComputing\">Рачунарство у облаку 
(енгл. <em>cloud computing</em>)</a>“ |"
+msgstr ""
+"„<a href=\"#CloudComputing\">Рачунарство у облаку 
(енгл. <em>cloud "
+"computing</em>)</a>“ |"
 
 # type: Content of: <h4>
 #. type: Content of: <p>
@@ -150,7 +148,8 @@
 msgid ""
 "&ldquo;<a href=\"#DigitalRightsManagement\">Digital Rights Management</"
 "a>&rdquo; |"
-msgstr "„<a href=\"#DigitalRightsManagement\">Управљање 
дигиталним правима</a>“ |"
+msgstr ""
+"„<a href=\"#DigitalRightsManagement\">Управљање 
дигиталним правима</a>“ |"
 
 # type: Content of: <h4>
 #. type: Content of: <p>
@@ -175,7 +174,9 @@
 # type: Content of: <h4>
 #. type: Content of: <p>
 msgid "&ldquo;<a href=\"#FreelyAvailable\">Freely available</a>&rdquo; |"
-msgstr "„<a href=\"#FreelyAvailable\">Слободно доступан 
(енгл. <em>freely available</em>)</a>“ |"
+msgstr ""
+"„<a href=\"#FreelyAvailable\">Слободно доступан (енгл. 
<em>freely available</"
+"em>)</a>“ |"
 
 # type: Content of: <h4>
 #. type: Content of: <p>
@@ -185,7 +186,9 @@
 # type: Content of: <h4>
 #. type: Content of: <p>
 msgid "&ldquo;<a href=\"#GiveAwaySoftware\">Give away software</a>&rdquo; |"
-msgstr "„<a href=\"#GiveAwaySoftware\">Софтвер на поклон 
(енгл. <em>give away</em>)</a>“ |"
+msgstr ""
+"„<a href=\"#GiveAwaySoftware\">Софтвер на поклон (енгл. 
<em>give away</em>)</"
+"a>“ |"
 
 # type: Content of: <h4>
 #. type: Content of: <p>
@@ -246,7 +249,8 @@
 # type: Content of: <h4>
 #. type: Content of: <p>
 msgid "&ldquo;<a href=\"#PowerPoint\">PowerPoint</a>&rdquo; |"
-msgstr "„<a href=\"#PowerPoint\">Пауер поинт (енгл. 
<em>PowerPoint</em>)</a>“ |"
+msgstr ""
+"„<a href=\"#PowerPoint\">Пауер поинт (енгл. 
<em>PowerPoint</em>)</a>“ |"
 
 # type: Content of: <h4>
 #. type: Content of: <p>
@@ -263,7 +267,6 @@
 
 # type: Content of: <h4>
 #. type: Content of: <p>
-#| msgid "&ldquo;Sell software&rdquo;"
 msgid "&ldquo;<a href=\"#SellSoftware\">Sell software</a>&rdquo; |"
 msgstr "„<a href=\"#SellSoftware\">Продаја софтвера</a>“ |"
 
@@ -274,7 +277,6 @@
 
 # type: Content of: <h4>
 #. type: Content of: <p>
-#| msgid "&ldquo;Software Industry&rdquo;"
 msgid "&ldquo;<a href=\"#SoftwareIndustry\">Software Industry</a>&rdquo; |"
 msgstr "„<a href=\"#SoftwareIndustry\">Индустрија 
софтвера</a>“ |"
 
@@ -285,19 +287,16 @@
 
 # type: Content of: <h4>
 #. type: Content of: <p>
-#| msgid "&ldquo;Theft&rdquo;"
 msgid "&ldquo;<a href=\"#Theft\">Theft</a>&rdquo; |"
 msgstr "„<a href=\"#Theft\">Крађа</a>“ |"
 
 # type: Content of: <h4>
 #. type: Content of: <p>
-#| msgid "&ldquo;Trusted Computing&rdquo;"
 msgid "&ldquo;<a href=\"#TrustedComputing\">Trusted Computing</a>&rdquo; |"
 msgstr "„<a href=\"#TrustedComputing\">Рачунарство са 
поверењем</a>“ |"
 
 # type: Content of: <h4>
 #. type: Content of: <p>
-#| msgid "&ldquo;Vendor&rdquo;"
 msgid "&ldquo;<a href=\"#Vendor\">Vendor</a>&rdquo;"
 msgstr "„<a href=\"#Vendor\">Продавац</a>“"
 
@@ -362,15 +361,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "Describing nonfree software as &ldquo;closed&rdquo; clearly refers to the "
-#| "term &ldquo;open source&rdquo;.  In the free software movement, <a href="
-#| "\"/philosophy/open-source-misses-the-point.html\"> we do not want to be "
-#| "confused with the open source camp</a>, so we are careful to avoid saying "
-#| "things that would encourage people to lump us in with them.  For "
-#| "instance, we avoid describing nonfree software as &ldquo;closed&rdquo;.  "
-#| "We call it &ldquo;nonfree&rdquo; or <a href=\"/philosophy/categories."
-#| "html#ProprietarySoftware\"> &ldquo;proprietary&rdquo;</a>."
 msgid ""
 "Describing nonfree software as &ldquo;closed&rdquo; clearly refers to the "
 "term &ldquo;open source.&rdquo; In the free software movement, <a href=\"/"
@@ -535,12 +525,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "In the first decade of the free software movement, free software packages "
-#| "were almost always noncommercial; the components of the GNU/Linux "
-#| "operating system were developed by individuals or by nonprofit "
-#| "organizations such as the FSF and universities.  Later, in the 90s, free "
-#| "commercial software started to appear."
 msgid ""
 "In the first decade of the free software movement, free software packages "
 "were almost always noncommercial; the components of the GNU/Linux operating "
@@ -649,9 +633,9 @@
 "употребљава да означи кориснике рачунара. 
Пуштањем се дигитални снимак, као "
 "ни програм покретаењм, не троши."
 
+# type: Content of: <p>
 #. type: Content of: <p>
 #, fuzzy
-# type: Content of: <p>
 #| msgid ""
 #| "The terms &ldquo;producer&rdquo; and &ldquo;consumer&rdquo; come from "
 #| "economic theory, and bring with them its narrow perspective and misguided "
@@ -663,9 +647,9 @@
 "the economics of uncopiable material products.  Of course, this error is "
 "exactly the one proprietary software developers want people to make."
 msgstr ""
-"Изрази „произвођач“ и „потрошач“ 
потичу из економске теорије, и намећу "
-"њене погрешне претпоставке и уску визуру 
економске теорије. То тежи ка "
-"извртању вашег начина мишљења."
+"Изрази „произвођач“ и „потрошач“ 
потичу из економске теорије, и намећу њене "
+"погрешне претпоставке и уску визуру 
економске теорије. То тежи ка извртању "
+"вашег начина мишљења."
 
 #. type: Content of: <p>
 #, fuzzy
@@ -681,8 +665,8 @@
 "software they use."
 msgstr ""
 "Осим тога, називање корисника софтвера 
„потрошачима“ им прописује врло "
-"ограничену улогу. Они се третирају као 
стока која незаинтересовано пасе "
-"све што јој други обезбеде."
+"ограничену улогу. Они се третирају као 
стока која незаинтересовано пасе све "
+"што јој други обезбеде."
 
 # type: Content of: <p>
 #. type: Content of: <p>
@@ -810,10 +794,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "However, as long as other people use the term &ldquo;content "
-#| "provider&rdquo;, political dissidents can well call themselves &ldquo;"
-#| "malcontent providers&rdquo;."
 msgid ""
 "However, as long as other people use the term &ldquo;content provider,"
 "&rdquo; political dissidents can well call themselves &ldquo;malcontent "
@@ -841,10 +821,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "In most cases, that term really refers to a system for updating pages on "
-#| "a Web site.  For that, we recommend the term &ldquo;Web site revision "
-#| "system&rdquo; (WRS)."
 msgid ""
 "In most cases, that term really refers to a system for updating pages on a "
 "web site.  For that, we recommend the term &ldquo;web site revision "
@@ -1051,13 +1027,12 @@
 "the conditions; this is neither right nor wrong, merely an ecological "
 "phenomenon, even if it goes so far as the extinction of a species."
 msgstr ""
-"Погрешно је описивати заједницу 
слободног софтвера (или било коју "
-"заједницу) као „екосистем“, јер та реч 
подразумева одсуство (1) намере и "
-"(2) етике. У екосистему врсте еволуирају у 
зависности од њихове "
-"прилагођености. Ако је нешто слабо, то 
бива истребљено, и то није ни "
-"исправно ни погрешно. Израз „екосистем“ 
имплицитно наводи на некритички "
-"став: „Не питај какве ствари <em>треба да 
буду,</em> већ само посматрај "
-"шта се дешава.“"
+"Погрешно је описивати заједницу 
слободног софтвера (или било коју 
заједницу) "
+"као „екосистем“, јер та реч подразумева 
одсуство (1) намере и (2) етике. У "
+"екосистему врсте еволуирају у зависности 
од њихове прилагођености. Ако је "
+"нешто слабо, то бива истребљено, и то није 
ни исправно ни погрешно. Израз "
+"„екосистем“ имплицитно наводи на 
некритички став: „Не питај какве ствари "
+"<em>треба да буду,</em> већ само посматрај шта 
се дешава.“"
 
 # type: Content of: <p>
 #. type: Content of: <p>
@@ -1240,7 +1215,6 @@
 
 # type: Content of: <h4>
 #. type: Content of: <h4>
-#| msgid "&ldquo;Hacker&rdquo;"
 msgid "&ldquo;Hacker&rdquo;"
 msgstr "„Хакер“"
 
@@ -1324,9 +1298,8 @@
 "in terms of &ldquo;intellectual property&rdquo;</a>."
 msgstr ""
 "Да бисмо избегли непотребно ширење 
двосмислености и забуне коју проузрокује "
-"овај израз, најбоље је чврсто одлучити да 
<a href=\"/philosophy/not-ipr."
-"html\">не говоримо или чак и мислимо у 
категоријама „интелектуалне својине“</"
-"a>."
+"овај израз, најбоље је чврсто одлучити да 
<a href=\"/philosophy/not-ipr.html"
+"\">не говоримо или чак и мислимо у 
категоријама „интелектуалне својине“</a>."
 
 # type: Content of: <p>
 #. type: Content of: <p>
@@ -1346,12 +1319,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "&ldquo;LAMP&rdquo; stands for &ldquo;Linux, Apache, MySQL and PHP&rdquo;"
-#| "&mdash;a common combination of software to use on a Web server, except "
-#| "that &ldquo;Linux&rdquo; in this context really refers to the GNU/Linux "
-#| "system.  So instead of &ldquo;LAMP&rdquo; it should be &ldquo;"
-#| "GLAMP&rdquo;: &ldquo;GNU, Linux, Apache, MySQL and PHP.&rdquo;"
 msgid ""
 "&ldquo;LAMP&rdquo; stands for &ldquo;Linux, Apache, MySQL and PHP&rdquo;"
 "&mdash;a common combination of software to use on a web server, except that "
@@ -1366,7 +1333,6 @@
 
 # type: Content of: <h4>
 #. type: Content of: <h4>
-#| msgid "&ldquo;Linux system&rdquo;"
 msgid "&ldquo;Linux system&rdquo;"
 msgstr "„Линукс систем“"
 
@@ -1383,9 +1349,9 @@
 "Линукс је назив језгра које развија Линус 
Торвалдс од 1991. Оперативни "
 "систем у којем се користи Линукс је у 
основи ГНУ са доданим Линуксом. "
 "Називати цео систем „Линуксом“ је и 
непоштено и збуњујуће. Молимо вас да "
-"називате цео систем <a 
href=\"/gnu/linux-and-gnu.html\">ГНУ-ом са "
-"Линуксом</a>, како бисте одали признање 
Пројекту ГНУ и уједно одвојили цео "
-"систем од језгра."
+"називате цео систем <a 
href=\"/gnu/linux-and-gnu.html\">ГНУ-ом са Линуксом</"
+"a>, како бисте одали признање Пројекту ГНУ 
и уједно одвојили цео систем од "
+"језгра."
 
 # type: Content of: <h4>
 #. type: Content of: <h4>
@@ -1460,7 +1426,6 @@
 
 # type: Content of: <h4>
 #. type: Content of: <h4>
-#| msgid "&ldquo;MP3 player&rdquo;"
 msgid "&ldquo;MP3 Player&rdquo;"
 msgstr "„МП3 плејер“"
 
@@ -1504,15 +1469,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "Please avoid using the term &ldquo;open&rdquo; or &ldquo;open "
-#| "source&rdquo; as a substitute for &ldquo;free software&rdquo;.  Those "
-#| "terms refer to a <a href=\"/philosophy/open-source-misses-the-point.html"
-#| "\"> different position</a> based on different values.  Free software is a "
-#| "political movement; open source is a development model.  When referring "
-#| "to the open source position, using its name is appropriate; but please do "
-#| "not use it to label us or our work&mdash;that leads people to think we "
-#| "share those views."
 msgid ""
 "Please avoid using the term &ldquo;open&rdquo; or &ldquo;open source&rdquo; "
 "as a substitute for &ldquo;free software.&rdquo; Those terms refer to a <a "
@@ -1538,11 +1494,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "It's ok to use the abbreviation &ldquo;PC&rdquo; to refer to a certain "
-#| "kind of computer hardware, but please don't use it with the implication "
-#| "that the computer is running Microsoft Windows.  If you install GNU/Linux "
-#| "on the same computer, it is still a PC."
 msgid ""
 "It's OK to use the abbreviation &ldquo;PC&rdquo; to refer to a certain kind "
 "of computer hardware, but please don't use it with the implication that the "
@@ -1745,7 +1696,6 @@
 
 # type: Content of: <h4>
 #. type: Content of: <h4>
-#| msgid "&ldquo;RAND (reasonable and nondiscriminatory)&rdquo;"
 msgid "&ldquo;RAND (Reasonable and Non-Discriminatory)&rdquo;"
 msgstr ""
 "„РИН — разумно и недискриминирајуће 
(енгл. <em>RAND — reasonable and "
@@ -1784,14 +1734,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "Standards bodies should recognize that these licenses are discriminatory, "
-#| "and drop the use of the term &ldquo;reasonable and "
-#| "nondiscriminatory&rdquo; or &ldquo;RAND&rdquo; to describe them.  Until "
-#| "they do so, writers who do not wish to join in the whitewashing would do "
-#| "well to reject that term.  To accept and use it merely because patent-"
-#| "wielding companies have made it widespread is to let those companies "
-#| "dictate the views you express."
 msgid ""
 "Standards bodies should recognize that these licenses are discriminatory, "
 "and drop the use of the term &ldquo;reasonable and non-discriminatory&rdquo; "
@@ -1916,13 +1858,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "The term &ldquo;software industry&rdquo; encourages people to imagine "
-#| "that software is always developed by a sort of factory and then delivered "
-#| "to consumers.  The free software community shows this is not the case.  "
-#| "Software businesses exist, and various businesses develop free and/or "
-#| "nonfree software, but those that develop free software are not run like "
-#| "factories."
 msgid ""
 "The term &ldquo;software industry&rdquo; encourages people to imagine that "
 "software is always developed by a sort of factory and then delivered to "
@@ -1960,12 +1895,12 @@
 msgstr ""
 "Израз „индустрија“ се користи као вид 
пропаганде бранилаца софтверских "
 "патената. Они називају изградњу софтвера 
„индустријом“ и онда покушавају да "
-"одбране став да би је требало подвргнути 
патентним монополима. <a "
-"href=\"http://web.archive.org/web/20071222001014/http://www.";
-"swpat.ffii.org/papers/europarl0309/\" title=\"archived version of http://";
-"swpat.ffii.org/papers/europarl0309/\">Европски парламент, "
-"одбацујући софтверске патенте 2003. године, 
изгласао је да се „индустрија“ "
-"дефинише као „аутоматизована производња 
материјалних добара“.</a>"
+"одбране став да би је требало подвргнути 
патентним монополима. <a href="
+"\"http://web.archive.org/web/20071222001014/http://www.swpat.ffii.org/papers/";
+"europarl0309/\" title=\"archived version of http://swpat.ffii.org/papers/";
+"europarl0309/\">Европски парламент, одбацујући 
софтверске патенте 2003. "
+"године, изгласао је да се „индустрија“ 
дефинише као „аутоматизована "
+"производња материјалних добара“.</a>"
 
 # type: Content of: <h4>
 #. type: Content of: <h4>
@@ -2048,9 +1983,8 @@
 "wrong (the spec), the laws are what should change."
 msgstr ""
 "Сама идеја да закони одређују шта је 
исправно а шта погрешно је промашај. "
-"Закони су, у најбољем случају, покушај да 
се достигне правда; рећи да "
-"закони дефинишу правду или етичко 
понашање представља обртање ствари "
-"наглавце."
+"Закони су, у најбољем случају, покушај да 
се достигне правда; рећи да закони "
+"дефинишу правду или етичко понашање 
представља обртање ствари наглавце."
 
 # type: Content of: <h4>
 #. type: Content of: <h4>
@@ -2059,12 +1993,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "<a href=\"/philosophy/can-you-trust.html\">&ldquo;Trusted computing&rdquo;"
-#| "</a> is the proponents' name for a scheme to redesign computers so that "
-#| "application developers can trust your computer to obey them instead of "
-#| "you.  For their point of view, it is &ldquo;trusted&rdquo;; from your "
-#| "point of view, it is &ldquo;treacherous.&rdquo;"
 msgid ""
 "<a href=\"/philosophy/can-you-trust.html\">&ldquo;Trusted computing&rdquo;</"
 "a> is the proponents' name for a scheme to redesign computers so that "
@@ -2153,12 +2081,6 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><div><p>
-#| msgid ""
-#| "Please send FSF &amp; GNU inquiries to <a href=\"mailto:address@hidden";
-#| "\"><em>address@hidden</em></a>.  There are also <a 
href=\"/contact/\">other "
-#| "ways to contact</a> the FSF.  <br /> Please send broken links and other "
-#| "corrections or suggestions to <a href=\"mailto:address@hidden";
-#| "\"><em>address@hidden</em></a>."
 msgid ""
 "Please send general FSF &amp; GNU inquiries to <a 
href=\"mailto:address@hidden";
 "\">&lt;address@hidden&gt;</a>.  There are also <a href=\"/contact/\">other 
ways "
@@ -2195,8 +2117,8 @@
 "panel of your PO editor (or above the msgid if you are using a simple text "
 "editor). All the Serbian POs need to be treated similarly; this can be done "
 "by simply modifying the two variants of this string in a master compendium "
-"(to be created). If you need any technical help, please contact "
-"address@hidden"
+"(to be created). If you need any technical help, please contact web-"
+"address@hidden"
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
@@ -2212,10 +2134,6 @@
 "2002, 2003, 2004, 2007, 2008, 2009 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
-#| msgid ""
-#| "This page is licensed under a <a rel=\"license\" href=\"http://";
-#| "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-#| "NoDerivs 3.0 United States License</a>."
 msgid ""
 "This page is licensed under a <a rel=\"license\" href=\"http://";
 "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
@@ -2255,10 +2173,10 @@
 #~ msgid ""
 #~ "<a href=\"/philosophy/philosophy.html\">Other Texts to Read</a> | &ldquo;"
 #~ "<a href=\"words-to-avoid.html#BSD-style\">BSD-style</a>&rdquo; | &ldquo;"
-#~ "<a href=\"words-to-avoid.html#Closed\">Closed</a>&rdquo; | &ldquo;<a "
-#~ "href=\"words-to-avoid.html#CloudComputing\">Cloud Computing</a>&rdquo; | "
-#~ "&ldquo;<a href=\"words-to-avoid.html#Commercial\">Commercial</a>&rdquo; "
-#~ "| &ldquo;<a href=\"words-to-avoid.html#Compensation\">Compensation</"
+#~ "<a href=\"words-to-avoid.html#Closed\">Closed</a>&rdquo; | &ldquo;<a href="
+#~ "\"words-to-avoid.html#CloudComputing\">Cloud Computing</a>&rdquo; | "
+#~ "&ldquo;<a href=\"words-to-avoid.html#Commercial\">Commercial</a>&rdquo; | "
+#~ "&ldquo;<a href=\"words-to-avoid.html#Compensation\">Compensation</"
 #~ "a>&rdquo; | &ldquo;<a href=\"words-to-avoid.html#Consumer\">Consumer</"
 #~ "a>&rdquo; | &ldquo;<a href=\"words-to-avoid.html#Content\">Content</"
 #~ "a>&rdquo; | &ldquo;<a href=\"words-to-avoid.html#Creator\">Creator</"
@@ -2273,22 +2191,22 @@
 #~ "away software</a>&rdquo; | &ldquo;<a href=\"words-to-avoid.html#Hacker"
 #~ "\">Hacker</a>&rdquo; | &ldquo;<a href=\"words-to-avoid."
 #~ "html#IntellectualProperty\">Intellectual property</a>&rdquo; | &ldquo;<a "
-#~ "href=\"words-to-avoid.html#LAMP\">LAMP system</a>&rdquo; | &ldquo;<a "
-#~ "href=\"words-to-avoid.html#Linux\">Linux system</a>&rdquo; | &ldquo;<a "
-#~ "href=\"words-to-avoid.html#Market\">Market</a>&rdquo; | &ldquo;<a href="
-#~ "\"words-to-avoid.html#MP3Player\">MP3 player</a>&rdquo; | &ldquo;<a href="
-#~ "\"words-to-avoid.html#Open\">Open</a>&rdquo; | &ldquo;<a href=\"words-to-"
-#~ "avoid.html#PC\">PC</a>&rdquo; | &ldquo;<a href=\"words-to-avoid."
-#~ "html#Photoshop\">Photoshop</a>&rdquo; | &ldquo;<a href=\"words-to-avoid."
-#~ "html#Piracy\">Piracy</a>&rdquo; | &ldquo;<a href=\"words-to-avoid."
-#~ "html#PowerPoint\">PowerPoint</a>&rdquo; | &ldquo;<a href=\"words-to-"
-#~ "avoid.html#Protection\">Protection</a>&rdquo; | &ldquo;<a href=\"words-"
-#~ "to-avoid.html#RAND\">RAND</a>&rdquo; | &ldquo;<a href=\"words-to-avoid."
-#~ "html#SellSoftware\">Sell software</a>&rdquo; | &ldquo;<a href=\"words-to-"
-#~ "avoid.html#SoftwareIndustry\">Software Industry</a>&rdquo; | &ldquo;<a "
-#~ "href=\"words-to-avoid.html#Theft\">Theft</a>&rdquo; | &ldquo;<a href="
-#~ "\"words-to-avoid.html#TrustedComputing\">Trusted Computing</a>&rdquo; | "
-#~ "&ldquo;<a href=\"words-to-avoid.html#Vendor\">Vendor</a>&rdquo;"
+#~ "href=\"words-to-avoid.html#LAMP\">LAMP system</a>&rdquo; | &ldquo;<a href="
+#~ "\"words-to-avoid.html#Linux\">Linux system</a>&rdquo; | &ldquo;<a href="
+#~ "\"words-to-avoid.html#Market\">Market</a>&rdquo; | &ldquo;<a href=\"words-"
+#~ "to-avoid.html#MP3Player\">MP3 player</a>&rdquo; | &ldquo;<a href=\"words-"
+#~ "to-avoid.html#Open\">Open</a>&rdquo; | &ldquo;<a href=\"words-to-avoid."
+#~ "html#PC\">PC</a>&rdquo; | &ldquo;<a href=\"words-to-avoid.html#Photoshop"
+#~ "\">Photoshop</a>&rdquo; | &ldquo;<a href=\"words-to-avoid.html#Piracy"
+#~ "\">Piracy</a>&rdquo; | &ldquo;<a href=\"words-to-avoid.html#PowerPoint"
+#~ "\">PowerPoint</a>&rdquo; | &ldquo;<a href=\"words-to-avoid.html#Protection"
+#~ "\">Protection</a>&rdquo; | &ldquo;<a href=\"words-to-avoid.html#RAND"
+#~ "\">RAND</a>&rdquo; | &ldquo;<a href=\"words-to-avoid.html#SellSoftware"
+#~ "\">Sell software</a>&rdquo; | &ldquo;<a href=\"words-to-avoid."
+#~ "html#SoftwareIndustry\">Software Industry</a>&rdquo; | &ldquo;<a href="
+#~ "\"words-to-avoid.html#Theft\">Theft</a>&rdquo; | &ldquo;<a href=\"words-"
+#~ "to-avoid.html#TrustedComputing\">Trusted Computing</a>&rdquo; | &ldquo;<a "
+#~ "href=\"words-to-avoid.html#Vendor\">Vendor</a>&rdquo;"
 #~ msgstr ""
 #~ "<a href=\"/philosophy/philosophy.sr.html\">Други текстови</a> 
| „<a href="
 #~ "\"words-to-avoid.sr.html#ForFree\">Бесплатно</a>“ | „<a 
href=\"words-to-"
@@ -2329,8 +2247,8 @@
 # type: Content of: <p>
 #~ msgid ""
 #~ "The terms &ldquo;producer&rdquo; and &ldquo;consumer&rdquo; come from "
-#~ "economic theory, and bring with them its narrow prespective and "
-#~ "misguided assumotions.  They tend to warp your thinking."
+#~ "economic theory, and bring with them its narrow prespective and misguided "
+#~ "assumotions.  They tend to warp your thinking."
 #~ msgstr ""
 #~ "Изрази „произвођач“ и „потрошач“ 
потичу из економске теорије, и намећу "
 #~ "њене погрешне претпоставке и уску 
визуру економске теорије. То тежи ка "
@@ -2339,8 +2257,8 @@
 # type: Content of: <p>
 #~ msgid ""
 #~ "In addition, describing the users of software as &ldquo;consumers&rdquo; "
-#~ "presumes a narrow role for them: it regards them as cattle that "
-#~ "passively graze on what others make available to them."
+#~ "presumes a narrow role for them: it regards them as cattle that passively "
+#~ "graze on what others make available to them."
 #~ msgstr ""
 #~ "Осим тога, називање корисника софтвера 
„потрошачима“ им прописује врло "
 #~ "ограничену улогу. Они се третирају као 
стока која незаинтересовано пасе "

Index: server/body-include-1.sr.html
===================================================================
RCS file: /web/www/www/server/body-include-1.sr.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- server/body-include-1.sr.html       22 Apr 2014 05:02:56 -0000      1.11
+++ server/body-include-1.sr.html       2 Dec 2014 11:01:48 -0000       1.12
@@ -11,8 +11,8 @@
  <form method="get" action="//www.gnu.org/cgi-bin/estseek.cgi">
   <div>
   <input name="phrase" id="phrase" type="text" size="18" accesskey="s"
-value="Why GNU/Linux?" onfocus="this.value=''" /> <input type="submit"
-value="Search" />
+value="Зашто ГНУ са Линуксом?" onfocus="this.value=''" /> 
<input
+type="submit" value="Тражи" />
   </div>
  </form>
 </div>

Index: server/body-include-2.sr.html
===================================================================
RCS file: /web/www/www/server/body-include-2.sr.html,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- server/body-include-2.sr.html       15 Sep 2014 17:57:26 -0000      1.58
+++ server/body-include-2.sr.html       2 Dec 2014 11:01:48 -0000       1.59
@@ -4,9 +4,9 @@
 <div id="header">
 <div id="fsf-frame">
 <p id="join-fsf"><a
-href="https://www.fsf.org/associate/support_freedom?referrer=4052";>JOIN&nbsp;THE&nbsp;FSF</a></p>
+href="https://www.fsf.org/associate/support_freedom?referrer=4052";>Придружите&nbsp;се&nbsp;ЗСС-у!</a></p>
 <div id="fssbox">
-<p><a href="http://www.fsf.org/fss";>Free Software Supporter</a></p>
+<p><a 
href="http://www.fsf.org/fss";>Присталица&nbsp;слободног&nbsp;софтвера</a></p>
 <form 
action="https://crm.fsf.org/civicrm/profile/create&amp;reset=1&amp;gid=31"; 
method="post">
  <div>
   <input name="postURL" type="hidden" value="" /> <input type="hidden"
@@ -16,8 +16,8 @@
  </div>
  <p>
   <input type="text" id="frmEmail" name="email-Primary" size="18"
-maxlength="80" value="email address" onfocus="this.value=''"/> <input
-type="submit" name="_qf_Edit_next" value="Sign up" />
+maxlength="80" value="address@hidden" onfocus="this.value=''"/> <input
+type="submit" name="_qf_Edit_next" value="У реду" />
  </p>
 </form>
 </div>
@@ -27,7 +27,7 @@
 <!-- /fsf-frame -->
 <div id="gnu-banner">
  <a href="/">
- <img src="/graphics/heckert_gnu.small.png" alt="[A GNU head]" 
/>Оперативни систем <strong>ГНУ</strong></a>
+ <img src="/graphics/heckert_gnu.small.png" alt="[ГНУ-ова глава] " 
/>Оперативни систем <strong>ГНУ</strong></a>
 </div>
 
 <!-- /gnu-banner -->
@@ -41,12 +41,12 @@
 <div id="navigation">
 
  <ul>
-  <li id="tabAboutGNU"><a href="/gnu/gnu.html">About&nbsp;GNU</a></li>
+  <li id="tabAboutGNU"><a href="/gnu/gnu.html">О&nbsp;ГНУ-у</a></li>
   <li id="tabPhilosophy"><a 
href="/philosophy/philosophy.html">Филозофија</a></li>
   <li id="tabLicenses"><a 
href="/licenses/licenses.html">Лиценце</a></li>
-  <li id="tabEducation"><a href="/education/education.html">Education</a></li>
-  <li id="tabSoftware"><a href="/software/software.html">Software</a></li>
-  <li id="tabDoc"><a href="/doc/doc.html">Documentation</a></li>
+  <li id="tabEducation"><a 
href="/education/education.html">Образовање</a></li>
+  <li id="tabSoftware"><a 
href="/software/software.html">Софтвер</a></li>
+  <li id="tabDoc"><a href="/doc/doc.html">Документација</a></li>
   <li id="tabHelp"><a 
href="/help/help.html">Помозите&nbsp;ГНУ-у</a></li>
  </ul>
 

Index: server/po/08whatsnew.sr.po
===================================================================
RCS file: /web/www/www/server/po/08whatsnew.sr.po,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- server/po/08whatsnew.sr.po  2 Dec 2014 10:53:07 -0000       1.12
+++ server/po/08whatsnew.sr.po  2 Dec 2014 11:01:48 -0000       1.13
@@ -205,14 +205,6 @@
 
 # type: Content of: <dl><dd>
 #. type: Content of: <dl><dd>
-#| msgid ""
-#| "The Free Software Foundation (FSF) has marked a milestone in their "
-#| "PlayOgg.org campaign with the announcement that National Public Radio "
-#| "(NPR) news station WBUR Boston has begun worldwide webcasting in the free "
-#| "audio format Ogg Vorbis. The WBUR stream is available at <a href=\"http://";
-#| "www.wbur.org/listen/\">http://www.wbur.org/listen/</a>, or you can go "
-#| "directly to <a href=\"http://www.wbur.org/listen/feed/ogg.m3u\";>http://";
-#| "www.wbur.org/listen/feed/ogg.m3u</a>."
 msgid ""
 "The Free Software Foundation (FSF) has marked a milestone in their PlayOgg."
 "org campaign with the announcement that National Public Radio (NPR) news "
@@ -350,8 +342,8 @@
 "ways to contact</a> the FSF."
 msgstr ""
 "Молимо вас да шаљете питања у вези са 
ЗСС-ом и ГНУ-ом на адресу <a href="
-"\"mailto:address@hidden";>&lt;address@hidden&gt;</a>. Постоје и <a 
href=\"/"
-"contact/\">други начини да се обратите</a> ЗСС-у."
+"\"mailto:address@hidden";>&lt;address@hidden&gt;</a>. Постоје и <a 
href=\"/contact/"
+"\">други начини да се обратите</a> ЗСС-у."
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
@@ -359,9 +351,8 @@
 "Please send broken links and other corrections or suggestions to <a href="
 "\"mailto:address@hidden";><em>address@hidden</em></a>."
 msgstr ""
-"Молимо вас да шаљете "
-"неисправне везе и друге исправке (или 
предлоге) на адресу <a href=\"mailto:";
-"address@hidden">&lt;address@hidden&gt;</a>."
+"Молимо вас да шаљете неисправне везе и 
друге исправке (или предлоге) на "
+"адресу <a href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>

Index: server/po/body-include-1.sr.po
===================================================================
RCS file: /web/www/www/server/po/body-include-1.sr.po,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- server/po/body-include-1.sr.po      2 Dec 2014 10:53:07 -0000       1.15
+++ server/po/body-include-1.sr.po      2 Dec 2014 11:01:49 -0000       1.16
@@ -18,30 +18,26 @@
 "Outdated-Since: 2011-09-23 12:25-0300\n"
 
 # type: Content of: <body><div><div><div><div><p>
-#, fuzzy
 #. type: Content of: <div>
+#, fuzzy
 msgid "<a href=\"#content\">Skip to main text</a>"
 msgstr "<a href=\"#content\">Скочи на садржај</a>"
 
 # type: Content of: <body><div><div><form><div>
 #. type: Content of: <div><form><div>
-#| msgid ""
-#| "<label class=\"netscape4\" for=\"phrase\">Search:</label> <input name="
-#| "\"phrase\" id=\"phrase\" type=\"text\" size=\"18\" accesskey=\"s\" value="
-#| "\"Why GNU/Linux?\" /> <input type=\"submit\" value=\"Search\" />"
 msgid ""
 "<input name=\"phrase\" id=\"phrase\" type=\"text\" size=\"18\" accesskey=\"s"
 "\" value=\"Why GNU/Linux?\" onfocus=\"this.value=''\" /> <input type=\"submit"
 "\" value=\"Search\" />"
 msgstr ""
 "<input name=\"phrase\" id=\"phrase\" type=\"text\" size=\"18\" accesskey=\"s"
-"\" value=\"Зашто ГНУ са Линуксом?\" 
onfocus=\"this.value=''\" /> <input type=\"submit"
-"\" value=\"Тражи\" />"
+"\" value=\"Зашто ГНУ са Линуксом?\" 
onfocus=\"this.value=''\" /> <input type="
+"\"submit\" value=\"Тражи\" />"
 
 # type: Content of: <body><div>
 #~ msgid ""
-#~ "<span class=\"netscape4\"><a href=\"#content\">Skip to content</a> | | "
-#~ "<a href=\"#searcher\">Skip to search</a> | </span><a href=\"#translations"
+#~ "<span class=\"netscape4\"><a href=\"#content\">Skip to content</a> | | <a "
+#~ "href=\"#searcher\">Skip to search</a> | </span><a href=\"#translations"
 #~ "\">Translations of this page</a>"
 #~ msgstr ""
 #~ "<span class=\"netscape4\"><a href=\"#content\">Скочи на 
садржај</a> | | "

Index: server/po/body-include-2.sr.po
===================================================================
RCS file: /web/www/www/server/po/body-include-2.sr.po,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- server/po/body-include-2.sr.po      2 Dec 2014 10:53:07 -0000       1.55
+++ server/po/body-include-2.sr.po      2 Dec 2014 11:01:50 -0000       1.56
@@ -19,9 +19,6 @@
 
 # type: Content of: <body><div><div><div><ul><li>
 #. type: Content of: <div><div><p>
-#| msgid ""
-#| "<a href=\"https://www.fsf.org/associate/support_freedom?";
-#| "referrer=4052\">Join the FSF!</a>"
 msgid ""
 "<a href=\"https://www.fsf.org/associate/support_freedom?";
 "referrer=4052\">JOIN&nbsp;THE&nbsp;FSF</a>"
@@ -33,7 +30,8 @@
 #. type: Content of: <div><div><div><p>
 msgid "<a href=\"http://www.fsf.org/fss\";>Free Software Supporter</a>"
 msgstr ""
-"<a 
href=\"http://www.fsf.org/fss\";>Присталица&nbsp;слободног&nbsp;софтвера</a>"
+"<a 
href=\"http://www.fsf.org/fss\";>Присталица&nbsp;слободног&nbsp;софтвера</"
+"a>"
 
 #. type: Content of: <div><div><div><form><div>
 msgid ""
@@ -49,10 +47,6 @@
 
 # type: Content of: <body><div><div><div><div><form><p>
 #. type: Content of: <div><div><div><form><p>
-#| msgid ""
-#| "<input type=\"text\" id=\"frmEmail\" name=\"email\" size=\"15\" maxlength="
-#| "\"80\" value=\"address@hidden" onfocus=\"this.value=''\" /> &nbsp; "
-#| "<input type=\"submit\" value=\"Ok\" />"
 msgid ""
 "<input type=\"text\" id=\"frmEmail\" name=\"email-Primary\" size=\"18\" "
 "maxlength=\"80\" value=\"email address\" onfocus=\"this.value=''\"/> <input "
@@ -102,7 +96,6 @@
 
 # type: Content of: <body><div><div><div><ul><li>
 #. type: Content of: <div><ul><li>
-#| msgid "<a href=\"/software/software.html\">Downloads</a>"
 msgid "<a href=\"/software/software.html\">Software</a>"
 msgstr "<a href=\"/software/software.html\">Софтвер</a>"
 

Index: gnu/po/gnu-users-never-heard-of-gnu.sr-diff.html
===================================================================
RCS file: gnu/po/gnu-users-never-heard-of-gnu.sr-diff.html
diff -N gnu/po/gnu-users-never-heard-of-gnu.sr-diff.html
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ gnu/po/gnu-users-never-heard-of-gnu.sr-diff.html    2 Dec 2014 11:01:44 
-0000       1.1
@@ -0,0 +1,135 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
+<!-- Generated by GNUN -->
+<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>/gnu/gnu-users-never-heard-of-gnu.html-diff</title>
+<style type="text/css">
+span.removed { background-color: #f22; color: #000; }
+span.inserted { background-color: #2f2; color: #000; }
+</style></head>
+<body><pre>
+&lt;!--#include virtual="/server/header.html" --&gt;
+&lt;!-- Parent-Version: 1.77 --&gt;
+&lt;title&gt;GNU Users Who Have Never Heard of GNU
+- GNU Project - Free Software Foundation&lt;/title&gt;
+&lt;!--#include virtual="/gnu/po/gnu-users-never-heard-of-gnu.translist" --&gt;
+&lt;!--#include virtual="/server/banner.html" --&gt;
+&lt;h2&gt;GNU Users Who Have Never Heard of GNU&lt;/h2&gt;
+
+&lt;p&gt;&lt;strong&gt;by &lt;a href="http://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/strong&gt;&lt;/p&gt;
+
+&lt;div class="announcement"&gt;
+  &lt;blockquote&gt;&lt;p&gt;To learn more about this issue, you can also read
+our &lt;a href="/gnu/gnu-linux-faq.html"&gt;GNU/Linux FAQ&lt;/a&gt;, our page 
on 
+&lt;a href="/gnu/why-gnu-linux.html"&gt;Why GNU/Linux?&lt;/a&gt; 
+and our page on &lt;a href="/gnu/linux-and-gnu.html"&gt;Linux and the GNU 
Project&lt;/a&gt;.
+&lt;/p&gt;&lt;/blockquote&gt;
+&lt;/div&gt;
+
+&lt;p&gt;Most people have never heard of GNU.  Even most of the people who use
+the GNU system have never heard of GNU, thanks to so many people and
+companies who teach them to call it &ldquo;Linux&rdquo;.  Nonetheless,
+the name GNU has certain associations, which people will discover once
+they hear the name.  GNU is associated with the ideals of freedom of the
+free software movement.  That association is no accident; the motive for
+developing GNU was specifically to make it possible to use a computer
+and have freedom.&lt;/p&gt;
+
+&lt;p&gt;The association between the name GNU and our goals of freedom and
+social solidarity exists in the minds of hundreds of thousands of
+GNU/Linux users that do know about GNU.  It exists in Wikipedia.  And it
+exists around the web; if these users search for GNU, they will find &lt;a
+href="http://www.gnu.org"&gt;www.gnu.org&lt;/a&gt;, which talks about free
+software and freedom.&lt;/p&gt;
+
+&lt;p&gt;A person seeing the name &ldquo;GNU&rdquo; for the first time in
+&ldquo;GNU/Linux&rdquo; won't immediately associate it with anything.
+However, when people know that the system is basically GNU, that brings
+them a step closer to learning about our ideals.  For instance, they
+might become curious and look for more information about GNU.&lt;/p&gt;
+
+&lt;p&gt;If they don't look for it, they may encounter it anyway.  The
+&ldquo;open source&rdquo; rhetoric tends to lead people's attention away
+from issues of users' freedom, but not totally; there is still
+discussion of GNU and free software, and people have some chance of
+coming across it.  When that happens, the reader is more likely to pay
+attention to information about GNU (such as that it's the work of a
+campaign for freedom and community) if he knows he is a user of the GNU
+system.&lt;/p&gt;
+
+&lt;p&gt;Over time, calling the system &ldquo;GNU/Linux&rdquo; spreads
+awareness of the ideals of freedom for which we developed the GNU
+system.  It is also useful as a reminder for people in our community who
+know about these ideals, in a world where much of discussion of free
+software takes a totally practical (and thus amoral) approach.  When we
+ask you to call the system &ldquo;GNU/Linux&rdquo;, we do so because
+awareness of GNU slowly but surely brings with it awareness of the free
+software ideals of freedom and community.&lt;/p&gt;
+
+&lt;/div&gt;&lt;!-- for id="content", starts in the include above --&gt;
+&lt;!--#include virtual="/server/footer.html" --&gt;
+&lt;div id="footer"&gt;
+&lt;div class="unprintable"&gt;
+
+&lt;p&gt;Please send general FSF &amp; GNU inquiries to
+&lt;a href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.
+There are also &lt;a href="/contact/"&gt;other ways to contact&lt;/a&gt;
+the FSF.  Broken links and other corrections or suggestions can be sent
+to &lt;a 
href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.&lt;/p&gt;
+
+&lt;p&gt;&lt;!-- TRANSLATORS: Ignore the original text in this paragraph,
+        replace it with the translation of these two:
+
+        We work hard and do our best to provide accurate, good quality
+        translations.  However, we are not exempt from imperfection.
+        Please send your comments and general suggestions in this regard
+        to &lt;a href="mailto:address@hidden"&gt;
+        &lt;address@hidden&gt;&lt;/a&gt;.&lt;/p&gt;
+
+        &lt;p&gt;For information on coordinating and submitting translations of
+        our web pages, see &lt;a
+        href="/server/standards/README.translations.html"&gt;Translations
+        README&lt;/a&gt;. --&gt;
+Please see the &lt;a
+href="/server/standards/README.translations.html"&gt;Translations
+README&lt;/a&gt; for information on coordinating and submitting translations
+of this article.&lt;/p&gt;
+&lt;/div&gt;
+
+&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
+     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
+     document was modified, or published.
+     
+     If you wish to list earlier years, that is ok too.
+     Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+     years, as long as each year in the range is in fact a copyrightable
+     year, i.e., a year in which the document was published (including
+     being publicly visible on the web or in a revision control system).
+     
+     There is more detail about copyright years in the GNU Maintainers
+     Information document, www.gnu.org/prep/maintain. --&gt;
+
+&lt;p&gt;Copyright &copy; 2006, 2007, 2013, 2014 Free Software Foundation, 
Inc.&lt;/p&gt;
+
+&lt;p&gt;This page is licensed under a &lt;a rel="license"
+href="http://creativecommons.org/licenses/by-nd/3.0/us/"&gt;Creative
+Commons Attribution-NoDerivs 3.0 United States License&lt;/a&gt;.&lt;/p&gt;
+
+&lt;!--#include virtual="/server/bottom-notes.html" --&gt;
+
+&lt;p class="unprintable"&gt;Updated:
+&lt;!-- timestamp start --&gt;
+$Date: 2014/12/02 11:01:44 $
+&lt;!-- timestamp end --&gt;
+&lt;/p&gt;
+&lt;/div&gt;
+&lt;/div&gt;
+&lt;/body&gt;
+&lt;/html&gt;
+</pre></body></html>



reply via email to

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