www/server/po footer-text.ca.po

[Miquel Puigpelat]

CVSROOT:        /web/www
Module name:    www
Changes by:     Miquel Puigpelat <puigpe>       16/04/23 17:52:02

Modified files:
        server/po      : footer-text.ca.po 

Log message:
        Updated.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/po/footer-text.ca.po?cvsroot=www&r1=1.28&r2=1.29

Patches:
Index: footer-text.ca.po
===================================================================
RCS file: /web/www/www/server/po/footer-text.ca.po,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- footer-text.ca.po   13 Feb 2016 01:30:22 -0000      1.28
+++ footer-text.ca.po   23 Apr 2016 17:52:02 -0000      1.29
@@ -7,15 +7,23 @@
 msgstr ""
 "Project-Id-Version: footer-text.po\n"
 "Report-Msgid-Bugs-To: \n"
+<<<<<<< footer-text.ca.po
+"POT-Creation-Date: 2014-03-29 05:38+0000\n"
+"PO-Revision-Date: 2016-04-23 19:50+0200\n"
+=======
 "POT-Creation-Date: 2016-02-13 01:25+0000\n"
 "PO-Revision-Date: 2014-04-01 20:11+0200\n"
+>>>>>>> 1.28
 "Last-Translator: Miquel Puigpelat <address@hidden>\n"
 "Language-Team: Catalan <address@hidden>\n"
-"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
+<<<<<<< footer-text.ca.po
+"Content-Transfer-Encoding: 8bit"
+=======
 "Content-Transfer-Encoding: 8bit\n"
 "X-Outdated-Since: 2016-02-13 01:25+0000\n"
+>>>>>>> 1.28
 
 # type: Content of: <div><div><div><div><ul><li>
 #. type: Content of: <div><ul><li>