Attachment #160870 for bug #203002

View | Details | Raw Unified | Return to bug 203002
Collapse All | Expand All

Lines 1-7 Link Here

(-)tortoisehg/Makefile (-1 / +1 lines)
1	# $FreeBSD: head/devel/tortoisehg/Makefile 392442 2015-07-18 18:51:31Z olivierd $	1	# $FreeBSD: head/devel/tortoisehg/Makefile 392442 2015-07-18 18:51:31Z olivierd $
2		2
3	PORTNAME= tortoisehg	3	PORTNAME= tortoisehg
4	PORTVERSION= 3.4.2	4	PORTVERSION= 3.5
5	CATEGORIES= devel	5	CATEGORIES= devel
6	MASTER_SITES= https://bitbucket.org/tortoisehg/targz/downloads/	6	MASTER_SITES= https://bitbucket.org/tortoisehg/targz/downloads/
7	#MASTER_SITES= http://cdn.bitbucket.org/tortoisehg/targz/downloads/	7	#MASTER_SITES= http://cdn.bitbucket.org/tortoisehg/targz/downloads/

Lines 1-2 Link Here

(-)tortoisehg/distinfo (-2 / +2 lines)
1	SHA256 (tortoisehg-3.4.2.tar.gz) = d22692166dc6ff61c9d12bfe5ceb77fbf87e7dd52222c956976e7987d84145a1	1	SHA256 (tortoisehg-3.5.tar.gz) = b072180ad851c6c04b003a75ee995a6e1a6cbe7d7a26e86398fd0b32f55194de
2	SIZE (tortoisehg-3.4.2.tar.gz) = 8205349	2	SIZE (tortoisehg-3.5.tar.gz) = 7395688




--- setup.py.orig	2015-08-06 04:30:23.000000000 +0300
+++ setup.py	2015-09-05 21:24:08.309849781 +0300
@@ -413,7 +413,7 @@
         ('build_config', lambda self: os.name != 'nt'),
         ('build_ui', None),
         ('build_qrc', lambda self: 'py2exe' in self.distribution.commands),
-        ('build_mo', None),
+%%NLS%%        ('build_mo', None),
         ] + _build_orig.sub_commands
 
 class clean(_clean_orig):
@@ -567,10 +567,10 @@
             dirs.remove('svg')  # drop source of .ico files
         _data_files.append((os.path.join('share/pixmaps/tortoisehg', root),
                             [os.path.join(root, f) for f in files]))
-    _data_files.extend((os.path.join('share', modir), [mofile])
-                       for pofile, modir, mofile in _walklocales())
-    _data_files += [('share/nautilus-python/extensions',
     }
 
@@ -501,11 +501,11 @@
     _data_files = [(os.path.join('share/pixmaps/tortoisehg', root),
         [os.path.join(root, file_) for file_ in files])
         for root, dirs, files in os.walk('icons')]
-    _data_files += [(os.path.join('share', root),
-        [os.path.join(root, file_) for file_ in files])
-        for root, dirs, files in os.walk('locale')]
-    _data_files += [('/usr/share/nautilus-python/extensions/',
-                     ['contrib/nautilus-thg.py'])]
+%%NLS%%    _data_files.extend((os.path.join('share', modir), [mofile])
+%%NLS%%                       for pofile, modir, mofile in _walklocales())
+%%NAUTILUS%%    _data_files += [('share/nautilus-python/extensions',
+%%NAUTILUS%%    _data_files += [('%%PREFIX%%/lib/nautilus/extensions-2.0/python',
+%%NAUTILUS%%                     ['contrib/nautilus-thg.py'])]
 
     return _scripts, _packages, _data_files, _extra
 




%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/htmlui.py
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/htmlui.pyc
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/htmlui.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/icons_rc.py
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/icons_rc.pyc
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/icons_rc.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/infobar.py
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/infobar.pyc
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/infobar.pyo

%%NLS%%share/locale/uk/LC_MESSAGES/tortoisehg.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/tortoisehg.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/tortoisehg.mo
share/pixmaps/tortoisehg/icons/16x16/actions/hg-add.png
share/pixmaps/tortoisehg/icons/16x16/actions/thg-repoconfig.png
share/pixmaps/tortoisehg/icons/16x16/actions/thg-userconfig.png
share/pixmaps/tortoisehg/icons/16x16/apps/gnupg.png
share/pixmaps/tortoisehg/icons/16x16/apps/kiln.png
share/pixmaps/tortoisehg/icons/16x16/apps/reviewboard.png
share/pixmaps/tortoisehg/icons/16x16/mimetypes/text-x-generic.png
share/pixmaps/tortoisehg/icons/16x16/status/hg-removed.png
share/pixmaps/tortoisehg/icons/22x22/actions/window-close.png
share/pixmaps/tortoisehg/icons/24x24/actions/hg-incoming.png
share/pixmaps/tortoisehg/icons/24x24/actions/hg-outgoing.png
share/pixmaps/tortoisehg/icons/24x24/actions/hg-pull.png
share/pixmaps/tortoisehg/icons/24x24/actions/hg-push.png
share/pixmaps/tortoisehg/icons/32x32/actions/hg-add.png
share/pixmaps/tortoisehg/icons/32x32/actions/hg-branch.png
share/pixmaps/tortoisehg/icons/32x32/actions/hg-sign.png
share/pixmaps/tortoisehg/icons/32x32/actions/thg-repoconfig.png
share/pixmaps/tortoisehg/icons/32x32/actions/thg-userconfig.png
share/pixmaps/tortoisehg/icons/32x32/status/hg-removed.png
share/pixmaps/tortoisehg/icons/README.txt
share/pixmaps/tortoisehg/icons/TortoiseMerge.ico
share/pixmaps/tortoisehg/icons/branch.ico
share/pixmaps/tortoisehg/icons/detect_rename.ico
share/pixmaps/tortoisehg/icons/expander-close.png
share/pixmaps/tortoisehg/icons/expander-open.png
share/pixmaps/tortoisehg/icons/fallback.svg
share/pixmaps/tortoisehg/icons/fileadd.ico
share/pixmaps/tortoisehg/icons/filedelete.ico
share/pixmaps/tortoisehg/icons/filemodify.ico
share/pixmaps/tortoisehg/icons/general.ico
share/pixmaps/tortoisehg/icons/hg.ico
share/pixmaps/tortoisehg/icons/hgB.ico

share/pixmaps/tortoisehg/icons/menucommit.ico
share/pixmaps/tortoisehg/icons/menucreaterepos.ico
share/pixmaps/tortoisehg/icons/menudelete.ico
share/pixmaps/tortoisehg/icons/menudiff.ico
share/pixmaps/tortoisehg/icons/menuhelp.ico
share/pixmaps/tortoisehg/icons/menuimport.ico
share/pixmaps/tortoisehg/icons/menulog.ico
share/pixmaps/tortoisehg/icons/menumerge.ico
share/pixmaps/tortoisehg/icons/menupatch.ico
share/pixmaps/tortoisehg/icons/menurepobrowse.ico
share/pixmaps/tortoisehg/icons/menurevert.ico
share/pixmaps/tortoisehg/icons/menurevisiongraph.ico
share/pixmaps/tortoisehg/icons/menusettings.ico
share/pixmaps/tortoisehg/icons/menushowchanged.ico
share/pixmaps/tortoisehg/icons/menusynch.ico
share/pixmaps/tortoisehg/icons/proxy.ico

share/pixmaps/tortoisehg/icons/scalable/actions/hg-remove.svg
share/pixmaps/tortoisehg/icons/scalable/actions/hg-rename.svg
share/pixmaps/tortoisehg/icons/scalable/actions/hg-revert.svg
share/pixmaps/tortoisehg/icons/scalable/actions/hg-serve.svg
share/pixmaps/tortoisehg/icons/scalable/actions/hg-shelve.svg
share/pixmaps/tortoisehg/icons/scalable/actions/hg-status.svg
share/pixmaps/tortoisehg/icons/scalable/actions/hg-strip.svg
share/pixmaps/tortoisehg/icons/scalable/actions/hg-tag.svg
share/pixmaps/tortoisehg/icons/scalable/actions/hg-transplant.svg
share/pixmaps/tortoisehg/icons/scalable/actions/hg-unbundle.svg

share/pixmaps/tortoisehg/icons/scalable/actions/tasktab-refresh.svg
share/pixmaps/tortoisehg/icons/scalable/actions/thg-add-subrepo.svg
share/pixmaps/tortoisehg/icons/scalable/actions/thg-console.svg
share/pixmaps/tortoisehg/icons/scalable/actions/thg-guess.svg
share/pixmaps/tortoisehg/icons/scalable/actions/thg-ignore.svg
share/pixmaps/tortoisehg/icons/scalable/actions/thg-log-load-all.svg
share/pixmaps/tortoisehg/icons/scalable/actions/thg-mq.svg
share/pixmaps/tortoisehg/icons/scalable/actions/thg-password.svg

share/pixmaps/tortoisehg/icons/scalable/actions/visualdiff.svg
share/pixmaps/tortoisehg/icons/scalable/apps/help-browser.svg
share/pixmaps/tortoisehg/icons/scalable/apps/help-readme.svg
share/pixmaps/tortoisehg/icons/scalable/apps/hg.svg
share/pixmaps/tortoisehg/icons/scalable/apps/preferences-desktop-font.svg
share/pixmaps/tortoisehg/icons/scalable/apps/system-file-manager.svg
share/pixmaps/tortoisehg/icons/scalable/apps/thg.svg
share/pixmaps/tortoisehg/icons/scalable/apps/tools-hooks.svg
share/pixmaps/tortoisehg/icons/scalable/apps/tools-spanner-hammer.svg
share/pixmaps/tortoisehg/icons/scalable/apps/utilities-terminal.svg
share/pixmaps/tortoisehg/icons/scalable/status/hg-merged-both.svg
share/pixmaps/tortoisehg/icons/scalable/status/hg-merged-p1.svg
share/pixmaps/tortoisehg/icons/scalable/status/hg-merged-p2.svg
share/pixmaps/tortoisehg/icons/scalable/status/hg-modified.svg
share/pixmaps/tortoisehg/icons/scalable/status/hg-patch-applied.svg
share/pixmaps/tortoisehg/icons/scalable/status/hg-patch-guarded.svg
share/pixmaps/tortoisehg/icons/scalable/status/hg-patch-unguarded.svg

share/pixmaps/tortoisehg/icons/settings_repo.ico
share/pixmaps/tortoisehg/icons/settings_user.ico
share/pixmaps/tortoisehg/icons/shelve.ico
share/pixmaps/tortoisehg/icons/svg/add.svg
share/pixmaps/tortoisehg/icons/svg/checkout.svg
share/pixmaps/tortoisehg/icons/svg/clone.svg
share/pixmaps/tortoisehg/icons/svg/commit.svg
share/pixmaps/tortoisehg/icons/svg/detect_rename.svg
share/pixmaps/tortoisehg/icons/svg/ignore.svg
share/pixmaps/tortoisehg/icons/svg/init.svg
share/pixmaps/tortoisehg/icons/svg/log.svg
share/pixmaps/tortoisehg/icons/svg/merge.svg
share/pixmaps/tortoisehg/icons/svg/proxy.svg
share/pixmaps/tortoisehg/icons/svg/recovery.svg
share/pixmaps/tortoisehg/icons/svg/refresh_overlays.svg
share/pixmaps/tortoisehg/icons/svg/remove.svg
share/pixmaps/tortoisehg/icons/svg/repobrowse.svg
share/pixmaps/tortoisehg/icons/svg/shelve.svg
share/pixmaps/tortoisehg/icons/svg/sync.svg
share/pixmaps/tortoisehg/icons/svg/thg_logo.svg
share/pixmaps/tortoisehg/icons/thg_logo.ico
share/pixmaps/tortoisehg/icons/thg_logo_92x50.png
%%DATADIR%%/mergetools.rc

Return to bug 203002

Lines 1-37 Link Here

(-)tortoisehg/files/patch-setup.py (-29 / +18 lines)
1	--- setup_.py 2013-09-06 04:45:26.000000000 +0400	1	--- setup.py.orig 2015-08-06 04:30:23.000000000 +0300
2	+++ setup.py 2013-09-09 09:31:13.148575638 +0400	2	+++ setup.py 2015-09-05 21:24:08.309849781 +0300
3	@@ -362,7 +362,7 @@	3	@@ -413,7 +413,7 @@
4	class build(_build_orig):	4	('build_config', lambda self: os.name != 'nt'),
5	sub_commands = [	5	('build_ui', None),
6	('build_qt', None),	6	('build_qrc', lambda self: 'py2exe' in self.distribution.commands),
7	- ('build_mo', None),	7	- ('build_mo', None),
8	+%%NLS%% ('build_mo', None),	8	+%%NLS%% ('build_mo', None),
9	] + _build_orig.sub_commands	9	] + _build_orig.sub_commands
10		10
11	class clean(_clean_orig):	11	class clean(_clean_orig):
12	@@ -381,7 +381,7 @@	12	@@ -567,10 +567,10 @@
13	'build_mo': build_mo ,	13	dirs.remove('svg') # drop source of .ico files
14	'clean': clean,	14	_data_files.append((os.path.join('share/pixmaps/tortoisehg', root),
15	'clean_local': clean_local,	15	[os.path.join(root, f) for f in files]))
16	- 'update_pot': update_pot ,	16	- _data_files.extend((os.path.join('share', modir), [mofile])
17	+%%NLS%% 'update_pot': update_pot ,	17	- for pofile, modir, mofile in _walklocales())
18	'import_po': import_po	18	- _data_files += [('share/nautilus-python/extensions',
19	}
20
21	@@ -501,11 +501,11 @@
22	_data_files = [(os.path.join('share/pixmaps/tortoisehg', root),
23	[os.path.join(root, file_) for file_ in files])
24	for root, dirs, files in os.walk('icons')]
25	- _data_files += [(os.path.join('share', root),
26	- [os.path.join(root, file_) for file_ in files])
27	- for root, dirs, files in os.walk('locale')]
28	- _data_files += [('/usr/share/nautilus-python/extensions/',
29	- ['contrib/nautilus-thg.py'])]	19	- ['contrib/nautilus-thg.py'])]
30	+%%NLS%% _data_files += [(os.path.join('share', root),	20	+%%NLS%% _data_files.extend((os.path.join('share', modir), [mofile])
31	+%%NLS%% [os.path.join(root, file_) for file_ in files])	21	+%%NLS%% for pofile, modir, mofile in _walklocales())
32	+%%NLS%% for root, dirs, files in os.walk('locale')]	22	+%%NAUTILUS%% _data_files += [('share/nautilus-python/extensions',
33	+%%NAUTILUS%% _data_files += [('%%PREFIX%%/lib/nautilus/extensions-2.0/python',
34	+%%NAUTILUS%% ['contrib/nautilus-thg.py'])]	23	+%%NAUTILUS%% ['contrib/nautilus-thg.py'])]
35		24
36	# Create a config.py. Distributions will need to supply their own	25	return _scripts, _packages, _data_files, _extra
37	cfgfile = os.path.join('tortoisehg', 'util', 'config.py')	26

Lines 111-119 Link Here

(-)tortoisehg/pkg-plist (-33 / +17 lines)
111	%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/htmlui.py	111	%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/htmlui.py
112	%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/htmlui.pyc	112	%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/htmlui.pyc
113	%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/htmlui.pyo	113	%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/htmlui.pyo
114	%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/icons_rc.py
115	%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/icons_rc.pyc
116	%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/icons_rc.pyo
117	%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/infobar.py	114	%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/infobar.py
118	%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/infobar.pyc	115	%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/infobar.pyc
119	%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/infobar.pyo	116	%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/infobar.pyo
Lines 404-429 Link Here
404	%%NLS%%share/locale/uk/LC_MESSAGES/tortoisehg.mo	401	%%NLS%%share/locale/uk/LC_MESSAGES/tortoisehg.mo
405	%%NLS%%share/locale/zh_CN/LC_MESSAGES/tortoisehg.mo	402	%%NLS%%share/locale/zh_CN/LC_MESSAGES/tortoisehg.mo
406	%%NLS%%share/locale/zh_TW/LC_MESSAGES/tortoisehg.mo	403	%%NLS%%share/locale/zh_TW/LC_MESSAGES/tortoisehg.mo
		404	share/pixmaps/tortoisehg/icons/16x16/actions/hg-add.png
		405	share/pixmaps/tortoisehg/icons/16x16/actions/thg-repoconfig.png
		406	share/pixmaps/tortoisehg/icons/16x16/actions/thg-userconfig.png
407	share/pixmaps/tortoisehg/icons/16x16/apps/gnupg.png	407	share/pixmaps/tortoisehg/icons/16x16/apps/gnupg.png
408	share/pixmaps/tortoisehg/icons/16x16/apps/kiln.png	408	share/pixmaps/tortoisehg/icons/16x16/apps/kiln.png
409	share/pixmaps/tortoisehg/icons/16x16/apps/reviewboard.png	409	share/pixmaps/tortoisehg/icons/16x16/apps/reviewboard.png
410	share/pixmaps/tortoisehg/icons/16x16/mimetypes/text-x-generic.png	410	share/pixmaps/tortoisehg/icons/16x16/mimetypes/text-x-generic.png
		411	share/pixmaps/tortoisehg/icons/16x16/status/hg-removed.png
411	share/pixmaps/tortoisehg/icons/22x22/actions/window-close.png	412	share/pixmaps/tortoisehg/icons/22x22/actions/window-close.png
412	share/pixmaps/tortoisehg/icons/24x24/actions/hg-incoming.png	413	share/pixmaps/tortoisehg/icons/24x24/actions/hg-incoming.png
413	share/pixmaps/tortoisehg/icons/24x24/actions/hg-outgoing.png	414	share/pixmaps/tortoisehg/icons/24x24/actions/hg-outgoing.png
414	share/pixmaps/tortoisehg/icons/24x24/actions/hg-pull.png	415	share/pixmaps/tortoisehg/icons/24x24/actions/hg-pull.png
415	share/pixmaps/tortoisehg/icons/24x24/actions/hg-push.png	416	share/pixmaps/tortoisehg/icons/24x24/actions/hg-push.png
		417	share/pixmaps/tortoisehg/icons/32x32/actions/hg-add.png
		418	share/pixmaps/tortoisehg/icons/32x32/actions/hg-branch.png
416	share/pixmaps/tortoisehg/icons/32x32/actions/hg-sign.png	419	share/pixmaps/tortoisehg/icons/32x32/actions/hg-sign.png
		420	share/pixmaps/tortoisehg/icons/32x32/actions/thg-repoconfig.png
		421	share/pixmaps/tortoisehg/icons/32x32/actions/thg-userconfig.png
		422	share/pixmaps/tortoisehg/icons/32x32/status/hg-removed.png
417	share/pixmaps/tortoisehg/icons/README.txt	423	share/pixmaps/tortoisehg/icons/README.txt
418	share/pixmaps/tortoisehg/icons/TortoiseMerge.ico	424	share/pixmaps/tortoisehg/icons/TortoiseMerge.ico
419	share/pixmaps/tortoisehg/icons/branch.ico
420	share/pixmaps/tortoisehg/icons/detect_rename.ico	425	share/pixmaps/tortoisehg/icons/detect_rename.ico
421	share/pixmaps/tortoisehg/icons/expander-close.png	426	share/pixmaps/tortoisehg/icons/expander-close.png
422	share/pixmaps/tortoisehg/icons/expander-open.png	427	share/pixmaps/tortoisehg/icons/expander-open.png
423	share/pixmaps/tortoisehg/icons/fallback.svg
424	share/pixmaps/tortoisehg/icons/fileadd.ico
425	share/pixmaps/tortoisehg/icons/filedelete.ico
426	share/pixmaps/tortoisehg/icons/filemodify.ico
427	share/pixmaps/tortoisehg/icons/general.ico	428	share/pixmaps/tortoisehg/icons/general.ico
428	share/pixmaps/tortoisehg/icons/hg.ico	429	share/pixmaps/tortoisehg/icons/hg.ico
429	share/pixmaps/tortoisehg/icons/hgB.ico	430	share/pixmaps/tortoisehg/icons/hgB.ico
Lines 436-451 Link Here
436	share/pixmaps/tortoisehg/icons/menucommit.ico	437	share/pixmaps/tortoisehg/icons/menucommit.ico
437	share/pixmaps/tortoisehg/icons/menucreaterepos.ico	438	share/pixmaps/tortoisehg/icons/menucreaterepos.ico
438	share/pixmaps/tortoisehg/icons/menudelete.ico	439	share/pixmaps/tortoisehg/icons/menudelete.ico
439	share/pixmaps/tortoisehg/icons/menudiff.ico
440	share/pixmaps/tortoisehg/icons/menuhelp.ico
441	share/pixmaps/tortoisehg/icons/menuimport.ico
442	share/pixmaps/tortoisehg/icons/menulog.ico	440	share/pixmaps/tortoisehg/icons/menulog.ico
443	share/pixmaps/tortoisehg/icons/menumerge.ico
444	share/pixmaps/tortoisehg/icons/menupatch.ico
445	share/pixmaps/tortoisehg/icons/menurepobrowse.ico	441	share/pixmaps/tortoisehg/icons/menurepobrowse.ico
446	share/pixmaps/tortoisehg/icons/menurevert.ico	442	share/pixmaps/tortoisehg/icons/menurevert.ico
447	share/pixmaps/tortoisehg/icons/menurevisiongraph.ico
448	share/pixmaps/tortoisehg/icons/menusettings.ico
449	share/pixmaps/tortoisehg/icons/menushowchanged.ico	443	share/pixmaps/tortoisehg/icons/menushowchanged.ico
450	share/pixmaps/tortoisehg/icons/menusynch.ico	444	share/pixmaps/tortoisehg/icons/menusynch.ico
451	share/pixmaps/tortoisehg/icons/proxy.ico	445	share/pixmaps/tortoisehg/icons/proxy.ico
Lines 503-509 Link Here
503	share/pixmaps/tortoisehg/icons/scalable/actions/hg-remove.svg	497	share/pixmaps/tortoisehg/icons/scalable/actions/hg-remove.svg
504	share/pixmaps/tortoisehg/icons/scalable/actions/hg-rename.svg	498	share/pixmaps/tortoisehg/icons/scalable/actions/hg-rename.svg
505	share/pixmaps/tortoisehg/icons/scalable/actions/hg-revert.svg	499	share/pixmaps/tortoisehg/icons/scalable/actions/hg-revert.svg
		500	share/pixmaps/tortoisehg/icons/scalable/actions/hg-serve.svg
		501	share/pixmaps/tortoisehg/icons/scalable/actions/hg-shelve.svg
506	share/pixmaps/tortoisehg/icons/scalable/actions/hg-status.svg	502	share/pixmaps/tortoisehg/icons/scalable/actions/hg-status.svg
		503	share/pixmaps/tortoisehg/icons/scalable/actions/hg-strip.svg
507	share/pixmaps/tortoisehg/icons/scalable/actions/hg-tag.svg	504	share/pixmaps/tortoisehg/icons/scalable/actions/hg-tag.svg
508	share/pixmaps/tortoisehg/icons/scalable/actions/hg-transplant.svg	505	share/pixmaps/tortoisehg/icons/scalable/actions/hg-transplant.svg
509	share/pixmaps/tortoisehg/icons/scalable/actions/hg-unbundle.svg	506	share/pixmaps/tortoisehg/icons/scalable/actions/hg-unbundle.svg
Lines 521-526 Link Here
521	share/pixmaps/tortoisehg/icons/scalable/actions/tasktab-refresh.svg	518	share/pixmaps/tortoisehg/icons/scalable/actions/tasktab-refresh.svg
522	share/pixmaps/tortoisehg/icons/scalable/actions/thg-add-subrepo.svg	519	share/pixmaps/tortoisehg/icons/scalable/actions/thg-add-subrepo.svg
523	share/pixmaps/tortoisehg/icons/scalable/actions/thg-console.svg	520	share/pixmaps/tortoisehg/icons/scalable/actions/thg-console.svg
		521	share/pixmaps/tortoisehg/icons/scalable/actions/thg-guess.svg
		522	share/pixmaps/tortoisehg/icons/scalable/actions/thg-ignore.svg
524	share/pixmaps/tortoisehg/icons/scalable/actions/thg-log-load-all.svg	523	share/pixmaps/tortoisehg/icons/scalable/actions/thg-log-load-all.svg
525	share/pixmaps/tortoisehg/icons/scalable/actions/thg-mq.svg	524	share/pixmaps/tortoisehg/icons/scalable/actions/thg-mq.svg
526	share/pixmaps/tortoisehg/icons/scalable/actions/thg-password.svg	525	share/pixmaps/tortoisehg/icons/scalable/actions/thg-password.svg
Lines 548-562 Link Here
548	share/pixmaps/tortoisehg/icons/scalable/actions/visualdiff.svg	547	share/pixmaps/tortoisehg/icons/scalable/actions/visualdiff.svg
549	share/pixmaps/tortoisehg/icons/scalable/apps/help-browser.svg	548	share/pixmaps/tortoisehg/icons/scalable/apps/help-browser.svg
550	share/pixmaps/tortoisehg/icons/scalable/apps/help-readme.svg	549	share/pixmaps/tortoisehg/icons/scalable/apps/help-readme.svg
		550	share/pixmaps/tortoisehg/icons/scalable/apps/hg.svg
551	share/pixmaps/tortoisehg/icons/scalable/apps/preferences-desktop-font.svg	551	share/pixmaps/tortoisehg/icons/scalable/apps/preferences-desktop-font.svg
552	share/pixmaps/tortoisehg/icons/scalable/apps/system-file-manager.svg	552	share/pixmaps/tortoisehg/icons/scalable/apps/system-file-manager.svg
553	share/pixmaps/tortoisehg/icons/scalable/apps/thg-logo.svg	553	share/pixmaps/tortoisehg/icons/scalable/apps/thg.svg
554	share/pixmaps/tortoisehg/icons/scalable/apps/tools-hooks.svg	554	share/pixmaps/tortoisehg/icons/scalable/apps/tools-hooks.svg
555	share/pixmaps/tortoisehg/icons/scalable/apps/tools-spanner-hammer.svg	555	share/pixmaps/tortoisehg/icons/scalable/apps/tools-spanner-hammer.svg
556	share/pixmaps/tortoisehg/icons/scalable/apps/utilities-terminal.svg	556	share/pixmaps/tortoisehg/icons/scalable/apps/utilities-terminal.svg
557	share/pixmaps/tortoisehg/icons/scalable/status/hg-merged-both.svg	557	share/pixmaps/tortoisehg/icons/scalable/status/hg-merged-both.svg
558	share/pixmaps/tortoisehg/icons/scalable/status/hg-merged-p1.svg	558	share/pixmaps/tortoisehg/icons/scalable/status/hg-merged-p1.svg
559	share/pixmaps/tortoisehg/icons/scalable/status/hg-merged-p2.svg	559	share/pixmaps/tortoisehg/icons/scalable/status/hg-merged-p2.svg
		560	share/pixmaps/tortoisehg/icons/scalable/status/hg-modified.svg
560	share/pixmaps/tortoisehg/icons/scalable/status/hg-patch-applied.svg	561	share/pixmaps/tortoisehg/icons/scalable/status/hg-patch-applied.svg
561	share/pixmaps/tortoisehg/icons/scalable/status/hg-patch-guarded.svg	562	share/pixmaps/tortoisehg/icons/scalable/status/hg-patch-guarded.svg
562	share/pixmaps/tortoisehg/icons/scalable/status/hg-patch-unguarded.svg	563	share/pixmaps/tortoisehg/icons/scalable/status/hg-patch-unguarded.svg
Lines 573-595 Link Here
573	share/pixmaps/tortoisehg/icons/settings_repo.ico	574	share/pixmaps/tortoisehg/icons/settings_repo.ico
574	share/pixmaps/tortoisehg/icons/settings_user.ico	575	share/pixmaps/tortoisehg/icons/settings_user.ico
575	share/pixmaps/tortoisehg/icons/shelve.ico	576	share/pixmaps/tortoisehg/icons/shelve.ico
576	share/pixmaps/tortoisehg/icons/svg/add.svg
577	share/pixmaps/tortoisehg/icons/svg/checkout.svg
578	share/pixmaps/tortoisehg/icons/svg/clone.svg
579	share/pixmaps/tortoisehg/icons/svg/commit.svg
580	share/pixmaps/tortoisehg/icons/svg/detect_rename.svg
581	share/pixmaps/tortoisehg/icons/svg/ignore.svg
582	share/pixmaps/tortoisehg/icons/svg/init.svg
583	share/pixmaps/tortoisehg/icons/svg/log.svg
584	share/pixmaps/tortoisehg/icons/svg/merge.svg
585	share/pixmaps/tortoisehg/icons/svg/proxy.svg
586	share/pixmaps/tortoisehg/icons/svg/recovery.svg
587	share/pixmaps/tortoisehg/icons/svg/refresh_overlays.svg
588	share/pixmaps/tortoisehg/icons/svg/remove.svg
589	share/pixmaps/tortoisehg/icons/svg/repobrowse.svg
590	share/pixmaps/tortoisehg/icons/svg/shelve.svg
591	share/pixmaps/tortoisehg/icons/svg/sync.svg
592	share/pixmaps/tortoisehg/icons/svg/thg_logo.svg
593	share/pixmaps/tortoisehg/icons/thg_logo.ico	577	share/pixmaps/tortoisehg/icons/thg_logo.ico
594	share/pixmaps/tortoisehg/icons/thg_logo_92x50.png	578	share/pixmaps/tortoisehg/icons/thg_logo_92x50.png
595	%%DATADIR%%/mergetools.rc	579	%%DATADIR%%/mergetools.rc