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

[GNUN]

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     15/02/02 04:26:42

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

Log message:
        Automatic update by GNUnited Nations.

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

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.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- whats-wrong-with-youtube.ru.po      2 Feb 2015 03:58:11 -0000       1.9
+++ whats-wrong-with-youtube.ru.po      2 Feb 2015 04:26:42 -0000       1.10
@@ -7,8 +7,13 @@
 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"
@@ -64,15 +69,21 @@
 
 #. type: Content of: <ul><li><ul><li>
 # | In the [-default-] (non-HTML5) mode, it involves use of Flash [-Player.-]
-# | {+Player, which is non-free.+}  It even tells users to install Flash
+# | {+Player, which is nonfree.+}  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. (С января "