[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/philosophy/po floss-and-foss.de.po floss-an...
From: |
GNUN |
Subject: |
www/philosophy/po floss-and-foss.de.po floss-an... |
Date: |
Mon, 09 Nov 2015 13:01:49 +0000 |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 15/11/09 13:01:48
Modified files:
philosophy/po : floss-and-foss.de.po floss-and-foss.fr.po
floss-and-foss.it.po floss-and-foss.ml.po
floss-and-foss.pot floss-and-foss.ru.po
floss-and-foss.uk.po
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/floss-and-foss.de.po?cvsroot=www&r1=1.12&r2=1.13
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/floss-and-foss.fr.po?cvsroot=www&r1=1.13&r2=1.14
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/floss-and-foss.it.po?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/floss-and-foss.ml.po?cvsroot=www&r1=1.12&r2=1.13
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/floss-and-foss.pot?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/floss-and-foss.ru.po?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/floss-and-foss.uk.po?cvsroot=www&r1=1.2&r2=1.3
Patches:
Index: floss-and-foss.de.po
===================================================================
RCS file: /web/www/www/philosophy/po/floss-and-foss.de.po,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- floss-and-foss.de.po 5 Feb 2015 16:28:39 -0000 1.12
+++ floss-and-foss.de.po 9 Nov 2015 13:01:47 -0000 1.13
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: floss-and-foss.html\n"
-"POT-Creation-Date: 2014-04-02 18:28+0000\n"
+"POT-Creation-Date: 2015-11-09 12:59+0000\n"
"PO-Revision-Date: 2014-04-14 22:00+0200\n"
"Last-Translator: Joerg Kohne <joeko (AT) online [PUNKT] de>\n"
"Language-Team: German <address@hidden>\n"
@@ -14,6 +14,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2015-11-09 12:59+0000\n"
#. type: Content of: <title>
msgid "FLOSS and FOSS - GNU Project - Free Software Foundation"
@@ -98,8 +99,26 @@
#. type: Content of: <p>
msgid ""
-"Thus, if you want to be neutral between free software and open source, the "
-"way to achieve that is to say “FLOSS,” not “FOSS.”"
+"“Free and Open Source Software” is misleading in another way: it "
+"suggests that “free and open source” names a single point of "
+"view, rather than mentioning two different ones. This conceptualization of "
+"the field is an obstacle to understanding the fact that free software and "
+"open source are different political positions that disagree fundamentally."
+msgstr ""
+
+#. type: Content of: <p>
+# | Thus, if you want to be neutral between free software and open source,
+# | {+and clear about them,+} the way to achieve that is to say
+# | “FLOSS,” not “FOSS.”
+#, fuzzy
+#| msgid ""
+#| "Thus, if you want to be neutral between free software and open source, "
+#| "the way to achieve that is to say “FLOSS,” not “FOSS."
+#| "”"
+msgid ""
+"Thus, if you want to be neutral between free software and open source, and "
+"clear about them, the way to achieve that is to say “FLOSS,” not "
+"“FOSS.”"
msgstr ""
"Wenn Sie daher Neutralität zwischen Freie Software und Open-Source-Software "
"zum Ausdruck bringen möchten, können Sie das mit <em>FLOSS</em> erreichen, "
@@ -172,14 +191,27 @@
"standards/README.translations\">LIESMICH für Ãbersetzungen</a>."
#. type: Content of: <div><p>
-msgid "Copyright © 2013 Richard Stallman"
+# | Copyright © [-2013-] {+2013, 2015+} Richard Stallman
+#, fuzzy
+#| msgid "Copyright © 2013 Richard Stallman"
+msgid "Copyright © 2013, 2015 Richard Stallman"
msgstr "Copyright © 2013 Richard Stallman."
#. type: Content of: <div><p>
+# | This page is licensed under a <a rel=\"license\"
+# | [-href=\"http://creativecommons.org/licenses/by-nd/3.0/us/\">Creative-]
+# | {+href=\"http://creativecommons.org/licenses/by-nd/4.0/\">Creative+}
+# | Commons [-Attribution-NoDerivs 3.0 United States-]
+# | {+Attribution-NoDerivatives 4.0 International+} License</a>.
+#, fuzzy
+#| 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-"
-"NoDerivs 3.0 United States License</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
msgstr ""
"Dieses Werk steht unter einer <a rel=\"license\" href=\"http://"
"creativecommons.org/licenses/by-nd/3.0/us/deed.de\">Creative Commons "
Index: floss-and-foss.fr.po
===================================================================
RCS file: /web/www/www/philosophy/po/floss-and-foss.fr.po,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- floss-and-foss.fr.po 19 Apr 2014 12:35:53 -0000 1.13
+++ floss-and-foss.fr.po 9 Nov 2015 13:01:47 -0000 1.14
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: floss-and-foss.html\n"
-"POT-Creation-Date: 2014-04-02 18:28+0000\n"
+"POT-Creation-Date: 2015-11-09 12:59+0000\n"
"PO-Revision-Date: 2014-04-19 13:57+0200\n"
"Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
"Language-Team: French <address@hidden>\n"
@@ -15,6 +15,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2015-11-09 12:59+0000\n"
"X-Generator: Gtranslator 2.91.5\n"
"Plural-Forms: \n"
@@ -105,8 +106,26 @@
#. type: Content of: <p>
msgid ""
-"Thus, if you want to be neutral between free software and open source, the "
-"way to achieve that is to say “FLOSS,” not “FOSS.”"
+"“Free and Open Source Software” is misleading in another way: it "
+"suggests that “free and open source” names a single point of "
+"view, rather than mentioning two different ones. This conceptualization of "
+"the field is an obstacle to understanding the fact that free software and "
+"open source are different political positions that disagree fundamentally."
+msgstr ""
+
+#. type: Content of: <p>
+# | Thus, if you want to be neutral between free software and open source,
+# | {+and clear about them,+} the way to achieve that is to say
+# | “FLOSS,” not “FOSS.”
+#, fuzzy
+#| msgid ""
+#| "Thus, if you want to be neutral between free software and open source, "
+#| "the way to achieve that is to say “FLOSS,” not “FOSS."
+#| "”"
+msgid ""
+"Thus, if you want to be neutral between free software and open source, and "
+"clear about them, the way to achieve that is to say “FLOSS,” not "
+"“FOSS.”"
msgstr ""
"En conséquence, si vous voulez être neutre vis-à -vis du logiciel libre et
de "
"l'open source, utilisez « FLOSS » et non « FOSS »."
@@ -180,19 +199,22 @@
"README.translations.html\">guide de traduction</a>."
#. type: Content of: <div><p>
-msgid "Copyright © 2013 Richard Stallman"
+# | Copyright © [-2013-] {+2013, 2015+} Richard Stallman
+#, fuzzy
+#| msgid "Copyright © 2013 Richard Stallman"
+msgid "Copyright © 2013, 2015 Richard Stallman"
msgstr "Copyright © 2013 Richard Stallman"
#. 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>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
msgstr ""
"Cette page peut être utilisée suivant les conditions de la licence <a rel="
-"\"license\" href=\"http://creativecommons.org/licenses/by-nd/3.0/us/deed.fr"
-"\">Creative Commons attribution de paternité, pas de modification, 3.0Â
Ãtats-"
-"Unis (CCÂ BY-ND 3.0Â US)</a>."
+"\"license\" href=\"http://creativecommons.org/licenses/by-nd/4.0/deed.fr"
+"\">Creative Commons attribution, pas de modification, 4.0Â internationale "
+"(CCÂ BY-ND 4.0)</a>."
#. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
#. type: Content of: <div><div>
Index: floss-and-foss.it.po
===================================================================
RCS file: /web/www/www/philosophy/po/floss-and-foss.it.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- floss-and-foss.it.po 24 Jan 2015 21:57:48 -0000 1.4
+++ floss-and-foss.it.po 9 Nov 2015 13:01:48 -0000 1.5
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: floss-and-foss.html\n"
-"POT-Creation-Date: 2014-04-02 18:28+0000\n"
+"POT-Creation-Date: 2015-11-09 12:59+0000\n"
"PO-Revision-Date: 2015-01-24 22:34+0100\n"
"Last-Translator: Andrea Pescetti <address@hidden>\n"
"Language-Team: Italian <address@hidden>\n"
@@ -15,6 +15,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2015-11-09 12:59+0000\n"
"X-Generator: Poedit 1.5.4\n"
#. type: Content of: <title>
@@ -105,8 +106,26 @@
#. type: Content of: <p>
msgid ""
-"Thus, if you want to be neutral between free software and open source, the "
-"way to achieve that is to say “FLOSS,” not “FOSS.”"
+"“Free and Open Source Software” is misleading in another way: it "
+"suggests that “free and open source” names a single point of "
+"view, rather than mentioning two different ones. This conceptualization of "
+"the field is an obstacle to understanding the fact that free software and "
+"open source are different political positions that disagree fundamentally."
+msgstr ""
+
+#. type: Content of: <p>
+# | Thus, if you want to be neutral between free software and open source,
+# | {+and clear about them,+} the way to achieve that is to say
+# | “FLOSS,” not “FOSS.”
+#, fuzzy
+#| msgid ""
+#| "Thus, if you want to be neutral between free software and open source, "
+#| "the way to achieve that is to say “FLOSS,” not “FOSS."
+#| "”"
+msgid ""
+"Thus, if you want to be neutral between free software and open source, and "
+"clear about them, the way to achieve that is to say “FLOSS,” not "
+"“FOSS.”"
msgstr ""
"Se si vuole quindi essere neutrali nella scelta tra software libero ed open "
"source, il modo giusto per farlo è dire “FLOSS” e non “"
@@ -172,19 +191,27 @@
"traduzioni</a>."
#. type: Content of: <div><p>
-msgid "Copyright © 2013 Richard Stallman"
+# | Copyright © [-2013-] {+2013, 2015+} Richard Stallman
+#, fuzzy
+#| msgid "Copyright © 2013 Richard Stallman"
+msgid "Copyright © 2013, 2015 Richard Stallman"
msgstr "Copyright © 2013 Richard Stallman"
#. type: Content of: <div><p>
+# || No change detected. The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid ""
+#| "This page is licensed under a <a rel=\"license\" href=\"http://"
+#| "creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+#| "NoDerivatives 4.0 International 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-"
-"NoDerivs 3.0 United States License</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
msgstr ""
"Questa pagina è distribuita secondo i termini della licenza <a rel=\"license"
-"\" href=\"http://creativecommons.org/licenses/by-nd/3.0/us/deed.it"
-"\">Creative Commons Attribuzione - Non opere derivate 3.0 Stati Uniti</a> "
-"(CC BY-ND 3.0)."
+"\" href=\"http://creativecommons.org/licenses/by-nd/4.0/\">Creative Commons "
+"Attribuzione - Non opere derivate 3.0 internazionale</a> (CC BY-ND 4.0)."
#. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
#. type: Content of: <div><div>
@@ -196,3 +223,13 @@
#. type: Content of: <div><p>
msgid "Updated:"
msgstr "Ultimo aggiornamento:"
+
+#~ 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>."
+#~ msgstr ""
+#~ "Questa pagina è distribuita secondo i termini della licenza <a rel="
+#~ "\"license\" href=\"http://creativecommons.org/licenses/by-nd/3.0/us/deed."
+#~ "it\">Creative Commons Attribuzione - Non opere derivate 3.0 Stati Uniti</"
+#~ "a> (CC BY-ND 3.0)."
Index: floss-and-foss.ml.po
===================================================================
RCS file: /web/www/www/philosophy/po/floss-and-foss.ml.po,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- floss-and-foss.ml.po 9 May 2014 15:30:36 -0000 1.12
+++ floss-and-foss.ml.po 9 Nov 2015 13:01:48 -0000 1.13
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: floss-and-foss.html\n"
-"POT-Creation-Date: 2014-04-02 18:28+0000\n"
+"POT-Creation-Date: 2015-11-09 12:59+0000\n"
"PO-Revision-Date: 2014-05-06 18:24+0530\n"
"Last-Translator: Navaneeth <address@hidden>\n"
"Language-Team: web-translators <address@hidden>\n"
@@ -16,6 +16,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2015-11-09 12:59+0000\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Lokalize 1.5\n"
@@ -97,8 +98,26 @@
#. type: Content of: <p>
msgid ""
-"Thus, if you want to be neutral between free software and open source, the "
-"way to achieve that is to say “FLOSS,” not “FOSS.”"
+"“Free and Open Source Software” is misleading in another way: it "
+"suggests that “free and open source” names a single point of "
+"view, rather than mentioning two different ones. This conceptualization of "
+"the field is an obstacle to understanding the fact that free software and "
+"open source are different political positions that disagree fundamentally."
+msgstr ""
+
+#. type: Content of: <p>
+# | Thus, if you want to be neutral between free software and open source,
+# | {+and clear about them,+} the way to achieve that is to say
+# | “FLOSS,” not “FOSS.”
+#, fuzzy
+#| msgid ""
+#| "Thus, if you want to be neutral between free software and open source, "
+#| "the way to achieve that is to say “FLOSS,” not “FOSS."
+#| "”"
+msgid ""
+"Thus, if you want to be neutral between free software and open source, and "
+"clear about them, the way to achieve that is to say “FLOSS,” not "
+"“FOSS.”"
msgstr ""
"à´
à´¤àµà´àµà´£àµà´àµ
à´¸àµà´µà´¤à´¨àµà´¤àµà´°à´¸àµà´«àµà´±àµà´±àµâà´µàµà´¯à´±à´¿à´¨àµà´
à´à´ªàµà´ªà´£àµâà´¸àµà´´àµà´¸à´¿à´¨àµà´ à´à´à´¯à´¿à´²àµâ
നിഷàµà´ªà´àµà´·à´®à´¾à´¯à´¿ നിലàµâà´àµà´à´¾à´¨àµâ "
"നിà´àµà´à´³àµâà´àµà´à´¾à´àµà´°à´¹à´®àµà´£àµà´àµà´àµà´à´¿à´²àµâ
“FOSS” à´à´¨àµà´¨à´¤à´¿à´¨àµ à´ªà´à´°à´ “FLOSS”
à´à´¨àµà´¨ "
@@ -160,18 +179,31 @@
"server/standards/README.translations.html\">Translations README</a>
à´à´¾à´£àµà´."
#. type: Content of: <div><p>
-msgid "Copyright © 2013 Richard Stallman"
+# | Copyright © [-2013-] {+2013, 2015+} Richard Stallman
+#, fuzzy
+#| msgid "Copyright © 2013 Richard Stallman"
+msgid "Copyright © 2013, 2015 Richard Stallman"
msgstr "Copyright © 2013 റിà´àµà´à´¾à´°àµâà´¡àµ
à´¸àµà´±àµà´±à´¾à´³àµâമനàµâ "
+# type: Content of: <div><p>
#. type: Content of: <div><p>
+# | This page is licensed under a <a rel=\"license\"
+# | [-href=\"http://creativecommons.org/licenses/by-nd/3.0/us/\">Creative-]
+# | {+href=\"http://creativecommons.org/licenses/by-nd/4.0/\">Creative+}
+# | Commons [-Attribution-NoDerivs 3.0 United States-]
+# | {+Attribution-NoDerivatives 4.0 International+} License</a>.
+#, fuzzy
+#| 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-"
-"NoDerivs 3.0 United States License</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
msgstr ""
"ഠതാളàµâ <a rel=\"license\"
href=\"http://creativecommons.org/licenses/by-"
-"nd/3.0/us/\">Creative Commons Attribution-NoDerivs 3.0 United States "
-"License</a> à´
à´à´¿à´¸àµà´¥à´¾à´¨à´¤àµà´¤à´¿à´²àµâ
à´ªàµà´°à´¸à´¿à´¦àµà´§àµà´à´°à´¿à´àµà´à´¤àµ."
+"nd/3.0/us/\">à´àµà´°à´¿à´¯àµà´±àµà´±àµà´µàµ à´àµà´®à´£àµâà´¸àµ
à´²àµà´¸à´¨àµâസിനൠ</a>à´àµà´´à´¿à´²à´¾à´£àµ."
#. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
#. type: Content of: <div><div>
@@ -182,3 +214,12 @@
#. type: Content of: <div><p>
msgid "Updated:"
msgstr "à´ªàµà´¤àµà´àµà´à´¿à´¯à´¤àµ:"
+
+#~ 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>."
+#~ msgstr ""
+#~ "ഠതാളàµâ <a rel=\"license\"
href=\"http://creativecommons.org/licenses/by-"
+#~ "nd/3.0/us/\">Creative Commons Attribution-NoDerivs 3.0 United States "
+#~ "License</a> à´
à´à´¿à´¸àµà´¥à´¾à´¨à´¤àµà´¤à´¿à´²àµâ
à´ªàµà´°à´¸à´¿à´¦àµà´§àµà´à´°à´¿à´àµà´à´¤àµ."
Index: floss-and-foss.pot
===================================================================
RCS file: /web/www/www/philosophy/po/floss-and-foss.pot,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- floss-and-foss.pot 2 Apr 2014 18:33:03 -0000 1.5
+++ floss-and-foss.pot 9 Nov 2015 13:01:48 -0000 1.6
@@ -7,13 +7,14 @@
msgid ""
msgstr ""
"Project-Id-Version: floss-and-foss.html\n"
-"POT-Creation-Date: 2014-04-02 18:28+0000\n"
+"POT-Creation-Date: 2015-11-09 12:59+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <address@hidden>\n"
"Language-Team: LANGUAGE <address@hidden>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: ENCODING"
+"Content-Transfer-Encoding: 8bit\n"
#. type: Content of: <title>
msgid "FLOSS and FOSS - GNU Project - Free Software Foundation"
@@ -71,8 +72,18 @@
#. type: Content of: <p>
msgid ""
-"Thus, if you want to be neutral between free software and open source, the "
-"way to achieve that is to say “FLOSS,” not “FOSS.”"
+"“Free and Open Source Software” is misleading in another way: it "
+"suggests that “free and open source” names a single point of "
+"view, rather than mentioning two different ones. This conceptualization of "
+"the field is an obstacle to understanding the fact that free software and "
+"open source are different political positions that disagree fundamentally."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"Thus, if you want to be neutral between free software and open source, and "
+"clear about them, the way to achieve that is to say “FLOSS,” not "
+"“FOSS.”"
msgstr ""
#. type: Content of: <p>
@@ -119,14 +130,14 @@
msgstr ""
#. type: Content of: <div><p>
-msgid "Copyright © 2013 Richard Stallman"
+msgid "Copyright © 2013, 2015 Richard Stallman"
msgstr ""
#. 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>."
+"href=\"http://creativecommons.org/licenses/by-nd/4.0/\">Creative Commons "
+"Attribution-NoDerivatives 4.0 International License</a>."
msgstr ""
#. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
Index: floss-and-foss.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/floss-and-foss.ru.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- floss-and-foss.ru.po 3 Apr 2014 05:58:57 -0000 1.5
+++ floss-and-foss.ru.po 9 Nov 2015 13:01:48 -0000 1.6
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: floss-and-foss.html\n"
-"POT-Creation-Date: 2014-04-02 18:28+0000\n"
+"POT-Creation-Date: 2015-11-09 12:59+0000\n"
"PO-Revision-Date: 2014-04-03 17:34+0000\n"
"Last-Translator: Ineiev <address@hidden>\n"
"Language-Team: Russian <address@hidden>\n"
@@ -16,6 +16,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2015-11-09 12:59+0000\n"
#. type: Content of: <title>
msgid "FLOSS and FOSS - GNU Project - Free Software Foundation"
@@ -110,8 +111,26 @@
#. type: Content of: <p>
msgid ""
-"Thus, if you want to be neutral between free software and open source, the "
-"way to achieve that is to say “FLOSS,” not “FOSS.”"
+"“Free and Open Source Software” is misleading in another way: it "
+"suggests that “free and open source” names a single point of "
+"view, rather than mentioning two different ones. This conceptualization of "
+"the field is an obstacle to understanding the fact that free software and "
+"open source are different political positions that disagree fundamentally."
+msgstr ""
+
+#. type: Content of: <p>
+# | Thus, if you want to be neutral between free software and open source,
+# | {+and clear about them,+} the way to achieve that is to say
+# | “FLOSS,” not “FOSS.”
+#, fuzzy
+#| msgid ""
+#| "Thus, if you want to be neutral between free software and open source, "
+#| "the way to achieve that is to say “FLOSS,” not “FOSS."
+#| "”"
+msgid ""
+"Thus, if you want to be neutral between free software and open source, and "
+"clear about them, the way to achieve that is to say “FLOSS,” not "
+"“FOSS.”"
msgstr ""
"ÐÑак, еÑли Ð²Ñ Ñ
оÑиÑе пÑидеÑживаÑÑÑÑ
нейÑÑалиÑеÑа Ð¼ÐµÐ¶Ð´Ñ ÑвободнÑми "
"пÑогÑаммами и оÑкÑÑÑÑм иÑÑ
однÑм ÑекÑÑом,
Ñо ÑÑого ÑледÑÐµÑ Ð´Ð¾ÑÑигаÑÑ "
@@ -175,21 +194,30 @@
# type: Content of: <div><p>
#. type: Content of: <div><p>
-msgid "Copyright © 2013 Richard Stallman"
+# | Copyright © [-2013-] {+2013, 2015+} Richard Stallman
+#, fuzzy
+#| msgid "Copyright © 2013 Richard Stallman"
+msgid "Copyright © 2013, 2015 Richard Stallman"
msgstr ""
"Copyright © 2013 Richard Stallman<br />Copyright © 2014 Free "
"Software Foundation, Inc. (translation)"
#. type: Content of: <div><p>
+# || No change detected. The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid ""
+#| "This page is licensed under a <a rel=\"license\" href=\"http://"
+#| "creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+#| "NoDerivatives 4.0 International 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-"
-"NoDerivs 3.0 United States License</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
msgstr ""
"ÐÑо пÑоизведение доÑÑÑпно по <a rel=\"license\"
href=\"http://"
-"creativecommons.org/licenses/by-nd/3.0/us/deed.ru\">лиÑензии Creative
"
-"Commons Attribution-NoDerivs (<em>ÐÑÑибÑÑÐ¸Ñ — Ðез
пÑоизводнÑÑ
"
-"пÑоизведений</em>) 3.0 СШÐ</a>."
+"creativecommons.org/licenses/by-nd/4.0/deed.ru\">лиÑензии Creative
Commons "
+"Attribution-NoDerivs (<em>ÐÑÑибÑÑÐ¸Ñ — Ðез
пÑоизводнÑÑ
"
+"пÑоизведений</em>) 4.0 ÐÑемиÑнаÑ</a>."
# type: Content of: <div><div>
#. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
Index: floss-and-foss.uk.po
===================================================================
RCS file: /web/www/www/philosophy/po/floss-and-foss.uk.po,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- floss-and-foss.uk.po 7 Sep 2014 04:57:40 -0000 1.2
+++ floss-and-foss.uk.po 9 Nov 2015 13:01:48 -0000 1.3
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: floss-and-foss.html\n"
-"POT-Creation-Date: 2014-04-02 18:28+0000\n"
+"POT-Creation-Date: 2015-11-09 12:59+0000\n"
"PO-Revision-Date: 2014-09-07 07:13+0300\n"
"Last-Translator: Andriy Bandura <address@hidden>\n"
"Language-Team: Ukrainian <address@hidden>\n"
@@ -14,6 +14,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: ENCODINGLanguage: uk\n"
+"X-Outdated-Since: 2015-11-09 12:59+0000\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: Lokalize 1.5\n"
@@ -107,8 +108,23 @@
#. type: Content of: <p>
msgid ""
-"Thus, if you want to be neutral between free software and open source, the "
-"way to achieve that is to say “FLOSS,” not “FOSS.”"
+"“Free and Open Source Software” is misleading in another way: it "
+"suggests that “free and open source” names a single point of "
+"view, rather than mentioning two different ones. This conceptualization of "
+"the field is an obstacle to understanding the fact that free software and "
+"open source are different political positions that disagree fundamentally."
+msgstr ""
+
+#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Thus, if you want to be neutral between free software and open source, "
+#| "the way to achieve that is to say “FLOSS,” not “FOSS."
+#| "”"
+msgid ""
+"Thus, if you want to be neutral between free software and open source, and "
+"clear about them, the way to achieve that is to say “FLOSS,” not "
+"“FOSS.”"
msgstr ""
"ÐÑже, ÑкÑо ви Ñ
оÑеÑе доÑÑимÑваÑиÑÑ
нейÑÑалÑÑеÑÑ Ð¼Ñж вÑлÑними пÑогÑамами Ñ "
"вÑдкÑиÑим виÑ
Ñдним ÑекÑÑом, Ñо ÑÑого ÑлÑд
доÑÑгаÑи виÑазом “"
@@ -173,14 +189,21 @@
"translations.html\">“ÐоÑÑÐ±Ð½Ð¸ÐºÑ Ð·
пеÑекладє</a>."
#. type: Content of: <div><p>
-msgid "Copyright © 2013 Richard Stallman"
+#, fuzzy
+#| msgid "Copyright © 2013 Richard Stallman"
+msgid "Copyright © 2013, 2015 Richard Stallman"
msgstr "Copyright © 2013 Ð ÑÑаÑд СÑолмен"
#. type: Content of: <div><p>
+#, fuzzy
+#| 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-"
-"NoDerivs 3.0 United States License</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
msgstr ""
"Ð¦Ñ ÑÑоÑÑнка доÑÑÑпна на ÑмоваÑ
<a rel=\"license\"
href=\"http://"
"creativecommons.org/licenses/by-nd/3.0/us/deed.uk\"> лÑÑензÑÑ
Creative "
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- www/philosophy/po floss-and-foss.de.po floss-an...,
GNUN <=