diff --git a/.gitignore b/.gitignore
index c88057db..9a0cf619 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
# git ignore file
+*.user
plugins/wmpa/wmpa_h.h
plugins/wmpa/wmpa_i.c
src/pixmaps/inline_pngs.h
diff --git a/HACKING b/HACKING
index 8f45aff5..5d68d0df 100644
--- a/HACKING
+++ b/HACKING
@@ -1,4 +1,4 @@
-Just some tips if you're going to help with xchat code (patches etc):
+Just some tips if you're going to help with HexChat code (patches etc):
* Use tabs, not spaces, to indent code.
@@ -32,20 +32,20 @@ routine (void)
* Please provide unified format diffs (run diff -u).
-* Call your patch something more meaningfull than xchat.diff (I get a
+* Call your patch something more meaningfull than hexchat.diff (I get a
million of these files!).
* To make a really nice and clean patch, do something like this:
Have two directories, unpacked from the original archive:
-xchat-2.0.0/
-xchat-2.0.0p1/
-Then edit/compile the xchat-2.0.0p1 directory. When you're done, make
+hexchat-2.0.0/
+hexchat-2.0.0p1/
+Then edit/compile the hexchat-2.0.0p1 directory. When you're done, make
a patch with:
-cd xchat-2.0.0p1
+cd hexchat-2.0.0p1
make distclean
cd ..
-diff -urN xchat-2.0.0 xchat-2.0.0p1 > xchat-something.diff
+diff -urN hexchat-2.0.0 hexchat-2.0.0p1 > hexchat-something.diff
-If using nmake (Windows) replace "make distclean" with "nmake -f makefile.msc clean"
\ No newline at end of file
+If using nmake (Windows) replace "make distclean" with "nmake -f makefile.msc clean"
diff --git a/INSTALL b/INSTALL
index 2773a1ce..1b459a29 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,4 +1,4 @@
-X-Chat Requirements:
+HexChat Requirements:
~~~~~~~~~~~~~~~~~~~~
- GTK 2.6+ (it comes with your Linux)
@@ -12,7 +12,7 @@ X-Chat Requirements:
-X-Chat Compiling and Installation:
+HexChat Compiling and Installation:
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Type this:
diff --git a/INSTALL.w32 b/INSTALL.w32
index 846741a0..ef09e44e 100644
--- a/INSTALL.w32
+++ b/INSTALL.w32
@@ -80,26 +80,26 @@ MS Visual C
(you only need Core SDK) - ~200 MB Download (Be warned).
4) Open the build enviroment.
- a) If your planning on developing modifications to the xchat code go:
+ a) If your planning on developing modifications to the HexChat code go:
Start->Programs->Microsoft Platform SDK...->Open Build Enviroment...->(Choose OS)->... (Debug)
- b) If your compiling just to use xchat and wish to no recieve debug messages:
+ b) If your compiling just to use HexChat and wish to no recieve debug messages:
Start->Programs->Microsoft Platform SDK...->Open Build Enviroment...->(Choose OS)->... (Retail)
- 5) Change directory into where you have download the xchat source to and type this:
+ 5) Change directory into where you have download the HexChat source to and type this:
cd src
nmake -f makefile.msc clean
nmake -f makefile.msc
- 6) Copy fe-gtk\xchat.exe to another place.
+ 6) Copy fe-gtk\hexchat.exe to another place.
MS VC++ 7 (.NET)
~~~~~~~~~~~~~~~~
3) Open the Visual Studio .NET Command Prompt
- 4) Change directory into where you have download the xchat source to and type this:
+ 4) Change directory into where you have download the HexChat source to and type this:
cd src
nmake -f makefile.msc clean
nmake -f makefile.msc
- 5) Copy fe-gtk\xchat.exe to another place.
+ 5) Copy fe-gtk\hexchat.exe to another place.
Common problems:
diff --git a/README b/README
index 809a903c..131dd529 100644
--- a/README
+++ b/README
@@ -1,26 +1,26 @@
-X-Chat README
+HexChat README
~~~~~~~~~~~~~
X-Chat ("xchat") Copyright (c) 1998-2010 By Peter Zelezny.
This program is released under the GPL v2 with the additional exemption
that compiling, linking, and/or using OpenSSL is allowed. You may
provide binary packages linked to the OpenSSL libraries, provided that
- all other requirements of the GPL are met.
+ all other requirements of the GPL are met.
See file COPYING for details.
What is it?
~~~~~~~~~~~
- X-Chat is an IRC client for UNIX operating systems. I.R.C. is Internet
+ HexChat is an IRC client for UNIX operating systems. I.R.C. is Internet
Relay Chat, see http://irchelp.org for more information about IRC in
- general. Xchat runs on most BSD and POSIX compliant operating systems.
+ general. HexChat runs on most BSD and POSIX compliant operating systems.
Requirements:
~~~~~~~~~~~~~
* GTK+ 2.10 (this is available at http://www.gtk.org).
- X-Chat is known to work on, at least:
+ HexChat is known to work on, at least:
* Linux
* FreeBSD
@@ -78,7 +78,7 @@ Perl Scripts:
Autoloading Perl Scripts and Plugins
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- * X-Chat automatically loads, at startup:
+ * HexChat automatically loads, at startup:
~/.xchat2/*.pl Perl scripts
~/.xchat2/*.py Python scripts
~/.xchat2/*.so Plugins
diff --git a/faq.html b/faq.html
index caaa9f5e..3cc139d6 100644
--- a/faq.html
+++ b/faq.html
@@ -1,8 +1,8 @@
HexChat FAQ
-
+-->
@@ -134,7 +134,7 @@ language support and all menus and GUI will be in English only.
UNIX:
Identd isn't actually apart of HexChat. You will need to download and install
- your own ident server. Most distributions, including Fedora, come with an
+ your own ident server. Most distributions, including Fedora, come with an
ident server program called oidentd. Make sure it is enabled in
/etc/xinetd.conf or read you distribution's documentation.
@@ -147,7 +147,7 @@ language support and all menus and GUI will be in English only.
- In the Server list's channel column enter multiple channels and separate
+ In the Server list's channel column enter multiple channels and separate
them by commas, eg: "#linux,#warez,#chat". Do not put spaces between the
channels. If the channels also have keys (passwords), then the syntax is:
"#channel1,#channel2,#channel3 key1,key2,key3"
diff --git a/hexchat.desktop b/hexchat.desktop
index b2acb0c8..24b0ecfd 100644
--- a/hexchat.desktop
+++ b/hexchat.desktop
@@ -14,7 +14,7 @@ Comment[pt_BR]=Cliente de IRC
Comment[sl]=Odjemalec IRC
Comment[sv]=IRC-klient
Comment[ro]=Client de IRC
-Comment[zh_TW]=X-Chat 聊天程式
+Comment[zh_TW]=HexChat 聊天程式
Comment=Chat with other people using Internet Relay Chat
Exec=hexchat
Icon=hexchat
diff --git a/hexchat.spec b/hexchat.spec
index 6faec8b3..dfe8474e 100644
--- a/hexchat.spec
+++ b/hexchat.spec
@@ -35,7 +35,7 @@ Provides: hexchat-python = %{epoch}:%{version}-%{release}
Obsoletes: hexchat-python < %{epoch}:%{version}-%{release}
%description
-X-Chat is an easy to use graphical IRC chat client for the X Window System.
+HexChat is an easy to use graphical IRC chat client for the X Window System.
It allows you to join multiple IRC channels (chat rooms) at the same time,
talk publicly, private one-on-one conversations etc. Even file transfers
are possible.
@@ -43,11 +43,11 @@ are possible.
This includes the plugins to run the Perl and Python scripts.
%package tcl
-Summary: Tcl script plugin for X-Chat
+Summary: Tcl script plugin for HexChat
Group: Applications/Internet
Requires: %{name} = %{epoch}:%{version}-%{release}
%description tcl
-This package contains the X-Chat plugin providing the Tcl scripting interface.
+This package contains the HexChat plugin providing the Tcl scripting interface.
%prep
%setup -q
diff --git a/plugins/checksum/checksum.vcxproj.user b/plugins/checksum/checksum.vcxproj.user
deleted file mode 100644
index 695b5c78..00000000
--- a/plugins/checksum/checksum.vcxproj.user
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/plugins/dns/dns.vcxproj.user b/plugins/dns/dns.vcxproj.user
deleted file mode 100644
index 695b5c78..00000000
--- a/plugins/dns/dns.vcxproj.user
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/plugins/doat/doat.vcxproj.user b/plugins/doat/doat.vcxproj.user
deleted file mode 100644
index 695b5c78..00000000
--- a/plugins/doat/doat.vcxproj.user
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/plugins/exec/exec.vcxproj.user b/plugins/exec/exec.vcxproj.user
deleted file mode 100644
index 695b5c78..00000000
--- a/plugins/exec/exec.vcxproj.user
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/plugins/fishlim/fishlim.vcxproj.user b/plugins/fishlim/fishlim.vcxproj.user
deleted file mode 100644
index 695b5c78..00000000
--- a/plugins/fishlim/fishlim.vcxproj.user
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/plugins/hextray/hextray.vcxproj.user b/plugins/hextray/hextray.vcxproj.user
deleted file mode 100644
index 695b5c78..00000000
--- a/plugins/hextray/hextray.vcxproj.user
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/plugins/lua/lua.vcxproj.user b/plugins/lua/lua.vcxproj.user
deleted file mode 100644
index 695b5c78..00000000
--- a/plugins/lua/lua.vcxproj.user
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/plugins/mpcinfo/mpcinfo.vcxproj.user b/plugins/mpcinfo/mpcinfo.vcxproj.user
deleted file mode 100644
index 695b5c78..00000000
--- a/plugins/mpcinfo/mpcinfo.vcxproj.user
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/plugins/perl/perl-512.vcxproj.user b/plugins/perl/perl-512.vcxproj.user
deleted file mode 100644
index 695b5c78..00000000
--- a/plugins/perl/perl-512.vcxproj.user
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/plugins/perl/perl-514.vcxproj.user b/plugins/perl/perl-514.vcxproj.user
deleted file mode 100644
index 695b5c78..00000000
--- a/plugins/perl/perl-514.vcxproj.user
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/plugins/perl/perl-516.vcxproj.user b/plugins/perl/perl-516.vcxproj.user
deleted file mode 100644
index 695b5c78..00000000
--- a/plugins/perl/perl-516.vcxproj.user
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/plugins/python/python.vcxproj.user b/plugins/python/python.vcxproj.user
deleted file mode 100644
index 695b5c78..00000000
--- a/plugins/python/python.vcxproj.user
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/plugins/sasl/sasl.vcxproj.user b/plugins/sasl/sasl.vcxproj.user
deleted file mode 100644
index 695b5c78..00000000
--- a/plugins/sasl/sasl.vcxproj.user
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/plugins/tcl/tcl.vcxproj.user b/plugins/tcl/tcl.vcxproj.user
deleted file mode 100644
index 695b5c78..00000000
--- a/plugins/tcl/tcl.vcxproj.user
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/plugins/upd/upd.vcxproj.user b/plugins/upd/upd.vcxproj.user
deleted file mode 100644
index 695b5c78..00000000
--- a/plugins/upd/upd.vcxproj.user
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/plugins/winamp/winamp.vcxproj.user b/plugins/winamp/winamp.vcxproj.user
deleted file mode 100644
index 695b5c78..00000000
--- a/plugins/winamp/winamp.vcxproj.user
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/plugins/winsys/winsys.vcxproj.user b/plugins/winsys/winsys.vcxproj.user
deleted file mode 100644
index 695b5c78..00000000
--- a/plugins/winsys/winsys.vcxproj.user
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/plugins/wmpa/wmpa.vcxproj.user b/plugins/wmpa/wmpa.vcxproj.user
deleted file mode 100644
index 695b5c78..00000000
--- a/plugins/wmpa/wmpa.vcxproj.user
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/src/common/common.vcxproj.user b/src/common/common.vcxproj.user
deleted file mode 100644
index 695b5c78..00000000
--- a/src/common/common.vcxproj.user
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/src/dirent/dirent.vcxproj.user b/src/dirent/dirent.vcxproj.user
deleted file mode 100644
index 695b5c78..00000000
--- a/src/dirent/dirent.vcxproj.user
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/src/fe-gtk/fe-gtk.vcxproj.user b/src/fe-gtk/fe-gtk.vcxproj.user
deleted file mode 100644
index 695b5c78..00000000
--- a/src/fe-gtk/fe-gtk.vcxproj.user
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/src/fe-text/fe-text.vcxproj.user b/src/fe-text/fe-text.vcxproj.user
deleted file mode 100644
index 695b5c78..00000000
--- a/src/fe-text/fe-text.vcxproj.user
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/src/htm/htm.csproj.user b/src/htm/htm.csproj.user
deleted file mode 100644
index 1f4a1d77..00000000
--- a/src/htm/htm.csproj.user
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
- publish\
-
-
-
-
-
- en-US
- false
-
-
\ No newline at end of file
diff --git a/src/pixmaps/pixmaps.vcxproj.user b/src/pixmaps/pixmaps.vcxproj.user
deleted file mode 100644
index 695b5c78..00000000
--- a/src/pixmaps/pixmaps.vcxproj.user
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/src/version/version.vcxproj.user b/src/version/version.vcxproj.user
deleted file mode 100644
index 695b5c78..00000000
--- a/src/version/version.vcxproj.user
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/win32/copy/copy.vcxproj.user b/win32/copy/copy.vcxproj.user
deleted file mode 100644
index 695b5c78..00000000
--- a/win32/copy/copy.vcxproj.user
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/win32/ext/zlib-wdk/install.vcxproj.user b/win32/ext/zlib-wdk/install.vcxproj.user
deleted file mode 100644
index 695b5c78..00000000
--- a/win32/ext/zlib-wdk/install.vcxproj.user
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/win32/ext/zlib-wdk/miniunz.vcxproj.user b/win32/ext/zlib-wdk/miniunz.vcxproj.user
deleted file mode 100644
index 695b5c78..00000000
--- a/win32/ext/zlib-wdk/miniunz.vcxproj.user
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/win32/ext/zlib-wdk/minizip.vcxproj.user b/win32/ext/zlib-wdk/minizip.vcxproj.user
deleted file mode 100644
index 695b5c78..00000000
--- a/win32/ext/zlib-wdk/minizip.vcxproj.user
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/win32/ext/zlib-wdk/testzlib.vcxproj.user b/win32/ext/zlib-wdk/testzlib.vcxproj.user
deleted file mode 100644
index 695b5c78..00000000
--- a/win32/ext/zlib-wdk/testzlib.vcxproj.user
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/win32/ext/zlib-wdk/testzlibdll.vcxproj.user b/win32/ext/zlib-wdk/testzlibdll.vcxproj.user
deleted file mode 100644
index 695b5c78..00000000
--- a/win32/ext/zlib-wdk/testzlibdll.vcxproj.user
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/win32/ext/zlib-wdk/zlibstat.vcxproj.user b/win32/ext/zlib-wdk/zlibstat.vcxproj.user
deleted file mode 100644
index 695b5c78..00000000
--- a/win32/ext/zlib-wdk/zlibstat.vcxproj.user
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/win32/ext/zlib-wdk/zlibvc.vcxproj.user b/win32/ext/zlib-wdk/zlibvc.vcxproj.user
deleted file mode 100644
index 695b5c78..00000000
--- a/win32/ext/zlib-wdk/zlibvc.vcxproj.user
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/win32/hexchat.props b/win32/hexchat.props
index 0f2a0df7..0f6d625e 100644
--- a/win32/hexchat.props
+++ b/win32/hexchat.props
@@ -1,4 +1,4 @@
-
+
diff --git a/win32/installer/hexchat-x64.skel.iss b/win32/installer/hexchat-x64.skel.iss
index 799f224f..61486190 100644
--- a/win32/installer/hexchat-x64.skel.iss
+++ b/win32/installer/hexchat-x64.skel.iss
@@ -10,6 +10,7 @@ UninstallDisplayName=HexChat (x64)
DefaultDirName={pf}\HexChat
DefaultGroupName=HexChat
DisableProgramGroupPage=yes
+Compression=lzma2/ultra
SolidCompression=yes
SourceDir=..\rel
OutputDir=..
diff --git a/win32/installer/hexchat-x86.skel.iss b/win32/installer/hexchat-x86.skel.iss
index 21b5efda..83a45bc7 100644
--- a/win32/installer/hexchat-x86.skel.iss
+++ b/win32/installer/hexchat-x86.skel.iss
@@ -10,6 +10,7 @@ UninstallDisplayName=HexChat (x86)
DefaultDirName={pf}\HexChat
DefaultGroupName=HexChat
DisableProgramGroupPage=yes
+Compression=lzma2/ultra
SolidCompression=yes
SourceDir=..\rel
OutputDir=..
diff --git a/win32/installer/installer.vcxproj.user b/win32/installer/installer.vcxproj.user
deleted file mode 100644
index 695b5c78..00000000
--- a/win32/installer/installer.vcxproj.user
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/win32/nls/nls.vcxproj b/win32/nls/nls.vcxproj
index 94bef1c6..baff5a63 100644
--- a/win32/nls/nls.vcxproj
+++ b/win32/nls/nls.vcxproj
@@ -61,10 +61,6 @@
true
true
-
-
-
-
cd ..\..\po
rmdir /q /s "$(OutDir)\locale"
@@ -87,10 +83,6 @@ mkdir "$(OutDir)\locale\%%~nA\LC_MESSAGES"
true
true
-
-
-
-
cd ..\..\po
rmdir /q /s "$(OutDir)\locale"
diff --git a/win32/nls/nls.vcxproj.user b/win32/nls/nls.vcxproj.user
deleted file mode 100644
index 695b5c78..00000000
--- a/win32/nls/nls.vcxproj.user
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
\ No newline at end of file