[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/licenses license-list.ru.html po/license-li...
From: |
GNUN |
Subject: |
www/licenses license-list.ru.html po/license-li... |
Date: |
Sat, 12 Apr 2014 11:02:26 +0000 |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 14/04/12 11:02:25
Modified files:
licenses : license-list.ru.html
licenses/po : license-list.de.po license-list.es.po
license-list.fr.po license-list.it.po
license-list.ja.po license-list.pot
license-list.ru-en.html license-list.ru.po
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/license-list.ru.html?cvsroot=www&r1=1.59&r2=1.60
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.de.po?cvsroot=www&r1=1.138&r2=1.139
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.es.po?cvsroot=www&r1=1.93&r2=1.94
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.fr.po?cvsroot=www&r1=1.211&r2=1.212
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.it.po?cvsroot=www&r1=1.155&r2=1.156
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ja.po?cvsroot=www&r1=1.43&r2=1.44
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.pot?cvsroot=www&r1=1.115&r2=1.116
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ru-en.html?cvsroot=www&r1=1.51&r2=1.52
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ru.po?cvsroot=www&r1=1.123&r2=1.124
Patches:
Index: license-list.ru.html
===================================================================
RCS file: /web/www/www/licenses/license-list.ru.html,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- license-list.ru.html 11 Apr 2014 20:30:28 -0000 1.59
+++ license-list.ru.html 12 Apr 2014 11:02:22 -0000 1.60
@@ -39,7 +39,7 @@
width: auto; max-width: 100%;
font-style: normal;
padding: 0 1em 1em 1em;
- margin: 1.5em 0 1em 1em;
+ margin: 2.5em 1.5em 1.5em 1.5em;
background: #f0f2f4;
border: 1px solid #c9cccf;
}
@@ -122,8 +122,11 @@
</div>
<!-- /class="toc" -->
-<h3 id="Introduction" class="big-section">
+<div class="big-section">
+<h3 id="Introduction">
Ðведение</h3>
+</div>
+<div style="clear: left;"></div>
<p>ÐÑ ÐºÐ»Ð°ÑÑиÑиÑиÑÑем лиÑензии по
опÑеделеннÑм клÑÑевÑм кÑиÑеÑиÑм:</p>
@@ -193,17 +196,19 @@
<dl class="blue"><dt></dt><dd></dd></dl>
</div>
-<div>
-<h3 id="SoftwareLicenses" class="big-section">
+<div class="big-section">
+<h3 id="SoftwareLicenses">
ÐиÑензии Ð´Ð»Ñ Ð¿ÑогÑамм</h3>
</div>
+<div style="clear: left;"></div>
-
-<h4 id="GPLCompatibleLicenses" class="big-subsection">
+<div class="big-subsection">
+<h4 id="GPLCompatibleLicenses">
<span id="FreeLicenses"></span>ÐиÑензии ÑвободнÑÑ
пÑогÑамм, ÑовмеÑÑимÑе Ñ
GPL</h4>
<span class="anchor-reference-id"> (<a
href="#GPLCompatibleLicenses">#GPLCompatibleLicenses</a>)</span>
+</div>
<p><strong>СледÑÑÑие лиÑензии ÑдовлеÑвоÑÑÑÑ
кÑиÑеÑиÑм лиÑензий <a
href="/philosophy/free-sw.html">ÑвободнÑÑ
пÑогÑамм</a> и
ÑовмеÑÑÐ¸Ð¼Ñ Ñ <a
@@ -978,14 +983,15 @@
</dl>
-<!-- end class "green" -->
+<!-- end class="green" -->
<hr class="separator" />
-
-<h4 id="GPLIncompatibleLicenses" class="big-subsection">
+<div class="big-subsection">
+<h4 id="GPLIncompatibleLicenses">
ÐиÑензии ÑвободнÑÑ
пÑогÑамм,
неÑовмеÑÑимÑе Ñ GPL</h4>
<span class="anchor-reference-id"> (<a
href="#GPLIncompatibleLicenses">#GPLIncompatibleLicenses</a>)</span>
+</div>
<p><strong>СледÑÑÑие лиÑензии ÑвлÑÑÑÑÑ
лиÑензиÑми <a
href="/philosophy/free-sw.html">ÑвободнÑÑ
пÑогÑамм</a>, но
<a
@@ -1579,15 +1585,16 @@
</dl>
-<!-- end class="orange -->
+<!-- end class="orange" -->
<hr class="separator" />
+<div class="big-subsection">
<span id="NonFreeSoftwareLicense"></span>
-<h4 id="NonFreeSoftwareLicenses" class="big-subsection">
+<h4 id="NonFreeSoftwareLicenses">
ÐиÑензии неÑвободнÑÑ
пÑогÑамм</h4>
<span class="anchor-reference-id"> (<a
href="#NonFreeSoftwareLicenses">#NonFreeSoftwareLicenses</a>)</span>
-
+</div>
<p><strong>СледÑÑÑие лиÑензии <em>не ÑвлÑÑÑÑÑ</em>
лиÑензиÑми <a
href="/philosophy/free-sw.html">ÑвободнÑÑ
пÑогÑамм</a>.
Ðни авÑомаÑиÑеÑки
@@ -2046,16 +2053,18 @@
</dl>
<!-- end class="red" -->
-<div>
-<h3 id="DocumentationLicenses" class="big-section">
+<div class="big-section">
+<h3 id="DocumentationLicenses">
ÐиÑензии Ð´Ð»Ñ Ð´Ð¾ÐºÑменÑаÑии</h3>
</div>
+<div style="clear: left;"></div>
-
-<h4 id="FreeDocumentationLicenses" class="big-subsection">
+<div class="big-subsection">
+<h4 id="FreeDocumentationLicenses">
ÐиÑензии Ñвободной докÑменÑаÑии</h4>
<span class="anchor-reference-id"> (<a
href="#FreeDocumentationLicenses">#FreeDocumentationLicenses</a>) </span>
+</div>
<p><strong>СледÑÑÑие лиÑензии ÑдовлеÑвоÑÑÑÑ
кÑиÑеÑиÑм лиÑензий <a
href="/philosophy/free-doc.html"> Ñвободной
докÑменÑаÑии</a>.</strong></p>
@@ -2144,12 +2153,13 @@
<!-- end class="orange" -->
<hr class="separator" />
-
-<h4 id="NonFreeDocumentationLicenses" class="big-subsection">
+<div class="big-subsection">
+<h4 id="NonFreeDocumentationLicenses">
ÐиÑензии неÑвободной докÑменÑаÑии</h4>
<span class="anchor-reference-id"> (<a
href="#NonFreeDocumentationLicenses">#NonFreeDocumentationLicenses</a>)
</span>
+</div>
<p><strong>СледÑÑÑие лиÑензии <em>не
ÑдовлеÑвоÑÑÑÑ ÐºÑиÑеÑиÑм</em> лиÑензий
Ñвободной докÑменÑаÑии:</strong></p>
@@ -2177,13 +2187,16 @@
</dl>
<!-- end class="red" -->
-<div>
-<h3 id="OtherLicenses" class="big-section">ÐиÑензии Ð´Ð»Ñ Ð´ÑÑгиÑ
ÑабоÑ</h3>
+<div class="big-section">
+<h3 id="OtherLicenses">ÐиÑензии Ð´Ð»Ñ Ð´ÑÑгиÑ
ÑабоÑ</h3>
</div>
+<div style="clear: left;"></div>
-<h4 class="big-subsection">ÐиÑензии Ð´Ð»Ñ ÑабоÑ
пÑакÑиÑеÑкого пÑименениÑ, кÑоме пÑогÑамм и
докÑменÑаÑии</h4>
+<div class="big-subsection">
+<h4>ÐиÑензии Ð´Ð»Ñ ÑÐ°Ð±Ð¾Ñ Ð¿ÑакÑиÑеÑкого
пÑименениÑ, кÑоме пÑогÑамм и
докÑменÑаÑии</h4>
<span class="anchor-reference-id"> (<a
href="#OtherLicenses">#OtherLicenses</a>)</span>
+</div>
<dl class="green">
@@ -2291,9 +2304,11 @@
</dl>
<!-- end class="orange" -->
-<h4 id="Fonts" class="big-subsection">
+<div class="big-subsection">
+<h4 id="Fonts">
ÐиÑензии Ð´Ð»Ñ ÑÑиÑÑов</h4>
<span class="anchor-reference-id"> (<a href="#Fonts">#Fonts</a>)</span>
+</div>
<p>ÐеÑеÑиÑленнÑе ниже лиÑензии оÑноÑÑÑÑÑ
не к Ñ
ÑдожеÑÑÐ²ÐµÐ½Ð½Ð¾Ð¼Ñ ÑеÑениÑ, а к его
вÑÑÐ°Ð¶ÐµÐ½Ð¸Ñ Ð² виде Ñайла. ÐаÑколÑко нам
извеÑÑно, на ÑеализаÑÐ¸Ñ ÑеÑÐµÐ½Ð¸Ñ Ð²Ñегда
@@ -2344,11 +2359,13 @@
</dl>
<!-- end class="orange" -->
-<h4 id="OpinionLicenses" class="big-subsection">
+<div class="big-subsection">
+<h4 id="OpinionLicenses">
ÐиÑензии Ð´Ð»Ñ ÑабоÑ, вÑÑажаÑÑиÑ
ÑоÑкÑ
зÑÐµÐ½Ð¸Ñ (напÑимеÑ, мнение или
ÑвидеÑелÑÑÑво)</h4>
<span class="anchor-reference-id"> (<a
href="#OpinionLicenses">#OpinionLicenses</a>)</span>
+</div>
<p>РабоÑÑ, коÑоÑÑе вÑÑажаÑÑ ÑÑе-Ñо
мнение — мемÑаÑÑ, комменÑаÑии и
Ñак далее — имеÑÑ Ð¿ÑинÑипиалÑно
дÑÑгое назнаÑение, Ñем Ñакие
@@ -2457,7 +2474,7 @@
<p class="unprintable"><!-- timestamp start -->
Ðбновлено:
-$Date: 2014/04/11 20:30:28 $
+$Date: 2014/04/12 11:02:22 $
<!-- timestamp end -->
</p>
Index: po/license-list.de.po
===================================================================
RCS file: /web/www/www/licenses/po/license-list.de.po,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -b -r1.138 -r1.139
--- po/license-list.de.po 12 Apr 2014 10:31:16 -0000 1.138
+++ po/license-list.de.po 12 Apr 2014 11:02:23 -0000 1.139
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: license-list.html\n"
-"POT-Creation-Date: 2014-04-12 10:26+0000\n"
+"POT-Creation-Date: 2014-04-12 10:57+0000\n"
"PO-Revision-Date: 2014-01-30 22:00+0100\n"
"Last-Translator: Joerg Kohne <joeko (AT) online [PUNKT] de>\n"
"Language-Team: German <address@hidden>\n"
@@ -3199,12 +3199,16 @@
msgstr "<a id=\"SoftwareLicenses\">Lizenzen für Software</a>"
#. type: Content of: <div><h4>
-# | <a [-href=\"#NonFreeSoftwareLicenses\">Nonfree-]
-# | {+id=\"NonFreeSoftwareLicenses\"> Nonfree+} Software Licenses</a>
+# | [-<a href=\"#GPLIncompatibleLicenses\"> GPL-Incompatible Free-]{+Nonfree+}
+# | Software [-Licenses</a>-] {+Licenses+}
#, fuzzy
-#| msgid "<a href=\"#NonFreeSoftwareLicenses\">Nonfree Software Licenses</a>"
-msgid "<a id=\"NonFreeSoftwareLicenses\"> Nonfree Software Licenses</a>"
-msgstr "<a href=\"#NonFreeSoftwareLicenses\">Unfreie Softwarelizenzen</a>"
+#| msgid ""
+#| "<a href=\"#GPLIncompatibleLicenses\"> GPL-Incompatible Free Software "
+#| "Licenses</a>"
+msgid "Nonfree Software Licenses"
+msgstr ""
+"<a href=\"#GPLIncompatibleLicenses\">Freie Softwarelizenzen (unvereinbar mit "
+"GNU GPL)</a>"
#. type: Content of: <div>
# | [-<a id=\"NoLicense\">No license</a>-]<span class=\"anchor-reference-id\">
@@ -5020,13 +5024,9 @@
msgstr "Aktualisierung:"
#, fuzzy
-#~| msgid ""
-#~| "<a href=\"#GPLIncompatibleLicenses\"> GPL-Incompatible Free Software "
-#~| "Licenses</a>"
-#~ msgid "Nonfree Software Licenses"
-#~ msgstr ""
-#~ "<a href=\"#GPLIncompatibleLicenses\">Freie Softwarelizenzen (unvereinbar "
-#~ "mit GNU GPL)</a>"
+#~| msgid "<a href=\"#NonFreeSoftwareLicenses\">Nonfree Software Licenses</a>"
+#~ msgid "<a id=\"NonFreeSoftwareLicenses\"> Nonfree Software Licenses</a>"
+#~ msgstr "<a href=\"#NonFreeSoftwareLicenses\">Unfreie Softwarelizenzen</a>"
#, fuzzy
#~| msgid "<a href=\"#NonFreeSoftwareLicenses\">Nonfree Software Licenses</a>"
Index: po/license-list.es.po
===================================================================
RCS file: /web/www/www/licenses/po/license-list.es.po,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -b -r1.93 -r1.94
--- po/license-list.es.po 12 Apr 2014 10:31:16 -0000 1.93
+++ po/license-list.es.po 12 Apr 2014 11:02:23 -0000 1.94
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: license-list.es\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-12 10:26+0000\n"
+"POT-Creation-Date: 2014-04-12 10:57+0000\n"
"PO-Revision-Date: 2014-04-05 10:10+0100\n"
"Last-Translator: Dora Scilipoti <dora AT gnu DOT org>\n"
"Language-Team: Spanish <address@hidden>\n"
@@ -3431,14 +3431,16 @@
# type: Content of: <ul><li><ul><li>
#. type: Content of: <div><h4>
-# | <a [-href=\"#NonFreeSoftwareLicenses\">Nonfree-]
-# | {+id=\"NonFreeSoftwareLicenses\"> Nonfree+} Software Licenses</a>
+# | [-<a href=\"#GPLIncompatibleLicenses\"> GPL-Incompatible Free-]{+Nonfree+}
+# | Software [-Licenses</a>-] {+Licenses+}
#, fuzzy
-#| msgid "<a href=\"#NonFreeSoftwareLicenses\">Nonfree Software Licenses</a>"
-msgid "<a id=\"NonFreeSoftwareLicenses\"> Nonfree Software Licenses</a>"
+#| msgid ""
+#| "<a href=\"#GPLIncompatibleLicenses\"> GPL-Incompatible Free Software "
+#| "Licenses</a>"
+msgid "Nonfree Software Licenses"
msgstr ""
-"<a href=\"#NonFreeSoftwareLicense\">Licencias de software que no son libres</"
-"a>"
+"<a href=\"#GPLIncompatibleLicenses\">Licencias de software libre "
+"incompatibles con la GPL</a>"
#. type: Content of: <div>
# | [-<a id=\"NoLicense\">No license</a>-]<span class=\"anchor-reference-id\">
@@ -5328,13 +5330,11 @@
# type: Content of: <ul><li><ul><li>
#, fuzzy
-#~| msgid ""
-#~| "<a href=\"#GPLIncompatibleLicenses\"> GPL-Incompatible Free Software "
-#~| "Licenses</a>"
-#~ msgid "Nonfree Software Licenses"
+#~| msgid "<a href=\"#NonFreeSoftwareLicenses\">Nonfree Software Licenses</a>"
+#~ msgid "<a id=\"NonFreeSoftwareLicenses\"> Nonfree Software Licenses</a>"
#~ msgstr ""
-#~ "<a href=\"#GPLIncompatibleLicenses\">Licencias de software libre "
-#~ "incompatibles con la GPL</a>"
+#~ "<a href=\"#NonFreeSoftwareLicense\">Licencias de software que no son "
+#~ "libres</a>"
# type: Content of: <ul><li><ul><li>
#, fuzzy
Index: po/license-list.fr.po
===================================================================
RCS file: /web/www/www/licenses/po/license-list.fr.po,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -b -r1.211 -r1.212
--- po/license-list.fr.po 12 Apr 2014 10:31:16 -0000 1.211
+++ po/license-list.fr.po 12 Apr 2014 11:02:23 -0000 1.212
@@ -10,7 +10,7 @@
msgid ""
msgstr ""
"Project-Id-Version: license-list.html\n"
-"POT-Creation-Date: 2014-04-12 10:26+0000\n"
+"POT-Creation-Date: 2014-04-12 10:57+0000\n"
"PO-Revision-Date: 2014-04-11 19:22+0200\n"
"Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
"Language-Team: French <address@hidden>\n"
@@ -3157,13 +3157,11 @@
msgstr "<span id=\"NonFreeSoftwareLicense\"></span>"
#. type: Content of: <div><h4>
-# | <a [-href=\"#NonFreeSoftwareLicenses\">Nonfree-]
-# | {+id=\"NonFreeSoftwareLicenses\"> Nonfree+} Software Licenses</a>
+# | {+Nonfree+} Software Licenses
#, fuzzy
-#| msgid "<a href=\"#NonFreeSoftwareLicenses\">Nonfree Software Licenses</a>"
-msgid "<a id=\"NonFreeSoftwareLicenses\"> Nonfree Software Licenses</a>"
-msgstr ""
-"<a href=\"#NonFreeSoftwareLicenses\">Licences de logiciel non libre</a>"
+#| msgid "Software Licenses"
+msgid "Nonfree Software Licenses"
+msgstr "Licences de logiciel"
#. type: Content of: <div>
msgid ""
@@ -4875,9 +4873,10 @@
msgstr "Dernière mise à jour :"
#, fuzzy
-#~| msgid "Software Licenses"
-#~ msgid "Nonfree Software Licenses"
-#~ msgstr "Licences de logiciel"
+#~| msgid "<a href=\"#NonFreeSoftwareLicenses\">Nonfree Software Licenses</a>"
+#~ msgid "<a id=\"NonFreeSoftwareLicenses\"> Nonfree Software Licenses</a>"
+#~ msgstr ""
+#~ "<a href=\"#NonFreeSoftwareLicenses\">Licences de logiciel non libre</a>"
#~ msgid ""
#~ "<a id=\"NonFreeSoftwareLicenses\" class=\"big-subsection\"> Nonfree "
Index: po/license-list.it.po
===================================================================
RCS file: /web/www/www/licenses/po/license-list.it.po,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -b -r1.155 -r1.156
--- po/license-list.it.po 12 Apr 2014 10:31:16 -0000 1.155
+++ po/license-list.it.po 12 Apr 2014 11:02:25 -0000 1.156
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: license-list.html\n"
-"POT-Creation-Date: 2014-04-12 10:26+0000\n"
+"POT-Creation-Date: 2014-04-12 10:57+0000\n"
"PO-Revision-Date: 2014-03-09 22:51+0100\n"
"Last-Translator: Andrea Pescetti <address@hidden>\n"
"Language-Team: Italian\n"
@@ -3411,12 +3411,16 @@
# type: Content of: <ul><li><ul><li>
#. type: Content of: <div><h4>
-# | <a [-href=\"#NonFreeSoftwareLicenses\">Nonfree-]
-# | {+id=\"NonFreeSoftwareLicenses\"> Nonfree+} Software Licenses</a>
+# | [-<a href=\"#GPLIncompatibleLicenses\"> GPL-Incompatible Free-]{+Nonfree+}
+# | Software [-Licenses</a>-] {+Licenses+}
#, fuzzy
-#| msgid "<a href=\"#NonFreeSoftwareLicenses\">Nonfree Software Licenses</a>"
-msgid "<a id=\"NonFreeSoftwareLicenses\"> Nonfree Software Licenses</a>"
-msgstr "<a href=\"#NonFreeSoftwareLicense\">Licenze di software non libero</a>"
+#| msgid ""
+#| "<a href=\"#GPLIncompatibleLicenses\"> GPL-Incompatible Free Software "
+#| "Licenses</a>"
+msgid "Nonfree Software Licenses"
+msgstr ""
+"<a href=\"#GPLIncompatibleLicenses\">Licenze di software libero "
+"incompatibili con la GPL</a>"
#. type: Content of: <div>
# | [-<a id=\"NoLicense\">No license</a>-]<span class=\"anchor-reference-id\">
@@ -5284,13 +5288,10 @@
# type: Content of: <ul><li><ul><li>
#, fuzzy
-#~| msgid ""
-#~| "<a href=\"#GPLIncompatibleLicenses\"> GPL-Incompatible Free Software "
-#~| "Licenses</a>"
-#~ msgid "Nonfree Software Licenses"
+#~| msgid "<a href=\"#NonFreeSoftwareLicenses\">Nonfree Software Licenses</a>"
+#~ msgid "<a id=\"NonFreeSoftwareLicenses\"> Nonfree Software Licenses</a>"
#~ msgstr ""
-#~ "<a href=\"#GPLIncompatibleLicenses\">Licenze di software libero "
-#~ "incompatibili con la GPL</a>"
+#~ "<a href=\"#NonFreeSoftwareLicense\">Licenze di software non libero</a>"
# type: Content of: <ul><li><ul><li>
#, fuzzy
Index: po/license-list.ja.po
===================================================================
RCS file: /web/www/www/licenses/po/license-list.ja.po,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- po/license-list.ja.po 12 Apr 2014 10:31:16 -0000 1.43
+++ po/license-list.ja.po 12 Apr 2014 11:02:25 -0000 1.44
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: license-list.html\n"
-"POT-Creation-Date: 2014-04-12 10:26+0000\n"
+"POT-Creation-Date: 2014-04-12 10:57+0000\n"
"PO-Revision-Date: 2014-02-02 10:46+0900\n"
"Last-Translator: NIIBE Yutaka <address@hidden>\n"
"Language-Team: Japanese <address@hidden>\n"
@@ -3071,10 +3071,13 @@
#. type: Content of: <div><h4>
#, fuzzy
-#| msgid "<a href=\"#NonFreeSoftwareLicenses\">Nonfree Software Licenses</a>"
-msgid "<a id=\"NonFreeSoftwareLicenses\"> Nonfree Software Licenses</a>"
+#| msgid ""
+#| "<a href=\"#GPLIncompatibleLicenses\"> GPL-Incompatible Free Software "
+#| "Licenses</a>"
+msgid "Nonfree Software Licenses"
msgstr ""
-"<a
href=\"#NonFreeSoftwareLicenses\">ä¸èªç±ãªã½ããã¦ã§ã¢ã»ã©ã¤ã»ã³ã¹</a>"
+"<a
href=\"#GPLIncompatibleLicenses\">GPLã¨ä¸¡ç«ããªãèªç±ã½ããã¦ã§ã¢ã»ã©ã¤ã»"
+"ã³ã¹</a>"
#. type: Content of: <div>
#, fuzzy
@@ -4772,13 +4775,10 @@
msgstr "æçµæ´æ°:"
#, fuzzy
-#~| msgid ""
-#~| "<a href=\"#GPLIncompatibleLicenses\"> GPL-Incompatible Free Software "
-#~| "Licenses</a>"
-#~ msgid "Nonfree Software Licenses"
+#~| msgid "<a href=\"#NonFreeSoftwareLicenses\">Nonfree Software Licenses</a>"
+#~ msgid "<a id=\"NonFreeSoftwareLicenses\"> Nonfree Software Licenses</a>"
#~ msgstr ""
-#~ "<a
href=\"#GPLIncompatibleLicenses\">GPLã¨ä¸¡ç«ããªãèªç±ã½ããã¦ã§ã¢ã»ã©ã¤"
-#~ "ã»ã³ã¹</a>"
+#~ "<a
href=\"#NonFreeSoftwareLicenses\">ä¸èªç±ãªã½ããã¦ã§ã¢ã»ã©ã¤ã»ã³ã¹</a>"
#, fuzzy
#~| msgid "<a href=\"#NonFreeSoftwareLicenses\">Nonfree Software Licenses</a>"
Index: po/license-list.pot
===================================================================
RCS file: /web/www/www/licenses/po/license-list.pot,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -b -r1.115 -r1.116
--- po/license-list.pot 12 Apr 2014 10:31:16 -0000 1.115
+++ po/license-list.pot 12 Apr 2014 11:02:25 -0000 1.116
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: license-list.html\n"
-"POT-Creation-Date: 2014-04-12 10:26+0000\n"
+"POT-Creation-Date: 2014-04-12 10:57+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <address@hidden>\n"
"Language-Team: LANGUAGE <address@hidden>\n"
@@ -2156,7 +2156,7 @@
msgstr ""
#. type: Content of: <div><h4>
-msgid "<a id=\"NonFreeSoftwareLicenses\"> Nonfree Software Licenses</a>"
+msgid "Nonfree Software Licenses"
msgstr ""
#. type: Content of: <div>
Index: po/license-list.ru-en.html
===================================================================
RCS file: /web/www/www/licenses/po/license-list.ru-en.html,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- po/license-list.ru-en.html 11 Apr 2014 20:00:29 -0000 1.51
+++ po/license-list.ru-en.html 12 Apr 2014 11:02:25 -0000 1.52
@@ -33,7 +33,7 @@
width: auto; max-width: 100%;
font-style: normal;
padding: 0 1em 1em 1em;
- margin: 1.5em 0 1em 1em;
+ margin: 2.5em 1.5em 1.5em 1.5em;
background: #f0f2f4;
border: 1px solid #c9cccf;
}
@@ -112,9 +112,11 @@
</div> <!-- /class="toc" -->
-
-<h3 id="Introduction" class="big-section">
+<div class="big-section">
+<h3 id="Introduction">
Introduction</h3>
+</div>
+<div style="clear: left;"></div>
<p>We classify a license according to certain key criteria:</p>
@@ -182,17 +184,19 @@
<dl class="blue"><dt></dt><dd></dd></dl>
</div>
-<div>
-<h3 id="SoftwareLicenses" class="big-section">
+<div class="big-section">
+<h3 id="SoftwareLicenses">
Software Licenses</h3>
</div>
+<div style="clear: left;"></div>
-
-<h4 id="GPLCompatibleLicenses" class="big-subsection">
+<div class="big-subsection">
+<h4 id="GPLCompatibleLicenses">
<span id="FreeLicenses"></span>
GPL-Compatible Free Software Licenses</h4>
<span class="anchor-reference-id">
(<a href="#GPLCompatibleLicenses">#GPLCompatibleLicenses</a>)</span>
+</div>
<p><strong>The following licenses qualify as <a
href="/philosophy/free-sw.html">free software</a>
@@ -992,15 +996,16 @@
<p>This is a lax, permissive non-copyleft free software license
which is compatible with the GNU GPL.</p></dd>
-</dl> <!-- end class "green" -->
+</dl> <!-- end class="green" -->
<hr class="separator" />
-
-<h4 id="GPLIncompatibleLicenses" class="big-subsection">
+<div class="big-subsection">
+<h4 id="GPLIncompatibleLicenses">
GPL-Incompatible Free Software Licenses</h4>
<span class="anchor-reference-id">
(<a href="#GPLIncompatibleLicenses">#GPLIncompatibleLicenses</a>)</span>
+</div>
<p><strong>The following licenses
are <a href="/philosophy/free-sw.html">free software</a> licenses, but
@@ -1601,16 +1606,17 @@
<p><a href="#Zope20">Version 2.0 of the Zope Public License</a> is
GPL-compatible.</p></dd>
-</dl> <!-- end class="orange -->
+</dl> <!-- end class="orange" -->
<hr class="separator" />
+<div class="big-subsection">
<span id="NonFreeSoftwareLicense"></span>
-<h4 id="NonFreeSoftwareLicenses" class="big-subsection">
+<h4 id="NonFreeSoftwareLicenses">
Nonfree Software Licenses</h4>
<span class="anchor-reference-id">
(<a href="#NonFreeSoftwareLicenses">#NonFreeSoftwareLicenses</a>)</span>
-
+</div>
<p><strong>The following licenses <em>do not qualify</em> as <a
href="/philosophy/free-sw.html">free software</a>
@@ -2060,17 +2066,19 @@
</dl> <!-- end class="red" -->
-<div>
-<h3 id="DocumentationLicenses" class="big-section">
+<div class="big-section">
+<h3 id="DocumentationLicenses">
Licenses For Documentation</h3>
</div>
+<div style="clear: left;"></div>
-
-<h4 id="FreeDocumentationLicenses" class="big-subsection">
+<div class="big-subsection">
+<h4 id="FreeDocumentationLicenses">
Free Documentation Licenses</h4>
<span class="anchor-reference-id">
(<a href="#FreeDocumentationLicenses">#FreeDocumentationLicenses</a>)
</span>
+</div>
<p><strong>The following licenses qualify as <a
href="/philosophy/free-doc.html">free
@@ -2156,12 +2164,13 @@
<hr class="separator" />
-
-<h4 id="NonFreeDocumentationLicenses" class="big-subsection">
+<div class="big-subsection">
+<h4 id="NonFreeDocumentationLicenses">
Nonfree Documentation Licenses</h4>
<span class="anchor-reference-id">
(<a href="#NonFreeDocumentationLicenses">#NonFreeDocumentationLicenses</a>)
</span>
+</div>
<p><strong>The following licenses <em>do not qualify</em>
as free documentation licenses:</strong></p>
@@ -2187,14 +2196,17 @@
</dl> <!-- end class="red" -->
-<div>
-<h3 id="OtherLicenses" class="big-section">Licenses for Other Works</h3>
+<div class="big-section">
+<h3 id="OtherLicenses">Licenses for Other Works</h3>
</div>
+<div style="clear: left;"></div>
-<h4 class="big-subsection">Licenses for Works of Practical Use
+<div class="big-subsection">
+<h4>Licenses for Works of Practical Use
besides Software and Documentation</h4>
<span class="anchor-reference-id">
(<a href="#OtherLicenses">#OtherLicenses</a>)</span>
+</div>
<dl class="green">
@@ -2297,11 +2309,12 @@
</dl> <!-- end class="orange" -->
-
-<h4 id="Fonts" class="big-subsection">
+<div class="big-subsection">
+<h4 id="Fonts">
Licenses for Fonts</h4>
<span class="anchor-reference-id">
(<a href="#Fonts">#Fonts</a>)</span>
+</div>
<p>The licenses below apply to an instantiation of a design in a computer
file, not the artistic design. As far as we know, an implementation of
@@ -2352,11 +2365,12 @@
</dl> <!-- end class="orange" -->
-
-<h4 id="OpinionLicenses" class="big-subsection">
+<div class="big-subsection">
+<h4 id="OpinionLicenses">
Licenses for Works stating a Viewpoint (e.g., Opinion or Testimony)</h4>
<span class="anchor-reference-id">
(<a href="#OpinionLicenses">#OpinionLicenses</a>)</span>
+</div>
<p>Works that express someone's opinion—memoirs, editorials, and
so on—serve a fundamentally different purpose than works for
@@ -2444,7 +2458,7 @@
<p></p><p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2014/04/11 20:00:29 $
+$Date: 2014/04/12 11:02:25 $
<!-- timestamp end -->
</p>
</div>
Index: po/license-list.ru.po
===================================================================
RCS file: /web/www/www/licenses/po/license-list.ru.po,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -b -r1.123 -r1.124
--- po/license-list.ru.po 12 Apr 2014 10:36:25 -0000 1.123
+++ po/license-list.ru.po 12 Apr 2014 11:02:25 -0000 1.124
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: license-list.html\n"
-"POT-Creation-Date: 2014-04-12 10:26+0000\n"
+"POT-Creation-Date: 2014-04-12 10:57+0000\n"
"PO-Revision-Date: 2014-04-12 17:17+0000\n"
"Last-Translator: Ineiev <address@hidden>\n"
"Language-Team: Russian <address@hidden>\n"
@@ -15,7 +15,6 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Outdated-Since: 2014-04-12 10:26+0000\n"
#. type: Content of: <title>
msgid ""
@@ -3157,12 +3156,8 @@
msgstr "<span id=\"NonFreeSoftwareLicense\"></span>"
#. type: Content of: <div><h4>
-# | <a [-href=\"#NonFreeSoftwareLicenses\">Nonfree-]
-# | {+id=\"NonFreeSoftwareLicenses\"> Nonfree+} Software Licenses</a>
-#| msgid "<a href=\"#NonFreeSoftwareLicenses\">Nonfree Software Licenses</a>"
-msgid "<a id=\"NonFreeSoftwareLicenses\"> Nonfree Software Licenses</a>"
-msgstr ""
-"<a id=\"NonFreeSoftwareLicenses\"> ÐиÑензии неÑвободнÑÑ
пÑогÑамм</a>"
+msgid "Nonfree Software Licenses"
+msgstr "ÐиÑензии неÑвободнÑÑ
пÑогÑамм"
#. type: Content of: <div>
msgid ""
@@ -4878,8 +4873,10 @@
msgid "Updated:"
msgstr "Ðбновлено:"
-#~ msgid "Nonfree Software Licenses"
-#~ msgstr "ÐиÑензии неÑвободнÑÑ
пÑогÑамм"
+#~| msgid "<a href=\"#NonFreeSoftwareLicenses\">Nonfree Software Licenses</a>"
+#~ msgid "<a id=\"NonFreeSoftwareLicenses\"> Nonfree Software Licenses</a>"
+#~ msgstr ""
+#~ "<a id=\"NonFreeSoftwareLicenses\"> ÐиÑензии неÑвободнÑÑ
пÑогÑамм</a>"
#~ msgid ""
#~ "<a id=\"NonFreeSoftwareLicenses\" class=\"big-subsection\"> Nonfree "