merge in latest merges. no idea why my copy rejected this initially
This commit is contained in:
commit
27810a9486
|
@ -69,11 +69,11 @@ Move first VPaned handle \fBDown\fR.
|
|||
Hide/Show \fBS\fRcrollbar.
|
||||
.TP
|
||||
.B Ctrl+Shift+N
|
||||
Move to \fBn\fRext terminal within the same tab, use Ctrl+Shift+PageDown to move to the next tab.
|
||||
Move to \fBn\fRext terminal within the same tab, use Ctrl+PageDown to move to the next tab.
|
||||
If \fBcycle_term_tab\fR is \fBFalse\fR, cycle within the same tab will be disabled
|
||||
.TP
|
||||
.B Ctrl+Shift+P
|
||||
Move to \fBp\fRrevious terminal within the same tab, use Ctrl+Shift+PageUp to move to the previous tab.
|
||||
Move to \fBp\fRrevious terminal within the same tab, use Ctrl+PageUp to move to the previous tab.
|
||||
If \fBcycle_term_tab\fR is \fBFalse\fR, cycle within the same tab will be disabled
|
||||
.TP
|
||||
.B Ctrl+Shift+W
|
||||
|
|
|
@ -131,7 +131,7 @@ If this is set to true, the fullscreen keyboard shortcut changes from F11 (like
|
|||
Default value: \fBFalse\fR
|
||||
.TP
|
||||
.B cycle_term_tab
|
||||
If this is set to true, when switching to the next/previous term, terminator will cycle within the same tab. Ctrl-Shift-PageUp/PageDown can then be used to move from one tab to the other one.
|
||||
If this is set to true, when switching to the next/previous term, terminator will cycle within the same tab. Ctrl-PageUp/PageDown can then be used to move from one tab to the other one.
|
||||
Default value: \fBTrue\fR
|
||||
.SH "SEE ALSO"
|
||||
.BR gnome\-terminal(1)
|
||||
|
|
11
setup.py
11
setup.py
|
@ -8,6 +8,7 @@ from distutils.log import info
|
|||
import glob
|
||||
import os
|
||||
import sys
|
||||
import platform
|
||||
|
||||
from terminatorlib.version import *
|
||||
|
||||
|
@ -45,7 +46,6 @@ class InstallData(install_data):
|
|||
def _compile_po_files (self):
|
||||
data_files = []
|
||||
|
||||
# Don't install language files on win32
|
||||
if WITHOUT_NLS:
|
||||
return data_files
|
||||
|
||||
|
@ -57,6 +57,11 @@ class InstallData(install_data):
|
|||
return data_files
|
||||
|
||||
|
||||
if platform.system() == 'FreeBSD':
|
||||
man_dir = 'man'
|
||||
else:
|
||||
man_dir = 'share/man'
|
||||
|
||||
setup(name='Terminator',
|
||||
version=APP_VERSION,
|
||||
description='Terminator, the robot future of terminals',
|
||||
|
@ -67,8 +72,8 @@ setup(name='Terminator',
|
|||
scripts=['terminator'],
|
||||
data_files=[
|
||||
('share/applications', ['data/terminator.desktop']),
|
||||
('share/man/man1', ['doc/terminator.1']),
|
||||
('share/man/man5', ['doc/terminator_config.5']),
|
||||
(os.path.join(man_dir, 'man1'), ['doc/terminator.1']),
|
||||
(os.path.join(man_dir, 'man5'), ['doc/terminator_config.5']),
|
||||
('share/pixmaps', ['data/icons/48x48/apps/terminator.png']),
|
||||
('share/icons/hicolor/scalable/apps', glob.glob('data/icons/scalable/apps/*.svg')),
|
||||
('share/icons/hicolor/16x16/apps', glob.glob('data/icons/16x16/apps/*.png')),
|
||||
|
|
Loading…
Reference in New Issue