[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/education edu-software-gimp.html education....
|
From: |
Therese Godefroy |
|
Subject: |
www/education edu-software-gimp.html education.... |
|
Date: |
Sat, 17 Apr 2021 10:47:30 -0400 (EDT) |
CVSROOT: /webcvs/www
Module name: www
Changes by: Therese Godefroy <th_g> 21/04/17 10:47:30
Modified files:
education : edu-software-gimp.html education.html
education.zh-cn.html
how-i-fought-to-graduate-without-using-non-free-software.html
education/po : education.pot education.zh-cn-en.html
education.zh-cn.po
Log message:
Link to side-menu.css; set Disable_top-addendum; adjust icon sizes.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/education/edu-software-gimp.html?cvsroot=www&r1=1.31&r2=1.32
http://web.cvs.savannah.gnu.org/viewcvs/www/education/education.html?cvsroot=www&r1=1.72&r2=1.73
http://web.cvs.savannah.gnu.org/viewcvs/www/education/education.zh-cn.html?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/education/how-i-fought-to-graduate-without-using-non-free-software.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/education.pot?cvsroot=www&r1=1.49&r2=1.50
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/education.zh-cn-en.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/education.zh-cn.po?cvsroot=www&r1=1.21&r2=1.22
Patches:
Index: edu-software-gimp.html
===================================================================
RCS file: /webcvs/www/www/education/edu-software-gimp.html,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- edu-software-gimp.html 30 Dec 2020 10:57:12 -0000 1.31
+++ edu-software-gimp.html 17 Apr 2021 14:47:30 -0000 1.32
@@ -7,12 +7,16 @@
<style type="text/css" media="screen"><!--
#content h2 { text-align: center; }
#mani-movie {
- width: 40em; max-width: 100%;
+ width: 37.7em; max-width: 100%;
margin: 2em auto;
}
-#mani-movie video { width: 100%; margin-bottom: .3em; }
+#mani-movie video { width: 100%; }
#mani-movie p { margin: .5em 0 0; text-align: justify; }
-#mani-movie .emph-box { font-size: smaller; padding: .7em 1.2em 1.2em; }
+#mani-movie .emph-box {
+ font-size: smaller;
+ padding: .4em 1.2em 1.1em;
+ margin-top: 0;
+}
--></style>
<!--#include virtual="/education/po/edu-software-gimp.translist" -->
<!--#include virtual="/server/banner.html" -->
@@ -296,7 +300,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2020/12/30 10:57:12 $
+$Date: 2021/04/17 14:47:30 $
<!-- timestamp end -->
</p>
</div>
Index: education.html
===================================================================
RCS file: /webcvs/www/www/education/education.html,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -b -r1.72 -r1.73
--- education.html 31 Jul 2020 07:59:47 -0000 1.72
+++ education.html 17 Apr 2021 14:47:30 -0000 1.73
@@ -5,31 +5,26 @@
<title>Free Software and Education
- GNU Project - Free Software Foundation</title>
<link rel="stylesheet" type="text/css" href="/side-menu.css" media="screen" />
-<style type="text/css" media="screen">
-<!--
+<style type="text/css" media="screen"><!--
#video-container {
width: 40em; max-width: 100%;
margin: 1.5em auto;
}
#video-container p { text-align: justify; }
#rms-movie { width: 100%; }
+.table { text-align: center; }
+.table ul { display: inline-block; margin: auto; text-align: left; }
+.table ul, .edu-note { text-align: left; }
+.table ul, .table ul li:first-child { margin-top: 0; }
@media (min-width: 48em) {
- #content .edu-note {
- float: right;
- max-width: 40%;
- margin: 3.2em 0 2.5em 1.5em;
+ .table { display: table; margin-bottom: 1.5em; }
+ .table ul, .edu-note {
+ display: table-cell;
+ vertical-align: middle;
}
-}-->
-<!--#if expr="$LANGUAGE_SUFFIX = /[.](ar|fa|he)/" -->
-<!--
-@media (min-width: 48em) {
- #content .edu-note {
- float: left;
- margin: 3.4em 1.5em 2.5em 0;
- }
-}-->
-<!--#endif -->
-</style>
+ .edu-note { width: 45%; max-width: 45%; padding-left: 2em; }
+}
+--></style>
<!--#include virtual="/education/po/education.translist" -->
<!--#include virtual="/server/banner.html" -->
<div class="nav">
@@ -142,13 +137,8 @@
</p></div> <!-- /.emph-box -->
</div>
-<div class="edu-note"><p>
-We are looking for free educational games, or information about free games
-that can be used for educational purposes. Contact
-<a href="mailto:education@gnu.org";><education@gnu.org></a>.
-</p></div>
-
<h3 id="indepth">In Depth</h3>
+<div class="table">
<ul>
<li>Learn about the <a href="/education/edu-why.html">Reasons Why</a>
educational institutions should use and teach exclusively Free Software.</li>
@@ -160,6 +150,13 @@
<li>An article by Dr. V. Sasi Kumar on the
<a href="/education/edu-system-india.html">education system in India</a>.</li>
</ul>
+
+<div class="edu-note"><p>
+We are looking for free educational games, or information about free games
+that can be used for educational purposes. Contact
+<a href="mailto:education@gnu.org";><education@gnu.org></a>.
+</p></div>
+</div>
</div>
</div>
@@ -204,7 +201,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2020/07/31 07:59:47 $
+$Date: 2021/04/17 14:47:30 $
<!-- timestamp end -->
</p>
</div>
Index: education.zh-cn.html
===================================================================
RCS file: /webcvs/www/www/education/education.zh-cn.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- education.zh-cn.html 1 Aug 2020 08:59:42 -0000 1.6
+++ education.zh-cn.html 17 Apr 2021 14:47:30 -0000 1.7
@@ -8,34 +8,26 @@
<!-- This file is automatically generated by GNUnited Nations! -->
<title>èªç±è½¯ä»¶ä¸æè² - GNU å·¥ç¨ - èªç±è½¯ä»¶åºéä¼</title>
<link rel="stylesheet" type="text/css" href="/side-menu.css" media="screen" />
-<style type="text/css" media="screen">
-<!--
+<style type="text/css" media="screen"><!--
#video-container {
width: 40em; max-width: 100%;
margin: 1.5em auto;
}
#video-container p { text-align: justify; }
#rms-movie { width: 100%; }
+.table { text-align: center; }
+.table ul { display: inline-block; margin: auto; text-align: left; }
+.table ul, .edu-note { text-align: left; }
+.table ul, .table ul li:first-child { margin-top: 0; }
@media (min-width: 48em) {
- #content .edu-note {
- float: right;
- max-width: 40%;
- margin: 3.2em 0 2.5em 1.5em;
+ .table { display: table; margin-bottom: 1.5em; }
+ .table ul, .edu-note {
+ display: table-cell;
+ vertical-align: middle;
}
-}-->
-<!--#if expr="$LANGUAGE_SUFFIX = /[.](ar|fa|he)/" -->
-<!--
-@media (min-width: 48em) {
- #content .edu-note {
- float: left;
- margin: 3.4em 1.5em 2.5em 0;
- }
-}-->
-<!--#endif -->
-
-
-
-
+ .edu-note { width: 45%; max-width: 45%; padding-left: 2em; }
+}
+-->
</style>
<!--#include virtual="/education/po/education.translist" -->
@@ -127,12 +119,8 @@
<!-- /.emph-box -->
</div>
-<div class="edu-note"><p>
-æ们æ£å¯»æ¾èªç±çæè²æ¸¸æï¼æè
æ¯å
³äºå¯ç¨äºæè²çèªç±æ¸¸æçä¿¡æ¯ã详æ
请èç³» <a
-href="mailto:education@gnu.org";><education@gnu.org></a>
-</p></div>
-
<h3 id="indepth">è¾æ·±å±æ¬¡</h3>
+<div class="table">
<ul>
<li>äºè§£æ´å¤æå
³ä¸ºä»ä¹æè²æºæåºä½¿ç¨èªç±è½¯ä»¶ç <a
href="/education/edu-why.html">çç±</a>ã</li>
@@ -142,6 +130,12 @@
<li>ä¸ç¯ç± V. Sasi Kumar å士æ°åçæç« ï¼<a
href="/education/edu-system-india.html">å°åº¦çæè²ç³»ç»</a>ã</li>
</ul>
+
+<div class="edu-note"><p>
+æ们æ£å¯»æ¾èªç±çæè²æ¸¸æï¼æè
æ¯å
³äºå¯ç¨äºæè²çèªç±æ¸¸æçä¿¡æ¯ã详æ
请èç³» <a
+href="mailto:education@gnu.org";><education@gnu.org></a>
+</p></div>
+</div>
</div>
<div class="translators-notes">
@@ -197,7 +191,7 @@
<p class="unprintable"><!-- timestamp start -->
æåæ´æ°ï¼
-$Date: 2020/08/01 08:59:42 $
+$Date: 2021/04/17 14:47:30 $
<!-- timestamp end -->
</p>
Index: how-i-fought-to-graduate-without-using-non-free-software.html
===================================================================
RCS file:
/webcvs/www/www/education/how-i-fought-to-graduate-without-using-non-free-software.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- how-i-fought-to-graduate-without-using-non-free-software.html 17 Apr
2021 13:57:35 -0000 1.1
+++ how-i-fought-to-graduate-without-using-non-free-software.html 17 Apr
2021 14:47:30 -0000 1.2
@@ -1,22 +1,23 @@
<!--#include virtual="/server/header.html" -->
<!-- Parent-Version: 1.96 -->
<!-- This page is derived from /server/standards/boilerplate.html -->
-
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
<title>How I Fought To Graduate Without Using Nonfree Software
- GNU Project - Free Software Foundation</title>
+<link rel="stylesheet" type="text/css" href="/side-menu.css" media="screen" />
<!--#include virtual="/server/gnun/initial-translations-list.html" -->
<!--#include virtual="/server/banner.html" -->
<div class="nav">
<a id="side-menu-button" class="switch" href="#navlinks">
- <img id="side-menu-icon" height="32"
+ <img id="side-menu-icon" height="25" width:="31"
src="/graphics/icons/side-menu.png"
title="Education Contents"
alt=" [Education Contents] " />
</a>
<p class="breadcrumb">
- <a href="/"><img src="/graphics/icons/home.png" height="24"
+ <a href="/"><img src="/graphics/icons/home.png" height="26" width="26"
alt="GNU Home" title="GNU Home" /></a> /
<a href="/education/education.html">Education</a> /
<a href="/education/resisting-proprietary-software.html">Resistance</a> /
@@ -340,7 +341,7 @@
GNU Project (https://gnu.org)</p>
</div>
-</div><!-- for id="content", starts in the include above -->
+</div>
<!--#include virtual="/education/education-menu.html" -->
<!--#include virtual="/server/footer.html" -->
<div id="footer" role="contentinfo">
@@ -398,7 +399,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2021/04/17 13:57:35 $
+$Date: 2021/04/17 14:47:30 $
<!-- timestamp end -->
</p>
</div>
Index: po/education.pot
===================================================================
RCS file: /webcvs/www/www/education/po/education.pot,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- po/education.pot 31 Jul 2020 07:55:33 -0000 1.49
+++ po/education.pot 17 Apr 2021 14:47:30 -0000 1.50
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: education.html\n"
-"POT-Creation-Date: 2020-07-31 07:55+0000\n"
+"POT-Creation-Date: 2021-04-15 11:34+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -146,35 +146,35 @@
"languages</a>."
msgstr ""
-#. type: Content of: <div><div><div><p>
-msgid ""
-"We are looking for free educational games, or information about free games "
-"that can be used for educational purposes. Contact <a "
-"href=\"mailto:education@gnu.org\";><education@gnu.org></a>."
-msgstr ""
-
#. type: Content of: <div><div><h3>
msgid "In Depth"
msgstr ""
-#. type: Content of: <div><div><ul><li>
+#. type: Content of: <div><div><div><ul><li>
msgid ""
"Learn about the <a href=\"/education/edu-why.html\">Reasons Why</a> "
"educational institutions should use and teach exclusively Free Software."
msgstr ""
-#. type: Content of: <div><div><ul><li>
+#. type: Content of: <div><div><div><ul><li>
msgid ""
"An article by Richard Stallman: <a href=\"/education/edu-schools.html\">Why "
"Schools Should Exclusively Use Free Software</a>."
msgstr ""
-#. type: Content of: <div><div><ul><li>
+#. type: Content of: <div><div><div><ul><li>
msgid ""
"An article by Dr. V. Sasi Kumar on the <a "
"href=\"/education/edu-system-india.html\">education system in India</a>."
msgstr ""
+#. type: Content of: <div><div><div><div><p>
+msgid ""
+"We are looking for free educational games, or information about free games "
+"that can be used for educational purposes. Contact <a "
+"href=\"mailto:education@gnu.org\";><education@gnu.org></a>."
+msgstr ""
+
#. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
#. type: Content of: <div><div>
msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
Index: po/education.zh-cn-en.html
===================================================================
RCS file: /webcvs/www/www/education/po/education.zh-cn-en.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- po/education.zh-cn-en.html 1 Aug 2020 08:59:42 -0000 1.4
+++ po/education.zh-cn-en.html 17 Apr 2021 14:47:30 -0000 1.5
@@ -5,31 +5,26 @@
<title>Free Software and Education
- GNU Project - Free Software Foundation</title>
<link rel="stylesheet" type="text/css" href="/side-menu.css" media="screen" />
-<style type="text/css" media="screen">
-<!--
+<style type="text/css" media="screen"><!--
#video-container {
width: 40em; max-width: 100%;
margin: 1.5em auto;
}
#video-container p { text-align: justify; }
#rms-movie { width: 100%; }
+.table { text-align: center; }
+.table ul { display: inline-block; margin: auto; text-align: left; }
+.table ul, .edu-note { text-align: left; }
+.table ul, .table ul li:first-child { margin-top: 0; }
@media (min-width: 48em) {
- #content .edu-note {
- float: right;
- max-width: 40%;
- margin: 3.2em 0 2.5em 1.5em;
+ .table { display: table; margin-bottom: 1.5em; }
+ .table ul, .edu-note {
+ display: table-cell;
+ vertical-align: middle;
}
-}-->
-<!--#if expr="$LANGUAGE_SUFFIX = /[.](ar|fa|he)/" -->
-<!--
-@media (min-width: 48em) {
- #content .edu-note {
- float: left;
- margin: 3.4em 1.5em 2.5em 0;
- }
-}-->
-<!--#endif -->
-</style>
+ .edu-note { width: 45%; max-width: 45%; padding-left: 2em; }
+}
+--></style>
<!--#include virtual="/education/po/education.translist" -->
<!--#include virtual="/server/banner.html" -->
<div class="nav">
@@ -142,13 +137,8 @@
</p></div> <!-- /.emph-box -->
</div>
-<div class="edu-note"><p>
-We are looking for free educational games, or information about free games
-that can be used for educational purposes. Contact
-<a href="mailto:education@gnu.org";><education@gnu.org></a>.
-</p></div>
-
<h3 id="indepth">In Depth</h3>
+<div class="table">
<ul>
<li>Learn about the <a href="/education/edu-why.html">Reasons Why</a>
educational institutions should use and teach exclusively Free Software.</li>
@@ -160,6 +150,13 @@
<li>An article by Dr. V. Sasi Kumar on the
<a href="/education/edu-system-india.html">education system in India</a>.</li>
</ul>
+
+<div class="edu-note"><p>
+We are looking for free educational games, or information about free games
+that can be used for educational purposes. Contact
+<a href="mailto:education@gnu.org";><education@gnu.org></a>.
+</p></div>
+</div>
</div>
</div>
@@ -204,7 +201,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2020/08/01 08:59:42 $
+$Date: 2021/04/17 14:47:30 $
<!-- timestamp end -->
</p>
</div>
Index: po/education.zh-cn.po
===================================================================
RCS file: /webcvs/www/www/education/po/education.zh-cn.po,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- po/education.zh-cn.po 1 Aug 2020 08:59:42 -0000 1.21
+++ po/education.zh-cn.po 17 Apr 2021 14:47:30 -0000 1.22
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: education.html\n"
-"POT-Creation-Date: 2020-07-31 07:55+0000\n"
+"POT-Creation-Date: 2021-04-15 11:34+0200\n"
"PO-Revision-Date: 2020-08-01 16:27+0800\n"
"Last-Translator: Wensheng Xie <wxie@member.fsf.org>\n"
"Language-Team: Chinese <www-zh-cn-translators@gnu.org>\n"
@@ -171,20 +171,11 @@
"<a
href=\"/education/misc/edu-misc.html#subtitles-rms-education\">æ´å¤è¯è¨</"
"a> å¯ä¾ä¸è½½ã"
-#. type: Content of: <div><div><div><p>
-msgid ""
-"We are looking for free educational games, or information about free games "
-"that can be used for educational purposes. Contact <a href=\"mailto:";
-"education@gnu.org\"><education@gnu.org></a>."
-msgstr ""
-"æ们æ£å¯»æ¾èªç±çæè²æ¸¸æï¼æè
æ¯å
³äºå¯ç¨äºæè²çèªç±æ¸¸æçä¿¡æ¯ã详æ
请èç³» "
-"<a href=\"mailto:education@gnu.org\";><education@gnu.org></a>"
-
#. type: Content of: <div><div><h3>
msgid "In Depth"
msgstr "è¾æ·±å±æ¬¡"
-#. type: Content of: <div><div><ul><li>
+#. type: Content of: <div><div><div><ul><li>
msgid ""
"Learn about the <a href=\"/education/edu-why.html\">Reasons Why</a> "
"educational institutions should use and teach exclusively Free Software."
@@ -192,7 +183,7 @@
"äºè§£æ´å¤æå
³ä¸ºä»ä¹æè²æºæåºä½¿ç¨èªç±è½¯ä»¶ç <a
href=\"/education/edu-why.html"
"\">çç±</a>ã"
-#. type: Content of: <div><div><ul><li>
+#. type: Content of: <div><div><div><ul><li>
msgid ""
"An article by Richard Stallman: <a href=\"/education/edu-schools.html\">Why "
"Schools Should Exclusively Use Free Software</a>."
@@ -200,7 +191,7 @@
"ä¸ç¯ç± Richard Stallman æ°åçæç« ï¼<a
href=\"/education/edu-schools.html\">"
"为ä»ä¹å¨å¦æ ¡ä¸åªåºä½¿ç¨èªç±è½¯ä»¶</a>ã"
-#. type: Content of: <div><div><ul><li>
+#. type: Content of: <div><div><div><ul><li>
msgid ""
"An article by Dr. V. Sasi Kumar on the <a href=\"/education/edu-system-india."
"html\">education system in India</a>."
@@ -208,6 +199,15 @@
"ä¸ç¯ç± V. Sasi Kumar å士æ°åçæç« ï¼<a
href=\"/education/edu-system-india."
"html\">å°åº¦çæè²ç³»ç»</a>ã"
+#. type: Content of: <div><div><div><div><p>
+msgid ""
+"We are looking for free educational games, or information about free games "
+"that can be used for educational purposes. Contact <a href=\"mailto:";
+"education@gnu.org\"><education@gnu.org></a>."
+msgstr ""
+"æ们æ£å¯»æ¾èªç±çæè²æ¸¸æï¼æè
æ¯å
³äºå¯ç¨äºæè²çèªç±æ¸¸æçä¿¡æ¯ã详æ
请èç³» "
+"<a href=\"mailto:education@gnu.org\";><education@gnu.org></a>"
+
#. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
#. type: Content of: <div><div>
msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- www/education edu-software-gimp.html education....,
Therese Godefroy <=