www/philosophy/po selling.zh-tw.po

[Cheng-Chia Tseng]

CVSROOT:        /web/www
Module name:    www
Changes by:     Cheng-Chia Tseng <zerngjia>     17/06/23 05:46:44

Modified files:
        philosophy/po  : selling.zh-tw.po 

Log message:
        (selling.zh-tw.po): fixing conflicts of Chinese translation

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/selling.zh-tw.po?cvsroot=www&r1=1.3&r2=1.4

Patches:
Index: selling.zh-tw.po
===================================================================
RCS file: /web/www/www/philosophy/po/selling.zh-tw.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- selling.zh-tw.po    23 Jun 2017 09:44:35 -0000      1.3
+++ selling.zh-tw.po    23 Jun 2017 09:46:43 -0000      1.4
@@ -6,14 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: selling.html\n"
-<<<<<<< selling.zh-tw.po
-"POT-Creation-Date: 2017-06-04 10:42+0800\n"
-"PO-Revision-Date: 2017-06-23 17:42+0800\n"
-=======
-"POT-Creation-Date: 2017-03-20 14:26+0000\n"
-"PO-Revision-Date: 2017-06-23 16:30+0800\n"
+"POT-Creation-Date: 2017-06-23 17:46+0800\n"
+"PO-Revision-Date: 2017-06-23 17:46+0800\n"
 "Last-Translator: Cheng-Chia Tseng <address@hidden>\n"
->>>>>>> 1.2
 "Language-Team: Traditional Chinese <address@hidden>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
@@ -250,9 +245,9 @@
 "doing it the way most companies do it: making the software proprietary "
 "rather than free."
 msgstr ""
-"然而，每當人們想到<a 
href=\"/philosophy/words-to-avoid.html#SellSoftware\">"
-"「銷售軟體」</a>時，他們通常想到的都是一般大å…
¬å¸çš„做法：製作專有軟體而不是自"
-"由軟體。"
+"然而，每當人們想到<a 
href=\"/philosophy/words-to-avoid.html#SellSoftware"
+"\">「銷售軟體」</a>時，他們通常想到的都是一般大å…
¬å¸çš„做法：製作專有軟體而不是"
+"自由軟體。"
 
 #. type: Content of: <p>
 msgid ""