www/fun/jokes/po merry-xmas.pot merry-xmas.tran...

[GNUN]

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     15/08/21 01:27:31

Modified files:
        fun/jokes/po   : merry-xmas.pot merry-xmas.translist 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/merry-xmas.pot?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/merry-xmas.translist?cvsroot=www&r1=1.7&r2=1.8

Patches:
Index: merry-xmas.pot
===================================================================
RCS file: /web/www/www/fun/jokes/po/merry-xmas.pot,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- merry-xmas.pot      7 Jul 2014 06:28:02 -0000       1.8
+++ merry-xmas.pot      21 Aug 2015 01:27:30 -0000      1.9
@@ -7,13 +7,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: merry-xmas.html\n"
-"POT-Creation-Date: 2014-07-07 06:25+0000\n"
+"POT-Creation-Date: 2015-08-21 01:25+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: ENCODING"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <title>
 msgid "Merry Christmas - GNU Project - Free Software Foundation"
@@ -102,17 +103,6 @@
 "for information on coordinating and submitting translations of this article."
 msgstr ""
 
-#. type: Content of: <div><p>
-msgid "Copyright &copy; 2014 Free Software Foundation, Inc."
-msgstr ""
-
-#. type: Content of: <div><p>
-msgid ""
-"This page is licensed under a <a rel=\"license\" "
-"href=\"http://creativecommons.org/licenses/by-nd/3.0/us/\";>Creative Commons "
-"Attribution-NoDerivs 3.0 United States License</a>."
-msgstr ""
-
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
 #. type: Content of: <div><div>
 msgid "*GNUN-SLOT: TRANSLATOR'S CREDITS*"

Index: merry-xmas.translist
===================================================================
RCS file: /web/www/www/fun/jokes/po/merry-xmas.translist,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- merry-xmas.translist        7 Jul 2014 06:28:02 -0000       1.7
+++ merry-xmas.translist        21 Aug 2015 01:27:30 -0000      1.8
@@ -5,9 +5,6 @@
 <span dir="ltr" class="original"><a lang="en" hreflang="en" 
href="/fun/jokes/merry-xmas.en.html">English</a>&nbsp;[en]</span> &nbsp;
 </p>
 </div>' -->
-<!--#if expr="$HTML_BODY = yes" -->
-<!-- Fallback for old position of translist; to be removed
-     when translists in all translations are included before banner.html. -->
-<!--#echo encoding="none" var="TRANSLATION_LIST" -->
-<!--#endif -->
+<link rel="alternate" type="text/html" href="/fun/jokes/merry-xmas.html" 
hreflang="x-default" />
+<link rel="alternate" type="text/html" lang="en" hreflang="en" 
href="/fun/jokes/merry-xmas.en.html" title="English" />
 <!-- end translist file -->