Skip to content
Snippets Groups Projects
Commit 433e09ab authored by George Nachman's avatar George Nachman
Browse files

Resolve conflicts

parents 352c2238 666f2bc0
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 0 additions and 580 deletions
French.lproj/AddressBook.strings deleted 100644 → 0
NaN GiB (NaN%)
View file @ 352c2238
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
French.lproj/ITConfigPanel.nib/classes.nib deleted 100644 → 0
+ 0
− 58
View file @ 352c2238
{
IBClasses = (
{CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; },
{
ACTIONS = {
chooseBackgroundImage = id;
setAntiIdle = id;
setAntiIdleCode = id;
setBackgroundColor = id;
setBoldColor = id;
setCharacterSpacing = id;
setCursorColor = id;
setCursorTextColor = id;
setDisableBold = id;
setForegroundColor = id;
setSelectedTextColor = id;
setSelectionColor = id;
setSessionEncoding = id;
setSessionName = id;
setTransparency = id;
setWindowSize = id;
toggleAntiAlias = id;
useBackgroundImage = id;
windowConfigFont = id;
windowConfigNAFont = id;
};
CLASS = ITConfigPanelController;
LANGUAGE = ObjC;
OUTLETS = {
"AI_CODE" = id;
"AI_ON" = id;
"CONFIG_ANTIALIAS" = id;
"CONFIG_BACKGROUND" = NSColorWell;
"CONFIG_BOLD" = NSColorWell;
"CONFIG_COL" = id;
"CONFIG_CURSOR" = NSColorWell;
"CONFIG_CURSORTEXT" = NSColorWell;
"CONFIG_ENCODING" = NSPopUpButton;
"CONFIG_EXAMPLE" = id;
"CONFIG_FOREGROUND" = NSColorWell;
"CONFIG_NAEXAMPLE" = id;
"CONFIG_NAME" = id;
"CONFIG_ROW" = id;
"CONFIG_SELECTION" = NSColorWell;
"CONFIG_SELECTIONTEXT" = NSColorWell;
"CONFIG_TRANS2" = id;
"CONFIG_TRANSPARENCY" = id;
backgroundImageView = NSImageView;
charHorizontalSpacing = NSSlider;
charVerticalSpacing = NSSlider;
disableBoldButton = NSButton;
useBackgroundImage = NSButton;
};
SUPERCLASS = NSWindowController;
}
);
IBVersion = 1;
}
\ No newline at end of file
French.lproj/ITConfigPanel.nib/info.nib deleted 100644 → 0
+ 0
− 45
View file @ 352c2238
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IBDocumentLocation</key>
<string>706 535 356 240 0 0 1280 1002 </string>
<key>IBFramework Version</key>
<string>349.0</string>
<key>IBGroupedObjects</key>
<dict>
<key>0</key>
<array>
<string>29</string>
<string>10</string>
<string>35</string>
<string>7</string>
</array>
<key>6</key>
<array>
<string>42</string>
<string>24</string>
<string>25</string>
<string>22</string>
<string>28</string>
<string>11</string>
<string>36</string>
<string>12</string>
<string>75</string>
<string>76</string>
<string>85</string>
<string>86</string>
<string>87</string>
<string>88</string>
</array>
</dict>
<key>IBLastGroupID</key>
<string>7</string>
<key>IBOpenObjects</key>
<array>
<integer>20</integer>
</array>
<key>IBSystem Version</key>
<string>7F44</string>
</dict>
</plist>
French.lproj/ITConfigPanel.nib/keyedobjects.nib deleted 100644 → 0
+ 0
− 0
View file @ 352c2238
File deleted
French.lproj/ITConfigPanel.nib/objects.nib deleted 100644 → 0
+ 0
− 0
View file @ 352c2238
File deleted
French.lproj/MainMenu.nib/classes.nib deleted 100644 → 0
+ 0
− 146
View file @ 352c2238
{
IBClasses = (
{
ACTIONS = {
clearBuffer = id;
clearScrollbackBuffer = id;
closeCurrentSession = id;
findNext = id;
findPrevious = id;
findWithSelection = id;
jumpToSelection = id;
logStart = id;
logStop = id;
nextSession = id;
pasteSelection = id;
previousSession = id;
saveDisplayProfile = id;
saveTerminalProfile = id;
showConfigWindow = id;
showFindPanel = id;
toggleBookmarksView = id;
toggleFontSizeFollowWindowResize = id;
toggleInputToAllSessions = id;
toggleRemapDeleteKey = id;
};
CLASS = FirstResponder;
LANGUAGE = ObjC;
SUPERCLASS = NSObject;
},
{CLASS = PTYTextView; LANGUAGE = ObjC; SUPERCLASS = NSTextView; },
{
ACTIONS = {
cancel = id;
changeBackground = id;
changeFontButton = id;
changeForeground = id;
changeNAFontButton = id;
ok = id;
restore = id;
};
CLASS = PreferencePanel;
LANGUAGE = ObjC;
OUTLETS = {
antiAlias = id;
autoclose = id;
background = id;
col = id;
copySelection = id;
doubleWidth = id;
encoding = id;
fontExample = id;
foreground = id;
hideTab = id;
nafontExample = id;
openAddressBook = id;
optionKey = id;
prefPanel = id;
promptOnClose = id;
remapDeleteKey = id;
row = id;
selectionColor = id;
shell = id;
silenceBell = id;
tabViewType = id;
terminal = id;
transparency = id;
"transparency_control" = id;
};
SUPERCLASS = NSResponder;
},
{
ACTIONS = {
clearBuffer = id;
closeCurrentSession = id;
logStart = id;
logStop = id;
newSession = id;
nextSession = id;
previousSession = id;
saveDisplayProfile = id;
saveTerminalProfile = id;
setMainMenu = id;
switchSession = id;
windowConfigBackground = id;
windowConfigCancel = id;
windowConfigFont = id;
windowConfigForeground = id;
windowConfigOk = id;
};
CLASS = PseudoTerminal;
LANGUAGE = ObjC;
OUTLETS = {
"AI_CODE" = id;
"AI_ON" = id;
"CONFIG_BACKGROUND" = id;
"CONFIG_COL" = id;
"CONFIG_ENCODING" = id;
"CONFIG_EXAMPLE" = id;
"CONFIG_FOREGROUND" = id;
"CONFIG_NAME" = id;
"CONFIG_PANEL" = id;
"CONFIG_ROW" = id;
"CONFIG_TRANS2" = id;
"CONFIG_TRANSPARENCY" = id;
SCROLLVIEW = id;
WINDOW = id;
};
SUPERCLASS = NSResponder;
},
{
ACTIONS = {
aboutOK = id;
biggerFont = id;
newSession = id;
newWindow = id;
nextTerminal = id;
previousTerminal = id;
showAbout = id;
showPrefWindow = id;
smallerFont = id;
useTransparency = id;
};
CLASS = iTermApplicationDelegate;
LANGUAGE = ObjC;
OUTLETS = {
ABOUT = id;
AUTHORS = NSTextView;
closeTab = NSMenuItem;
closeWindow = NSMenuItem;
fontSizeFollowWindowResize = NSMenuItem;
logStart = NSMenuItem;
logStop = NSMenuItem;
newTab = NSMenuItem;
newWindow = NSMenuItem;
nextTerminal = NSMenuItem;
previousTerminal = NSMenuItem;
selectTab = NSMenuItem;
sendInputToAllSessions = NSMenuItem;
toggleBookmarksView = NSMenuItem;
toggleTransparency = NSMenuItem;
};
SUPERCLASS = NSObject;
}
);
IBVersion = 1;
}
\ No newline at end of file
French.lproj/MainMenu.nib/info.nib deleted 100644 → 0
+ 0
− 21
View file @ 352c2238
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IBDocumentLocation</key>
<string>54 131 511 388 0 0 1280 832 </string>
<key>IBEditorPositions</key>
<dict>
<key>29</key>
<string>219 762 375 44 0 0 1280 1002 </string>
</dict>
<key>IBFramework Version</key>
<string>364.0</string>
<key>IBOpenObjects</key>
<array>
<integer>29</integer>
</array>
<key>IBSystem Version</key>
<string>7U16</string>
</dict>
</plist>
French.lproj/MainMenu.nib/keyedobjects.nib deleted 100644 → 0
+ 0
− 0
View file @ 352c2238
File deleted
French.lproj/MainMenu.nib/objects.nib deleted 100644 → 0
+ 0
− 0
View file @ 352c2238
File deleted
French.lproj/MainMenu.strings deleted 100644 → 0
NaN GiB (NaN%)
View file @ 352c2238
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
French.lproj/PreferencePanel.nib/classes.nib deleted 100644 → 0
+ 0
− 165
View file @ 352c2238
{
IBClasses = (
{CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; },
{
ACTIONS = {
addBookmark = id;
addBookmarkCancel = id;
addBookmarkConfirm = id;
addBookmarkFolder = id;
addBookmarkFolderCancel = id;
addBookmarkFolderConfirm = id;
cancel = id;
deleteBookmark = id;
deleteBookmarkCancel = id;
deleteBookmarkConfirm = id;
deleteBookmarkFolder = id;
editBookmark = id;
ok = id;
setDefaultSession = id;
};
CLASS = PreferencePanel;
LANGUAGE = ObjC;
OUTLETS = {
addBookmarkFolderPanel = NSPanel;
bookmarkCommand = NSTextField;
bookmarkDeleteButton = NSButton;
bookmarkDisplayProfile = NSPopUpButton;
bookmarkEditButton = NSButton;
bookmarkFolderName = NSTextField;
bookmarkKeyboardProfile = NSPopUpButton;
bookmarkName = NSTextField;
bookmarkShortcut = NSPopUpButton;
bookmarkTerminalProfile = NSPopUpButton;
bookmarkWorkingDirectory = NSTextField;
bookmarksView = NSOutlineView;
cmdSelection = NSButton;
defaultSessionButton = NSButton;
deleteBookmarkPanel = NSPanel;
editBookmarkPanel = NSPanel;
enableBonjour = NSButton;
focusFollowsMouse = NSButton;
hideTab = id;
maxVertically = NSButton;
middleButtonPastesFromClipboard = NSButton;
profilesWindow = NSWindow;
promptOnClose = id;
selectionCopiesText = NSButton;
tabPosition = NSPopUpButton;
windowStyle = NSPopUpButton;
wordChars = NSTextField;
};
SUPERCLASS = NSWindowController;
},
{
ACTIONS = {
displayBackgroundImage = id;
displayChangeColor = id;
displayProfileChanged = id;
displaySelectFont = id;
displaySelectNAFont = id;
displaySetAntiAlias = id;
displaySetDisableBold = id;
displaySetFontSpacing = id;
kbEntryAdd = id;
kbEntryAddCancel = id;
kbEntryAddConfirm = id;
kbEntryDelete = id;
kbEntrySelectorChanged = id;
kbOptionKeyChanged = id;
kbProfileChanged = id;
profileAdd = id;
profileAddCancel = id;
profileAddConfirm = id;
profileDelete = id;
profileDeleteCancel = id;
profileDeleteConfirm = id;
showProfilesWindow = id;
terminalProfileChanged = id;
terminalSetBlink = id;
terminalSetCloseOnSessionEnd = id;
terminalSetDoubleWidth = id;
terminalSetEncoding = id;
terminalSetSendIdleChar = id;
terminalSetShowBell = id;
terminalSetSilenceBell = id;
terminalSetType = id;
terminalSetXtermMouseReporting = id;
};
CLASS = iTermProfileWindowController;
LANGUAGE = ObjC;
OUTLETS = {
addKBEntry = NSPanel;
addProfile = NSPanel;
deleteProfile = NSPanel;
displayAnsi0Color = NSColorWell;
displayAnsi10Color = NSColorWell;
displayAnsi11Color = NSColorWell;
displayAnsi12Color = NSColorWell;
displayAnsi13Color = NSColorWell;
displayAnsi14Color = NSColorWell;
displayAnsi15Color = NSColorWell;
displayAnsi1Color = NSColorWell;
displayAnsi2Color = NSColorWell;
displayAnsi3Color = NSColorWell;
displayAnsi4Color = NSColorWell;
displayAnsi5Color = NSColorWell;
displayAnsi6Color = NSColorWell;
displayAnsi7Color = NSColorWell;
displayAnsi8Color = NSColorWell;
displayAnsi9Color = NSColorWell;
displayAntiAlias = NSButton;
displayBGColor = NSColorWell;
displayBackgroundImage = NSImageView;
displayBoldColor = NSColorWell;
displayColTextField = NSTextField;
displayCursorColor = NSColorWell;
displayCursorTextColor = NSColorWell;
displayDisableBold = NSButton;
displayFGColor = NSColorWell;
displayFontAccessoryView = NSView;
displayFontSpacingHeight = NSSlider;
displayFontSpacingWidth = NSSlider;
displayFontTextField = NSTextField;
displayNAFontTextField = NSTextField;
displayProfileDeleteButton = NSButton;
displayProfileSelector = NSPopUpButton;
displayRowTextField = NSTextField;
displaySelectedTextColor = NSColorWell;
displaySelectionColor = NSColorWell;
displayTransparency = NSTextField;
displayUseBackgroundImage = NSButton;
kbEntryAction = NSPopUpButton;
kbEntryDeleteButton = NSButton;
kbEntryKey = NSPopUpButton;
kbEntryKeyCode = NSTextField;
kbEntryKeyModifierCommand = NSButton;
kbEntryKeyModifierControl = NSButton;
kbEntryKeyModifierOption = NSButton;
kbEntryKeyModifierShift = NSButton;
kbEntryTableView = NSTableView;
kbEntryText = NSTextField;
kbOptionKey = NSMatrix;
kbProfileDeleteButton = NSButton;
kbProfileSelector = NSPopUpButton;
profileName = NSTextField;
profileTabView = NSTabView;
terminalBlink = NSButton;
terminalCloseOnSessionEnd = NSButton;
terminalDoubleWidth = NSButton;
terminalEncoding = NSPopUpButton;
terminalIdleChar = NSTextField;
terminalProfileDeleteButton = NSButton;
terminalProfileSelector = NSPopUpButton;
terminalScrollback = NSTextField;
terminalSendIdleChar = NSButton;
terminalShowBell = NSButton;
terminalSilenceBell = NSButton;
terminalType = NSPopUpButton;
xtermMouseReporting = NSButton;
};
SUPERCLASS = NSWindowController;
}
);
IBVersion = 1;
}
\ No newline at end of file
French.lproj/PreferencePanel.nib/info.nib deleted 100644 → 0
+ 0
− 75
View file @ 352c2238
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IBDocumentLocation</key>
<string>26 74 500 343 0 0 1024 746 </string>
<key>IBEditorPositions</key>
<dict>
<key>1310</key>
<string>480 598 319 177 0 0 1280 1002 </string>
</dict>
<key>IBFramework Version</key>
<string>443.0</string>
<key>IBGroupedObjects</key>
<dict>
<key>0</key>
<array>
<string>846</string>
<string>943</string>
<string>865</string>
</array>
<key>1</key>
<array>
<string>816</string>
<string>833</string>
</array>
<key>11</key>
<array>
<string>1106</string>
<string>1107</string>
<string>1108</string>
<string>1109</string>
<string>1110</string>
<string>1111</string>
<string>1112</string>
<string>1113</string>
<string>1114</string>
<string>1115</string>
<string>1116</string>
<string>1117</string>
<string>1118</string>
<string>1119</string>
</array>
<key>2</key>
<array>
<string>832</string>
<string>909</string>
<string>866</string>
<string>838</string>
</array>
<key>3</key>
<array>
<string>944</string>
<string>910</string>
<string>868</string>
<string>827</string>
</array>
<key>4</key>
<array>
<string>1320</string>
<string>819</string>
<string>855</string>
<string>895</string>
</array>
</dict>
<key>IBLastGroupID</key>
<string>12</string>
<key>IBOpenObjects</key>
<array>
<integer>32</integer>
</array>
<key>IBSystem Version</key>
<string>8H14</string>
</dict>
</plist>
French.lproj/PreferencePanel.nib/keyedobjects.nib deleted 100644 → 0
+ 0
− 0
View file @ 352c2238
File deleted
French.lproj/PreferencePanel.nib/objects.nib deleted 100644 → 0
+ 0
− 0
View file @ 352c2238
File deleted
French.lproj/PreferencePanel.strings deleted 100644 → 0
NaN GiB (NaN%)
View file @ 352c2238
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
French.lproj/PseudoTerminal.nib/classes.nib deleted 100644 → 0
+ 0
− 56
View file @ 352c2238
{
IBClasses = (
{
ACTIONS = {
adEditBackground = id;
adEditCancel = id;
adEditFont = id;
adEditForeground = id;
adEditOK = id;
adbAddEntry = id;
adbCancel = id;
adbEditEntry = id;
adbGotoQuickOpen = id;
adbOk = id;
adbRemoveEntry = id;
};
CLASS = AddressBook;
LANGUAGE = ObjC;
OUTLETS = {
adBackground = NSColorWell;
adCommand = NSTextField;
adEncoding = NSComboBox;
adForegroud = NSColorWell;
adName = NSTextField;
adTable = NSTableView;
adTextExample = NSTextView;
};
SUPERCLASS = NSObject;
},
{CLASS = PTYScrollView; LANGUAGE = ObjC; SUPERCLASS = NSScrollView; },
{CLASS = PTYTextView; LANGUAGE = ObjC; SUPERCLASS = NSTextView; },
{
ACTIONS = {
clearBuffer = id;
clearScrollbackBuffer = id;
closeCurrentSession = id;
closeTabContextualMenuAction = id;
logStart = id;
logStop = id;
moveTabToNewWindowContextualMenuAction = id;
nextSession = id;
previousSession = id;
saveDisplayProfile = id;
saveTerminalProfile = id;
switchSession = id;
toggleBookmarksView = id;
toggleFontSizeFollowWindowResize = id;
toggleInputToAllSessions = id;
};
CLASS = PseudoTerminal;
LANGUAGE = ObjC;
SUPERCLASS = NSWindowController;
}
);
IBVersion = 1;
}
\ No newline at end of file
French.lproj/PseudoTerminal.nib/info.nib deleted 100644 → 0
+ 0
− 14
View file @ 352c2238
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IBDocumentLocation</key>
<string>377 417 356 240 0 0 1280 1002 </string>
<key>IBFramework Version</key>
<string>443.0</string>
<key>IBLockedObjects</key>
<array/>
<key>IBSystem Version</key>
<string>8H14</string>
</dict>
</plist>
French.lproj/PseudoTerminal.nib/keyedobjects.nib deleted 100644 → 0
+ 0
− 0
View file @ 352c2238
File deleted
French.lproj/PseudoTerminal.nib/objects.nib deleted 100644 → 0
+ 0
− 0
View file @ 352c2238
File deleted
French.lproj/PseudoTerminal.strings deleted 100644 → 0
NaN GiB (NaN%)
View file @ 352c2238
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment