last fixes

diff --cc ru/index.html
index 11a5cf46c9c1002e087ccdc19bac66aa4e3e09ab,a17b34de91b5b97356379a774a2b1a2be18e9031..f7d4a228381aa51006294344528a481ef03c7de2
--- 1/ru/index.html
--- 2/ru/index.html
+++ b/ru/index.html
@@@ -49,8 -49,16 +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>

diff --cc ru/mac.html
index 340b32ea588446887e2e92b25a2ac380f017c116,891605a660491770021fe4e02790344d8e20454e..32ce139178c1c6c27d0efeb4f5ae54eb71435571
--- 1/ru/mac.html
--- 2/ru/mac.html
+++ b/ru/mac.html
@@@ -49,8 -49,16 +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>

diff --cc ru/windows.html
index 17c6f41a311c4daadcb021d76749d9c39288d646,26bf914bbd5c8881539c2b222ed3b421fef2f8ca..8407c39f372767f04917cbc9a0c5703eb239a605
--- 1/ru/windows.html
--- 2/ru/windows.html
+++ b/ru/windows.html
@@@ -46,11 -46,19 +46,24 @@@
                                <a href="mac.html">Mac OS</a>
                              </li>
                            <li>
-                               <a href="windows.html">Windows</a>
+                               <a href="windows.html" class="current">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>