www fry/po/happy-birthday-to-gnu-sfd-totem.sq.p...

[Besnik Bleta]

CVSROOT:        /web/www
Module name:    www
Changes by:     Besnik Bleta <beso>     12/04/11 20:32:02

Modified files:
        fry/po         : happy-birthday-to-gnu-sfd-totem.sq.po 
                         happy-birthday-to-gnu-sfd-vlc.sq.po 
                         happy-birthday-to-gnu-sfd-xine.sq.po 
        po             : home-staged.sq.po 
        server/po      : server.sq.po takeaction.sq.po 

Log message:
        fixing merge conflicts

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/fry/po/happy-birthday-to-gnu-sfd-totem.sq.po?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/fry/po/happy-birthday-to-gnu-sfd-vlc.sq.po?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/fry/po/happy-birthday-to-gnu-sfd-xine.sq.po?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/po/home-staged.sq.po?cvsroot=www&r1=1.32&r2=1.33
http://web.cvs.savannah.gnu.org/viewcvs/www/server/po/server.sq.po?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/server/po/takeaction.sq.po?cvsroot=www&r1=1.51&r2=1.52

Patches:
Index: fry/po/happy-birthday-to-gnu-sfd-totem.sq.po
===================================================================
RCS file: /web/www/www/fry/po/happy-birthday-to-gnu-sfd-totem.sq.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- fry/po/happy-birthday-to-gnu-sfd-totem.sq.po        20 Sep 2011 17:11:09 
-0000      1.5
+++ fry/po/happy-birthday-to-gnu-sfd-totem.sq.po        11 Apr 2012 20:30:13 
-0000      1.6
@@ -6,8 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
+
 "POT-Creation-Date: 2011-09-20 12:26-0300\n"
-"PO-Revision-Date: 2011-01-03 00:19+0200\n"
+"PO-Revision-Date: 2011-01-03 09:21+0200\n"
 "Last-Translator: Besnik Bleta <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
 "MIME-Version: 1.0\n"

Index: fry/po/happy-birthday-to-gnu-sfd-vlc.sq.po
===================================================================
RCS file: /web/www/www/fry/po/happy-birthday-to-gnu-sfd-vlc.sq.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- fry/po/happy-birthday-to-gnu-sfd-vlc.sq.po  20 Sep 2011 17:11:09 -0000      
1.5
+++ fry/po/happy-birthday-to-gnu-sfd-vlc.sq.po  11 Apr 2012 20:30:15 -0000      
1.6
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "POT-Creation-Date: 2011-09-20 12:26-0300\n"
-"PO-Revision-Date: 2011-01-03 00:31+0200\n"
+"PO-Revision-Date: 2011-01-03 09:23+0200\n"
 "Last-Translator: Besnik Bleta <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
 "MIME-Version: 1.0\n"
@@ -216,6 +216,7 @@
 "Të drejta Kopjimi &copy; 2008 <a href=\"http://www.fsf.org\";>Free Software "
 "Foundation</a>, Inc."
 
+
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
 msgid ""

Index: fry/po/happy-birthday-to-gnu-sfd-xine.sq.po
===================================================================
RCS file: /web/www/www/fry/po/happy-birthday-to-gnu-sfd-xine.sq.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- fry/po/happy-birthday-to-gnu-sfd-xine.sq.po 20 Sep 2011 17:11:10 -0000      
1.5
+++ fry/po/happy-birthday-to-gnu-sfd-xine.sq.po 11 Apr 2012 20:30:15 -0000      
1.6
@@ -6,8 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
+
 "POT-Creation-Date: 2011-09-20 12:26-0300\n"
-"PO-Revision-Date: 2011-01-03 00:42+0200\n"
+"PO-Revision-Date: 2011-01-03 09:23+0200\n"
 "Last-Translator: Besnik Bleta <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
 "MIME-Version: 1.0\n"

Index: po/home-staged.sq.po
===================================================================
RCS file: /web/www/www/po/home-staged.sq.po,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- po/home-staged.sq.po        11 Apr 2012 14:02:06 -0000      1.32
+++ po/home-staged.sq.po        11 Apr 2012 20:30:43 -0000      1.33
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "POT-Creation-Date: 2012-04-06 19:00-0300\n"
-"PO-Revision-Date: 2012-04-11 16:00+0200\n"
+"PO-Revision-Date: 2012-04-11 23:22+0200\n"
 "Last-Translator: Besnik Bleta <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
 "Language: \n"

Index: server/po/server.sq.po
===================================================================
RCS file: /web/www/www/server/po/server.sq.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- server/po/server.sq.po      11 Apr 2012 13:13:35 -0000      1.3
+++ server/po/server.sq.po      11 Apr 2012 20:31:18 -0000      1.4
@@ -14,7 +14,6 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Outdated-Since: 2011-11-30 20:25-0500\n"
 
 #. type: Content of: <title>
 msgid "About GNU Servers - GNU Project - Free Software Foundation (FSF)"

Index: server/po/takeaction.sq.po
===================================================================
RCS file: /web/www/www/server/po/takeaction.sq.po,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- server/po/takeaction.sq.po  11 Apr 2012 14:03:00 -0000      1.51
+++ server/po/takeaction.sq.po  11 Apr 2012 20:31:19 -0000      1.52
@@ -14,7 +14,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Outdated-Since: 2012-04-06 19:01-0300\n"
+
 
 # type: Content of: <title>
 #. type: Content of: <title>