last fixes

[enc.git] / ru / index.html

diff --git a/ru/index.html b/ru/index.html
index 11a5cf46c9c1002e087ccdc19bac66aa4e3e09ab..f7d4a228381aa51006294344528a481ef03c7de2 100644 (file)
--- a/ru/index.html
+++ b/ru/index.html
@@ -49,8 +49,21 @@
                               <a href="windows.html">Windows</a>
                             </li>
                            <li class="spacer">
+<<<<<<< HEAD
                               <a href="https://fsf.org/share?u=https://u.fsf.org/zb&amp;t=Шифрование эл. почты для каждого via %40fsf">
                                 #ПОДЕЛИТЬСЯ
+=======
+                              <a href="https://fsf.org/share?u=https://u.fsf.org/zb&amp;t=Email encryption for everyone via %40fsf">
+                                #SHARE&nbsp;
+                                <img src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
+                                     class="share-logo" alt="[GNU Social]">&nbsp;
+                                 <img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
+                                      class="share-logo" alt="[Pump.io]">&nbsp;
+                                 <img src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png"
+                                      class="share-logo" alt="[Reddit]">&nbsp;
+                                 <img src="//static.fsf.org/nosvn/enc-dev0/img/hacker-news.png"
+                                      class="share-logo" alt="[Hacker News]">
+>>>>>>> 7a1ff11d3d3eca5a96213305a923e7fc55aa39e8
                               </a>
                             </li>
                          </ul>
@@ -74,7 +87,7 @@
                                     </p>
                                   </div>
 
-                                       <p><a href="https://crm.fsf.org/civicrm/contribute/transact?reset=1&id=14&pk_campaign=esd&pk_kwd=guide_donate"><img alt="Donate" src="//static.fsf.org/nosvn/enc-dev0/img/ru/donate.png"></a>  <!-- Removed join button     <a href="https://u.fsf.org/yr"><img alt="Join now" src="//static.fsf.org/nosvn/enc-dev0/img/ru/join.png"></a></p> -->
+                                       <p><a href="https://crm.fsf.org/civicrm/contribute/transact?reset=1&id=14&pk_campaign=email_self_defense&pk_kwd=guide_donate"><img alt="Donate" src="//static.fsf.org/nosvn/enc-dev0/img/ru/donate.png"></a>  <!-- Removed join button     <a href="https://u.fsf.org/yr"><img alt="Join now" src="//static.fsf.org/nosvn/enc-dev0/img/ru/join.png"></a></p> -->
 
                                </div><!-- End #fsf-intro -->