Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.0, 1.0.1, and 1.0.2

Merge with stable

Changeset 4b004d45b081

Parents 5684f9c399a0

Parents 9818e60e88a3

by Steve Borho

Changes to 2 files · Browse files at 4b004d45b081 Showing diff from parent 5684f9c399a0 9818e60e88a3 Diff from another changeset...

 
8
9
10
11
 
12
13
14
15
16
17
 
18
19
20
 
1439
1440
1441
1442
 
1443
1444
1445
 
8
9
10
 
11
12
13
14
15
16
 
17
18
19
20
 
1439
1440
1441
 
1442
1443
1444
1445
@@ -8,13 +8,13 @@
 "Project-Id-Version: tortoisehg\n"  "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"  "POT-Creation-Date: 2010-01-18 19:30+0000\n" -"PO-Revision-Date: 2010-01-19 06:28+0000\n" +"PO-Revision-Date: 2010-01-22 04:58+0000\n"  "Last-Translator: Yuki Kodama <Unknown>\n"  "Language-Team: Japanese <ja@li.org>\n"  "MIME-Version: 1.0\n"  "Content-Type: text/plain; charset=UTF-8\n"  "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-01-20 04:38+0000\n" +"X-Launchpad-Export-Date: 2010-01-23 04:47+0000\n"  "X-Generator: Launchpad (build Unknown)\n"    #: thgtaskbar.py:38 @@ -1439,7 +1439,7 @@
   #: tortoisehg\hgtk\hgemail.py:168  msgid "diffstat" -msgstr "diffstat" +msgstr "差分情報"    #: tortoisehg\hgtk\hgemail.py:170  msgid "add diffstat output to messages"
 
44
45
46
47
 
48
49
50
 
44
45
46
 
47
48
49
50
@@ -44,7 +44,7 @@
    Return 'str' type string.   """ - return tounicode(s).encode('utf-8') + return tounicode(s).encode('utf-8').replace('\0','')    def fromutf(s):   """