www-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

www/events/po rms-nyu-2001-transcript.tr.po


From: Therese Godefroy
Subject: www/events/po rms-nyu-2001-transcript.tr.po
Date: Fri, 20 Feb 2015 17:03:55 +0000

CVSROOT:        /webcvs/www
Module name:    www
Changes by:     Therese Godefroy <th_g> 15/02/20 17:03:54

Modified files:
        events/po      : rms-nyu-2001-transcript.tr.po 

Log message:
        Fix validation.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/events/po/rms-nyu-2001-transcript.tr.po?cvsroot=www&r1=1.12&r2=1.13

Patches:
Index: rms-nyu-2001-transcript.tr.po
===================================================================
RCS file: /webcvs/www/www/events/po/rms-nyu-2001-transcript.tr.po,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- rms-nyu-2001-transcript.tr.po       20 Feb 2015 16:37:51 -0000      1.12
+++ rms-nyu-2001-transcript.tr.po       20 Feb 2015 17:03:52 -0000      1.13
@@ -44,8 +44,8 @@
 "May 2001"
 msgstr ""
 "Richard M. Stallman'ın “Özgür Yazılım: Özgürlük ve İşbirliği” 
isimli, New "
-"York'taki New York Üniversitesi'nde, 29 Mayıs 2001 tarihinde yaptığı '
-'konuşmanın metnidir."
+"York'taki New York Üniversitesi'nde, 29 Mayıs 2001 tarihinde yaptığı "
+"konuşmanın metnidir."
 
 # type: Content of: <div><blockquote><p>
 #. type: Content of: <div><blockquote><p>
@@ -4633,36 +4633,19 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
-<<<<<<< rms-nyu-2001-transcript.tr.po
-msgid "Copyright &copy; 2001, 2005, 2006, 2014 Richard M. Stallman"
-msgstr "Copyright &copy; 2001, 2005, 2006, 2014 Richard M. Stallman"
-=======
-#, fuzzy
 #| msgid "Copyright &copy; 2001, 2005, 2006 Richard M. Stallman"
 msgid "Copyright &copy; 2001, 2005, 2006, 2014, 2015 Richard M. Stallman"
-msgstr "Copyright &copy; 2001, 2005, 2006 Richard M. Stallman"
->>>>>>> 1.11
+msgstr "Copyright &copy; 2001, 2005, 2006, 2014, 2015 Richard M. Stallman"
 
 #. type: Content of: <div><p>
-#, fuzzy
-#| 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>."
 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 ""
-<<<<<<< rms-nyu-2001-transcript.tr.po
 "Bu sayfa a <a rel=\"license\" href=\"http://creativecommons.org/licenses/by-";
 "nd/3.0/us/deed.tr\">Creative Commons Attribution-NoDerivs 3.0 United States "
 "License</a> ile lisanslanmıştır."
-=======
-"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>."
->>>>>>> 1.11
 
 # type: Content of: <div><div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]