www/philosophy/po whats-wrong-with-youtube.ru.po

[Pavel Kharitonov]

CVSROOT:        /web/www
Module name:    www
Changes by:     Pavel Kharitonov <ineiev>       15/02/02 04:30:12

Modified files:
        philosophy/po  : whats-wrong-with-youtube.ru.po 

Log message:
        Validation fix.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/whats-wrong-with-youtube.ru.po?cvsroot=www&r1=1.10&r2=1.11

Patches:
Index: whats-wrong-with-youtube.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/whats-wrong-with-youtube.ru.po,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- whats-wrong-with-youtube.ru.po      2 Feb 2015 04:26:42 -0000       1.10
+++ whats-wrong-with-youtube.ru.po      2 Feb 2015 04:30:11 -0000       1.11
@@ -7,13 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: whats-wrong-with-youtube.html\n"
-<<<<<<< whats-wrong-with-youtube.ru.po
-"POT-Creation-Date: 2015-02-02 03:55+0000\n"
-"PO-Revision-Date: 2015-01-16 13:34+0000\n"
-=======
 "POT-Creation-Date: 2015-02-02 03:25+0000\n"
 "PO-Revision-Date: 2015-02-02 13:34+0000\n"
->>>>>>> 1.9
 "Last-Translator: Ineiev <address@hidden>\n"
 "Language-Team: Russian <address@hidden>\n"
 "Language: ru\n"
@@ -69,21 +64,15 @@
 
 #. type: Content of: <ul><li><ul><li>
 # | In the [-default-] (non-HTML5) mode, it involves use of Flash [-Player.-]
-# | {+Player, which is nonfree.+}  It even tells users to install Flash
+# | {+Player, which is non-free.+}  It even tells users to install Flash
 # | Player. {+(This mode is deprecated as of January 2015.)+}
 #| msgid ""
 #| "In the default (non-HTML5) mode, it involves use of Flash Player.  It "
 #| "even tells users to install Flash Player."
 msgid ""
-<<<<<<< whats-wrong-with-youtube.ru.po
-"In the (non-HTML5) mode, it involves use of Flash Player, which is nonfree.  "
-"It even tells users to install Flash Player. (This mode is deprecated as of "
-"January 2015.)"
-=======
 "In the (non-HTML5) mode, it involves use of Flash Player, which is non"
 "free.  It even tells users to install Flash Player. (This mode is deprecated "
 "as of January 2015.)"
->>>>>>> 1.9
 msgstr ""
 "Если режим не HTML5, это означает работу с Flash 
Player, который не свободен. Сайт даже "
 "говорит пользователям, чтобы они 
установили Flash Player. (С января "