[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/distros screenshot.ml.html screenshot.ro.ht...
|
From: |
GNUN |
|
Subject: |
www/distros screenshot.ml.html screenshot.ro.ht... |
|
Date: |
Thu, 29 Oct 2015 09:58:40 +0000 |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 15/10/29 09:58:40
Modified files:
distros : screenshot.ml.html screenshot.ro.html
distros/po : screenshot.de.po screenshot.fr.po
screenshot.hr-diff.html screenshot.hr.po
screenshot.it.po screenshot.ja.po
screenshot.ko-diff.html screenshot.ko.po
screenshot.ml-diff.html screenshot.ml.po
screenshot.pl.po screenshot.pot
screenshot.ro-diff.html screenshot.ro.po
screenshot.ru.po screenshot.uk.po
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/screenshot.ml.html?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/screenshot.ro.html?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/screenshot.de.po?cvsroot=www&r1=1.41&r2=1.42
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/screenshot.fr.po?cvsroot=www&r1=1.17&r2=1.18
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/screenshot.hr-diff.html?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/screenshot.hr.po?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/screenshot.it.po?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/screenshot.ja.po?cvsroot=www&r1=1.26&r2=1.27
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/screenshot.ko-diff.html?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/screenshot.ko.po?cvsroot=www&r1=1.13&r2=1.14
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/screenshot.ml-diff.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/screenshot.ml.po?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/screenshot.pl.po?cvsroot=www&r1=1.23&r2=1.24
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/screenshot.pot?cvsroot=www&r1=1.16&r2=1.17
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/screenshot.ro-diff.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/screenshot.ro.po?cvsroot=www&r1=1.12&r2=1.13
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/screenshot.ru.po?cvsroot=www&r1=1.15&r2=1.16
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/screenshot.uk.po?cvsroot=www&r1=1.12&r2=1.13
Patches:
Index: screenshot.ml.html
===================================================================
RCS file: /web/www/www/distros/screenshot.ml.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- screenshot.ml.html 26 May 2015 05:58:09 -0000 1.5
+++ screenshot.ml.html 29 Oct 2015 09:58:36 -0000 1.6
@@ -3,7 +3,7 @@
http://www.gnu.org/distros/po/screenshot.ml.po</a>'
--><!--#set var="ORIGINAL_FILE" value="/distros/screenshot.html"
--><!--#set var="DIFF_FILE" value="/distros/po/screenshot.ml-diff.html"
- --><!--#set var="OUTDATED_SINCE" value="2015-02-04" --><!--#set
var="ENGLISH_PAGE" value="/distros/screenshot.en.html" -->
+ --><!--#set var="OUTDATED_SINCE" value="2015-02-04" -->
@@ -102,7 +102,7 @@
<p class="unprintable"><!-- timestamp start -->
à´ªàµà´¤àµà´àµà´à´¿à´¯à´¤àµàµ:
-$Date: 2015/05/26 05:58:09 $
+$Date: 2015/10/29 09:58:36 $
<!-- timestamp end -->
</p>
Index: screenshot.ro.html
===================================================================
RCS file: /web/www/www/distros/screenshot.ro.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- screenshot.ro.html 26 May 2015 05:58:09 -0000 1.11
+++ screenshot.ro.html 29 Oct 2015 09:58:37 -0000 1.12
@@ -3,7 +3,7 @@
http://www.gnu.org/distros/po/screenshot.ro.po</a>'
--><!--#set var="ORIGINAL_FILE" value="/distros/screenshot.html"
--><!--#set var="DIFF_FILE" value="/distros/po/screenshot.ro-diff.html"
- --><!--#set var="OUTDATED_SINCE" value="2015-02-04" --><!--#set
var="ENGLISH_PAGE" value="/distros/screenshot.en.html" -->
+ --><!--#set var="OUTDATED_SINCE" value="2015-02-04" -->
@@ -102,7 +102,7 @@
<p class="unprintable"><!-- timestamp start -->
Actualizat la:
-$Date: 2015/05/26 05:58:09 $
+$Date: 2015/10/29 09:58:37 $
<!-- timestamp end -->
</p>
Index: po/screenshot.de.po
===================================================================
RCS file: /web/www/www/distros/po/screenshot.de.po,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- po/screenshot.de.po 11 Jul 2015 14:33:37 -0000 1.41
+++ po/screenshot.de.po 29 Oct 2015 09:58:38 -0000 1.42
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: screenshot.html\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2015-02-17 10:25+0000\n"
+"POT-Creation-Date: 2015-10-29 09:55+0000\n"
"PO-Revision-Date: 2015-04-15 22:00+0100\n"
"Last-Translator: Jоегg Kоhпе <joeko (AT) online [PUNKT] de>\n"
"Language-Team: German <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-10-29 09:55+0000\n"
#. type: Content of: <title>
msgid "Screenshot of a Free Distro - GNU Project - Free Software Foundation"
@@ -27,16 +28,33 @@
msgstr "Bildschirmfoto einer freien Distribution"
#. type: Attribute 'alt' of: <p><img>
-msgid "[ Desktop with text processor and spreadsheet windows ]"
+# | [ Desktop with text [-processor-] {+processor, image manipulation
+# | program+} and [-spreadsheet-] {+web browser+} windows ]
+#, fuzzy
+#| msgid "[ Desktop with text processor and spreadsheet windows ]"
+msgid ""
+"[ Desktop with text processor, image manipulation program and web browser "
+"windows ]"
msgstr ""
"Bildschirmfoto einer GNU/Linux-Distribution mit geöffnetem "
"Textverarbeitungs- und Tabellenkalkulationsprogramm"
#. type: Content of: <p>
+# | <small>Screenshot of the Trisquel GNU/Linux distribution running
+# | LibreOffice, a free software office suite comparable to Microsoft Office
+# | or Apple [-iWork</small>-] {+iWork; GIMP, a free image manipulation
+# | program comparable to Adobe Photoshop; GNU IceCat, a free web browser
+# | based on Mozilla Firefox.</small>+}
+#, fuzzy
+#| msgid ""
+#| "<small>Screenshot of the Trisquel GNU/Linux distribution running "
+#| "LibreOffice, a free software office suite comparable to Microsoft Office "
+#| "or Apple iWork</small>"
msgid ""
"<small>Screenshot of the Trisquel GNU/Linux distribution running "
"LibreOffice, a free software office suite comparable to Microsoft Office or "
-"Apple iWork</small>"
+"Apple iWork; GIMP, a free image manipulation program comparable to Adobe "
+"Photoshop; GNU IceCat, a free web browser based on Mozilla Firefox.</small>"
msgstr ""
"<small>Bildschirmfoto von Trisquel, einer GNU/Linux-Distribution auf der "
"LibreOffice, ein mit Microsoft Office oder Apple iWork vergleichbares freies "
@@ -94,14 +112,24 @@
"standards/README.translations\">LIESMICH für Ãbersetzungen</a>."
#. type: Content of: <div><p>
-msgid "Copyright © 2014, 2015 Free Software Foundation, Inc."
-msgstr "Copyright © 2011-2015 Free Software Foundation, Inc."
+msgid "Copyright © 2015 Jade Levesque"
+msgstr ""
#. type: Content of: <div><p>
+# | [-This page-]{+The screenshot+} is licensed under a <a rel=\"license\"
+# | [-href=\"http://creativecommons.org/licenses/by-nd/3.0/us/\";>Creative-]
+# | {+href=\"https://creativecommons.org/licenses/by-sa/4.0/\";>Creative+}
+# | Commons [-Attribution-NoDerivs 3.0 United States-]
+# | {+Attribution-ShareAlike 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>."
+"The screenshot is licensed under a <a rel=\"license\" href=\"https://";
+"creativecommons.org/licenses/by-sa/4.0/\">Creative Commons Attribution-"
+"ShareAlike 4.0 International License</a>."
msgstr ""
"Dieses Werk ist lizenziert unter einer <a rel=\"license\" href=\"http://";
"creativecommons.org/licenses/by-nd/3.0/us/deed.de\">Creative Commons "
@@ -120,6 +148,9 @@
msgid "Updated:"
msgstr "Aktualisierung:"
+#~ msgid "Copyright © 2014, 2015 Free Software Foundation, Inc."
+#~ msgstr "Copyright © 2011-2015 Free Software Foundation, Inc."
+
#~ msgid ""
#~ "<a href=\"/distros/free-distros.html\">Ready-to-use GNU system variants</"
#~ "a>"
Index: po/screenshot.fr.po
===================================================================
RCS file: /web/www/www/distros/po/screenshot.fr.po,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- po/screenshot.fr.po 17 Feb 2015 13:17:23 -0000 1.17
+++ po/screenshot.fr.po 29 Oct 2015 09:58:38 -0000 1.18
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: screenshot.html\n"
-"POT-Creation-Date: 2015-02-17 10:25+0000\n"
+"POT-Creation-Date: 2015-10-29 09:55+0000\n"
"PO-Revision-Date: 2015-02-17 14:16+0100\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-10-29 09:55+0000\n"
"Plural-Forms: \n"
"X-Generator: Gtranslator 2.91.5\n"
@@ -29,14 +30,31 @@
msgstr "Capture d'écran d'une distribution libre"
#. type: Attribute 'alt' of: <p><img>
-msgid "[ Desktop with text processor and spreadsheet windows ]"
+# | [ Desktop with text [-processor-] {+processor, image manipulation
+# | program+} and [-spreadsheet-] {+web browser+} windows ]
+#, fuzzy
+#| msgid "[ Desktop with text processor and spreadsheet windows ]"
+msgid ""
+"[ Desktop with text processor, image manipulation program and web browser "
+"windows ]"
msgstr "[ Bureau avec fenêtres de traitement de texte et de tableur ]"
#. type: Content of: <p>
+# | <small>Screenshot of the Trisquel GNU/Linux distribution running
+# | LibreOffice, a free software office suite comparable to Microsoft Office
+# | or Apple [-iWork</small>-] {+iWork; GIMP, a free image manipulation
+# | program comparable to Adobe Photoshop; GNU IceCat, a free web browser
+# | based on Mozilla Firefox.</small>+}
+#, fuzzy
+#| msgid ""
+#| "<small>Screenshot of the Trisquel GNU/Linux distribution running "
+#| "LibreOffice, a free software office suite comparable to Microsoft Office "
+#| "or Apple iWork</small>"
msgid ""
"<small>Screenshot of the Trisquel GNU/Linux distribution running "
"LibreOffice, a free software office suite comparable to Microsoft Office or "
-"Apple iWork</small>"
+"Apple iWork; GIMP, a free image manipulation program comparable to Adobe "
+"Photoshop; GNU IceCat, a free web browser based on Mozilla Firefox.</small>"
msgstr ""
"<small>Capture d'écran du système d'exploitation GNU/Linux avec
LibreOffice, "
"une suite bureautique libre comparable à Microsoft Office ou Apple iWork</"
@@ -92,19 +110,29 @@
"README.translations.html\">guide de traduction</a>."
#. type: Content of: <div><p>
-msgid "Copyright © 2014, 2015 Free Software Foundation, Inc."
-msgstr "Copyright © 2014, 2015 Free Software Foundation, Inc."
+msgid "Copyright © 2015 Jade Levesque"
+msgstr ""
#. type: Content of: <div><p>
+# | [-This page-]{+The screenshot+} is licensed under a <a rel=\"license\"
+# | [-href=\"http://creativecommons.org/licenses/by-nd/4.0/\";>Creative-]
+# | {+href=\"https://creativecommons.org/licenses/by-sa/4.0/\";>Creative+}
+# | Commons [-Attribution-NoDerivatives-] {+Attribution-ShareAlike+} 4.0
+# | International License</a>.
+#, 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>."
+"The screenshot is licensed under a <a rel=\"license\" href=\"https://";
+"creativecommons.org/licenses/by-sa/4.0/\">Creative Commons Attribution-"
+"ShareAlike 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>
@@ -117,3 +145,6 @@
#. type: Content of: <div><p>
msgid "Updated:"
msgstr "Dernière mise à jour :"
+
+#~ msgid "Copyright © 2014, 2015 Free Software Foundation, Inc."
+#~ msgstr "Copyright © 2014, 2015 Free Software Foundation, Inc."
Index: po/screenshot.hr-diff.html
===================================================================
RCS file: /web/www/www/distros/po/screenshot.hr-diff.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- po/screenshot.hr-diff.html 19 May 2015 06:00:32 -0000 1.5
+++ po/screenshot.hr-diff.html 29 Oct 2015 09:58:38 -0000 1.6
@@ -18,12 +18,16 @@
<!--#include virtual="/server/banner.html" -->
<h2>Screenshot of a Free Distro</h2>
-<p><img src="/graphics/t-desktop-4.jpg" alt="[ Desktop with text
- processor and spreadsheet windows ]" width="100%" /></p>
+<p><img <span
class="removed"><del><strong>src="/graphics/t-desktop-4.jpg"</strong></del></span>
<span
class="inserted"><ins><em>src="screenshots/trisquel.png"</em></ins></span>
alt="[ Desktop with text
+ <span class="removed"><del><strong>processor</strong></del></span>
+ <span class="inserted"><ins><em>processor, image manipulation
program</em></ins></span> and <span
class="removed"><del><strong>spreadsheet</strong></del></span> <span
class="inserted"><ins><em>web browser</em></ins></span> windows ]"
+ width="100%" /></p>
<p class="c"><small>Screenshot of the Trisquel GNU/Linux
distribution
running LibreOffice, a free software office suite comparable to
-Microsoft Office or Apple iWork</small></p>
+Microsoft Office or Apple <span
class="removed"><del><strong>iWork</small></p></strong></del></span>
<span class="inserted"><ins><em>iWork; GIMP, a free image manipulation program
+comparable to Adobe Photoshop; GNU IceCat, a free web browser based
+on Mozilla Firefox.</small></p></em></ins></span>
<h3 class="c"><a <span
class="removed"><del><strong>href="/distros/free-distros.html">Download GNU
now</a></h3></strong></del></span> <span
class="inserted"><ins><em>href="/distros/free-distros.html">Try
GNU/Linux</a></h3></em></ins></span>
@@ -59,7 +63,7 @@
<!-- Regarding copyright, in general, standalone pages (as opposed to
files generated as part of manuals) on the GNU web server should
- be under CC BY-ND 3.0 US. Please do NOT change or remove this
+ be under CC BY-ND <span class="removed"><del><strong>3.0
US.</strong></del></span> <span
class="inserted"><ins><em>4.0.</em></ins></span> Please do NOT change or
remove this
without talking with the webmasters or licensing team first.
Please make sure the copyright date is consistent with the
document. For web pages, it is ok to list just the latest year the
@@ -74,11 +78,15 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © <span class="removed"><del><strong>2010,
2013</strong></del></span> <span class="inserted"><ins><em>2014,
2015</em></ins></span> Free Software Foundation, Inc.</p>
+<p>Copyright © <span class="removed"><del><strong>2010, 2013 Free
Software Foundation, Inc.</p>
-<p>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>.
+<p>This page</strong></del></span> <span class="inserted"><ins><em>2015
Jade Levesque</p>
+
+<p>The screenshot</em></ins></span> is licensed under a
+<a rel="license"
+<span
class="removed"><del><strong>href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative</strong></del></span>
+<span
class="inserted"><ins><em>href="https://creativecommons.org/licenses/by-sa/4.0/">Creative</em></ins></span>
+Commons <span class="removed"><del><strong>Attribution-NoDerivs 3.0 United
States</strong></del></span> <span
class="inserted"><ins><em>Attribution-ShareAlike 4.0
International</em></ins></span> License</a>.
</p>
<!--#include virtual="/server/bottom-notes.html" -->
@@ -87,7 +95,7 @@
<span class="inserted"><ins><em><p</em></ins></span>
class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/05/19 06:00:32 $
+$Date: 2015/10/29 09:58:38 $
<!-- timestamp end -->
</p>
</div>
Index: po/screenshot.hr.po
===================================================================
RCS file: /web/www/www/distros/po/screenshot.hr.po,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- po/screenshot.hr.po 17 Feb 2015 10:27:55 -0000 1.9
+++ po/screenshot.hr.po 29 Oct 2015 09:58:38 -0000 1.10
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: screenshot.html\n"
-"POT-Creation-Date: 2015-02-17 10:25+0000\n"
+"POT-Creation-Date: 2015-10-29 09:55+0000\n"
"PO-Revision-Date: 2014-02-04 20:04+0100\n"
"Last-Translator: Martina Bebek <address@hidden>\n"
"Language-Team: GNU Croatian Translation Team <address@hidden>\n"
@@ -30,16 +30,33 @@
msgstr "Snimka ekrana slobodne distribucije"
#. type: Attribute 'alt' of: <p><img>
-msgid "[ Desktop with text processor and spreadsheet windows ]"
+# | [ Desktop with text [-processor-] {+processor, image manipulation
+# | program+} and [-spreadsheet-] {+web browser+} windows ]
+#, fuzzy
+#| msgid "[ Desktop with text processor and spreadsheet windows ]"
+msgid ""
+"[ Desktop with text processor, image manipulation program and web browser "
+"windows ]"
msgstr ""
"[ Radna povrÅ¡ina s prozorima programa za obradu teksta i tabliÄnoga "
"kalkulatora ]"
#. type: Content of: <p>
+# | <small>Screenshot of the Trisquel GNU/Linux distribution running
+# | LibreOffice, a free software office suite comparable to Microsoft Office
+# | or Apple [-iWork</small>-] {+iWork; GIMP, a free image manipulation
+# | program comparable to Adobe Photoshop; GNU IceCat, a free web browser
+# | based on Mozilla Firefox.</small>+}
+#, fuzzy
+#| msgid ""
+#| "<small>Screenshot of the Trisquel GNU/Linux distribution running "
+#| "LibreOffice, a free software office suite comparable to Microsoft Office "
+#| "or Apple iWork</small>"
msgid ""
"<small>Screenshot of the Trisquel GNU/Linux distribution running "
"LibreOffice, a free software office suite comparable to Microsoft Office or "
-"Apple iWork</small>"
+"Apple iWork; GIMP, a free image manipulation program comparable to Adobe "
+"Photoshop; GNU IceCat, a free web browser based on Mozilla Firefox.</small>"
msgstr ""
"<small>Snimka ekrana distribucije Trisquel GNU/Linux na kojoj je pokrenut "
"LibreOffice, slobodan uredski softverski paket sliÄan uredskim paketima "
@@ -101,22 +118,28 @@
"prijevode</a>."
#. type: Content of: <div><p>
-# | Copyright © [-2010, 2013-] {+2014, 2015+} Free Software Foundation,
-# | Inc.
-#, fuzzy
-#| msgid "Copyright © 2010, 2013 Free Software Foundation, Inc."
-msgid "Copyright © 2014, 2015 Free Software Foundation, Inc."
-msgstr "Copyright © 2010, 2013 Free Software Foundation, Inc."
+msgid "Copyright © 2015 Jade Levesque"
+msgstr ""
#. type: Content of: <div><p>
+# | [-This page-]{+The screenshot+} is licensed under a <a rel=\"license\"
+# | [-href=\"http://creativecommons.org/licenses/by-nd/3.0/us/\";>Creative-]
+# | {+href=\"https://creativecommons.org/licenses/by-sa/4.0/\";>Creative+}
+# | Commons [-Attribution-NoDerivs 3.0 United States-]
+# | {+Attribution-ShareAlike 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>."
-msgstr ""
-"Ovo djelo dano je na korištenje pod <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/deed.hr\"> Creative Commons "
-"Imenovanje-Bez prerada 3.0 SAD licencom</a>."
+"The screenshot is licensed under a <a rel=\"license\" href=\"https://";
+"creativecommons.org/licenses/by-sa/4.0/\">Creative Commons Attribution-"
+"ShareAlike 4.0 International License</a>."
+msgstr ""
+"Ovo djelo je dano na korištenje pod licencom <a rel=\"license\" href="
+"\"http://creativecommons.org/licenses/by-nd/3.0/us/deed.hr\";> Creative "
+"Commons Imenovanje-Bez prerada 3.0 SAD</a>."
#. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
#. type: Content of: <div><div>
@@ -129,6 +152,20 @@
msgstr "Vrijeme zadnje izmjene:"
#, fuzzy
+#~| msgid "Copyright © 2010, 2013 Free Software Foundation, Inc."
+#~ msgid "Copyright © 2014, 2015 Free Software Foundation, Inc."
+#~ msgstr "Copyright © 2010, 2013 Free Software Foundation, Inc."
+
+#~ 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 ""
+#~ "Ovo djelo dano je na korištenje pod <a rel=\"license\" href=\"http://";
+#~ "creativecommons.org/licenses/by-nd/3.0/us/deed.hr\"> Creative Commons "
+#~ "Imenovanje-Bez prerada 3.0 SAD licencom</a>."
+
+#, fuzzy
#~| msgid "The Free Software Foundation"
#~ msgid "Copyright © 2014 Free Software Foundation, Inc."
#~ msgstr "Zaklada za slobodan softver"
Index: po/screenshot.it.po
===================================================================
RCS file: /web/www/www/distros/po/screenshot.it.po,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- po/screenshot.it.po 17 Feb 2015 22:27:21 -0000 1.10
+++ po/screenshot.it.po 29 Oct 2015 09:58:38 -0000 1.11
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: screenshot.html\n"
-"POT-Creation-Date: 2015-02-17 10:25+0000\n"
+"POT-Creation-Date: 2015-10-29 09:55+0000\n"
"PO-Revision-Date: 2015-02-17 23:03+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-10-29 09:55+0000\n"
"X-Generator: Poedit 1.5.4\n"
#. type: Content of: <title>
@@ -28,16 +29,33 @@
msgstr "Screenshot di una distribuzione libera"
#. type: Attribute 'alt' of: <p><img>
-msgid "[ Desktop with text processor and spreadsheet windows ]"
+# | [ Desktop with text [-processor-] {+processor, image manipulation
+# | program+} and [-spreadsheet-] {+web browser+} windows ]
+#, fuzzy
+#| msgid "[ Desktop with text processor and spreadsheet windows ]"
+msgid ""
+"[ Desktop with text processor, image manipulation program and web browser "
+"windows ]"
msgstr ""
"[ Desktop con aperte due finestre, una di un programma di scrittura testi e "
"l'altra di un foglio elettronico ]"
#. type: Content of: <p>
+# | <small>Screenshot of the Trisquel GNU/Linux distribution running
+# | LibreOffice, a free software office suite comparable to Microsoft Office
+# | or Apple [-iWork</small>-] {+iWork; GIMP, a free image manipulation
+# | program comparable to Adobe Photoshop; GNU IceCat, a free web browser
+# | based on Mozilla Firefox.</small>+}
+#, fuzzy
+#| msgid ""
+#| "<small>Screenshot of the Trisquel GNU/Linux distribution running "
+#| "LibreOffice, a free software office suite comparable to Microsoft Office "
+#| "or Apple iWork</small>"
msgid ""
"<small>Screenshot of the Trisquel GNU/Linux distribution running "
"LibreOffice, a free software office suite comparable to Microsoft Office or "
-"Apple iWork</small>"
+"Apple iWork; GIMP, a free image manipulation program comparable to Adobe "
+"Photoshop; GNU IceCat, a free web browser based on Mozilla Firefox.</small>"
msgstr ""
"<small>Screenshot della distribuzione Trisquel GNU/Linux che esegue "
"LibreOffice, un software di produttività personale paragonabile a Microsoft "
@@ -94,19 +112,28 @@
"traduzioni</a>."
#. type: Content of: <div><p>
-msgid "Copyright © 2014, 2015 Free Software Foundation, Inc."
-msgstr "Copyright © 2014, 2015 Free Software Foundation, Inc."
+msgid "Copyright © 2015 Jade Levesque"
+msgstr ""
#. type: Content of: <div><p>
+# | [-This page-]{+The screenshot+} is licensed under a <a rel=\"license\"
+# | [-href=\"http://creativecommons.org/licenses/by-nd/4.0/\";>Creative-]
+# | {+href=\"https://creativecommons.org/licenses/by-sa/4.0/\";>Creative+}
+# | Commons [-Attribution-NoDerivatives-] {+Attribution-ShareAlike+} 4.0
+# | International License</a>.
+#, 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>."
+"The screenshot is licensed under a <a rel=\"license\" href=\"https://";
+"creativecommons.org/licenses/by-sa/4.0/\">Creative Commons Attribution-"
+"ShareAlike 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>
@@ -117,3 +144,16 @@
#. type: Content of: <div><p>
msgid "Updated:"
msgstr "Ultimo aggiornamento:"
+
+#~ msgid "Copyright © 2014, 2015 Free Software Foundation, Inc."
+#~ msgstr "Copyright © 2014, 2015 Free Software Foundation, Inc."
+
+#~ 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: po/screenshot.ja.po
===================================================================
RCS file: /web/www/www/distros/po/screenshot.ja.po,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- po/screenshot.ja.po 2 Mar 2015 00:57:37 -0000 1.26
+++ po/screenshot.ja.po 29 Oct 2015 09:58:39 -0000 1.27
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: screenshot.html\n"
-"POT-Creation-Date: 2015-02-17 10:25+0000\n"
+"POT-Creation-Date: 2015-10-29 09:55+0000\n"
"PO-Revision-Date: 2015-03-02 09:16+0900\n"
"Last-Translator: NIIBE Yutaka <address@hidden>\n"
"Language-Team: Japanese <address@hidden>\n"
@@ -14,6 +14,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2015-10-29 09:55+0000\n"
#. type: Content of: <title>
msgid "Screenshot of a Free Distro - GNU Project - Free Software Foundation"
@@ -26,14 +27,24 @@
msgstr "èªç±ãªãã£ã¹ããã®ã¹ã¯ãªã¼ã³ã·ã§ãã"
#. type: Attribute 'alt' of: <p><img>
-msgid "[ Desktop with text processor and spreadsheet windows ]"
+#, fuzzy
+#| msgid "[ Desktop with text processor and spreadsheet windows ]"
+msgid ""
+"[ Desktop with text processor, image manipulation program and web browser "
+"windows ]"
msgstr "[
ããã¹ãã»ããã»ããµã¨ã¹ãã¬ããã·ã¼ãã®ã¦ã¤ã³ãã¦ã®ãã¹ã¯ããã
]"
#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "<small>Screenshot of the Trisquel GNU/Linux distribution running "
+#| "LibreOffice, a free software office suite comparable to Microsoft Office "
+#| "or Apple iWork</small>"
msgid ""
"<small>Screenshot of the Trisquel GNU/Linux distribution running "
"LibreOffice, a free software office suite comparable to Microsoft Office or "
-"Apple iWork</small>"
+"Apple iWork; GIMP, a free image manipulation program comparable to Adobe "
+"Photoshop; GNU IceCat, a free web browser based on Mozilla Firefox.</small>"
msgstr ""
"<small>Trisquel
GNU/Linuxãã£ã¹ããªãã¥ã¼ã·ã§ã³ã®ã¹ã¯ãªã¼ã³ã·ã§ããã"
"LibreOffice.org
(ãã¤ã¯ãã½ãããªãã£ã¹ãããã¯ã¢ããã«iWorkã¨åçã®èªç±ã½ã"
@@ -85,18 +96,23 @@
"README.translations.html\">翻訳 README</a>ãã覧ãã ããã"
#. type: Content of: <div><p>
-msgid "Copyright © 2014, 2015 Free Software Foundation, Inc."
-msgstr "Copyright © 2014, 2015 Free Software Foundation, Inc."
+msgid "Copyright © 2015 Jade Levesque"
+msgstr ""
#. type: Content of: <div><p>
+#, 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>."
+"The screenshot is licensed under a <a rel=\"license\" href=\"https://";
+"creativecommons.org/licenses/by-sa/4.0/\">Creative Commons Attribution-"
+"ShareAlike 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/4.0/\">Creative Commons Attribution-NoDerivs 4.0 International License</a>"
+"ã®æ¡ä»¶ã§è¨±è«¾ããã¾ãã"
#. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
#. type: Content of: <div><div>
Index: po/screenshot.ko-diff.html
===================================================================
RCS file: /web/www/www/distros/po/screenshot.ko-diff.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- po/screenshot.ko-diff.html 19 May 2015 06:00:32 -0000 1.11
+++ po/screenshot.ko-diff.html 29 Oct 2015 09:58:39 -0000 1.12
@@ -20,12 +20,15 @@
<span class="removed"><del><strong><p><a
href="/distros/free-distros.html"><img src="/graphics/t-desktop-4.jpg"
alt="Screenshot</strong></del></span>
<span class="inserted"><ins><em><h2>Screenshot</em></ins></span> of
<span class="removed"><del><strong>the GNU/Linux operating system running
OpenOffice.org,</strong></del></span> a <span class="removed"><del><strong>free
software office suite comparable to Microsoft Office or Apple
iWork"</strong></del></span> <span class="inserted"><ins><em>Free
Distro</h2>
-<p><img src="/graphics/t-desktop-4.jpg" alt="[ Desktop with text
- processor and spreadsheet windows ]"</em></ins></span> width="100%" <span
class="removed"><del><strong>/></a></p></strong></del></span>
<span class="inserted"><ins><em>/></p></em></ins></span>
+<p><img src="screenshots/trisquel.png" alt="[ Desktop with text
+ processor, image manipulation program and web browser windows
]"</em></ins></span>
+ width="100%" <span
class="removed"><del><strong>/></a></p></strong></del></span>
<span class="inserted"><ins><em>/></p></em></ins></span>
<p class="c"><small>Screenshot of the Trisquel GNU/Linux
distribution
running <span
class="removed"><del><strong>OpenOffice.org,</strong></del></span> <span
class="inserted"><ins><em>LibreOffice,</em></ins></span> a free software office
suite comparable to
-Microsoft Office or Apple iWork</small></p>
+Microsoft Office or Apple <span
class="removed"><del><strong>iWork</small></p></strong></del></span>
<span class="inserted"><ins><em>iWork; GIMP, a free image manipulation program
+comparable to Adobe Photoshop; GNU IceCat, a free web browser based
+on Mozilla Firefox.</small></p></em></ins></span>
<h3 class="c"><a <span
class="removed"><del><strong>href="/distros/free-distros.html">Download GNU
now</a></h3></strong></del></span> <span
class="inserted"><ins><em>href="/distros/free-distros.html">Try
GNU/Linux</a></h3></em></ins></span>
@@ -73,7 +76,7 @@
<!-- Regarding copyright, in general, standalone pages (as opposed to
files generated as part of manuals) on the GNU web server should
- be under CC BY-ND 3.0 US. Please do NOT change or remove this
+ be under CC BY-ND 4.0. 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
@@ -88,12 +91,15 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright</em></ins></span> © <span
class="removed"><del><strong>2010</strong></del></span> <span
class="inserted"><ins><em>2014, 2015</em></ins></span> Free Software
Foundation, <span class="removed"><del><strong>Inc.
-</p></strong></del></span> <span
class="inserted"><ins><em>Inc.</p></em></ins></span>
+<p>Copyright</em></ins></span> © <span
class="removed"><del><strong>2010 Free Software Foundation, Inc.
+</p>
+<p>This page</strong></del></span> <span class="inserted"><ins><em>2015
Jade Levesque</p>
-<p>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>.
+<p>The screenshot</em></ins></span> is licensed under a
+<a rel="license"
+<span
class="removed"><del><strong>href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative</strong></del></span>
+<span
class="inserted"><ins><em>href="https://creativecommons.org/licenses/by-sa/4.0/">Creative</em></ins></span>
+Commons <span class="removed"><del><strong>Attribution-NoDerivs 3.0 United
States</strong></del></span> <span
class="inserted"><ins><em>Attribution-ShareAlike 4.0
International</em></ins></span> License</a>.
</p>
<span class="removed"><del><strong><p>
@@ -103,7 +109,7 @@
<p class="unprintable">Updated:</em></ins></span>
<!-- timestamp start -->
-$Date: 2015/05/19 06:00:32 $
+$Date: 2015/10/29 09:58:39 $
<!-- timestamp end -->
</p>
</div>
Index: po/screenshot.ko.po
===================================================================
RCS file: /web/www/www/distros/po/screenshot.ko.po,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- po/screenshot.ko.po 17 Feb 2015 10:27:56 -0000 1.13
+++ po/screenshot.ko.po 29 Oct 2015 09:58:39 -0000 1.14
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: screenshot.html\n"
-"POT-Creation-Date: 2015-02-17 10:25+0000\n"
+"POT-Creation-Date: 2015-10-29 09:55+0000\n"
"PO-Revision-Date: 2012-04-28 01:52+0900\n"
"Last-Translator: Chang-hun Song <address@hidden>\n"
"Language-Team: Korean <address@hidden>\n"
@@ -30,7 +30,9 @@
msgstr "ìì ë°°í¬íììì ì¤í íë©´ - GNU ì´ìì²´ì "
#. type: Attribute 'alt' of: <p><img>
-msgid "[ Desktop with text processor and spreadsheet windows ]"
+msgid ""
+"[ Desktop with text processor, image manipulation program and web browser "
+"windows ]"
msgstr ""
#. type: Content of: <p>
@@ -42,7 +44,8 @@
msgid ""
"<small>Screenshot of the Trisquel GNU/Linux distribution running "
"LibreOffice, a free software office suite comparable to Microsoft Office or "
-"Apple iWork</small>"
+"Apple iWork; GIMP, a free image manipulation program comparable to Adobe "
+"Photoshop; GNU IceCat, a free web browser based on Mozilla Firefox.</small>"
msgstr ""
"<small>GNU/리ë
ì¤ Triquel ë°°í¬íìì ì¤íëê³ ìë ì¤í
ì¤í¼ì¤ì íë©´ì
ëë¤. "
"ì´ ìíí¸ì¨ì´ë ë§ì´í¬ë¡ìíí¸ì ì¤í¼ì¤ë ì íì
iWorkì íì íë ìì ìíí¸"
@@ -100,16 +103,19 @@
"standards/README.translations.html\">ë²ì ìë´</a>를 ì°¸ê³ í´
주ì¸ì."
#. type: Content of: <div><p>
-#, fuzzy
-#| msgid "Copyright © 2011 Free Software Foundation, Inc."
-msgid "Copyright © 2014, 2015 Free Software Foundation, Inc."
-msgstr "Copyright © 2011 Free Software Foundation, Inc."
+msgid "Copyright © 2015 Jade Levesque"
+msgstr ""
#. 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>."
+"The screenshot is licensed under a <a rel=\"license\" href=\"https://";
+"creativecommons.org/licenses/by-sa/4.0/\">Creative Commons Attribution-"
+"ShareAlike 4.0 International License</a>."
msgstr ""
"ì´ íì´ì§ë <a rel=\"license\"
href=\"http://creativecommons.org/licenses/by-";
"nd/3.0/us/deed.ko\">í¬ë¦¬ìì´í°ë¸ ì»¤ë¨¼ì¤ ì ììíì-ë³ê²½ê¸ì§
3.0 ë¯¸êµ ì´ì©íë½"
@@ -126,6 +132,11 @@
msgstr "ìµì¢
ìì ì¼:"
#, fuzzy
+#~| msgid "Copyright © 2011 Free Software Foundation, Inc."
+#~ msgid "Copyright © 2014, 2015 Free Software Foundation, Inc."
+#~ msgstr "Copyright © 2011 Free Software Foundation, Inc."
+
+#, fuzzy
#~| msgid "<a href=\"/distros/free-distros.html\">Download GNU now</a>"
#~ msgid ""
#~ "<a href=\"/distros/free-distros.html\">Ready-to-use GNU system variants</"
Index: po/screenshot.ml-diff.html
===================================================================
RCS file: /web/www/www/distros/po/screenshot.ml-diff.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- po/screenshot.ml-diff.html 26 May 2015 05:58:11 -0000 1.3
+++ po/screenshot.ml-diff.html 29 Oct 2015 09:58:39 -0000 1.4
@@ -18,12 +18,16 @@
<!--#include virtual="/server/banner.html" -->
<h2>Screenshot of a Free Distro</h2>
-<p><img src="/graphics/t-desktop-4.jpg" alt="[ Desktop with text
- processor and spreadsheet windows ]" width="100%" /></p>
+<p><img <span
class="removed"><del><strong>src="/graphics/t-desktop-4.jpg"</strong></del></span>
<span
class="inserted"><ins><em>src="screenshots/trisquel.png"</em></ins></span>
alt="[ Desktop with text
+ <span class="removed"><del><strong>processor</strong></del></span>
+ <span class="inserted"><ins><em>processor, image manipulation
program</em></ins></span> and <span
class="removed"><del><strong>spreadsheet</strong></del></span> <span
class="inserted"><ins><em>web browser</em></ins></span> windows ]"
+ width="100%" /></p>
<p class="c"><small>Screenshot of the Trisquel GNU/Linux
distribution
running LibreOffice, a free software office suite comparable to
-Microsoft Office or Apple iWork</small></p>
+Microsoft Office or Apple <span
class="removed"><del><strong>iWork</small></p></strong></del></span>
<span class="inserted"><ins><em>iWork; GIMP, a free image manipulation program
+comparable to Adobe Photoshop; GNU IceCat, a free web browser based
+on Mozilla Firefox.</small></p></em></ins></span>
<h3 class="c"><a <span
class="removed"><del><strong>href="/distros/free-distros.html">Download GNU
now</a></h3></strong></del></span> <span
class="inserted"><ins><em>href="/distros/free-distros.html">Try
GNU/Linux</a></h3></em></ins></span>
@@ -59,7 +63,7 @@
<!-- Regarding copyright, in general, standalone pages (as opposed to
files generated as part of manuals) on the GNU web server should
- be under CC BY-ND 3.0 US. Please do NOT change or remove this
+ be under CC BY-ND <span class="removed"><del><strong>3.0
US.</strong></del></span> <span
class="inserted"><ins><em>4.0.</em></ins></span> Please do NOT change or
remove this
without talking with the webmasters or licensing team first.
Please make sure the copyright date is consistent with the
document. For web pages, it is ok to list just the latest year the
@@ -74,18 +78,22 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © <span
class="removed"><del><strong>2014</strong></del></span> <span
class="inserted"><ins><em>2014, 2015</em></ins></span> Free Software
Foundation, Inc.</p>
+<p>Copyright © <span class="removed"><del><strong>2014 Free
Software Foundation, Inc.</p>
-<p>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>.
+<p>This page</strong></del></span> <span class="inserted"><ins><em>2015
Jade Levesque</p>
+
+<p>The screenshot</em></ins></span> is licensed under a
+<a rel="license"
+<span
class="removed"><del><strong>href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative</strong></del></span>
+<span
class="inserted"><ins><em>href="https://creativecommons.org/licenses/by-sa/4.0/">Creative</em></ins></span>
+Commons <span class="removed"><del><strong>Attribution-NoDerivs 3.0 United
States</strong></del></span> <span
class="inserted"><ins><em>Attribution-ShareAlike 4.0
International</em></ins></span> License</a>.
</p>
<!--#include virtual="/server/bottom-notes.html" -->
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/05/26 05:58:11 $
+$Date: 2015/10/29 09:58:39 $
<!-- timestamp end -->
</p>
</div>
Index: po/screenshot.ml.po
===================================================================
RCS file: /web/www/www/distros/po/screenshot.ml.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- po/screenshot.ml.po 17 Feb 2015 10:27:56 -0000 1.4
+++ po/screenshot.ml.po 29 Oct 2015 09:58:39 -0000 1.5
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: screenshot.html\n"
-"POT-Creation-Date: 2015-02-17 10:25+0000\n"
+"POT-Creation-Date: 2015-10-29 09:55+0000\n"
"PO-Revision-Date: 2014-05-11 21:06+0530\n"
"Last-Translator: Navaneeth <address@hidden>\n"
"Language-Team: Malayalam <address@hidden>\n"
@@ -25,14 +25,31 @@
msgstr "à´à´°àµ à´¸àµà´µà´¤à´¨àµà´¤àµà´°
വിതരണതàµà´¤à´¿à´¨àµà´±àµ
à´¸àµà´àµà´°àµà´¨àµâà´·àµà´àµà´àµ"
#. type: Attribute 'alt' of: <p><img>
-msgid "[ Desktop with text processor and spreadsheet windows ]"
+# | [ Desktop with text [-processor-] {+processor, image manipulation
+# | program+} and [-spreadsheet-] {+web browser+} windows ]
+#, fuzzy
+#| msgid "[ Desktop with text processor and spreadsheet windows ]"
+msgid ""
+"[ Desktop with text processor, image manipulation program and web browser "
+"windows ]"
msgstr "[ à´àµà´àµà´¸àµà´±àµà´±àµ à´ªàµà´°àµà´¸à´¸àµà´¸à´±àµà´
à´¸àµà´ªàµà´°àµà´¡àµà´·àµà´±àµà´±àµ
വിനàµâà´¡àµà´à´³àµà´®àµà´³àµà´³ പശàµà´à´¾à´¤àµà´¤à´²à´ ]"
#. type: Content of: <p>
+# | <small>Screenshot of the Trisquel GNU/Linux distribution running
+# | LibreOffice, a free software office suite comparable to Microsoft Office
+# | or Apple [-iWork</small>-] {+iWork; GIMP, a free image manipulation
+# | program comparable to Adobe Photoshop; GNU IceCat, a free web browser
+# | based on Mozilla Firefox.</small>+}
+#, fuzzy
+#| msgid ""
+#| "<small>Screenshot of the Trisquel GNU/Linux distribution running "
+#| "LibreOffice, a free software office suite comparable to Microsoft Office "
+#| "or Apple iWork</small>"
msgid ""
"<small>Screenshot of the Trisquel GNU/Linux distribution running "
"LibreOffice, a free software office suite comparable to Microsoft Office or "
-"Apple iWork</small>"
+"Apple iWork; GIMP, a free image manipulation program comparable to Adobe "
+"Photoshop; GNU IceCat, a free web browser based on Mozilla Firefox.</small>"
msgstr ""
"<small>à´®àµà´àµà´°àµà´¸àµà´«àµà´±àµà´±àµ à´à´«àµà´¸à´¿à´¨àµà´
à´à´ªàµà´ªà´¿à´³àµâ à´à´µà´°àµâà´àµà´à´¿à´¨àµà´
ബദലാവàµà´¨àµà´¨ ലിബàµà´°àµ à´à´«àµà´¸àµ
à´àµà´°à´¿à´¸àµà´àµà´µà´²àµâ à´àµà´¨àµ/"
"ലിനà´àµà´¸à´¿à´²àµâ
à´ªàµà´°à´µà´°àµâà´¤àµà´¤à´¿à´àµà´àµà´¨àµà´¨
à´¸àµà´àµà´°àµà´¨àµâà´·àµà´àµà´àµ</small>"
@@ -88,19 +105,26 @@
"org></a> സഹായà´à´®à´¾à´µàµà´.</p><p>à´
à´²àµà´à´¨à´¤àµà´¤à´¿à´¨àµà´±àµ പരിà´à´¾à´·
നലàµâà´à´¾à´¨àµà´ മറàµà´±àµà´ <a href=\"/"
"server/standards/README.translations.html\">Translations README</a>
à´à´¾à´£àµà´."
-# type: Content of: <div><p>
#. type: Content of: <div><p>
-# | Copyright © [-2010-] {+2014, 2015+} Free Software Foundation, Inc.
-#, fuzzy
-#| msgid "Copyright © 2010 Free Software Foundation, Inc."
-msgid "Copyright © 2014, 2015 Free Software Foundation, Inc."
-msgstr "Copyright © 2010 Free Software Foundation, Inc."
+msgid "Copyright © 2015 Jade Levesque"
+msgstr ""
+# type: Content of: <div><p>
#. type: Content of: <div><p>
+# | [-This page-]{+The screenshot+} is licensed under a <a rel=\"license\"
+# | [-href=\"http://creativecommons.org/licenses/by-nd/3.0/us/\";>Creative-]
+# | {+href=\"https://creativecommons.org/licenses/by-sa/4.0/\";>Creative+}
+# | Commons [-Attribution-NoDerivs 3.0 United States-]
+# | {+Attribution-ShareAlike 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>."
+"The screenshot is licensed under a <a rel=\"license\" href=\"https://";
+"creativecommons.org/licenses/by-sa/4.0/\">Creative Commons Attribution-"
+"ShareAlike 4.0 International License</a>."
msgstr ""
"ഠതാളàµâ <a rel=\"license\"
href=\"http://creativecommons.org/licenses/by-";
"nd/3.0/us/\">à´àµà´°à´¿à´¯àµà´±àµà´±àµà´µàµ à´àµà´®à´£àµâà´¸àµ
à´²àµà´¸à´¨àµâസിനൠ</a>à´àµà´´à´¿à´²à´¾à´£àµ."
@@ -117,5 +141,19 @@
msgid "Updated:"
msgstr "à´ªàµà´¤àµà´àµà´à´¿à´¯à´¤àµàµ:"
+# type: Content of: <div><p>
+#, fuzzy
+#~| msgid "Copyright © 2010 Free Software Foundation, Inc."
+#~ msgid "Copyright © 2014, 2015 Free Software Foundation, Inc."
+#~ msgstr "Copyright © 2010 Free Software Foundation, Inc."
+
+#~ 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/\">à´àµà´°à´¿à´¯àµà´±àµà´±àµà´µàµ à´àµà´®à´£àµâà´¸àµ
à´²àµà´¸à´¨àµâസിനൠ</a>à´àµà´´à´¿à´²à´¾à´£àµ."
+
#~ msgid "Copyright © 2014 Free Software Foundation, Inc."
#~ msgstr "Copyright © 2014 Free Software Foundation, Inc."
Index: po/screenshot.pl.po
===================================================================
RCS file: /web/www/www/distros/po/screenshot.pl.po,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- po/screenshot.pl.po 2 May 2015 04:48:24 -0000 1.23
+++ po/screenshot.pl.po 29 Oct 2015 09:58:39 -0000 1.24
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: screenshot.html\n"
-"POT-Creation-Date: 2015-02-17 10:25+0000\n"
+"POT-Creation-Date: 2015-10-29 09:55+0000\n"
"PO-Revision-Date: 2015-02-21 11:34-0600\n"
"Last-Translator: Jan Owoc <jsowoc AT gmail.com>\n"
"Language-Team: Polish <address@hidden>\n"
@@ -13,6 +13,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2015-10-29 09:55+0000\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
"|| n%100>=20) ? 1 : 2);\n"
"X-Generator: Virtaal 0.7.0\n"
@@ -28,14 +29,31 @@
msgstr "Zrzut wolnej dystrybucji"
#. type: Attribute 'alt' of: <p><img>
-msgid "[ Desktop with text processor and spreadsheet windows ]"
+# | [ Desktop with text [-processor-] {+processor, image manipulation
+# | program+} and [-spreadsheet-] {+web browser+} windows ]
+#, fuzzy
+#| msgid "[ Desktop with text processor and spreadsheet windows ]"
+msgid ""
+"[ Desktop with text processor, image manipulation program and web browser "
+"windows ]"
msgstr "[ Pulpit z edytorem tekstu i arkuszem kalkulacyjnym ]"
#. type: Content of: <p>
+# | <small>Screenshot of the Trisquel GNU/Linux distribution running
+# | LibreOffice, a free software office suite comparable to Microsoft Office
+# | or Apple [-iWork</small>-] {+iWork; GIMP, a free image manipulation
+# | program comparable to Adobe Photoshop; GNU IceCat, a free web browser
+# | based on Mozilla Firefox.</small>+}
+#, fuzzy
+#| msgid ""
+#| "<small>Screenshot of the Trisquel GNU/Linux distribution running "
+#| "LibreOffice, a free software office suite comparable to Microsoft Office "
+#| "or Apple iWork</small>"
msgid ""
"<small>Screenshot of the Trisquel GNU/Linux distribution running "
"LibreOffice, a free software office suite comparable to Microsoft Office or "
-"Apple iWork</small>"
+"Apple iWork; GIMP, a free image manipulation program comparable to Adobe "
+"Photoshop; GNU IceCat, a free web browser based on Mozilla Firefox.</small>"
msgstr ""
"<small>Zrzut ekranu dystrybucji Trisquel GNU/Linux z uruchomionym "
"LibreOffice, wolnym oprogramowaniem biurowym porównywalnym do Microsoft
"
@@ -92,21 +110,29 @@
"translations.html\">tÅumaczeÅ</a>."
#. type: Content of: <div><p>
-msgid "Copyright © 2014, 2015 Free Software Foundation, Inc."
-msgstr "Copyright © 2014, 2015 Free Software Foundation, Inc."
+msgid "Copyright © 2015 Jade Levesque"
+msgstr ""
#. type: Content of: <div><p>
+# | [-This page-]{+The screenshot+} is licensed under a <a rel=\"license\"
+# | [-href=\"http://creativecommons.org/licenses/by-nd/4.0/\";>Creative-]
+# | {+href=\"https://creativecommons.org/licenses/by-sa/4.0/\";>Creative+}
+# | Commons [-Attribution-NoDerivatives-] {+Attribution-ShareAlike+} 4.0
+# | International License</a>.
+#, 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>."
-msgstr ""
-"Ten utwór objÄty jest licencjÄ
Creative Commons Uznanie autorstwa-Bez "
-"utworów zależnych 3.0 Stany Zjednoczone. Aby zobaczyÄ kopiÄ
niniejszej "
-"licencji przejdź na stronÄ <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">http://creativecommons.org/";
-"licenses/by-nd/3.0/us/</a> lub napisz do Creative Commons, 171 "
-"Second Street, Suite 300, San Francisco, California 94105, USA."
+"The screenshot is licensed under a <a rel=\"license\" href=\"https://";
+"creativecommons.org/licenses/by-sa/4.0/\">Creative Commons Attribution-"
+"ShareAlike 4.0 International License</a>."
+msgstr ""
+"Ta strona jest dostÄpna na <a rel=\"license\" href=\"http://";
+"creativecommons.org/licenses/by-nd/4.0/deed.pl\">licencji Creative Commons "
+"Uznanie autorstwa – Bez utworów zależnych 4.0 "
+"MiÄdzynarodowe</a>."
#. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
#. type: Content of: <div><div>
Index: po/screenshot.pot
===================================================================
RCS file: /web/www/www/distros/po/screenshot.pot,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- po/screenshot.pot 17 Feb 2015 10:27:56 -0000 1.16
+++ po/screenshot.pot 29 Oct 2015 09:58:39 -0000 1.17
@@ -7,13 +7,14 @@
msgid ""
msgstr ""
"Project-Id-Version: screenshot.html\n"
-"POT-Creation-Date: 2015-02-17 10:25+0000\n"
+"POT-Creation-Date: 2015-10-29 09:55+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 "Screenshot of a Free Distro - GNU Project - Free Software Foundation"
@@ -24,14 +25,17 @@
msgstr ""
#. type: Attribute 'alt' of: <p><img>
-msgid "[ Desktop with text processor and spreadsheet windows ]"
+msgid ""
+"[ Desktop with text processor, image manipulation program and web browser "
+"windows ]"
msgstr ""
#. type: Content of: <p>
msgid ""
"<small>Screenshot of the Trisquel GNU/Linux distribution running "
"LibreOffice, a free software office suite comparable to Microsoft Office or "
-"Apple iWork</small>"
+"Apple iWork; GIMP, a free image manipulation program comparable to Adobe "
+"Photoshop; GNU IceCat, a free web browser based on Mozilla Firefox.</small>"
msgstr ""
#. type: Content of: <h3>
@@ -74,14 +78,14 @@
msgstr ""
#. type: Content of: <div><p>
-msgid "Copyright © 2014, 2015 Free Software Foundation, Inc."
+msgid "Copyright © 2015 Jade Levesque"
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>."
+"The screenshot is licensed under a <a rel=\"license\" "
+"href=\"https://creativecommons.org/licenses/by-sa/4.0/\";>Creative Commons "
+"Attribution-ShareAlike 4.0 International License</a>."
msgstr ""
#. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
Index: po/screenshot.ro-diff.html
===================================================================
RCS file: /web/www/www/distros/po/screenshot.ro-diff.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- po/screenshot.ro-diff.html 26 May 2015 05:58:11 -0000 1.4
+++ po/screenshot.ro-diff.html 29 Oct 2015 09:58:40 -0000 1.5
@@ -18,12 +18,16 @@
<!--#include virtual="/server/banner.html" -->
<h2>Screenshot of a Free Distro</h2>
-<p><img src="/graphics/t-desktop-4.jpg" alt="[ Desktop with text
- processor and spreadsheet windows ]" width="100%" /></p>
+<p><img <span
class="removed"><del><strong>src="/graphics/t-desktop-4.jpg"</strong></del></span>
<span
class="inserted"><ins><em>src="screenshots/trisquel.png"</em></ins></span>
alt="[ Desktop with text
+ <span class="removed"><del><strong>processor</strong></del></span>
+ <span class="inserted"><ins><em>processor, image manipulation
program</em></ins></span> and <span
class="removed"><del><strong>spreadsheet</strong></del></span> <span
class="inserted"><ins><em>web browser</em></ins></span> windows ]"
+ width="100%" /></p>
<p class="c"><small>Screenshot of the Trisquel GNU/Linux
distribution
running LibreOffice, a free software office suite comparable to
-Microsoft Office or Apple iWork</small></p>
+Microsoft Office or Apple <span
class="removed"><del><strong>iWork</small></p></strong></del></span>
<span class="inserted"><ins><em>iWork; GIMP, a free image manipulation program
+comparable to Adobe Photoshop; GNU IceCat, a free web browser based
+on Mozilla Firefox.</small></p></em></ins></span>
<h3 class="c"><a <span
class="removed"><del><strong>href="/distros/free-distros.html">Download GNU
now</a></h3></strong></del></span> <span
class="inserted"><ins><em>href="/distros/free-distros.html">Try
GNU/Linux</a></h3></em></ins></span>
@@ -59,7 +63,7 @@
<!-- Regarding copyright, in general, standalone pages (as opposed to
files generated as part of manuals) on the GNU web server should
- be under CC BY-ND 3.0 US. Please do NOT change or remove this
+ be under CC BY-ND <span class="removed"><del><strong>3.0
US.</strong></del></span> <span
class="inserted"><ins><em>4.0.</em></ins></span> Please do NOT change or
remove this
without talking with the webmasters or licensing team first.
Please make sure the copyright date is consistent with the
document. For web pages, it is ok to list just the latest year the
@@ -74,18 +78,22 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © <span
class="removed"><del><strong>2014</strong></del></span> <span
class="inserted"><ins><em>2014, 2015</em></ins></span> Free Software
Foundation, Inc.</p>
+<p>Copyright © <span class="removed"><del><strong>2014 Free
Software Foundation, Inc.</p>
-<p>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>.
+<p>This page</strong></del></span> <span class="inserted"><ins><em>2015
Jade Levesque</p>
+
+<p>The screenshot</em></ins></span> is licensed under a
+<a rel="license"
+<span
class="removed"><del><strong>href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative</strong></del></span>
+<span
class="inserted"><ins><em>href="https://creativecommons.org/licenses/by-sa/4.0/">Creative</em></ins></span>
+Commons <span class="removed"><del><strong>Attribution-NoDerivs 3.0 United
States</strong></del></span> <span
class="inserted"><ins><em>Attribution-ShareAlike 4.0
International</em></ins></span> License</a>.
</p>
<!--#include virtual="/server/bottom-notes.html" -->
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/05/26 05:58:11 $
+$Date: 2015/10/29 09:58:40 $
<!-- timestamp end -->
</p>
</div>
Index: po/screenshot.ro.po
===================================================================
RCS file: /web/www/www/distros/po/screenshot.ro.po,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- po/screenshot.ro.po 17 Feb 2015 10:27:56 -0000 1.12
+++ po/screenshot.ro.po 29 Oct 2015 09:58:40 -0000 1.13
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: screenshot.html\n"
-"POT-Creation-Date: 2015-02-17 10:25+0000\n"
+"POT-Creation-Date: 2015-10-29 09:55+0000\n"
"PO-Revision-Date: 2013-12-11 12:39+0200\n"
"Last-Translator: Tiberiu C. Turbureanu <address@hidden>\n"
"Language-Team: Romanian <address@hidden>\n"
@@ -28,14 +28,24 @@
msgstr "Captura de ecran a unei distribuÈii libere"
#. type: Attribute 'alt' of: <p><img>
-msgid "[ Desktop with text processor and spreadsheet windows ]"
+#, fuzzy
+#| msgid "[ Desktop with text processor and spreadsheet windows ]"
+msgid ""
+"[ Desktop with text processor, image manipulation program and web browser "
+"windows ]"
msgstr "Biroul cu ferestrele de procesor de text Èi de foaie de calcul"
#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "<small>Screenshot of the Trisquel GNU/Linux distribution running "
+#| "LibreOffice, a free software office suite comparable to Microsoft Office "
+#| "or Apple iWork</small>"
msgid ""
"<small>Screenshot of the Trisquel GNU/Linux distribution running "
"LibreOffice, a free software office suite comparable to Microsoft Office or "
-"Apple iWork</small>"
+"Apple iWork; GIMP, a free image manipulation program comparable to Adobe "
+"Photoshop; GNU IceCat, a free web browser based on Mozilla Firefox.</small>"
msgstr ""
"<small>Captura de ecran a distribuÈiei de GNU+Linux Trisquel rulând "
"LibreOffice, un program de biroticÄ liber, comparabil cu Microsoft Office
Èi "
@@ -93,16 +103,19 @@
"html\">ghidul de traduceri</a>."
#. type: Content of: <div><p>
-#, fuzzy
-#| msgid "Copyright © 2010, 2013 Free Software Foundation, Inc."
-msgid "Copyright © 2014, 2015 Free Software Foundation, Inc."
-msgstr "Copyright © 2010, 2013 Free Software Foundation, Inc."
+msgid "Copyright © 2015 Jade Levesque"
+msgstr ""
#. 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>."
+"The screenshot is licensed under a <a rel=\"license\" href=\"https://";
+"creativecommons.org/licenses/by-sa/4.0/\">Creative Commons Attribution-"
+"ShareAlike 4.0 International License</a>."
msgstr ""
"AceastÄ paginÄ este licenÈiatÄ sub licenÈa <a rel=\"license\"
href=\"http://";
"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Atribuire - "
@@ -120,6 +133,20 @@
msgid "Updated:"
msgstr "Actualizat la:"
+#, fuzzy
+#~| msgid "Copyright © 2010, 2013 Free Software Foundation, Inc."
+#~ msgid "Copyright © 2014, 2015 Free Software Foundation, Inc."
+#~ msgstr "Copyright © 2010, 2013 Free Software Foundation, Inc."
+
+#~ 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 ""
+#~ "AceastÄ paginÄ este licenÈiatÄ sub licenÈa <a rel=\"license\" href="
+#~ "\"http://creativecommons.org/licenses/by-nd/3.0/us/\";>Creative Commons "
+#~ "Atribuire - FÄrÄ modificÄri 3.0 Statele Unite</a>."
+
# type: Content of: <div><p>
#~ msgid "Copyright © 2014 Free Software Foundation, Inc."
#~ msgstr "Copyright © 2014 Free Software Foundation, Inc."
Index: po/screenshot.ru.po
===================================================================
RCS file: /web/www/www/distros/po/screenshot.ru.po,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- po/screenshot.ru.po 17 Feb 2015 15:29:00 -0000 1.15
+++ po/screenshot.ru.po 29 Oct 2015 09:58:40 -0000 1.16
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: screenshot.html\n"
-"POT-Creation-Date: 2015-02-17 10:25+0000\n"
+"POT-Creation-Date: 2015-10-29 09:55+0000\n"
"PO-Revision-Date: 2015-02-17 17:17+0000\n"
"Last-Translator: Ineiev <address@hidden>\n"
"Language-Team: Russian <address@hidden>\n"
@@ -15,6 +15,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2015-10-29 09:55+0000\n"
#. type: Content of: <title>
msgid "Screenshot of a Free Distro - GNU Project - Free Software Foundation"
@@ -27,14 +28,31 @@
msgstr "Ðид ÑкÑана Ñвободного диÑÑÑибÑÑива"
#. type: Attribute 'alt' of: <p><img>
-msgid "[ Desktop with text processor and spreadsheet windows ]"
+# | [ Desktop with text [-processor-] {+processor, image manipulation
+# | program+} and [-spreadsheet-] {+web browser+} windows ]
+#, fuzzy
+#| msgid "[ Desktop with text processor and spreadsheet windows ]"
+msgid ""
+"[ Desktop with text processor, image manipulation program and web browser "
+"windows ]"
msgstr "[ РабоÑий ÑÑол Ñ Ð¾ÐºÐ½Ð°Ð¼Ð¸ ÑекÑÑового и
ÑаблиÑного пÑоÑеÑÑоÑов ]"
#. type: Content of: <p>
+# | <small>Screenshot of the Trisquel GNU/Linux distribution running
+# | LibreOffice, a free software office suite comparable to Microsoft Office
+# | or Apple [-iWork</small>-] {+iWork; GIMP, a free image manipulation
+# | program comparable to Adobe Photoshop; GNU IceCat, a free web browser
+# | based on Mozilla Firefox.</small>+}
+#, fuzzy
+#| msgid ""
+#| "<small>Screenshot of the Trisquel GNU/Linux distribution running "
+#| "LibreOffice, a free software office suite comparable to Microsoft Office "
+#| "or Apple iWork</small>"
msgid ""
"<small>Screenshot of the Trisquel GNU/Linux distribution running "
"LibreOffice, a free software office suite comparable to Microsoft Office or "
-"Apple iWork</small>"
+"Apple iWork; GIMP, a free image manipulation program comparable to Adobe "
+"Photoshop; GNU IceCat, a free web browser based on Mozilla Firefox.</small>"
msgstr ""
"Ðид ÑкÑана диÑÑÑибÑÑива Trisquel GNU/Linux Ñ
ÑабоÑаÑÑим LibreOffice, "
"ÑвободнÑм пакеÑом канÑелÑÑÑкиÑ
пÑогÑамм,
ÑопоÑÑавимÑм Ñ Microsoft Office."
@@ -87,21 +105,30 @@
"пÑедложениÑм пеÑеводов наÑиÑ
ÑÑаÑей Ñм. в
<a href=\"/server/standards/README."
"translations.html\">“Ð ÑководÑÑве по
пеÑеводам”</a>."
-# type: Content of: <div><p>
#. type: Content of: <div><p>
-msgid "Copyright © 2014, 2015 Free Software Foundation, Inc."
-msgstr "Copyright © 2014, 2015 Free Software Foundation, Inc."
+msgid "Copyright © 2015 Jade Levesque"
+msgstr ""
#. type: Content of: <div><p>
+# | [-This page-]{+The screenshot+} is licensed under a <a rel=\"license\"
+# | [-href=\"http://creativecommons.org/licenses/by-nd/4.0/\";>Creative-]
+# | {+href=\"https://creativecommons.org/licenses/by-sa/4.0/\";>Creative+}
+# | Commons [-Attribution-NoDerivatives-] {+Attribution-ShareAlike+} 4.0
+# | International License</a>.
+#, 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>."
+"The screenshot is licensed under a <a rel=\"license\" href=\"https://";
+"creativecommons.org/licenses/by-sa/4.0/\">Creative Commons Attribution-"
+"ShareAlike 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.
@@ -119,5 +146,9 @@
msgstr "Ðбновлено:"
# type: Content of: <div><p>
+#~ msgid "Copyright © 2014, 2015 Free Software Foundation, Inc."
+#~ msgstr "Copyright © 2014, 2015 Free Software Foundation, Inc."
+
+# type: Content of: <div><p>
#~ msgid "Copyright © 2014 Free Software Foundation, Inc."
#~ msgstr "Copyright © 2014 Free Software Foundation, Inc."
Index: po/screenshot.uk.po
===================================================================
RCS file: /web/www/www/distros/po/screenshot.uk.po,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- po/screenshot.uk.po 2 Mar 2015 18:27:01 -0000 1.12
+++ po/screenshot.uk.po 29 Oct 2015 09:58:40 -0000 1.13
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: screenshot.html\n"
-"POT-Creation-Date: 2015-02-17 10:25+0000\n"
+"POT-Creation-Date: 2015-10-29 09:55+0000\n"
"PO-Revision-Date: 2015-03-02 20:02+0200\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-10-29 09:55+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"
@@ -29,14 +30,24 @@
msgstr "ÐнÑмок екÑÐ°Ð½Ñ Ð²ÑлÑного диÑÑÑибÑÑива"
#. type: Attribute 'alt' of: <p><img>
-msgid "[ Desktop with text processor and spreadsheet windows ]"
+#, fuzzy
+#| msgid "[ Desktop with text processor and spreadsheet windows ]"
+msgid ""
+"[ Desktop with text processor, image manipulation program and web browser "
+"windows ]"
msgstr "[СÑÑлÑниÑÑ Ð· вÑкнами ÑекÑÑового Ñ
ÑаблиÑного пÑоÑеÑоÑа]"
#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "<small>Screenshot of the Trisquel GNU/Linux distribution running "
+#| "LibreOffice, a free software office suite comparable to Microsoft Office "
+#| "or Apple iWork</small>"
msgid ""
"<small>Screenshot of the Trisquel GNU/Linux distribution running "
"LibreOffice, a free software office suite comparable to Microsoft Office or "
-"Apple iWork</small>"
+"Apple iWork; GIMP, a free image manipulation program comparable to Adobe "
+"Photoshop; GNU IceCat, a free web browser based on Mozilla Firefox.</small>"
msgstr ""
"<small>ÐнÑмок екÑÐ°Ð½Ñ Ð´Ð¸ÑÑÑибÑÑÐ¸Ð²Ñ Trisquel GNU/Linux
distribution Ñз "
"запÑÑеним LibreOffice, вÑлÑним оÑÑÑним пакеÑом
пÑогÑам, ÑпÑвÑÑавним з "
@@ -93,15 +104,19 @@
"translations.html\">“ÐоÑÑÐ±Ð½Ð¸ÐºÑ Ð·
пеÑекладє</a>."
#. type: Content of: <div><p>
-msgid "Copyright © 2014, 2015 Free Software Foundation, Inc."
+msgid "Copyright © 2015 Jade Levesque"
msgstr ""
-"Copyright © 2014, 2015 Фонд вÑлÑного пÑогÑамного
забезпеÑеннÑ, Inc."
#. 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>."
+"The screenshot is licensed under a <a rel=\"license\" href=\"https://";
+"creativecommons.org/licenses/by-sa/4.0/\">Creative Commons Attribution-"
+"ShareAlike 4.0 International License</a>."
msgstr ""
"Ð¦Ñ ÑÑоÑÑнка доÑÑÑпна на ÑмоваÑ
<a rel=\"license\"
href=\"http://";
"creativecommons.org/licenses/by-nd/3.0/us/deed.uk\"> лÑÑензÑÑ
Creative "
@@ -119,6 +134,10 @@
msgid "Updated:"
msgstr "Ðновлено:"
+#~ msgid "Copyright © 2014, 2015 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright © 2014, 2015 Фонд вÑлÑного
пÑогÑамного забезпеÑеннÑ, Inc."
+
# type: Content of: <div><p>
#~ msgid "Copyright © 2014 Free Software Foundation, Inc."
#~ msgstr "Copyright © 2014 Фонд вÑлÑного
пÑогÑамного забезпеÑеннÑ, Inc."
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- www/distros screenshot.ml.html screenshot.ro.ht...,
GNUN <=