Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.8, 0.8.1, and 0.8.2

merge translations

Changeset 72ac3b76c867…

Parents f87c61ccbb3e…

Parents 6dca82ff6f94…

by Steve Borho

Changes to 4 files · Browse files at 72ac3b76c867 Showing diff from parent f87c61ccbb3e 6dca82ff6f94 Diff from another changeset...

Change 1 of 1 Show Entire File contrib/​win32/​mercurial.ini Stacked
 
92
93
94
 
 
95
96
97
 
92
93
94
95
96
97
98
99
@@ -92,6 +92,8 @@
 ;win32mbcs =  ;win32text =  ;zeroconf = +; Extra extensions bundled with TortoiseHg +;fold =    ; To use cleverencode/cleverdecode, you must enable win32text extension  ;
Change 1 of 1 Show Entire File contrib/​win32/​mercurial.iss Stacked
 
62
63
64
65
66
 
 
67
68
69
 
62
63
64
 
 
65
66
67
68
69
@@ -62,8 +62,8 @@
 Source: COPYING.txt; DestDir: {app}; DestName: Copying.txt  Source: ..\icons\hgicon.ico; DestDir: {app}   -Source: win32\shellext\THgShell.dll; DestDir: {app}; DestName: ThgShell.dll; Check: not Is64BitInstallMode; Flags: ignoreversion restartreplace uninsrestartdelete -Source: win32\shellext\ThgShell64.dll; DestDir: {app}; DestName: ThgShell.dll; Check: Is64BitInstallMode; Flags: ignoreversion restartreplace uninsrestartdelete +Source: ..\files\THgShellx86.dll; DestDir: {app}; DestName: ThgShell.dll; Check: not Is64BitInstallMode; Flags: ignoreversion restartreplace uninsrestartdelete +Source: ..\files\ThgShellia64.dll; DestDir: {app}; DestName: ThgShell.dll; Check: Is64BitInstallMode; Flags: ignoreversion restartreplace uninsrestartdelete    [INI]  Filename: {app}\Mercurial.url; Section: InternetShortcut; Key: URL; String: http://www.selenic.com/mercurial/
Change 1 of 2 Show Entire File contrib/​win32/​setup.py Stacked
 
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
 
186
187
188
189
190
 
191
192
193
 
145
146
147
 
 
 
 
 
 
 
 
 
 
148
 
149
150
151
 
175
176
177
 
 
178
179
180
181
@@ -145,18 +145,7 @@
  self.distribution.data_files.append((join('mercurial', modir),   [mofile]))   -class build_shellext(build): - description = "Build TortoiseHg shell extensions" - - def run(self): - cwd = os.getcwd() - os.chdir("win32/shellext") - os.environ["DEBUG"] = "1" - os.system("mingw32-make") - os.chdir(cwd) -  build.sub_commands.append(('build_mo', None)) -build.sub_commands.append(('build_shellext', None))    Distribution.pure = 0  Distribution.global_options.append(('pure', None, "use pure (slow) Python " @@ -186,8 +175,7 @@
   cmdclass = {'install_data': install_package_data,   'build_mo': build_mo, - 'build_py': hg_build_py, - 'build_shellext' : build_shellext} + 'build_py': hg_build_py}    ext_modules=[   Extension('mercurial.base85', ['mercurial/base85.c']),
Change 1 of 1 Show Entire File hggtk/​merge.py Stacked
 
101
102
103
104
105
106
107
 
 
 
 
108
109
110
111
 
112
113
 
114
115
116
 
117
118
119
 
101
102
103
 
 
 
 
104
105
106
107
108
109
110
 
111
112
 
113
114
115
 
116
117
118
119
@@ -101,19 +101,19 @@
  summary = ctx.description().replace('\0', '')   summary = summary.split('\n')[0]   escape = gtklib.markup_escape_text - desc = '<b>' + _('rev') + '</b>\t\t: %s\n' % escape(revstr) - desc += '<b>' + _('summary') + '</b>\t: %s\n' % escape(summary[:80]) - desc += '<b>' + _('user') + '</b>\t\t: %s\n' % escape(ctx.user()) - desc += '<b>' + _('date') + '</b>\t\t: %s\n' \ + desc = '<b>' + hglib.fromutf(_('rev')) + '</b>\t\t: %s\n' % escape(revstr) + desc += '<b>' + hglib.fromutf(_('summary')) + '</b>\t: %s\n' % escape(summary[:80]) + desc += '<b>' + hglib.fromutf(_('user')) + '</b>\t\t: %s\n' % escape(ctx.user()) + desc += '<b>' + hglib.fromutf(_('date')) + '</b>\t\t: %s\n' \   % escape(hglib.displaytime(ctx.date()))   node = repo.lookup(revid)   tags = repo.nodetags(node) - desc += '<b>' + _('branch') + '</b>\t: ' + escape(ctx.branch()) + desc += '<b>' + hglib.fromutf(_('branch')) + '</b>\t: ' + escape(ctx.branch())   if tags: - desc += '\n<b>' + _('tags') + '</b>\t\t: ' \ + desc += '\n<b>' + hglib.fromutf(_('tags')) + '</b>\t\t: ' \   + escape(', '.join(tags))   if node not in repo.heads(): - desc += '\n<b>' + _('Not a head revision!') + '</b>' + desc += '\n<b>' + hglib.fromutf(_('Not a head revision!')) + '</b>'   return revstr, hglib.toutf(desc)     def set_notify_func(self, func, *args):