From: Greg Farough <gregf@fsf.org>
Date: Mon, 6 Jan 2020 15:18:35 +0000 (-0500)
Subject: Merge branch 'master' of vcs.fsf.org:fsf-giving-guide
X-Git-Url: https://vcs.fsf.org/?p=fsf-giving-guide.git;a=commitdiff_plain;h=58976f8baeeac379f010fc29fde4a7fcb148194f;hp=c66ac69455d0cbb794ca174f492f9e2199c8d107

Merge branch 'master' of vcs.fsf.org:fsf-giving-guide
---

diff --git a/v10/givingguide.html b/v10/givingguide.html
index ffa52ec..ec93f48 100644
--- a/v10/givingguide.html
+++ b/v10/givingguide.html
@@ -335,18 +335,24 @@
                                 <div id="fsf-modal-window-elem-close-button" onclick="//fsfModalWindowElemDontShowForAWhile();">
                                     <i class="fa fa-close">&#8203;</i>
                                 </div>
-                                <h2>Join us and make an impact!</h2>
+                                <h2>Join us and make a difference!</h2>
                             </div>
                             <div id="fsf-modal-window-elem-left-column">
                                 <div id="fsf-modal-window-elem-text">
 
 <p>
 
-Our associate members are the heart of the FSF's commitment to a society where software respects our freedom and dignity. Every individual that takes a stand will help us reach our goal to welcome 600 new free software advocates by December 31st.
+With your help, we can make this new decade one in which tools and devices will no longer control their users.
 
 </p>
 
-<p><span id="fsf-modal-window-text-link"><a href="https://www.fsf.org/appeal?pk_campaign=frfall2019&pk_kwd=learn-more&pk_source=modal">READ MORE</a> | <a href="https://my.fsf.org/join?pk_campaign=frfall2019&pk_source=modal2">JOIN</a></span></p>
+<p>
+
+To ring in 2020, we're extending our offer for exclusive gifts to all new or renewing annual associate members until January 17th.
+
+</p>
+
+<p><span id="fsf-modal-window-text-link"><a href="https://www.fsf.org/appeal?pk_campaign=frfall2019&pk_kwd=learn-more&pk_source=modal">READ MORE</a> | <a href="https://www.fsf.org/blogs/community/presenting-shoetool-happy-holidays-from-the-fsf?pk_campaign=frfall2019&pk_source=modal2">WATCH THE VIDEO</a></span></p>
 
                                 </div>
                             </div>
@@ -377,7 +383,7 @@ var startTime, endTime, switchTextTime;
 
 startTime = new Date('2019-11-18T04:00:00Z');
 switchTextTime = new Date('2019-12-12T04:00:00Z');
-endTime = new Date('2020-01-01T04:00:00Z');
+endTime = new Date('2020-01-18T04:00:00Z');
 
 // possibly switch the text that is displayed in the modal window, depending
 // upon the current date.
@@ -393,9 +399,9 @@ function fsfModalWindowElemMaybeSwitchText () {
     // switch dbd text
     document.getElementById("fsf-modal-window-elem-text").innerHTML =' \
 \
-<p>Our associate members are the heart of the FSF\'s commitment to a society where software respects our freedom and dignity. Every individual that takes a stand will help us reach our goal to welcome 600 new free software advocates by December 31st.<\/p> \
+<p>With your help, we can make this new decade one in which tools and devices will no longer control their users.<\/p><p>To ring in 2020, we\'re extending our offer for exclusive gifts to all new or renewing annual associate members until January 17th.<\/p> \
 \
-<p><span id="fsf-modal-window-text-link"><a href="https://www.fsf.org/appeal?pk_campaign=frfall2019&pk_kwd=learn-more&pk_source=modal">READ MORE<\/a> | <a href="https://my.fsf.org/join?pk_campaign=frfall2019&pk_source=modal2">JOIN<\/a><\/span><\/p>';
+<p><span id="fsf-modal-window-text-link"><a href="https://www.fsf.org/appeal?pk_campaign=frfall2019&pk_kwd=learn-more&pk_source=modal">READ MORE<\/a> | <a href="https://www.fsf.org/blogs/community/presenting-shoetool-happy-holidays-from-the-fsf?pk_campaign=frfall2019&pk_source=modal2">WATCH THE VIDEO<\/a><\/span><\/p>';
 }
 
 // show fsf-modal-window-elem if it hasn't been previously closed by
@@ -536,7 +542,7 @@ window.addEventListener("keydown",  function  (event)  {
           <div class="illustration col-md-6">
 			<center>
             <img src="img/Illustration.png" alt="large-illutration" class="img-responsive center-dblock" /><hr />
-			<video style="width: 100%; max-width: 640px;" controls="controls" poster="https://static.fsf.org/nosvn/videos/fsf-shoetool/thumbnails/ShoeTool-Cover-1.jpg" crossorigin="anonymous"><source src="https://static.fsf.org/nosvn/videos/fsf-shoetool/fsf-shoetool-720p.mp4" type="video/mp4" /><track kind="subtitles" label="English" srclang="en" src="https://static.fsf.org/nosvn/videos/fsf-shoetool/captions/shoetoolfsf_en.vtt" default="default" /></video>
+                        <video style="width: 100%; max-width: 640px;" controls="controls" poster="https://static.fsf.org/nosvn/videos/fsf-shoetool/thumbnails/ShoeTool-Cover-1.jpg" crossorigin="anonymous"><source src="https://static.fsf.org/nosvn/videos/fsf-shoetool/fsf-shoetool-720p.mp4" type="video/mp4" /><source src="https://static.fsf.org/nosvn/videos/fsf-shoetool/fsf-shoetool-720p.webm" type="video/webm" /><source src="https://static.fsf.org/nosvn/videos/fsf-shoetool/fsf-shoetool-720p.ogv" type="video/ogg" /><track kind="subtitles" label="English" srclang="en" src="https://static.fsf.org/nosvn/videos/fsf-shoetool/captions/shoetoolfsf_en.vtt" default="default" /></video>
 			</center>
           </div>
           <div class="intro-text col-md-6">
diff --git a/v9/givingguide.html b/v9/givingguide.html
index 7c16343..8d481b9 100644
--- a/v9/givingguide.html
+++ b/v9/givingguide.html
@@ -335,18 +335,24 @@
                                 <div id="fsf-modal-window-elem-close-button" onclick="//fsfModalWindowElemDontShowForAWhile();">
                                     <i class="fa fa-close">&#8203;</i>
                                 </div>
-                                <h2>Join us and make an impact!</h2>
+                                <h2>Join us and make a difference!</h2>
                             </div>
                             <div id="fsf-modal-window-elem-left-column">
                                 <div id="fsf-modal-window-elem-text">
 
 <p>
 
-Our associate members are the heart of the FSF's commitment to a society where software respects our freedom and dignity. Every individual that takes a stand will help us reach our goal to welcome 600 new free software advocates by December 31st.
+With your help, we can make this new decade one in which tools and devices will no longer control their users.
 
 </p>
 
-<p><span id="fsf-modal-window-text-link"><a href="https://www.fsf.org/appeal?pk_campaign=frfall2019&pk_kwd=learn-more&pk_source=modal">READ MORE</a> | <a href="https://my.fsf.org/join?pk_campaign=frfall2019&pk_source=modal2">JOIN</a></span></p>
+<p>
+
+To ring in 2020, we're extending our offer for exclusive gifts to all new or renewing annual associate members until January 17th.
+
+</p>
+
+<p><span id="fsf-modal-window-text-link"><a href="https://www.fsf.org/appeal?pk_campaign=frfall2019&pk_kwd=learn-more&pk_source=modal">READ MORE</a> | <a href="https://www.fsf.org/blogs/community/presenting-shoetool-happy-holidays-from-the-fsf?pk_campaign=frfall2019&pk_source=modal2">WATCH THE VIDEO</a></span></p>
 
                                 </div>
                             </div>
@@ -377,7 +383,7 @@ var startTime, endTime, switchTextTime;
 
 startTime = new Date('2019-11-18T04:00:00Z');
 switchTextTime = new Date('2019-12-12T04:00:00Z');
-endTime = new Date('2020-01-01T04:00:00Z');
+endTime = new Date('2020-01-18T04:00:00Z');
 
 // possibly switch the text that is displayed in the modal window, depending
 // upon the current date.
@@ -393,9 +399,9 @@ function fsfModalWindowElemMaybeSwitchText () {
     // switch dbd text
     document.getElementById("fsf-modal-window-elem-text").innerHTML =' \
 \
-<p>Our associate members are the heart of the FSF\'s commitment to a society where software respects our freedom and dignity. Every individual that takes a stand will help us reach our goal to welcome 600 new free software advocates by December 31st.<\/p> \
+<p>With your help, we can make this new decade one in which tools and devices will no longer control their users.<\/p><p>To ring in 2020, we\'re extending our offer for exclusive gifts to all new or renewing annual associate members until January 17th.<\/p> \
 \
-<p><span id="fsf-modal-window-text-link"><a href="https://www.fsf.org/appeal?pk_campaign=frfall2019&pk_kwd=learn-more&pk_source=modal">READ MORE<\/a> | <a href="https://my.fsf.org/join?pk_campaign=frfall2019&pk_source=modal2">JOIN<\/a><\/span><\/p>';
+<p><span id="fsf-modal-window-text-link"><a href="https://www.fsf.org/appeal?pk_campaign=frfall2019&pk_kwd=learn-more&pk_source=modal">READ MORE<\/a> | <a href="https://www.fsf.org/blogs/community/presenting-shoetool-happy-holidays-from-the-fsf?pk_campaign=frfall2019&pk_source=modal2">WATCH THE VIDEO<\/a><\/span><\/p>';
 }
 
 // show fsf-modal-window-elem if it hasn't been previously closed by