From: Vitaliy Grishenko <vitolink@gmail.com>
Date: Wed, 30 Jul 2014 19:20:16 +0000 (+0400)
Subject: last fixes
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=205a5bb9dc6d4f5585f0f2c5e3a592e0ef066f09;p=enc-live.git

last fixes
---

205a5bb9dc6d4f5585f0f2c5e3a592e0ef066f09
diff --cc ru/index.html
index 11a5cf4,a17b34d..f7d4a22
--- a/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 340b32e,891605a..32ce139
--- a/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 17c6f41,26bf914..8407c39
--- a/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>