Resolve conflicts

433e09ab · George Nachman · 352c2238 · 666f2bc0 · 352c2238 · 352c2238
Commit 433e09ab authored 13 years ago by George Nachman
--- a/zh_TW.lproj/iTerm Help/preferences.html
+++ b/zh_TW.lproj/iTerm Help/preferences.html
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<TITLE>iTerm : Preferences</TITLE>
-</HEAD>
-
-<BODY BGCOLOR="#FFFFFF" LINK="#696969" ALINK="#696969" VLINK="#696969">
-<LINK REL=stylesheet HREF="styles.css" TYPE="text/css">
-<CENTER>
-<A HREF="index.html"><IMG SRC="iTerm.png" TITLE="" ALT="iTerm" BORDER="0"></A>
-<H1><A HREF="index.html">iTerm Project Homepage</A></H1>
-
-<TABLE BGCOLOR="#000000" CELLPADDING="10" CELLSPACING="1" BORDER="0" WIDTH="100%">
-<TR>
-<TD VALIGN="TOP" WIDTH="300" BGCOLOR="#FFFFFF">
-<FONT SIZE="5"><STRONG>iTerm Info:</STRONG></FONT><BR>
-<UL>
-<LI><A HREF="index.html"> 主頁 </A></LI>
-<LI><A HREF="navigation.html">Address Book</A></LI>
-<LI><A HREF="preferences.html">Configure Panel</A></LI>
-<LI><A HREF="navigation.html">Contextual Menu</A></LI>
-<LI><A HREF="install.html">Installation</A></LI>
-<LI><A HREF="misc.html">Misc</A></LI>
-<LI><A HREF="navigation.html">Navigation</A></LI>
-<LI><A HREF="preferences.html">Preferences</A></LI>
-<LI><A HREF="install.html">System Requirements</A><LI>
-<LI><A HREF="history.html">Version History</A></LI>
-</UL>
-
-
-<FONT SIZE="5"><STRONG>Links:</STRONG></FONT><BR>
-<UL>
-<A HREF="http://sourceforge.net/projects/iterm/">iTerm (sourceforge project page)</A><BR>
-<A HREF="http://sourceforge.net/tracker/?atid=518976&group_id=67789&func=browse">Request a feature</A><BR>
-<A HREF="http://sourceforge.net/tracker/?atid=518973&group_id=67789&func=browse">Submit a Bug</A><BR>
-<BR>
-<A HREF="http://sourceforge.net">
-<IMG SRC="http://sourceforge.net/sflogo.php?group_id=67789&amp;type=2" WIDTH="125" HEIGHT="37" BORDER="0" ALT="SourceForge Logo">
-</A>
-</UL>
-</TD>
-
-
-<TD VALIGN="TOP" BGCOLOR="#FFFFFF">
-<FONT SIZE="5"><STRONG>Preference vs Configure panels:</STRONG></FONT><BR>
-<UL>The Configure panels and the Preference panels are essentially the same thing, with the exception that the Configure panel applies changes to the current window only.  The Preference panel changes the default session settings.</UL>
-<FONT SIZE="5"><STRONG>Preferences:</STRONG></FONT>
-<UL>
-<LI><STRONG>Anti-Aliasing</STRONG>: Recommended for viewing text easier.</LI>
-<LI><STRONG>Transparency:</STRONG> Is a wonderful thing, but if you have "100%" transparency, when you click in the session window, the mouse click will be sent to the application behind iTerm.</LI>
-<LI><STRONG>Window Size:</STRONG> If  you change the size of the session window in the Configure panel it will resize the window to that size regardless of number of session open.  However, if you open a new session in a new tab, the window will remain the same size, and not honor the settings of the new session.</LI>
-<LI><STRONG>Shells:</STRONG> The default shells is /bin/tcsh.  Other common shells are:
-<UL>/bin/sh<BR>/bin/csh<BR>/bin/bash<BR>/bin/zsh.</UL></LI>
-</UL>
-
-</TD>
-</TR>
-</TABLE>
-
-<BR>
-<FONT SIZE="-1">
-Modified: Jan 7th, 2003<BR>Created: Dec 18th, 2002<BR>
-<A HREF="MAILTO:fabian@macvillage.net">Fabian</A> and <A HREF="MAILTO:ujwal@setlurgroup.com">Ujwal S. Sathyam</A><BR>
-Support free software by writing one.<BR>
-</FONT>
-
-</CENTER>
-</BODY>
-</HTML>
--- a/zh_TW.lproj/iTerm Help/styles.css
+++ b/zh_TW.lproj/iTerm Help/styles.css
-<style type="text/css">
A {
	color:#696969;
	text-decoration:underline;}A:hover {
	color:#FF8C00;
	text-decoration:none;}</style>
\ No newline at end of file