Pidgin

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14219/src

Modified Files:
	gtkthemes.h status.h 
Log Message:
Doxygen fixes


Index: gtkthemes.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkthemes.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -p -r1.3 -r1.4
--- gtkthemes.h	20 Sep 2005 21:47:57 -0000	1.3
+++ gtkthemes.h	30 Sep 2005 05:07:02 -0000	1.4
@@ -1,5 +1,6 @@
 /**
- * @defgroup gtkui GTK+ User Interface
+ * @file gtkthemes.h GTK+ Smiley Theme API
+ * @ingroup gtkui
  *
  * gaim
  *

Index: status.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/status.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -p -r1.29 -r1.30
--- status.h	12 Sep 2005 06:04:26 -0000	1.29
+++ status.h	30 Sep 2005 05:07:03 -0000	1.30
@@ -501,7 +501,7 @@ void gaim_status_set_active_with_attrs(G
  *
  * @param status The status.
  * @param active The active state.
- * @param list   A list of attributes to set on the status.  This list is
+ * @param attrs  A list of attributes to set on the status.  This list is
  *               composed of key/value pairs, where each key is a valid
  *               attribute name for this GaimStatusType.
  */

Update of /cvsroot/gaim/gaim/src/protocols
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12416/src/protocols

Modified Files:
	Makefile.am 
Log Message:
Autodetect Howl and enable the Bonjour PRPL if the Howl libs and header
files are found.

This is my first real forray into configure.ac, so someone smart may
want to look through it.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/Makefile.am,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -p -r1.19 -r1.20
--- Makefile.am	20 Aug 2005 20:17:07 -0000	1.19
+++ Makefile.am	30 Sep 2005 04:56:25 -0000	1.20
@@ -1,3 +1,3 @@
-DIST_SUBDIRS = gg irc jabber msn napster novell oscar sametime silc toc simple trepia yahoo zephyr
+DIST_SUBDIRS = bonjour gg irc jabber msn napster novell oscar sametime silc toc simple trepia yahoo zephyr
 
 SUBDIRS = $(DYNAMIC_PRPLS) $(STATIC_PRPLS)

Update of /cvsroot/gaim/gaim
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12416

Modified Files:
	configure.ac 
Log Message:
Autodetect Howl and enable the Bonjour PRPL if the Howl libs and header
files are found.

This is my first real forray into configure.ac, so someone smart may
want to look through it.


Index: configure.ac
===================================================================
RCS file: /cvsroot/gaim/gaim/configure.ac,v
retrieving revision 1.316
retrieving revision 1.317
diff -u -d -p -r1.316 -r1.317
--- configure.ac	7 Sep 2005 16:20:38 -0000	1.316
+++ configure.ac	30 Sep 2005 04:56:25 -0000	1.317
@@ -101,10 +101,46 @@ dnl to prevent the g_stat()/g_unlink() c
 dnl (09:50:07) Robot101: LSchiere2: it's easy. +LC_SYS_LARGEFILE somewhere in configure.ac
 AC_SYS_LARGEFILE
 
-dnl Check for SILC client includes and libraries
-AC_ARG_WITH(silc-includes, [  --with-silc-includes=DIR
-                          Compile the SILC plugin against includes in DIR ], [ac_silc_includes="$withval"], [ac_silc_includes="no"])
-AC_ARG_WITH(silc-libs, [  --with-silc-libs=DIR    Compile the SILC plugin against the SILC libs in DIR], [ac_silc_libs="$withval"], [ac_silc_libs="no"])
+
+
+dnl #######################################################################
+dnl # Check for Howl headers (for Bonjour)
+dnl #######################################################################
+AC_ARG_WITH(howl-includes, [AC_HELP_STRING([--with-howl-includes=DIR], [Compile the Bonjour plugin against the Howl includes in DIR])], [ac_howl_includes="$withval"], [ac_howl_includes="no"])
+AC_ARG_WITH(howl-libs, [AC_HELP_STRING([--with-howl-libs=DIR], [Compile the Bonjour plugin against the Howl libs in DIR])], [ac_howl_libs="$withval"], [ac_howl_libs="no"])
+HOWL_CFLAGS=""
+HOWL_LIBS=""
+
+dnl Attempt to autodetect Howl
+PKG_CHECK_MODULES(HOWL, howl,
+	[howlincludes="yes" howllibs="yes"],
+	[howlincludes="no" howllibs="no"])
+
+dnl Override HOWL_CFLAGS if the user specified an include dir
+if test "$ac_howl_includes" != "no"; then
+	HOWL_CFLAGS="-I$ac_howl_includes"
+fi
+CPPFLAGS_save="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $HOWL_CFLAGS"
+AC_CHECK_HEADER(howl.h, [howlincludes=yes], [howlincludes=no])
+CPPFLAGS="$CPPFLAGS_save"
+
+dnl Override HOWL_LIBS if the user specified a libs dir
+if test "$ac_howl_libs" != "no"; then
+	HOWL_LIBS="-L$ac_howl_libs"
+fi
+AC_CHECK_LIB(howl, sw_discovery_init, [howllibs=yes], [howllibs=no], $HOWL_LIBS)
+
+AC_SUBST(HOWL_CFLAGS)
+AC_SUBST(HOWL_LIBS)
+
+
+
+dnl #######################################################################
+dnl # Check for SILC client includes and libraries
+dnl #######################################################################
+AC_ARG_WITH(silc-includes, [AC_HELP_STRING([--with-silc-includes=DIR], [Compile the SILC plugin against includes in DIR])], [ac_silc_includes="$withval"], [ac_silc_includes="no"])
+AC_ARG_WITH(silc-libs, [AC_HELP_STRING([--with-silc-libs=DIR], [Compile the SILC plugin against the SILC libs in DIR])], [ac_silc_libs="$withval"], [ac_silc_libs="no"])
 SILC_CFLAGS=""
 SILC_LIBS=""
 if test -n "$with_silc_includes" || test -n "$with_silc_libs"; then
@@ -144,6 +180,8 @@ fi
 AC_SUBST(SILC_LIBS)
 AC_SUBST(SILC_CFLAGS)
 
+
+
 AC_ARG_ENABLE(distrib,,,enable_distrib=no)
 AM_CONDITIONAL(DISTRIB, test "x$enable_distrib" = "xyes")
 AC_ARG_ENABLE(prpls,   [  --disable-prpls         don't build dynamic protocol plugins],,enable_prpls=yes)
@@ -154,7 +192,10 @@ if test "x$STATIC_PRPLS" != "x" -a "x$DY
 fi
 
 if test "x$STATIC_PRPLS" = "xall" ; then
-	STATIC_PRPLS="gg irc jabber msn napster novell oscar sametime silc yahoo zephyr"
+	STATIC_PRPLS="bonjour gg irc jabber msn napster novell oscar sametime silc yahoo zephyr"
+fi
+if test "x$howlincludes" != "xyes" -o "x$howllibs" != "xyes"; then
+	STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/bonjour//'`
 fi
 if test "x$silcincludes" != "xyes" -o "x$silcclient" != "xyes"; then
 	STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/silc//'`
@@ -168,6 +209,7 @@ for i in $STATIC_PRPLS ; do
 	extern_init="$extern_init extern gboolean gaim_init_${i}_plugin();"
 	load_proto="$load_proto gaim_init_${i}_plugin();"
 	case $i in
+		bonjour)	static_bonjour=yes ;;
 		gg)			static_gg=yes ;;
 		irc)		static_irc=yes ;;
 		jabber)		static_jabber=yes ;;
@@ -185,6 +227,7 @@ for i in $STATIC_PRPLS ; do
 		*)			echo "Invalid static protocol $i!!" ; exit ;;
 	esac
 done
+AM_CONDITIONAL(STATIC_BONJOUR, test "x$static_bonjour" = "xyes" -a "x$howlincludes" = "xyes" -a "x$howllibs" = "xyes")
 AM_CONDITIONAL(STATIC_GG, test "x$static_gg" = "xyes")
 AM_CONDITIONAL(STATIC_IRC, test "x$static_irc" = "xyes")
 AM_CONDITIONAL(STATIC_JABBER, test "x$static_jabber" = "xyes")
@@ -203,9 +246,12 @@ AC_SUBST(STATIC_LINK_LIBS)
 AC_DEFINE_UNQUOTED(STATIC_PROTO_INIT, $extern_init void static_proto_init() { $load_proto },
 	[Loads static protocol plugin module initialization functions.])
 
-AC_ARG_WITH(dynamic_prpls,   [  --with-dynamic-prpls    specify which protocols to build dynamically],[DYNAMIC_PRPLS=`echo $withval | $sedpath 's/,/ /g'`])
+AC_ARG_WITH(dynamic_prpls, [AC_HELP_STRING([--with-dynamic-prpls], [specify which protocols to build dynamically])], [DYNAMIC_PRPLS=`echo $withval | $sedpath 's/,/ /g'`])
 if test "x$DYNAMIC_PRPLS" = "xall" ; then
-	DYNAMIC_PRPLS="gg irc jabber msn napster novell oscar sametime silc yahoo zephyr"
+	DYNAMIC_PRPLS="bonjour gg irc jabber msn napster novell oscar sametime silc yahoo zephyr"
+fi
+if test "x$howlincludes" != "xyes" -o "x$howllibs" != "xyes"; then
+	DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/bonjour//'`
 fi
 if test "x$silcincludes" != "xyes" -o "x$silcclient" != "xyes"; then
 	DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/silc//'`
@@ -213,6 +259,7 @@ fi
 AC_SUBST(DYNAMIC_PRPLS)
 for i in $DYNAMIC_PRPLS ; do
 	case $i in
+		bonjour)	dynamic_bonjour=yes ;;
 		gg)			dynamic_gg=yes ;;
 		irc)		dynamic_irc=yes ;;
 		jabber)		dynamic_jabber=yes ;;
@@ -230,6 +277,7 @@ for i in $DYNAMIC_PRPLS ; do
 		*)			echo "Invalid dynamic protocol $i!!" ; exit ;;
 	esac
 done
+AM_CONDITIONAL(DYNAMIC_BONJOUR, test "x$dynamic_bonjour" = "xyes" -a "x$bonjourincludes" = "xyes" -a "x$bonjourclient" = "xyes")
 AM_CONDITIONAL(DYNAMIC_GG, test "x$dynamic_gg" = "xyes")
 AM_CONDITIONAL(DYNAMIC_IRC, test "x$dynamic_irc" = "xyes")
 AM_CONDITIONAL(DYNAMIC_JABBER, test "x$dynamic_jabber" = "xyes")
@@ -1178,7 +1226,7 @@ else
 	enable_prpls=no
 fi
 
-dnl checks for icqlib
+dnl checks for icqlib--do we still need these?
 AC_CHECK_HEADERS(asm/byteorder.h byteswap.h endian.h machine/endian.h arpa/nameser_compat.h)
 AC_CHECK_FUNCS(bswap_32 bswap_16)
 AC_C_BIGENDIAN
@@ -1341,6 +1389,7 @@ AC_OUTPUT([Makefile
 		   sounds/Makefile
 		   src/Makefile
 		   src/protocols/Makefile
+		   src/protocols/bonjour/Makefile
 		   src/protocols/gg/Makefile
 		   src/protocols/irc/Makefile
 		   src/protocols/jabber/Makefile

Update of /cvsroot/gaim/web/htdocs/win32
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14927

Modified Files:
	index.php 
Log Message:
How did this happen?

Index: index.php
===================================================================
RCS file: /cvsroot/gaim/web/htdocs/win32/index.php,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -d -p -r1.134 -r1.135
--- index.php	21 Sep 2005 02:17:20 -0000	1.134
+++ index.php	29 Sep 2005 20:51:58 -0000	1.135
@@ -140,14 +140,14 @@ gaim-<?php print $current_win32_version;
 <h2 id="debug">Debugging Windows Gaim</h2>
 <h3>What to do if Gaim crashes</h3>
 <p>First make sure that you are not affected by 'Dll Hell' as described above. Download and install the <a href="http://prdownloads.sourceforge.net/gaim/gaim-<?php print $current_win32_version; ?>-debug.exe">debug version of WinGaim <?php print $current_win32_version; ?></a>. The next time you run Gaim and it crashes, the call stack will be dumped to <code>gaim.RPT</code> in your Gaim install dir.  When submitting a bug report, give a detailed description on how to produce your bug and attach the most recent crash dump from your <code>gaim.RPT</code> file.</p>
+<h2 id="portable">Running Windows Gaim From a USB Drive</h2>
+<p>It is relatively easy to set up Gaim to run from a USB Drive.  Most of Gaim is very good about not assuming that it is installed; a slightly customized launcher makes it all come together nicely.</p>
+<p>The way that this is set up, other GTK+ applications can use the same GTK+ runtime.</p>
 <p>Caveats
 <ul>
   <li>SpellChecking doesn't work yet, it requires some minor changes that aren't in a released version of Gaim yet.</li>
 </ul>
 </p>
-<h2 id="portable">Running Windows Gaim From a USB Drive</h2>
-<p>It is relatively easy to set up Gaim to run from a USB Drive.  Most of Gaim is very good about not assuming that it is installed; a slightly customized launcher makes it all come together nicely.</p>
-<p>The way that this is set up, other GTK+ applications can use the same GTK+ runtime.</p>
 <h3>How to setup your USB-Drive Gaim</h3>
 <ul>
   <li>Download and Install Gaim</li>

Update of /cvsroot/gaim/gaim/src/win32/nsis
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32665/src/win32/nsis

Modified Files:
	langmacros.nsh 
Added Files:
	gaim-plugin.nsh 
Log Message:
Add SIMPLE to default build. Update installer with unmerged changes in oldstatus and to support the SIMPLE prpl.


Index: langmacros.nsh
===================================================================
RCS file: /cvsroot/gaim/gaim/src/win32/nsis/langmacros.nsh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -p -r1.3 -r1.4
--- langmacros.nsh	15 May 2005 18:53:22 -0000	1.3
+++ langmacros.nsh	29 Sep 2005 15:37:44 -0000	1.4
@@ -81,6 +81,35 @@
   !insertmacro GAIM_MACRO_LANGSTRING_INSERT un.GAIM_UNINSTALL_ERROR_1		${CUR_LANG}
   !insertmacro GAIM_MACRO_LANGSTRING_INSERT un.GAIM_UNINSTALL_ERROR_2		${CUR_LANG}
 
+  ; Spellcheck Section Prompts
+  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_SECTION_TITLE	${CUR_LANG}
+  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_ERROR		${CUR_LANG}
+  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_DICT_ERROR		${CUR_LANG}
+  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_SECTION_DESCRIPTION	${CUR_LANG}
+  !insertmacro GAIM_MACRO_LANGSTRING_INSERT ASPELL_INSTALL_FAILED		${CUR_LANG}
+  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_BRETON		${CUR_LANG}
+  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_CATALAN		${CUR_LANG}
+  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_CZECH		${CUR_LANG}
+  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_WELSH		${CUR_LANG}
+  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_DANISH		${CUR_LANG}
+  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_GERMAN		${CUR_LANG}
+  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_ENGLISH		${CUR_LANG}
+  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_GREEK		${CUR_LANG}
+  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_ESPERANTO		${CUR_LANG}
+  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_SPANISH		${CUR_LANG}
+  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_FAROESE		${CUR_LANG}
+  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_FRENCH		${CUR_LANG}
+  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_ITALIAN		${CUR_LANG}
+  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_DUTCH		${CUR_LANG}
+  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_NORWEGIAN		${CUR_LANG}
+  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_POLISH		${CUR_LANG}
+  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_PORTUGUESE		${CUR_LANG}
+  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_ROMANIAN		${CUR_LANG}
+  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_RUSSIAN		${CUR_LANG}
+  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_SLOVAK		${CUR_LANG}
+  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_SWEDISH		${CUR_LANG}
+  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_UKRAINIAN		${CUR_LANG}
+
   !undef CUR_LANG
 !macroend

Update of /cvsroot/gaim/gaim
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32665

Modified Files:
	gaim-installer.nsi Makefile.mingw 
Log Message:
Add SIMPLE to default build. Update installer with unmerged changes in oldstatus and to support the SIMPLE prpl.

Index: gaim-installer.nsi
===================================================================
RCS file: /cvsroot/gaim/gaim/gaim-installer.nsi,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -p -r1.82 -r1.83
--- gaim-installer.nsi	14 Aug 2005 06:23:51 -0000	1.82
+++ gaim-installer.nsi	29 Sep 2005 15:37:44 -0000	1.83
@@ -1,7 +1,8 @@
 ; Installer script for win32 Gaim
-; Herman Bloggs <hermanator12002@...>
+; Original Author: Herman Bloggs <hermanator12002@...>
+; Updated By: Daniel Atallah <daniel_atallah@...>
 
-; NOTE: this .NSI script is intended for NSIS 2.0 (final release).
+; NOTE: this .NSI script is intended for NSIS 2.08
 ;
 
 ;--------------------------------
@@ -12,6 +13,7 @@ Var GTK_THEME_SEL
[...1212 lines suppressed...]
+  DetailPrint "Downloading the Aspell $R0 Dictionary... ($R3)"
+  NSISdl::download $R3 $R1
+  Pop $R3
+  StrCmp $R3 "success" +3
+    StrCpy $R0 $R3
+    Goto done
+  ExecWait '"$R1"'
+  Delete $R1
+  Goto check ; Check that it is now installed correctly
+
+  installed: ;The dictionary is currently installed, no error message
+    DetailPrint "Aspell $R0 Dictionary is installed"
+    StrCpy $R0 ''
+
+  done:
+  Pop $R3
+  Pop $R2
+  Pop $R1
+  Exch $R0
+FunctionEnd

Index: Makefile.mingw
===================================================================
RCS file: /cvsroot/gaim/gaim/Makefile.mingw,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -p -r1.43 -r1.44
--- Makefile.mingw	11 Jul 2005 07:52:50 -0000	1.43
+++ Makefile.mingw	29 Sep 2005 15:37:44 -0000	1.44
@@ -25,6 +25,7 @@ TREPIA = $(GAIM_PROTOS)/trepia
 GG = $(GAIM_PROTOS)/gg
 NOVELL = $(GAIM_PROTOS)/novell
 SILC = $(GAIM_PROTOS)/silc
+SIMPLE = $(GAIM_PROTOS)/simple
 SAMETIME = $(GAIM_PROTOS)/sametime
 PO = ./po
 
@@ -58,6 +59,7 @@ GG_TYPE = PLUGIN
 NOVELL_TYPE = PLUGIN
 TREPIA_TYPE = PLUGIN
 SILC_TYPE = PLUGIN
+SIMPLE_TYPE = PLUGIN
 SAMETIME_TYPE = PLUGIN
 
 all:
@@ -71,6 +73,7 @@ all:
 	$(MAKE) TYPE='$(GG_TYPE)' -C $(GG) -f Makefile.mingw
 	$(MAKE) TYPE='$(NOVELL_TYPE)' -C $(NOVELL) -f Makefile.mingw
 	$(MAKE) TYPE='$(SILC_TYPE)' -C $(SILC) -f Makefile.mingw
+	$(MAKE) TYPE='$(SIMPLE_TYPE)' -C $(SIMPLE) -f Makefile.mingw
 	$(MAKE) TYPE='$(SAMETIME_TYPE)' -C $(SAMETIME) -f Makefile.mingw
 	$(MAKE) -C $(GAIM_SRC) -f Makefile.mingw
 	$(MAKE) -C $(GAIM_PLUGINS) -f Makefile.mingw
@@ -92,6 +95,7 @@ install: all
 	$(MAKE) TYPE='$(GG_TYPE)' -C $(GG) -f Makefile.mingw install
 	$(MAKE) TYPE='$(NOVELL_TYPE)' -C $(NOVELL) -f Makefile.mingw install
 	$(MAKE) TYPE='$(SILC_TYPE)' -C $(SILC) -f Makefile.mingw install
+	$(MAKE) TYPE='$(SIMPLE_TYPE)' -C $(SIMPLE) -f Makefile.mingw install
 	$(MAKE) TYPE='$(SAMETIME_TYPE)' -C $(SAMETIME) -f Makefile.mingw install
 	cp $(NEEDED_DLLS) $(GAIM_INSTALL_DIR)
 	cp $(SOUNDS) $(GAIM_INSTALL_DIR)/sounds/gaim
@@ -119,6 +123,7 @@ clean:
 	$(MAKE) -C $(GG) -f Makefile.mingw clean
 	$(MAKE) -C $(NOVELL) -f Makefile.mingw clean
 	$(MAKE) -C $(SILC) -f Makefile.mingw clean
+	$(MAKE) -C $(SIMPLE) -f Makefile.mingw clean
 	$(MAKE) -C $(SAMETIME) -f Makefile.mingw clean
 	$(MAKE) -C $(GAIM_SRC) -f Makefile.mingw clean
 	$(MAKE) -C $(GAIM_PLUGINS) -f Makefile.mingw clean

Update of /cvsroot/gaim/gaim/src/win32/nsis/translations
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32665/src/win32/nsis/translations

Modified Files:
	albanian.nsh bulgarian.nsh catalan.nsh czech.nsh danish.nsh 
	dutch.nsh english.nsh finnish.nsh french.nsh german.nsh 
	hungarian.nsh italian.nsh japanese.nsh korean.nsh 
	norwegian.nsh polish.nsh portuguese-br.nsh portuguese.nsh 
	romanian.nsh serbian-latin.nsh simp-chinese.nsh slovak.nsh 
	slovenian.nsh spanish.nsh swedish.nsh trad-chinese.nsh 
	vietnamese.nsh 
Log Message:
Add SIMPLE to default build. Update installer with unmerged changes in oldstatus and to support the SIMPLE prpl.

Index: albanian.nsh
===================================================================
RCS file: /cvsroot/gaim/gaim/src/win32/nsis/translations/albanian.nsh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -p -r1.3 -r1.4
--- albanian.nsh	11 Apr 2005 12:24:46 -0000	1.3
+++ albanian.nsh	29 Sep 2005 15:37:44 -0000	1.4
@@ -27,7 +27,7 @@
 !define GTK_SECTION_DESCRIPTION		"Një grup mjetesh shumëplatformësh për GUI, përdorur nga Gaim-i"
 !define GTK_THEMES_SECTION_DESCRIPTION	"Temat GTK+ mund të ndryshojnë pamjen dhe sjelljen e zbatimeve GTK+."
 !define GTK_NO_THEME_DESC			"Mos instalo temë GTK+"
-!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) është një temë GTK+ që ndërthuret mirë mjedisin Windows."
+!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) është një temë GTK që ndërthuret mirë mjedisin Windows."
 !define GTK_BLUECURVE_THEME_DESC		"Tema Bluecurve."
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC	"Tema Lighthouseblue."
 

Index: bulgarian.nsh
===================================================================
RCS file: /cvsroot/gaim/gaim/src/win32/nsis/translations/bulgarian.nsh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -p -r1.4 -r1.5
--- bulgarian.nsh	11 Apr 2005 12:24:46 -0000	1.4
+++ bulgarian.nsh	29 Sep 2005 15:37:44 -0000	1.5
@@ -23,7 +23,7 @@
 !define GTK_SECTION_DESCRIPTION		"Ìóëòèïëàòôîðåí êèò çà ãðàôè÷åí èçãëåä, èçïîëçâàí îò Gaim"
 !define GTK_THEMES_SECTION_DESCRIPTION	"GTK+ òåìèòå ìîãàò äà ïðîìåíÿò Èçãëåäà íà GTK+ ïðèëîæåíèÿ."
 !define GTK_NO_THEME_DESC			"Íå èíñòàëèðàéòå GTK+ òåìà"
-!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) å GTK+ òåìà êîÿòî ñå ñìåñâà äîáðå ñúñ Windows."
+!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) å GTK òåìà êîÿòî ñå ñìåñâà äîáðå ñúñ Windows."
 !define GTK_BLUECURVE_THEME_DESC		"Bluecurve òåìàòà."
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC	"Lighthouseblue òåìàòà."
 

Index: catalan.nsh
===================================================================
RCS file: /cvsroot/gaim/gaim/src/win32/nsis/translations/catalan.nsh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -p -r1.3 -r1.4
--- catalan.nsh	11 Apr 2005 12:24:46 -0000	1.3
+++ catalan.nsh	29 Sep 2005 15:37:44 -0000	1.4
@@ -1,54 +1,94 @@
-;;
-;;  catalan.nsh
-;;
-;;  Catalan language strings for the Windows Gaim NSIS installer.
-;;  Windows Code page: 1252
-;;
-;;  Author: "Bernat López" <bernatl@...>
-;;  Version 2
-;;  
-
-; Startup GTK+ check
-!define GTK_INSTALLER_NEEDED			"L'entorn d'execució GTK+ no existeix o necessita ésser actualitzat.$\rSius plau instal.la la versió${GTK_VERSION} o superior de l'entonr GTK+"
-
-; License Page
-!define GAIM_LICENSE_BUTTON			"Següent >"
-!define GAIM_LICENSE_BOTTOM_TEXT		"$(^Name) és distribuït sota llicència GPLe. Podeu consultar la llicència, només per proposits informatius, aquí. $_CLICK"
-
-; Components Page
-!define GAIM_SECTION_TITLE			"Client Gaim de Missatgeria Instantània (necessari)"
-!define GTK_SECTION_TITLE			"Entorn d'Execució GTK+ (necessari)"
-!define GTK_THEMES_SECTION_TITLE		"Temes GTK+"
-!define GTK_NOTHEME_SECTION_TITLE		"Sense tema"
-!define GTK_WIMP_SECTION_TITLE		"Tema Imwi"
-!define GTK_BLUECURVE_SECTION_TITLE		"Tema Corba Blava"
-!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Tema Light House Blue"
-!define GAIM_SECTION_DESCRIPTION		"Fitxers i dlls del nucli de Gaim"
-!define GTK_SECTION_DESCRIPTION		"Una eina IGU multiplataforma, utilitzada per Gaim"
-!define GTK_THEMES_SECTION_DESCRIPTION	"GTK+ Themes can change the look and feel of GTK+ applications."
-!define GTK_NO_THEME_DESC			"No instal.lis un tema GTK+"
-!define GTK_WIMP_THEME_DESC			"GTK-Imwi (imitador Windows) és un tema GTK+ que s'integra perfectament en un entorn d'escriptori Windows."
-!define GTK_BLUECURVE_THEME_DESC		"El tema Corba Blava."
-!define GTK_LIGHTHOUSEBLUE_THEME_DESC	"The Lighthouseblue theme."
-
-; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"S'ha trobat una versió antiga de l'entorn d'execució GTK. Vols actualitzar-la?$\rNota: Gaim no funcionarà sino ho fas."
-
-; Installer Finish Page
-!define GAIM_FINISH_VISIT_WEB_SITE		"Visita la pàgina web de Gaim per Windows"
-
-; Gaim Section Prompts and Texts
-!define GAIM_UNINSTALL_DESC			"Gaim (només esborrar)"
-!define GAIM_PROMPT_WIPEOUT			"El teu directori antic de Gaim serà esborrat. Vols continuar?$\r$\rNota: Els plugins no estàndards que tinguis instal.lats seran esborrats.$\rLes preferències d'usuari de Gaim no es veruan afectades."
-!define GAIM_PROMPT_DIR_EXISTS		"El directori d'instal.lació que has especificat ja existeix. Tots els continguts$\rseran esborrats. Vols continuar?"
-
-; GTK+ Section Prompts
-!define GTK_INSTALL_ERROR			"Error installlant l'entorn d'execució GTK+."
-!define GTK_BAD_INSTALL_PATH			"El directori que has introduït no pot ésser accedit o creat."
-
-; GTK+ Themes section
-!define GTK_NO_THEME_INSTALL_RIGHTS		"No tens permisos per instal.lar un tema GTK+."
-
-; Uninstall Section Prompts
-!define un.GAIM_UNINSTALL_ERROR_1		"L'instal.lador podria no trobar les entrades del registre de Gaim.$\rProbablement un altre usuari ha instal.lat aquesta aplicació."
-!define un.GAIM_UNINSTALL_ERROR_2		"No tens permís per desinstal.lar aquesta aplicació."
+;;  vim:syn=winbatch:encoding=cp1252:
+;;
+;;  catalan.nsh
+;;
+;;  Catalan language strings for the Windows Gaim NSIS installer.
+;;  Windows Code page: 1252
+;;
+;;  Author: "Bernat López" <bernatl@...>
+;;  Version 2
+;;
+
+; Startup Checks
+!define INSTALLER_IS_RUNNING			"L'instal.lador encara està executant-se."
+!define GAIM_IS_RUNNING				"Hi ha una instància del Gaim executant-se. Surt del Gaim i torna a intentar-ho."
+!define GTK_INSTALLER_NEEDED			"L'entorn d'execució GTK+ no existeix o necessita ésser actualitzat.$\rSius plau instal.la la versió${GTK_VERSION} o superior de l'entonr GTK+"
+
+; License Page
+!define GAIM_LICENSE_BUTTON			"Següent >"
+!define GAIM_LICENSE_BOTTOM_TEXT		"$(^Name) és distribuït sota llicència GPL. Podeu consultar la llicència, només per proposits informatius, aquí.  $_CLICK"
+
+; Components Page
+!define GAIM_SECTION_TITLE			"Client Gaim de Missatgeria Instantània (necessari)"
+!define GTK_SECTION_TITLE			"Entorn d'Execució GTK+ (necessari)"
+!define GTK_THEMES_SECTION_TITLE		"Temes GTK+"
+!define GTK_NOTHEME_SECTION_TITLE		"Sense tema"
+!define GTK_WIMP_SECTION_TITLE			"Tema Imwi"
+!define GTK_BLUECURVE_SECTION_TITLE		"Tema Corba Blava"
+!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Tema Light House Blue"
+!define GAIM_SHORTCUTS_SECTION_TITLE		"Enllaços directes"
+!define GAIM_DESKTOP_SHORTCUT_SECTION_TITLE	"Escriptori"
+!define GAIM_STARTMENU_SHORTCUT_SECTION_TITLE	"Menu Inici"
+!define GAIM_SECTION_DESCRIPTION		"Fitxers i dlls del nucli de Gaim"
+!define GTK_SECTION_DESCRIPTION			"Una eina IGU multiplataforma, utilitzada per Gaim"
+!define GTK_THEMES_SECTION_DESCRIPTION		"Els temes GTK+ poden modificar l'aspecte de les aplicacions GTK+."
+!define GTK_NO_THEME_DESC			"No instal.lis un tema GTK+"
+!define GTK_WIMP_THEME_DESC			"GTK-Imwi (imitador Windows) és un tema GTK que s'integra perfectament en un entorn d'escriptori Windows."
+!define GTK_BLUECURVE_THEME_DESC		"El tema Corba Blava."
+!define GTK_LIGHTHOUSEBLUE_THEME_DESC		"The Lighthouseblue theme."
+!define GAIM_SHORTCUTS_SECTION_DESCRIPTION	"Enllaços directes per iniciar el Gaim"
+!define GAIM_DESKTOP_SHORTCUT_DESC		"Afegir un enllaç directe al Gaim a l'Escriptori"
+!define GAIM_STARTMENU_SHORTCUT_DESC		"Crear una entrada Gaim al Menu Inici"
+
+
+; GTK+ Directory Page
+!define GTK_UPGRADE_PROMPT			"S'ha trobat una versió antiga de l'entorn d'execució GTK. Vols actualitzar-la?$\rNota: Gaim no funcionarà sino ho fas."
+
+; Installer Finish Page
+!define GAIM_FINISH_VISIT_WEB_SITE		"Visita la pàgina web de Gaim per Windows"
+
+; Gaim Section Prompts and Texts
+!define GAIM_UNINSTALL_DESC			"Gaim (només esborrar)"
+!define GAIM_PROMPT_WIPEOUT			"El teu directori antic de Gaim serà esborrat. Vols continuar?$\r$\rNota: Els plugins no estàndards que tinguis instal.lats seran esborrats.$\rLes preferències d'usuari de Gaim no es veruan afectades."
+!define GAIM_PROMPT_DIR_EXISTS			"El directori d'instal.lació que has especificat ja existeix. Tots els continguts$\rseran esborrats. Vols continuar?"
+
+; GTK+ Section Prompts
+!define GTK_INSTALL_ERROR			"Error installlant l'entorn d'execució GTK+."
+!define GTK_BAD_INSTALL_PATH			"El directori que has introduït no pot ésser accedit o creat."
+
+; GTK+ Themes section
+!define GTK_NO_THEME_INSTALL_RIGHTS		"No tens permisos per instal.lar un tema GTK+."
+
+; Uninstall Section Prompts
+!define un.GAIM_UNINSTALL_ERROR_1		"L'instal.lador podria no trobar les entrades del registre de Gaim.$\rProbablement un altre usuari ha instal.lat aquesta aplicació."
+!define un.GAIM_UNINSTALL_ERROR_2		"No tens permís per desinstal.lar aquesta aplicació."
+
+; Spellcheck Section Prompts
+!define GAIM_SPELLCHECK_SECTION_TITLE		"Suport a la Verificació de l'Ortografia "
+!define GAIM_SPELLCHECK_ERROR			"Error instal.lant verificació de l'ortografia"
+!define GAIM_SPELLCHECK_DICT_ERROR		"Error Instal.lant Diccionari  per a Verificació de l'Ortografia"
+!define GAIM_SPELLCHECK_SECTION_DESCRIPTION	"Suport per a Verificació de l'Ortografia.  (és necesaria connexió a internet per dur a terme la instal.lació)"
+!define ASPELL_INSTALL_FAILED			"La instal.lació ha fallat"
+!define GAIM_SPELLCHECK_BRETON			"Bretó"
+!define GAIM_SPELLCHECK_CATALAN			"Català"
+!define GAIM_SPELLCHECK_CZECH			"Txec"
+!define GAIM_SPELLCHECK_WELSH			"Gal·lès"
+!define GAIM_SPELLCHECK_DANISH			"Danès"
+!define GAIM_SPELLCHECK_GERMAN			"Alemany"
+!define GAIM_SPELLCHECK_GREEK			"Grec"
+!define GAIM_SPELLCHECK_ENGLISH			"Anglès"
+!define GAIM_SPELLCHECK_ESPERANTO		"Esperanto"
+!define GAIM_SPELLCHECK_SPANISH			"Espanyol"
+!define GAIM_SPELLCHECK_FAROESE			"Feroès"
+!define GAIM_SPELLCHECK_FRENCH			"Francès"
+!define GAIM_SPELLCHECK_ITALIAN			"Italià"
+!define GAIM_SPELLCHECK_DUTCH			"Holandès"
+!define GAIM_SPELLCHECK_NORWEGIAN		"Noruec"
+!define GAIM_SPELLCHECK_POLISH			"Polonès"
+!define GAIM_SPELLCHECK_PORTUGUESE		"Portuguès"
+!define GAIM_SPELLCHECK_ROMANIAN		"Romanès"
+!define GAIM_SPELLCHECK_RUSSIAN			"Rus"
+!define GAIM_SPELLCHECK_SLOVAK			"Eslovac"
+!define GAIM_SPELLCHECK_SWEDISH			"Suec"
+!define GAIM_SPELLCHECK_UKRAINIAN		"Ucraïnès"
+

Index: czech.nsh
===================================================================
RCS file: /cvsroot/gaim/gaim/src/win32/nsis/translations/czech.nsh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -p -r1.2 -r1.3
--- czech.nsh	11 Apr 2005 12:24:46 -0000	1.2
+++ czech.nsh	29 Sep 2005 15:37:44 -0000	1.3
@@ -27,7 +27,7 @@
 !define GTK_SECTION_DESCRIPTION		"Multi-platform GUI toolkit používaný Gaimem"
 !define GTK_THEMES_SECTION_DESCRIPTION	"GTK+ témata umožòují mìnit vzhled a zpùsob ovládání GTK+ aplikací."
 !define GTK_NO_THEME_DESC			"Neinstalovat GTK+ téma"
-!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) je GTK+ téma které zapadne do Vašeho pracovního prostøedí ve Windows."
+!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) je GTK téma které zapadne do Vašeho pracovního prostøedí ve Windows."
 !define GTK_BLUECURVE_THEME_DESC		"Bluecurve téma."
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC	"Lighthouseblue téma."
 

Index: danish.nsh
===================================================================
RCS file: /cvsroot/gaim/gaim/src/win32/nsis/translations/danish.nsh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -p -r1.2 -r1.3
--- danish.nsh	11 Apr 2005 12:24:46 -0000	1.2
+++ danish.nsh	29 Sep 2005 15:37:44 -0000	1.3
@@ -27,7 +27,7 @@
 !define GTK_SECTION_DESCRIPTION		"Et multi-platform grafisk interface udviklingsværktøj, bruges af Gaim"
 !define GTK_THEMES_SECTION_DESCRIPTION	"GTK+ Temaer kan ændre GTK+ programmers generelle udseende."
 !define GTK_NO_THEME_DESC			"Installér ikke noget GTK+ tema"
-!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows efterligner) er et GTK+ tema som falder i med Windows skrivebordsmiljøet."
+!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows efterligner) er et GTK tema som falder i med Windows skrivebordsmiljøet."
 !define GTK_BLUECURVE_THEME_DESC		"The Bluecurve tema."
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC	"The Lighthouseblue tema."
 

Index: dutch.nsh
===================================================================
RCS file: /cvsroot/gaim/gaim/src/win32/nsis/translations/dutch.nsh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -p -r1.7 -r1.8
--- dutch.nsh	19 Nov 2003 22:41:35 -0000	1.7
+++ dutch.nsh	29 Sep 2005 15:37:44 -0000	1.8
@@ -1,54 +1,87 @@
-;;
-;;  dutch.nsh
-;;
-;;  Default language strings for the Windows Gaim NSIS installer.
-;;  Windows Code page: 1252
-;;
-;;  Author: Vincent van Adrighem <vincent@...>
-;;  Version 2
-;;
-
-; Startup GTK+ check
-!define GTK_INSTALLER_NEEDED			"De GTK+ runtime-omgeving is niet aanwezig of moet vernieuwd worden.$\rInstalleer v${GTK_VERSION} of nieuwer van de GTK+ runtime-omgeving"
-
-; License Page
-!define GAIM_LICENSE_BUTTON			"Volgende >"
-!define GAIM_LICENSE_BOTTOM_TEXT		"$(^Name) wordt uitgegeven onder de GPL licentie. Deze licentie wordt hier slechts ter informatie aangeboden. $_CLICK"
-
-; Components Page
-!define GAIM_SECTION_TITLE			"Gaim Instant Messaging Client (vereist)"
-!define GTK_SECTION_TITLE			"GTK+ runtime-omgeving (vereist)"
-!define GTK_THEMES_SECTION_TITLE		"GTK+ thema's"
-!define GTK_NOTHEME_SECTION_TITLE		"Geen thema"
-!define GTK_WIMP_SECTION_TITLE		"Wimp thema"
-!define GTK_BLUECURVE_SECTION_TITLE		"Bluecurve thema"
-!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue thema"
-!define GAIM_SECTION_DESCRIPTION		"Gaim hoofdbestanden en dlls"
-!define GTK_SECTION_DESCRIPTION		"Een multi-platform gebruikersinterface, gebruikt door Gaim"
-!define GTK_THEMES_SECTION_DESCRIPTION	"GTK+ thema's veranderen het uiterlijk en gedrag van GTK+ programma's."
-!define GTK_NO_THEME_DESC			"Geen GTK+ thema installeren"
-!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) is een GTK+ thema wat goed past in een windows omgeving."
-!define GTK_BLUECURVE_THEME_DESC		"Het Bluecurve thema (standaardthema voor RedHat Linux)."
-!define GTK_LIGHTHOUSEBLUE_THEME_DESC	"Het Lighthouseblue thema."
-
-; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"Er is een oude versie van GTK+ gevonden. Wilt u deze bijwerken?$\rLet op: Gaim werkt misschien niet als u dit niet doet."
-
-; Installer Finish Page
-!define GAIM_FINISH_VISIT_WEB_SITE		"Neem een kijkje op de Windows Gaim webpagina"
-
-; Gaim Section Prompts and Texts
-!define GAIM_UNINSTALL_DESC			"Gaim (alleen verwijderen)"
-!define GAIM_PROMPT_WIPEOUT			"Uw oude Gaim map staat op het punt om verwijderd te worden. Wilt u doorgaan?$\r$\rLet op: Alle door uzelf geïnstalleerde plugins zullen ook verwijderd worden.$\rDe gebruikersinstellingen van Gaim worden niet aangeraakt."
-!define GAIM_PROMPT_DIR_EXISTS		"De gegeven installatiemap bestaat al. Eventuele inhoud zal verwijderd worden. Wilt u doorgaan?"
-
-; GTK+ Section Prompts
-!define GTK_INSTALL_ERROR			"Fout bij installatie van GTK+ runtime omgeving."
-!define GTK_BAD_INSTALL_PATH			"Het door u gegeven pad kan niet benaderd worden."
-
-; GTK+ Themes section
-!define GTK_NO_THEME_INSTALL_RIGHTS		"U heeft geen toestemming om een GTK+ thema te installeren."
-
-; Uninstall Section Prompts
-!define un.GAIM_UNINSTALL_ERROR_1         "De uninstaller kon geen register-ingangen voor Gaim vinden.$\rWaarschijnlijk heeft een andere gebruiker het programma geïnstalleerd."
-!define un.GAIM_UNINSTALL_ERROR_2         "U mag dit programma niet verwijderen."
+;;  vim:syn=winbatch:encoding=cp1252
+;;
+;;  dutch.nsh
+;;
+;;  Default language strings for the Windows Gaim NSIS installer.
+;;  Windows Code page: 1252
+;;
+;;  Author: Vincent van Adrighem <vincent@...>
+;;  Version 2
+;;
+; Startup Checks
+!define INSTALLER_IS_RUNNING			"Er is al een installatie actief."
+!define GAIM_IS_RUNNING			"Gaim wordt op dit moment uitgevoerd. Sluit Gaim af en start de installatie opnieuw."
+!define GTK_INSTALLER_NEEDED			"De GTK+ runtime-omgeving is niet aanwezig of moet vernieuwd worden.$\rInstalleer v${GTK_VERSION} of nieuwer van de GTK+ runtime-omgeving"
+
+
+; License Page
+!define GAIM_LICENSE_BUTTON			"Volgende >"
+!define GAIM_LICENSE_BOTTOM_TEXT		"$(^Name) wordt uitgegeven onder de GPL licentie. Deze licentie wordt hier slechts ter informatie aangeboden. $_CLICK"
+
+; Components Page
+!define GAIM_SECTION_TITLE			"Gaim Instant Messaging Client (vereist)"
+!define GTK_SECTION_TITLE			"GTK+ runtime-omgeving (vereist)"
+!define GTK_THEMES_SECTION_TITLE		"GTK+ thema's"
+!define GTK_NOTHEME_SECTION_TITLE		"Geen thema"
+!define GTK_WIMP_SECTION_TITLE		"Wimp thema"
+!define GTK_BLUECURVE_SECTION_TITLE		"Bluecurve thema"
+!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue thema"
+!define GAIM_SECTION_DESCRIPTION		"Gaim hoofdbestanden en dlls"
+!define GTK_SECTION_DESCRIPTION		"Een multi-platform gebruikersinterface, gebruikt door Gaim"
+!define GTK_THEMES_SECTION_DESCRIPTION	"GTK+ thema's veranderen het uiterlijk en gedrag van GTK+ programma's."
+!define GTK_NO_THEME_DESC			"Geen GTK+ thema installeren"
+!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) is een GTK+ thema wat goed past in een windows omgeving."
+!define GTK_BLUECURVE_THEME_DESC		"Het Bluecurve thema (standaardthema voor RedHat Linux)."
+!define GTK_LIGHTHOUSEBLUE_THEME_DESC	"Het Lighthouseblue thema."
+
+; GTK+ Directory Page
+!define GTK_UPGRADE_PROMPT			"Er is een oude versie van GTK+ gevonden. Wilt u deze bijwerken?$\rLet op: Gaim werkt misschien niet als u dit niet doet."
+
+; Installer Finish Page
+!define GAIM_FINISH_VISIT_WEB_SITE		"Neem een kijkje op de Windows Gaim webpagina"
+
+; Gaim Section Prompts and Texts
+!define GAIM_UNINSTALL_DESC			"Gaim (alleen verwijderen)"
+!define GAIM_PROMPT_WIPEOUT			"Uw oude Gaim map staat op het punt om verwijderd te worden. Wilt u doorgaan?$\r$\rLet op: Alle door uzelf geïnstalleerde plugins zullen ook verwijderd worden.$\rDe gebruikersinstellingen van Gaim worden niet aangeraakt."
+!define GAIM_PROMPT_DIR_EXISTS		"De gegeven installatiemap bestaat al. Eventuele inhoud zal verwijderd worden. Wilt u doorgaan?"
+
+; GTK+ Section Prompts
+!define GTK_INSTALL_ERROR			"Fout bij installatie van GTK+ runtime omgeving."
+!define GTK_BAD_INSTALL_PATH			"Het door u gegeven pad kan niet benaderd worden."
+
+; GTK+ Themes section
+!define GTK_NO_THEME_INSTALL_RIGHTS		"U heeft geen toestemming om een GTK+ thema te installeren."
+
+; Uninstall Section Prompts
+!define un.GAIM_UNINSTALL_ERROR_1         "Het verwijderingsprogramma voor Gaim kon geen register-ingangen voor Gaim vinden.$\rWaarschijnlijk heeft een andere gebruiker het programma geïnstalleerd."
+!define un.GAIM_UNINSTALL_ERROR_2         "U mag dit programma niet verwijderen."
+
+
+; Spellcheck Section Prompts
+!define GAIM_SPELLCHECK_SECTION_TITLE		"Spellingscontrole"
+!define GAIM_SPELLCHECK_ERROR			"Fout bij installatie van spellingscontrole"
+!define GAIM_SPELLCHECK_DICT_ERROR		"Fout bij installatie van woordenboek voor spellingscontrole"
+!define GAIM_SPELLCHECK_SECTION_DESCRIPTION	"Ondersteuning voor spellingscontrole. (Internetverbinding nodig voor installatie)"
+!define ASPELL_INSTALL_FAILED			"Installatie mislukt"
+!define GAIM_SPELLCHECK_BRETON			"Bretons"
+!define GAIM_SPELLCHECK_CATALAN			"Catalaans"
+!define GAIM_SPELLCHECK_CZECH			"Tsjechisch"
+!define GAIM_SPELLCHECK_WELSH			"Welsh"
+!define GAIM_SPELLCHECK_DANISH			"Deens"
+!define GAIM_SPELLCHECK_GERMAN			"Duits"
+!define GAIM_SPELLCHECK_GREEK			"Grieks"
+!define GAIM_SPELLCHECK_ENGLISH			"Engels"
+!define GAIM_SPELLCHECK_ESPERANTO		"Esperanto"
+!define GAIM_SPELLCHECK_SPANISH			"Spaans"
+!define GAIM_SPELLCHECK_FAROESE			"Faroese"
+!define GAIM_SPELLCHECK_FRENCH			"Frans"
+!define GAIM_SPELLCHECK_ITALIAN			"Italiaans"
+!define GAIM_SPELLCHECK_DUTCH			"Nederlands"
+!define GAIM_SPELLCHECK_NORWEGIAN		"Noors"
+!define GAIM_SPELLCHECK_POLISH			"Pools"
+!define GAIM_SPELLCHECK_PORTUGUESE		"Portugees"
+!define GAIM_SPELLCHECK_ROMANIAN			"Roemeens"
+!define GAIM_SPELLCHECK_RUSSIAN			"Russisch"
+!define GAIM_SPELLCHECK_SLOVAK			"Slowaaks"
+!define GAIM_SPELLCHECK_SWEDISH			"Zweeds"
+!define GAIM_SPELLCHECK_UKRAINIAN		"Oekraïns"

Index: english.nsh
===================================================================
RCS file: /cvsroot/gaim/gaim/src/win32/nsis/translations/english.nsh,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -p -r1.15 -r1.16
--- english.nsh	15 May 2005 18:53:23 -0000	1.15
+++ english.nsh	29 Sep 2005 15:37:44 -0000	1.16
@@ -35,7 +35,7 @@
 !insertmacro GAIM_MACRO_DEFAULT_STRING GTK_SECTION_DESCRIPTION		"A multi-platform GUI toolkit, used by Gaim"
 !insertmacro GAIM_MACRO_DEFAULT_STRING GTK_THEMES_SECTION_DESCRIPTION	"GTK+ Themes can change the look and feel of GTK+ applications."
 !insertmacro GAIM_MACRO_DEFAULT_STRING GTK_NO_THEME_DESC			"Don't install a GTK+ theme"
-!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) is a GTK+ theme that blends well into the Windows desktop environment."
+!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) is a GTK theme that blends well into the Windows desktop environment."
 !insertmacro GAIM_MACRO_DEFAULT_STRING GTK_BLUECURVE_THEME_DESC		"The Bluecurve theme."
 !insertmacro GAIM_MACRO_DEFAULT_STRING GTK_LIGHTHOUSEBLUE_THEME_DESC	"The Lighthouseblue theme."
 !insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SHORTCUTS_SECTION_DESCRIPTION   "Shortcuts for starting Gaim"
@@ -63,3 +63,33 @@
 ; Uninstall Section Prompts
 !insertmacro GAIM_MACRO_DEFAULT_STRING un.GAIM_UNINSTALL_ERROR_1		"The uninstaller could not find registry entries for Gaim.$\rIt is likely that another user installed this application."
 !insertmacro GAIM_MACRO_DEFAULT_STRING un.GAIM_UNINSTALL_ERROR_2		"You do not have permission to uninstall this application."
+
+; Spellcheck Section Prompts
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_SECTION_TITLE		"Spellchecking Support"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_ERROR			"Error Installing Spellchecking"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_DICT_ERROR		"Error Installing Spellchecking Dictionary"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_SECTION_DESCRIPTION	"Support for Spellchecking.  (Internet connection required for installation)"
+!insertmacro GAIM_MACRO_DEFAULT_STRING ASPELL_INSTALL_FAILED			"Installation Failed"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_BRETON			"Breton"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_CATALAN			"Catalan"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_CZECH			"Czech"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_WELSH			"Welsh"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_DANISH			"Danish"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_GERMAN			"German"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_GREEK			"Greek"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_ENGLISH			"English"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_ESPERANTO		"Esperanto"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_SPANISH			"Spanish"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_FAROESE			"Faroese"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_FRENCH			"French"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_ITALIAN			"Italian"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_DUTCH			"Dutch"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_NORWEGIAN		"Norwegian"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_POLISH			"Polish"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_PORTUGUESE		"Portuguese"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_ROMANIAN			"Romanian"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_RUSSIAN			"Russian"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_SLOVAK			"Slovak"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_SWEDISH			"Swedish"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_UKRAINIAN		"Ukrainian"
+

Index: finnish.nsh
===================================================================
RCS file: /cvsroot/gaim/gaim/src/win32/nsis/translations/finnish.nsh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -p -r1.2 -r1.3
--- finnish.nsh	11 Apr 2005 12:24:46 -0000	1.2
+++ finnish.nsh	29 Sep 2005 15:37:44 -0000	1.3
@@ -27,7 +27,7 @@
 !define GTK_SECTION_DESCRIPTION		"Monipohjainen GUI (käyttäjäulkoasu) työkalupakki, Gaimin käyttämä"
 !define GTK_THEMES_SECTION_DESCRIPTION	"GTK+ teemat voivat muuttaa GTK+ ohjelmien ulkonäköä ja tuntua."
 !define GTK_NO_THEME_DESC			"Älä asenna GTK+ teemoja"
-!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windowsiin mukautuminen) on GTK+ teema joka sulautuu hyvin Windowsin ympäristöön."
+!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windowsiin mukautuminen) on GTK teema joka sulautuu hyvin Windowsin ympäristöön."
 !define GTK_BLUECURVE_THEME_DESC		"Bluecurve teema."
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC	"Lighthouseblue teema."
 

Index: french.nsh
===================================================================
RCS file: /cvsroot/gaim/gaim/src/win32/nsis/translations/french.nsh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -p -r1.4 -r1.5
--- french.nsh	19 Nov 2003 22:41:35 -0000	1.4
+++ french.nsh	29 Sep 2005 15:37:44 -0000	1.5
@@ -1,55 +1,95 @@
-;;
-;;  french.nsh
-;;
-;;  French language strings for the Windows Gaim NSIS installer.
-;;  Windows Code page: 1252
-;;
-;;  Author: Eric Boumaour <zongo@...>, 2003.
-;;  Version 2
-;;
-
-; Startup GTK+ check
-!define GTK_INSTALLER_NEEDED			"Les bibliothèques de l'environnement GTK+ ne sont pas installées ou nécessitent une mise à jour.$\rVeuillez installer les bibliothèques GTK+ v${GTK_VERSION} ou plus récentes."
-
-; License Page
-!define GAIM_LICENSE_BUTTON			"Suivant >"
-!define GAIM_LICENSE_BOTTOM_TEXT		"$(^Name) est disponible sous licence GPL. Le texte de licence suivant est fourni uniquement à titre informatif. $_CLICK" 
-
-; Components Page
-!define GAIM_SECTION_TITLE			"Gaim messagerie instantanée (obligatoire)"
-!define GTK_SECTION_TITLE			"Bibliothèques GTK+ (obligatoire)"
-!define GTK_THEMES_SECTION_TITLE		"Thèmes GTK+"
-!define GTK_NOTHEME_SECTION_TITLE		"Pas de thème"
-!define GTK_WIMP_SECTION_TITLE		"Thème Wimp"
-!define GTK_BLUECURVE_SECTION_TITLE		"Thème Bluecurve"
-!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Thème Light House Blue"
-!define GAIM_SECTION_DESCRIPTION		"Fichiers et DLLs de base de Gaim"
-!define GTK_SECTION_DESCRIPTION		"A multi-platform GUI toolkit, used by Gaim"
-!define GTK_THEMES_SECTION_DESCRIPTION	"Les thèmes GTK+ permettent de changer l'aspect des applications GTK+."
-!define GTK_NO_THEME_DESC			"Ne pas installer de thème GTK+"
-!define GTK_WIMP_THEME_DESC			"GTK-Wimp (imitateur de Windows) est un thème de GTK+ qui se fond dans l'environnement graphique de Windows."
-!define GTK_BLUECURVE_THEME_DESC		"Thème Bluecurve"
-!define GTK_LIGHTHOUSEBLUE_THEME_DESC	"Thème Lighthouseblue"
-
-; GTK+ Dir Selector Page
-!define GTK_UPGRADE_PROMPT			"Une ancienne version des bibliothèques GTK+ a été trouvée. Voulez-vous la mettre à jour ?$\rNote : Gaim peut ne pas fonctionner sans cela."
-
-; Installer Finish Page
-!define GAIM_FINISH_VISIT_WEB_SITE		"Visitez la page web de Gaim Windows" 
-
-; Gaim Section Prompts and Texts
-!define GAIM_UNINSTALL_DESC			"Gaim (supprimer uniquement)"
-!define GAIM_PROMPT_WIPEOUT			"L'ancien répertoire de Gaim va être supprimé. Voulez-vous continuer ?$\r$\rNote : Tous les plugins non standards que vous avez installés seront aussi supprimés.$\rLes configurations des utilisateurs de Gaim ne sont pas touchés."
-!define GAIM_PROMPT_DIR_EXISTS		"Le répertoire d'installation existe déjà. Son contenu sera effacé.$\rVoulez-vous continuer ?"
-
-; GTK+ Section Prompts
-!define GTK_INSTALL_ERROR			"Erreur lors de l'installation des bibliothèques GTK+"
-!define GTK_BAD_INSTALL_PATH			"Le répertoire d'installation ne peut pas être créé ou n'est pas accessible."
-
-; GTK+ Themes section
-!define GTK_NO_THEME_INSTALL_RIGHTS		"Vous n'avez pas les permissions pour installer un thème GTK+"
-
-; Uninstall Section Prompts
-!define un.GAIM_UNINSTALL_ERROR_1         "Les clefs de Gaim n'ont pas été trouvées dans la base de registres.$\rL'application a peut-être été installée par un utilisateur différent."
-!define un.GAIM_UNINSTALL_ERROR_2         "Vous n'avez pas les permissions pour supprimer cette application."
-
+;;  vim:syn=winbatch:encoding=cp1252:
+;;
+;;  french.nsh
+;;
+;;  French language strings for the Windows Gaim NSIS installer.
+;;  Windows Code page: 1252
+;;
+;;  Version 3
+;;  Author: Eric Boumaour <zongo_fr@...>, 2003-2005.
+;;
+
+; Make sure to update the GAIM_MACRO_LANGUAGEFILE_END macro in
+; langmacros.nsh when updating this file
+
+; Startup Checks
+!define INSTALLER_IS_RUNNING			"Le programme d'installation est déjà en cours d'exécution."
+!define GAIM_IS_RUNNING				"Une instance de Gaim est en cours d'exécution. Veuillez quitter Gaim et réessayer."
+!define GTK_INSTALLER_NEEDED			"Les bibliothèques de l'environnement GTK+ ne sont pas installées ou ont besoin d'une mise à jour.$\rVeuillez installer la version ${GTK_VERSION} ou plus récente des bibliothèques GTK+."
+
+; License Page
+!define GAIM_LICENSE_BUTTON			"Suivant >"
+!define GAIM_LICENSE_BOTTOM_TEXT		"$(^Name) est disponible sous licence GNU General Public License (GPL). Le texte de licence suivant est fourni uniquement à titre informatif. $_CLICK" 
+
+; Components Page
+!define GAIM_SECTION_TITLE			"Gaim client de messagerie instantanée (obligatoire)"
+!define GTK_SECTION_TITLE			"Bibliothèques GTK+ (obligatoire)"
+!define GTK_THEMES_SECTION_TITLE		"Thèmes GTK+"
+!define GTK_NOTHEME_SECTION_TITLE		"Pas de thème"
+!define GTK_WIMP_SECTION_TITLE			"Thème Wimp"
+!define GTK_BLUECURVE_SECTION_TITLE		"Thème Bluecurve"
+!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Thème Light House Blue"
+!define GAIM_SHORTCUTS_SECTION_TITLE		"Raccourcis"
+!define GAIM_DESKTOP_SHORTCUT_SECTION_TITLE	"Bureau"
+!define GAIM_STARTMENU_SHORTCUT_SECTION_TITLE	"Menu Démarrer"
+!define GAIM_SECTION_DESCRIPTION		"Fichiers et DLLs de base de Gaim"
+!define GTK_SECTION_DESCRIPTION			"Un ensemble d'outils pour interfaces graphiques multi-plateforme, utilisé par Gaim"
+!define GTK_THEMES_SECTION_DESCRIPTION		"Les thèmes GTK+ permettent de changer l'aspect des applications GTK+."
+!define GTK_NO_THEME_DESC			"Ne pas installer de thème GTK+"
+!define GTK_WIMP_THEME_DESC			"GTK-Wimp (imitateur de Windows) est un thème de GTK+ qui se fond dans l'environnement graphique de Windows."
+!define GTK_BLUECURVE_THEME_DESC		"Thème Bluecurve"
+!define GTK_LIGHTHOUSEBLUE_THEME_DESC		"Thème Lighthouseblue"
+!define GAIM_SHORTCUTS_SECTION_DESCRIPTION	"Raccourcis pour lancer Gaim"
+!define GAIM_DESKTOP_SHORTCUT_DESC		"Créer un raccourci pour Gaim sur le bureau"
+!define GAIM_STARTMENU_SHORTCUT_DESC		"Créer un raccourci pour Gaim dans le menu Démarrer"
+
+; GTK+ Directory Page
+!define GTK_UPGRADE_PROMPT			"Une ancienne version des bibliothèques GTK+ a été trouvée. Voulez-vous la mettre à jour ?$\rNote : Gaim peut ne pas fonctionner si vous ne le faites pas."
+
+; Installer Finish Page
+!define GAIM_FINISH_VISIT_WEB_SITE		"Visitez la page web de Gaim Windows" 
+
+; Gaim Section Prompts and Texts
+!define GAIM_UNINSTALL_DESC			"Gaim (supprimer uniquement)"
+!define GAIM_PROMPT_WIPEOUT			"L'ancien dossier de Gaim va être supprimé. Voulez-vous continuer ?$\r$\rNote : Tous les plugins non standards que vous avez installés seront aussi supprimés.$\rLes configurations et les comptes utilisateurs de Gaim ne sont pas touchés."
+!define GAIM_PROMPT_DIR_EXISTS			"Le dossier d'installation que vous avez choisi existe déjà. Son contenu sera effacé.$\rVoulez-vous continuer ?"
+
+; GTK+ Section Prompts
+!define GTK_INSTALL_ERROR			"Erreur lors de l'installation des bibliothèques GTK+"
+!define GTK_BAD_INSTALL_PATH			"Le dossier d'installation ne peut pas être créé ou n'est pas accessible."
+
+; GTK+ Themes section
+!define GTK_NO_THEME_INSTALL_RIGHTS		"Vous n'avez pas les permissions pour installer un thème GTK+."
+
+; Uninstall Section Prompts
+!define un.GAIM_UNINSTALL_ERROR_1		"Le programme de désinstallation n'a pas retrouvé les entrées de Gaim dans la base de registres.$\rL'application a peut-être été installée par un utilisateur différent."
+!define un.GAIM_UNINSTALL_ERROR_2		"Vous n'avez pas les permissions pour supprimer cette application."
+
+; Spellcheck Section Prompts
+!define GAIM_SPELLCHECK_SECTION_TITLE		"Correction orthographique"
+!define GAIM_SPELLCHECK_ERROR			"Erreur à l'installation du correcteur orthographique"
+!define GAIM_SPELLCHECK_DICT_ERROR		"Erreur à l'installation du dictionnaire pour le correcteur orthographique"
+!define GAIM_SPELLCHECK_SECTION_DESCRIPTION	"Correction orthogaphique. (Une connexion internet est nécessaire pour son installation)"
+!define ASPELL_INSTALL_FAILED			"Échec de l'installation"
+!define GAIM_SPELLCHECK_BRETON			"Breton"
+!define GAIM_SPELLCHECK_CATALAN			"Catalan"
+!define GAIM_SPELLCHECK_CZECH			"Tchèque"
+!define GAIM_SPELLCHECK_WELSH			"Gallois"
+!define GAIM_SPELLCHECK_DANISH			"Danois"
+!define GAIM_SPELLCHECK_GERMAN			"Allemand"
+!define GAIM_SPELLCHECK_GREEK			"Grec"
+!define GAIM_SPELLCHECK_ENGLISH			"Anglais"
+!define GAIM_SPELLCHECK_ESPERANTO		"Espéranto"
+!define GAIM_SPELLCHECK_SPANISH			"Espagnol"
+!define GAIM_SPELLCHECK_FAROESE			"Féringien"
+!define GAIM_SPELLCHECK_FRENCH			"Français"
+!define GAIM_SPELLCHECK_ITALIAN			"Italien"
+!define GAIM_SPELLCHECK_DUTCH			"Hollandais"
+!define GAIM_SPELLCHECK_NORWEGIAN		"Norvégien"
+!define GAIM_SPELLCHECK_POLISH			"Polonais"
+!define GAIM_SPELLCHECK_PORTUGUESE		"Portugais"
+!define GAIM_SPELLCHECK_ROMANIAN		"Roumain"
+!define GAIM_SPELLCHECK_RUSSIAN			"Russe"
+!define GAIM_SPELLCHECK_SLOVAK			"Slovaque"
+!define GAIM_SPELLCHECK_SWEDISH			"Suédois"
+!define GAIM_SPELLCHECK_UKRAINIAN		"Ukrainien"

Index: german.nsh
===================================================================
RCS file: /cvsroot/gaim/gaim/src/win32/nsis/translations/german.nsh,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -p -r1.10 -r1.11
--- german.nsh	11 Apr 2005 12:24:46 -0000	1.10
+++ german.nsh	29 Sep 2005 15:37:44 -0000	1.11
@@ -1,56 +1,63 @@
-;;
-;;  german.nsh
-;;
-;;  German language strings for the Windows Gaim NSIS installer.
-;;  Windows Code page: 1252
-;;
-;;  Author: Bjoern Voigt <bjoern@...>, 2005.
-;;  Version 3
-;;
- 
-; Startup checks
-!define INSTALLER_IS_RUNNING			"Der Installer läuft schon."
-!define GAIM_IS_RUNNING				"Eine Instanz von Gaim läuft momentan schon. Beenden Sie Gaim und versuchen Sie es nochmal."
-!define GTK_INSTALLER_NEEDED			"Die GTK+ Runtime Umgebung fehlt entweder oder muß aktualisiert werden.$\rBitte installieren Sie v${GTK_VERSION} oder höher der GTK+ Runtime"
- 
-; License Page
-!define GAIM_LICENSE_BUTTON			"Weiter >"
-!define GAIM_LICENSE_BOTTOM_TEXT		"$(^Name) wird unter der GNU General Public License (GPL) veröffentlicht. Die Lizenz dient hier nur der Information. $_CLICK"
- 
-; Components Page
-!define GAIM_SECTION_TITLE			"Gaim Instant Messaging Client (erforderlich)"
-!define GTK_SECTION_TITLE			"GTK+ Runtime Umgebung (erforderlich)"
-!define GTK_THEMES_SECTION_TITLE		"GTK+ Themen"
-!define GTK_NOTHEME_SECTION_TITLE		"Kein Thema"
-!define GTK_WIMP_SECTION_TITLE		"Wimp Thema"
-!define GTK_BLUECURVE_SECTION_TITLE		"Bluecurve Thema"
-!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue Thema"
-!define GAIM_SECTION_DESCRIPTION		"Gaim Basis-Dateien und -DLLs"
-!define GTK_SECTION_DESCRIPTION		"Ein Multi-Plattform GUI Toolkit, verwendet von Gaim"
-!define GTK_THEMES_SECTION_DESCRIPTION	"GTK+ Themen können Aussehen und Bedienung von GTK+ Anwendungen verändern."
-!define GTK_NO_THEME_DESC			"Installiere kein GTK+ Thema"
-!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows Imitator) ist ein GTK+ Theme, daß sich besonders gut in den Windows Desktop integriert."
-!define GTK_BLUECURVE_THEME_DESC		"Das Bluecurve Thema."
-!define GTK_LIGHTHOUSEBLUE_THEME_DESC	"Das Lighthouseblue Thema."
- 
-; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"Eine alte Version der GTK+ Runtime wurde gefunden. Möchten Sie aktualisieren?$\rHinweis: Gaim funktioniert evtl. nicht, wenn Sie nicht aktualisieren."
- 
-; Installer Finish Page
-!define GAIM_FINISH_VISIT_WEB_SITE		"Besuchen Sie die Windows Gaim Webseite"
- 
-; Gaim Section Prompts and Texts
-!define GAIM_UNINSTALL_DESC			"Gaim (nur entfernen)"
-!define GAIM_PROMPT_WIPEOUT			"Ihre altes Gaim-Verzeichnis soll gelöscht werden. Möchten Sie fortfahren?$\r$\rHinweis: Alle nicht-Standard Plugins, die Sie evtl. installiert haben werden$\rgelöscht. Gaim-Benutzereinstellungen sind nicht betroffen."
-!define GAIM_PROMPT_DIR_EXISTS		"Das Installationsverzeichnis, daß Sie angegeben haben, existiert schon. Der Verzeichnisinhalt$\rwird gelöscht. Möchten Sie fortfahren?"
- 
-; GTK+ Section Prompts
-!define GTK_INSTALL_ERROR			"Fehler beim Installieren der GTK+ Runtime."
-!define GTK_BAD_INSTALL_PATH			"Der Pfad, den Sie eingegeben haben, existiert nicht und kann nicht erstellt werden."
- 
-; GTK+ Themes section
-!define GTK_NO_THEME_INSTALL_RIGHTS		"Sie haben keine Berechtigung, um ein GTK+ Theme zu installieren."
- 
-; Uninstall Section Prompts
-!define un.GAIM_UNINSTALL_ERROR_1		"Der Deinstaller konnte keine Registrierungsschlüssel für Gaim finden.$\rEs ist wahrscheinlich, daß ein anderer Benutzer diese Anwendunng installiert hat."
-!define un.GAIM_UNINSTALL_ERROR_2		"Sie haben keine Berechtigung, diese Anwendung zu deinstallieren."
+;; vim:syn=winbatch:encoding=cp1252:
+;;
+;;  german.nsh
+;;
+;;  German language strings for the Windows Gaim NSIS installer.
+;;  Windows Code page: 1252
+;;
+;;  Author: Bjoern Voigt <bjoern@...>, 2005.
+;;  Version 3
+;;
+ 
+; Startup checks
+!define INSTALLER_IS_RUNNING			"Der Installer läuft schon."
+!define GAIM_IS_RUNNING				"Eine Instanz von Gaim läuft momentan schon. Beenden Sie Gaim und versuchen Sie es nochmal."
+!define GTK_INSTALLER_NEEDED			"Die GTK+ Runtime Umgebung fehlt entweder oder muß aktualisiert werden.$\rBitte installieren Sie v${GTK_VERSION} oder höher der GTK+ Runtime"
+ 
+; License Page
+!define GAIM_LICENSE_BUTTON			"Weiter >"
+!define GAIM_LICENSE_BOTTOM_TEXT		"$(^Name) wird unter der GNU General Public License (GPL) veröffentlicht. Die Lizenz dient hier nur der Information. $_CLICK"
+ 
+; Components Page
+!define GAIM_SECTION_TITLE			"Gaim Instant Messaging Client (erforderlich)"
+!define GTK_SECTION_TITLE			"GTK+ Runtime Umgebung (erforderlich)"
+!define GTK_THEMES_SECTION_TITLE		"GTK+ Themen"
+!define GTK_NOTHEME_SECTION_TITLE		"Kein Thema"
+!define GTK_WIMP_SECTION_TITLE		"Wimp Thema"
+!define GTK_BLUECURVE_SECTION_TITLE		"Bluecurve Thema"
+!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue Thema"
+!define GAIM_SHORTCUTS_SECTION_TITLE	"Verknüpfungen"
+!define GAIM_DESKTOP_SHORTCUT_SECTION_TITLE	"Desktop"
+!define GAIM_STARTMENU_SHORTCUT_SECTION_TITLE	"Startmenü"
+!define GAIM_SECTION_DESCRIPTION		"Gaim Basis-Dateien und -DLLs"
+!define GTK_SECTION_DESCRIPTION		"Ein Multi-Plattform GUI Toolkit, verwendet von Gaim"
+!define GTK_THEMES_SECTION_DESCRIPTION	"GTK+ Themen können Aussehen und Bedienung von GTK+ Anwendungen verändern."
+!define GTK_NO_THEME_DESC			"Installiere kein GTK+ Thema"
+!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows Imitator) ist ein GTK Theme, das sich besonders gut in den Windows Desktop integriert."
+!define GTK_BLUECURVE_THEME_DESC		"Das Bluecurve Thema."
+!define GTK_LIGHTHOUSEBLUE_THEME_DESC	"Das Lighthouseblue Thema."
+!define GAIM_SHORTCUTS_SECTION_DESCRIPTION	"Verknüpfungen zum Start von Gaim"
+!define GAIM_DESKTOP_SHORTCUT_DESC   "Erstellt eine Verknüpfung zu Gaim auf dem Desktop"
+!define GAIM_STARTMENU_SHORTCUT_DESC   "Erstellt einen Eintrag für Gaim im Startmenü"
+ 
+; GTK+ Directory Page
+!define GTK_UPGRADE_PROMPT			"Eine alte Version der GTK+ Runtime wurde gefunden. Möchten Sie aktualisieren?$\rHinweis: Gaim funktioniert evtl. nicht, wenn Sie nicht aktualisieren."
+ 
+; Installer Finish Page
+!define GAIM_FINISH_VISIT_WEB_SITE		"Besuchen Sie die Windows Gaim Webseite"
+ 
+; Gaim Section Prompts and Texts
+!define GAIM_UNINSTALL_DESC			"Gaim (nur entfernen)"
+!define GAIM_PROMPT_WIPEOUT			"Ihre altes Gaim-Verzeichnis soll gelöscht werden. Möchten Sie fortfahren?$\r$\rHinweis: Alle nicht-Standard Plugins, die Sie evtl. installiert haben werden$\rgelöscht. Gaim-Benutzereinstellungen sind nicht betroffen."
+!define GAIM_PROMPT_DIR_EXISTS		"Das Installationsverzeichnis, das Sie angegeben haben, existiert schon. Der Verzeichnisinhalt$\rwird gelöscht. Möchten Sie fortfahren?"
+ 
+; GTK+ Section Prompts
+!define GTK_INSTALL_ERROR			"Fehler beim Installieren der GTK+ Runtime."
+!define GTK_BAD_INSTALL_PATH			"Der Pfad, den Sie eingegeben haben, existiert nicht und kann nicht erstellt werden."
+ 
+; GTK+ Themes section
+!define GTK_NO_THEME_INSTALL_RIGHTS		"Sie haben keine Berechtigung, um ein GTK+ Theme zu installieren."
+ 
+; Uninstall Section Prompts
+!define un.GAIM_UNINSTALL_ERROR_1		"Der Deinstaller konnte keine Registrierungsschlüssel für Gaim finden.$\rEs ist wahrscheinlich, daß ein anderer Benutzer diese Anwendunng installiert hat."
+!define un.GAIM_UNINSTALL_ERROR_2		"Sie haben keine Berechtigung, diese Anwendung zu deinstallieren."

Index: hungarian.nsh
===================================================================
RCS file: /cvsroot/gaim/gaim/src/win32/nsis/translations/hungarian.nsh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -p -r1.4 -r1.5
--- hungarian.nsh	11 Apr 2005 12:24:46 -0000	1.4
+++ hungarian.nsh	29 Sep 2005 15:37:44 -0000	1.5
@@ -1,46 +1,92 @@
-;;
-;;  hungarian.nsh
-;;
-;;  Default language strings for the Windows Gaim NSIS installer.
-;;  Windows Code page: 1250
-;;
-;;  Author: Sutto Zoltan <suttozoltan@...
-;;
-
-; Startup GTK+ check
-!define GTK_INSTALLER_NEEDED			"A GTK+ futtató környezet hiányzik vagy újabb verzió szükséges.$\rKérem installálja a v${GTK_VERSION} vagy magasabb verziójú GTK+ futtató környezetet."
-
-; Components Page
-!define GAIM_SECTION_TITLE			"Gaim IM kliens (szükséges)"
-!define GTK_SECTION_TITLE			"GTK+ futtató környezet (szükséges)"
-!define GTK_THEMES_SECTION_TITLE		"GTK+ témák"
-!define GTK_NOTHEME_SECTION_TITLE		"Nincs téma"
-!define GTK_WIMP_SECTION_TITLE		"Wimp téma"
-!define GTK_BLUECURVE_SECTION_TITLE		"Bluecurve téma"
-!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue téma"
-!define GAIM_SECTION_DESCRIPTION		"Gaim fájlok és dll-ek"
-!define GTK_SECTION_DESCRIPTION		"Gaim által használt több-platformos grafikus környezet"
-!define GTK_THEMES_SECTION_DESCRIPTION	"GTK+ témák megváltoztatják a GTK+ alkalmazások kinézetét."
-!define GTK_NO_THEME_DESC			"Ne installálja a GTK+ témákat"
-!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows utánzat) egy Windows környezettel harmonizáló GTK+ téma."
-!define GTK_BLUECURVE_THEME_DESC		"A Bluecurve téma."
-!define GTK_LIGHTHOUSEBLUE_THEME_DESC	"A Lighthouseblue téma."
-
-; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"Egy régi verziójú GTK+ futtató környezet van telepítve. Kívánja frissíteni?$\rMegjegyzés: Gaim valószínüleg nem fog mûködni amig nem frissíti."
-
-; Gaim Section Prompts and Texts
-!define GAIM_UNINSTALL_DESC			"Gaim (csak eltávolítás)"
-!define GAIM_PROMPT_WIPEOUT			"Az Ön korábbi Gaim könyvtára törlõdni fog. Folytatni szeretné?$\r$\rMegjegyzés: Minden Ön által telepített plugin törlõdni fog.$\rGaim felhasználói beállításokat ez nem érinti."
-!define GAIM_PROMPT_DIR_EXISTS		"A telepítéskor megadott könyvtár már létezik. Minden állomány törlõdni fog.$\rFolytatni szeretné?"
-
-; GTK+ Section Prompts
-!define GTK_INSTALL_ERROR			"Hiba a GTK+ futtató telepítése közben."
-!define GTK_BAD_INSTALL_PATH			"A megadott elérési út nem elérhetõ vagy nem hozható létre."
-
-; GTK+ Themes section
-!define GTK_NO_THEME_INSTALL_RIGHTS		"Nincs jogosultsága a GTK+ témák telepítéséhez."
-
-; Uninstall Section Prompts
-!define un.GAIM_UNINSTALL_ERROR_1         "Az eltávolító nem talált Gaim registry bejegyzéseket.$\rValószínüleg egy másik felhasználó telepítette az alkalmazást."
-!define un.GAIM_UNINSTALL_ERROR_2         "Nincs jogosultsága az alkalmazás eltávolításához."
+;;
+;;  hungarian.nsh
+;;
+;;  Default language strings for the Windows Gaim NSIS installer.
+;;  Windows Code page: 1250
+;;
+;;  Authors: Sutto Zoltan <suttozoltan@...>, 2003
+;;           Gabor Kelemen <kelemeng@...>, 2005
+;;
+
+; Startup Checks
+!define GTK_INSTALLER_NEEDED			"A GTK+ futtató környezet hiányzik vagy frissítése szükséges.$\rKérem telepítse a v${GTK_VERSION} vagy magasabb verziójú GTK+ futtató környezetet."
+!define INSTALLER_IS_RUNNING			"A telepíto már fut."
+!define GAIM_IS_RUNNING				"Jelenleg fut a Gaim egy példánya. Lépjen ki a Gaimból és azután próbálja újra."
+
+; License Page
+!define GAIM_LICENSE_BUTTON			"Tovább >"
+!define GAIM_LICENSE_BOTTOM_TEXT		"A $(^Name) a GNU General Public License (GPL) alatt kerül terjesztésre. Az itt olvasható licenc csak tájékoztatási célt szolgál. $_CLICK"
+
+; Components Page
+!define GAIM_SECTION_TITLE			"Gaim azonnali üzeno kliens (szükséges)"
+!define GTK_SECTION_TITLE			"GTK+ futtató környezet (szükséges)"
+!define GTK_THEMES_SECTION_TITLE		"GTK+ témák"
+!define GTK_NOTHEME_SECTION_TITLE		"Nincs téma"
+!define GTK_WIMP_SECTION_TITLE			"Wimp téma"
+!define GTK_BLUECURVE_SECTION_TITLE		"Bluecurve téma"
+!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue téma"
+!define GAIM_SHORTCUTS_SECTION_TITLE		"Parancsikonok"
+!define GAIM_DESKTOP_SHORTCUT_SECTION_TITLE	"Asztal"
+!define GAIM_STARTMENU_SHORTCUT_SECTION_TITLE	"Start Menü"
+!define GAIM_SECTION_DESCRIPTION		"Gaim fájlok és dll-ek"
+!define GTK_SECTION_DESCRIPTION			"A Gaim által használt többplatformos grafikus környezet"
+!define GTK_THEMES_SECTION_DESCRIPTION		"A GTK+ témák megváltoztatják a GTK+ alkalmazások kinézetét."
+!define GTK_NO_THEME_DESC			"Ne telepítse a GTK+ témákat"
+!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows utánzat) egy Windows környezettel harmonizáló GTK téma."
+!define GTK_BLUECURVE_THEME_DESC		"A Bluecurve téma."
+!define GTK_LIGHTHOUSEBLUE_THEME_DESC		"A Lighthouseblue téma."
+!define GAIM_SHORTCUTS_SECTION_DESCRIPTION	"Parancsikonok a Gaim indításához"
+!define GAIM_DESKTOP_SHORTCUT_DESC		"Parancsikon létrehozása a Gaimhoz az asztalon"
+!define GAIM_STARTMENU_SHORTCUT_DESC		"Start Menü bejegyzés létrehozása a Gaimhoz"
+
+; GTK+ Directory Page
+!define GTK_UPGRADE_PROMPT			"Egy régi verziójú GTK+ futtatókörnyezet van telepítve. Kívánja frissíteni?$\rMegjegyzés: a Gaim nem fog muködni, ha nem frissíti."
+
+; Installer Finish Page
+!define GAIM_FINISH_VISIT_WEB_SITE		"A Windows Gaim weboldalának felkeresése"
+
+; Gaim Section Prompts and Texts
+!define GAIM_UNINSTALL_DESC			"Gaim (csak eltávolítás)"
+!define GAIM_PROMPT_WIPEOUT			"Az Ön korábbi Gaim könyvtára törölve lesz. Folytatni szeretné?$\r$\rMegjegyzés: Minden Ön által telepített bovítmény törölve lesz.$\rA Gaim felhasználói beállításokra ez nincs hatással."
+!define GAIM_PROMPT_DIR_EXISTS			"A megadott telepítési könyvtár már létezik. A tartalma törölve lesz.$\rFolytatni szeretné?"
+
+; GTK+ Section Prompts
+!define GTK_INSTALL_ERROR			"Hiba a GTK+ futtatókörnyezet telepítése közben."
+!define GTK_BAD_INSTALL_PATH			"A megadott elérési út nem érheto el, vagy nem hozható létre."
+
+; GTK+ Themes section
+!define GTK_NO_THEME_INSTALL_RIGHTS		"Nincs jogosultsága a GTK+ témák telepítéséhez."
+
+; Uninstall Section Prompts
+!define un.GAIM_UNINSTALL_ERROR_1		"Az eltávolító nem találta a Gaim registry bejegyzéseket.$\rValószínüleg egy másik felhasználó telepítette az alkalmazást."
+!define un.GAIM_UNINSTALL_ERROR_2		"Nincs jogosultsága az alkalmazás eltávolításához."
+
+; Spellcheck Section Prompts
+!define GAIM_SPELLCHECK_SECTION_TITLE		"Helyesírásellenorzés támogatása"
+!define GAIM_SPELLCHECK_ERROR			"Hiba a helyesírásellenorzés telepítése közben"
+!define GAIM_SPELLCHECK_DICT_ERROR		"Hiba a helyesírásellenorzési szótár telepítése közben"
+!define GAIM_SPELLCHECK_SECTION_DESCRIPTION	"Helyesírásellenorzés támogatása. (Internetkapcsolat szükséges a telepítéshez)"
+!define ASPELL_INSTALL_FAILED			"A telepítés sikertelen"
+!define GAIM_SPELLCHECK_BRETON			"Breton"
+!define GAIM_SPELLCHECK_CATALAN			"Katalán"
+!define GAIM_SPELLCHECK_CZECH			"Cseh"
+!define GAIM_SPELLCHECK_WELSH			"Walesi"
+!define GAIM_SPELLCHECK_DANISH			"Dán"
+!define GAIM_SPELLCHECK_GERMAN			"Német"
+!define GAIM_SPELLCHECK_GREEK			"Görög"
+!define GAIM_SPELLCHECK_ENGLISH			"Angol"
+!define GAIM_SPELLCHECK_ESPERANTO		"Eszperantó"
+!define GAIM_SPELLCHECK_SPANISH			"Spanyol"
+!define GAIM_SPELLCHECK_FAROESE			"Faröai"
+!define GAIM_SPELLCHECK_FRENCH			"Francia"
+!define GAIM_SPELLCHECK_ITALIAN			"Olasz"
+!define GAIM_SPELLCHECK_DUTCH			"Holland"
+!define GAIM_SPELLCHECK_NORWEGIAN		"Norvég"
+!define GAIM_SPELLCHECK_POLISH			"Lengyel"
+!define GAIM_SPELLCHECK_PORTUGUESE		"Portugál"
+!define GAIM_SPELLCHECK_ROMANIAN		"Román"
+!define GAIM_SPELLCHECK_RUSSIAN			"Orosz"
+!define GAIM_SPELLCHECK_SLOVAK			"Szlovák"
+!define GAIM_SPELLCHECK_SWEDISH			"Svéd"
+!define GAIM_SPELLCHECK_UKRAINIAN		"Ukrán"
+

Index: italian.nsh
===================================================================
RCS file: /cvsroot/gaim/gaim/src/win32/nsis/translations/italian.nsh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -p -r1.6 -r1.7
--- italian.nsh	11 Apr 2005 12:24:46 -0000	1.6
+++ italian.nsh	29 Sep 2005 15:37:44 -0000	1.7
@@ -27,7 +27,7 @@
 !define GTK_SECTION_DESCRIPTION		"Un toolkit multipiattaforma per interfacce grafiche, usato da Gaim"
 !define GTK_THEMES_SECTION_DESCRIPTION	"I temi GTK+ modificano l'aspetto delle applicazioni GTK+."
 !define GTK_NO_THEME_DESC			"Non installare nessun tema GTK+"
-!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) è un tema GTK+ che si adatta bene all'aspetto di Windows."
+!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) è un tema GTK che si adatta bene all'aspetto di Windows."
 !define GTK_BLUECURVE_THEME_DESC		"Il tema Bluecurve."
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC	"Il tema Lighthouseblue."
 

Index: japanese.nsh
===================================================================
RCS file: /cvsroot/gaim/gaim/src/win32/nsis/translations/japanese.nsh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -p -r1.1 -r1.2
--- japanese.nsh	29 Jan 2004 16:55:24 -0000	1.1
+++ japanese.nsh	29 Sep 2005 15:37:44 -0000	1.2
@@ -1,54 +1,93 @@
-;;
-;;  japanese.nsh
-;;
-;;  Japanese language strings for the Windows Gaim NSIS installer.
-;;  Windows Code page: 932
-;;
-;;  Author: "Takeshi Kurosawa" <t-kuro@...>
-;;  Version 2
-;;
-
-; Startup GTK+ check
-!define GTK_INSTALLER_NEEDED			"GTK+ƒ‰ƒ“ƒ^ƒCƒ€ŠÂ‹«‚ª–³‚¢‚©‚à‚µ‚­‚̓AƒbƒvƒOƒŒ[ƒh‚·‚é•K—v‚ª‚ ‚è‚Ü‚·B$\rv${GTK_VERSION}‚à‚µ‚­‚Í‚»‚êˆÈã‚ÌGTK+ƒ‰ƒ“ƒ^ƒCƒ€‚ðƒCƒ“ƒXƒg[ƒ‹‚µ‚Ä‚­‚¾‚³‚¢B"
-
-; License Page
-!define GAIM_LICENSE_BUTTON			"ŽŸ‚Ö >"
-!define GAIM_LICENSE_BOTTOM_TEXT		"$(^Name)‚ÍGPLƒ‰ƒCƒZƒ“ƒX‚ÌŒ³‚ŃŠƒŠ[ƒX‚³‚ê‚Ä‚¢‚Ü‚·Bƒ‰ƒCƒZƒ“ƒX‚Í‚±‚±‚ÉŽQl‚Ì‚½‚ß‚¾‚¯‚É’ñ‹Ÿ‚³‚ê‚Ä‚¢‚Ü‚·B $_CLICK"
-
-; Components Page
-!define GAIM_SECTION_TITLE			"GaimƒCƒ“ƒXƒ^ƒ“ƒgƒƒbƒZƒ“ƒWƒƒ (•K{)"
-!define GTK_SECTION_TITLE			"GTK+ Runtime Environment (•K{)"
-!define GTK_THEMES_SECTION_TITLE		"GTK+‚̃e[ƒ}"
-!define GTK_NOTHEME_SECTION_TITLE		"ƒe[ƒ}‚È‚µ"
-!define GTK_WIMP_SECTION_TITLE		"Wimpƒe[ƒ}"
-!define GTK_BLUECURVE_SECTION_TITLE		"Bluecurveƒe[ƒ}"
-!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blueƒe[ƒ}"
-!define GAIM_SECTION_DESCRIPTION		"Gaim‚ÌŠj‚Æ‚È‚éƒtƒ@ƒCƒ‹‚Ædll"
-!define GTK_SECTION_DESCRIPTION		"Gaim‚ÌŽg‚Á‚Ä‚¢‚éƒ}ƒ‹ƒ`ƒvƒ‰ƒbƒgƒtƒH[ƒ€GUIƒc[ƒ‹ƒLƒbƒg"
-!define GTK_THEMES_SECTION_DESCRIPTION	"GTK+‚̃e[ƒ}‚́AGTK+‚̃AƒvƒŠƒP[ƒVƒ‡ƒ“‚̃‹ƒbƒN•ƒtƒB[ƒ‹‚ð•Ï‚¦‚ç‚ê‚Ü‚·B"
-!define GTK_NO_THEME_DESC			"GTK+‚̃e[ƒ}‚ðƒCƒ“ƒXƒg[ƒ‹‚µ‚È‚¢"
-!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator)‚ÍWindows‚̃fƒXƒNƒgƒbƒvŠÂ‹«‚Æ‚æ‚­’²˜a‚µ‚½ƒe[ƒ}‚Å‚·B"
-!define GTK_BLUECURVE_THEME_DESC		"Bluecurveƒe[ƒ}B"
-!define GTK_LIGHTHOUSEBLUE_THEME_DESC	"Lighthouseblueƒe[ƒ}B"
-
-; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"ŒÃ‚¢ƒo[ƒWƒ‡ƒ“‚ÌGTK+ƒ‰ƒ“ƒ^ƒCƒ€‚ªŒ©‚‚©‚è‚Ü‚µ‚½BƒAƒbƒvƒOƒŒ[ƒh‚µ‚Ü‚·‚©?$\r’ˆÓ: Gaim‚̓AƒbƒvƒOƒŒ[ƒh‚µ‚È‚¢ŒÀ‚è“®‚©‚È‚¢‚Å‚µ‚傤B"
-
-; Installer Finish Page
-!define GAIM_FINISH_VISIT_WEB_SITE		"Windows Gaim‚ÌWebƒy[ƒW‚ð–K‚ê‚Ä‚­‚¾‚³‚¢B"
-
-; Gaim Section Prompts and Texts
-!define GAIM_UNINSTALL_DESC			"Gaim (íœ‚Ì‚Ý)"
-!define GAIM_PROMPT_WIPEOUT			"ŒÃ‚¢Gaim‚̃tƒHƒ‹ƒ_‚̍폜‚ÉŠÖ‚µ‚āB‘±s‚µ‚Ü‚·‚©?$\r$\r’ˆÓ: ‚ ‚È‚½‚̃Cƒ“ƒXƒg[ƒ‹‚µ‚½‚·‚ׂĂ̔ñ•W€‚ȃvƒ‰ƒOƒCƒ“‚͍폜‚³‚ê‚Ü‚·B$\rGaim‚̐ݒè‚͉e‹¿‚ðŽó‚¯‚Ü‚¹‚ñB"
-!define GAIM_PROMPT_DIR_EXISTS		"‚ ‚È‚½‚ÌŽw’肵‚½ƒCƒ“ƒXƒg[ƒ‹æ‚̃tƒHƒ‹ƒ_‚Í‚·‚Å‚É‘¶Ý‚µ‚Ä‚¢‚Ü‚·B“à—e‚Í‚·‚ׂÄ$\ríœ‚³‚ê‚Ü‚·B‘±s‚µ‚Ü‚·‚©?"
-
-; GTK+ Section Prompts
-!define GTK_INSTALL_ERROR			"GTK+ƒ‰ƒ“ƒ^ƒCƒ€‚̃Cƒ“ƒXƒg[ƒ‹‚ŃGƒ‰[‚ª”­¶‚µ‚Ü‚µ‚½B"
-!define GTK_BAD_INSTALL_PATH			"‚ ‚È‚½‚Ì“ü—Í‚µ‚½ƒpƒX‚ɃAƒNƒZƒX‚Ü‚½‚͍쐬‚Å‚«‚Ü‚¹‚ñB"
-
-; GTK+ Themes section
-!define GTK_NO_THEME_INSTALL_RIGHTS		"‚ ‚È‚½‚ÍGTK+‚̃e[ƒ}‚ðƒCƒ“ƒXƒg[ƒ‹‚·‚錠ŒÀ‚ðŽ‚Á‚Ä‚¢‚Ü‚¹‚ñB"
-
-; Uninstall Section Prompts
-!define un.GAIM_UNINSTALL_ERROR_1		"ƒAƒ“ƒCƒ“ƒXƒg[ƒ‰‚ÍGaim‚̃ŒƒWƒXƒgƒŠƒGƒ“ƒgƒŠ‚ð”­Œ©‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B$\r‚¨‚»‚ç‚­•Ê‚̃†[ƒU‚ɃCƒ“ƒXƒg[ƒ‹‚³‚ꂽ‚Å‚µ‚傤B"
-!define un.GAIM_UNINSTALL_ERROR_2		"‚ ‚È‚½‚Í‚±‚̃AƒvƒŠƒP[ƒVƒ‡ƒ“‚ðƒAƒ“ƒCƒ“ƒXƒg[ƒ‹‚·‚錠ŒÀ‚ðŽ‚Á‚Ä‚¢‚Ü‚¹‚ñB"
+;;  vim:syn=winbatch:encoding=cp932:
+;;
+;;  japanese.nsh
+;;
+;;  Japanese language strings for the Windows Gaim NSIS installer.
+;;  Windows Code page: 932
+;;
+;;  Author: "Takeshi Kurosawa" <t-kuro@...>
+;;  Version 2
+;;
+
+; Startup Checks
+!define INSTALLER_IS_RUNNING			"ƒCƒ“ƒXƒg[ƒ‰‚ªŠù‚ÉŽÀs‚³‚ê‚Ä‚¢‚Ü‚·"
+!define GAIM_IS_RUNNING				"Gaim ‚ªŽÀs‚³‚ê‚Ä‚¢‚Ü‚·BGaim ‚ðI—¹‚µ‚Ä‚©‚çÄ“xŽÀs‚µ‚Ä‚­‚¾‚³‚¢"
+!define GTK_INSTALLER_NEEDED			"GTK+ƒ‰ƒ“ƒ^ƒCƒ€ŠÂ‹«‚ª–³‚¢‚©‚à‚µ‚­‚̓AƒbƒvƒOƒŒ[ƒh‚·‚é•K—v‚ª‚ ‚è‚Ü‚·B$\rv${GTK_VERSION}‚à‚µ‚­‚Í‚»‚êˆÈã‚ÌGTK+ƒ‰ƒ“ƒ^ƒCƒ€‚ðƒCƒ“ƒXƒg[ƒ‹‚µ‚Ä‚­‚¾‚³‚¢B"
+
+; License Page
+!define GAIM_LICENSE_BUTTON			"ŽŸ‚Ö >"
+!define GAIM_LICENSE_BOTTOM_TEXT		"$(^Name)‚ÍGPLƒ‰ƒCƒZƒ“ƒX‚ÌŒ³‚ŃŠƒŠ[ƒX‚³‚ê‚Ä‚¢‚Ü‚·Bƒ‰ƒCƒZƒ“ƒX‚Í‚±‚±‚ÉŽQl‚Ì‚½‚ß‚¾‚¯‚É’ñ‹Ÿ‚³‚ê‚Ä‚¢‚Ü‚·B $_CLICK"
+
+; Components Page
+!define GAIM_SECTION_TITLE			"GaimƒCƒ“ƒXƒ^ƒ“ƒgƒƒbƒZƒ“ƒWƒƒ (•K{)"
+!define GTK_SECTION_TITLE			"GTK+ Runtime Environment (•K{)"
+!define GTK_THEMES_SECTION_TITLE		"GTK+‚̃e[ƒ}"
+!define GTK_NOTHEME_SECTION_TITLE		"ƒe[ƒ}‚È‚µ"
+!define GTK_WIMP_SECTION_TITLE			"Wimpƒe[ƒ}"
+!define GTK_BLUECURVE_SECTION_TITLE		"Bluecurveƒe[ƒ}"
+!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blueƒe[ƒ}"
+!define GAIM_SHORTCUTS_SECTION_TITLE		"ƒVƒ‡[ƒgƒJƒbƒg"
+!define GAIM_DESKTOP_SHORTCUT_SECTION_TITLE	"ƒfƒXƒNƒgƒbƒv"
+!define GAIM_STARTMENU_SHORTCUT_SECTION_TITLE	"ƒXƒ^[ƒgƒAƒbƒv"
+!define GAIM_SECTION_DESCRIPTION		"Gaim‚ÌŠj‚Æ‚È‚éƒtƒ@ƒCƒ‹‚Ædll"
+!define GTK_SECTION_DESCRIPTION			"Gaim‚ÌŽg‚Á‚Ä‚¢‚éƒ}ƒ‹ƒ`ƒvƒ‰ƒbƒgƒtƒH[ƒ€GUIƒc[ƒ‹ƒLƒbƒg"
+!define GTK_THEMES_SECTION_DESCRIPTION		"GTK+‚̃e[ƒ}‚́AGTK+‚̃AƒvƒŠƒP[ƒVƒ‡ƒ“‚̃‹ƒbƒN•ƒtƒB[ƒ‹‚ð•Ï‚¦‚ç‚ê‚Ü‚·B"
+!define GTK_NO_THEME_DESC			"GTK+‚̃e[ƒ}‚ðƒCƒ“ƒXƒg[ƒ‹‚µ‚È‚¢"
+!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator)‚ÍWindows‚̃fƒXƒNƒgƒbƒvŠÂ‹«‚Æ‚æ‚­’²˜a‚µ‚½ƒe[ƒ}‚Å‚·B"
+!define GTK_BLUECURVE_THEME_DESC		"Bluecurveƒe[ƒ}B"
+!define GTK_LIGHTHOUSEBLUE_THEME_DESC		"Lighthouseblueƒe[ƒ}B"
+!define GAIM_SHORTCUTS_SECTION_DESCRIPTION	"Gaim ‚ðŽÀs‚·‚邽‚߂̃Vƒ‡[ƒgƒJƒbƒg"
+!define GAIM_DESKTOP_SHORTCUT_DESC		"ƒfƒXƒNƒgƒbƒv‚É Gaim ‚̃Vƒ‡[ƒgƒJƒbƒg‚ðì¬‚·‚é"
+!define GAIM_STARTMENU_SHORTCUT_DESC		"ƒXƒ^[ƒgƒƒjƒ…[‚É Gaim ‚̍€–Ú‚ðì¬‚·‚é"
+
+; GTK+ Directory Page
+!define GTK_UPGRADE_PROMPT			"ŒÃ‚¢ƒo[ƒWƒ‡ƒ“‚ÌGTK+ƒ‰ƒ“ƒ^ƒCƒ€‚ªŒ©‚‚©‚è‚Ü‚µ‚½BƒAƒbƒvƒOƒŒ[ƒh‚µ‚Ü‚·‚©?$\r’ˆÓ: Gaim‚̓AƒbƒvƒOƒŒ[ƒh‚µ‚È‚¢ŒÀ‚è“®‚©‚È‚¢‚Å‚µ‚傤B"
+
+; Installer Finish Page
+!define GAIM_FINISH_VISIT_WEB_SITE		"Windows Gaim‚ÌWebƒy[ƒW‚ð–K‚ê‚Ä‚­‚¾‚³‚¢B"
+
+; Gaim Section Prompts and Texts
+!define GAIM_UNINSTALL_DESC			"Gaim (íœ‚Ì‚Ý)"
+!define GAIM_PROMPT_WIPEOUT			"ŒÃ‚¢Gaim‚̃tƒHƒ‹ƒ_‚̍폜‚ÉŠÖ‚µ‚āB‘±s‚µ‚Ü‚·‚©?$\r$\r’ˆÓ: ‚ ‚È‚½‚̃Cƒ“ƒXƒg[ƒ‹‚µ‚½‚·‚ׂĂ̔ñ•W€‚ȃvƒ‰ƒOƒCƒ“‚͍폜‚³‚ê‚Ü‚·B$\rGaim‚̐ݒè‚͉e‹¿‚ðŽó‚¯‚Ü‚¹‚ñB"
+!define GAIM_PROMPT_DIR_EXISTS			"‚ ‚È‚½‚ÌŽw’肵‚½ƒCƒ“ƒXƒg[ƒ‹æ‚̃tƒHƒ‹ƒ_‚Í‚·‚Å‚É‘¶Ý‚µ‚Ä‚¢‚Ü‚·B“à—e‚Í‚·‚ׂÄ$\ríœ‚³‚ê‚Ü‚·B‘±s‚µ‚Ü‚·‚©?"
+
+; GTK+ Section Prompts
+!define GTK_INSTALL_ERROR			"GTK+ƒ‰ƒ“ƒ^ƒCƒ€‚̃Cƒ“ƒXƒg[ƒ‹‚ŃGƒ‰[‚ª”­¶‚µ‚Ü‚µ‚½B"
+!define GTK_BAD_INSTALL_PATH			"‚ ‚È‚½‚Ì“ü—Í‚µ‚½ƒpƒX‚ɃAƒNƒZƒX‚Ü‚½‚͍쐬‚Å‚«‚Ü‚¹‚ñB"
+
+; GTK+ Themes section
+!define GTK_NO_THEME_INSTALL_RIGHTS		"‚ ‚È‚½‚ÍGTK+‚̃e[ƒ}‚ðƒCƒ“ƒXƒg[ƒ‹‚·‚錠ŒÀ‚ðŽ‚Á‚Ä‚¢‚Ü‚¹‚ñB"
+
+; Uninstall Section Prompts
+!define un.GAIM_UNINSTALL_ERROR_1		"ƒAƒ“ƒCƒ“ƒXƒg[ƒ‰‚ÍGaim‚̃ŒƒWƒXƒgƒŠƒGƒ“ƒgƒŠ‚ð”­Œ©‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B$\r‚¨‚»‚ç‚­•Ê‚̃†[ƒU‚ɃCƒ“ƒXƒg[ƒ‹‚³‚ꂽ‚Å‚µ‚傤B"
+!define un.GAIM_UNINSTALL_ERROR_2		"‚ ‚È‚½‚Í‚±‚̃AƒvƒŠƒP[ƒVƒ‡ƒ“‚ðƒAƒ“ƒCƒ“ƒXƒg[ƒ‹‚·‚錠ŒÀ‚ðŽ‚Á‚Ä‚¢‚Ü‚¹‚ñB"
+
+; Spellcheck Section Prompts
+!define GAIM_SPELLCHECK_SECTION_TITLE		"ƒXƒyƒ‹ƒ`ƒFƒbƒN‚̃Tƒ|[ƒg"
+!define GAIM_SPELLCHECK_ERROR			"ƒXƒyƒ‹ƒ`ƒFƒbƒN‚̃Cƒ“ƒXƒg[ƒ‹‚ÉŽ¸”s‚µ‚Ü‚µ‚½"
+!define GAIM_SPELLCHECK_DICT_ERROR		"ƒXƒyƒ‹ƒ`ƒFƒbƒNŽ«‘‚̃Cƒ“ƒXƒg[ƒ‹‚ÉŽ¸”s‚µ‚Ü‚µ‚½B"
+!define GAIM_SPELLCHECK_SECTION_DESCRIPTION	"ƒXƒyƒ‹ƒ`ƒFƒbƒN‚̃Tƒ|[ƒg  (ƒCƒ“ƒ^[ƒlƒbƒgÚ‘±‚ªƒCƒ“ƒXƒg[ƒ‹‚É•K—v‚Å‚·)"
+!define ASPELL_INSTALL_FAILED			"ƒCƒ“ƒXƒg[ƒ‹‚ÉŽ¸”s‚µ‚Ü‚µ‚½"
+!define GAIM_SPELLCHECK_BRETON			"ƒuƒ‹ƒ^[ƒjƒ…Œê"
+!define GAIM_SPELLCHECK_CATALAN			"ƒJƒ^ƒ‹[ƒjƒƒŒê"
+!define GAIM_SPELLCHECK_CZECH			"ƒ`ƒFƒRŒê"
+!define GAIM_SPELLCHECK_WELSH			"ƒEƒF[ƒ‹ƒYŒê"
+!define GAIM_SPELLCHECK_DANISH			"ƒfƒ“ƒ}[ƒNŒê"
+!define GAIM_SPELLCHECK_GERMAN			"ƒhƒCƒcŒê"
+!define GAIM_SPELLCHECK_GREEK			"ƒMƒŠƒVƒƒŒê"
+!define GAIM_SPELLCHECK_ENGLISH			"‰pŒê"
+!define GAIM_SPELLCHECK_ESPERANTO		"ƒGƒXƒyƒ‰ƒ“ƒgŒê"
+!define GAIM_SPELLCHECK_SPANISH			"ƒXƒyƒCƒ“Œê"
+!define GAIM_SPELLCHECK_FAROESE			"ƒtƒFƒ[Œê"
+!define GAIM_SPELLCHECK_FRENCH			"ƒtƒ‰ƒ“ƒXŒê"
+!define GAIM_SPELLCHECK_ITALIAN			"ƒCƒ^ƒŠƒAŒê"
+!define GAIM_SPELLCHECK_DUTCH			"ƒIƒ‰ƒ“ƒ_Œê"
+!define GAIM_SPELLCHECK_NORWEGIAN		"ƒmƒ‹ƒEƒF[Œã"
+!define GAIM_SPELLCHECK_POLISH			"ƒ|[ƒ‰ƒ“ƒhŒê"
+!define GAIM_SPELLCHECK_PORTUGUESE		"ƒ|ƒ‹ƒgƒKƒ‹Œê"
+!define GAIM_SPELLCHECK_ROMANIAN		"ƒ‹[ƒ}ƒjƒAŒê"
+!define GAIM_SPELLCHECK_RUSSIAN			"ƒƒVƒAŒê"
+!define GAIM_SPELLCHECK_SLOVAK			"ƒXƒƒ”ƒ@ƒLƒAŒê"
+!define GAIM_SPELLCHECK_SWEDISH			"ƒXƒEƒF[ƒfƒ“Œã"
+!define GAIM_SPELLCHECK_UKRAINIAN		"ƒEƒNƒ‰ƒCƒiŒê"
+

Index: korean.nsh
===================================================================
RCS file: /cvsroot/gaim/gaim/src/win32/nsis/translations/korean.nsh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -p -r1.5 -r1.6
--- korean.nsh	11 Apr 2005 12:24:46 -0000	1.5
+++ korean.nsh	29 Sep 2005 15:37:44 -0000	1.6
@@ -22,7 +22,7 @@
 !define GTK_SECTION_DESCRIPTION		"°¡ÀÓÀÌ »ç¿ëÇÏ´Â ¸ÖƼ Ç÷§Æû GUI ÅøŶ"
 !define GTK_THEMES_SECTION_DESCRIPTION	"GTK+ Å׸¶´Â GTK+ ÇÁ·Î±×·¥ÀÇ ·è¾ØÇÊÀ» ¹Ù²Ü ¼ö ÀÖ½À´Ï´Ù."
 !define GTK_NO_THEME_DESC			"GTK+ Å׸¶¸¦ ¼³Ä¡ÇÏÁö ¾Ê½À´Ï´Ù."
-!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator)´Â À©µµ¿ì µ¥½ºÅ©Å¾ ȯ°æ¿¡ Àß Á¶È­µÇ´Â GTK+ Å׸¶ÀÔ´Ï´Ù."
+!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator)´Â À©µµ¿ì µ¥½ºÅ©Å¾ ȯ°æ¿¡ Àß Á¶È­µÇ´Â GTK Å׸¶ÀÔ´Ï´Ù."
 !define GTK_BLUECURVE_THEME_DESC		"ºí·çÄ¿ºê Å׸¶."
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC	"The Lighthouseblue theme."
 

Index: norwegian.nsh
===================================================================
RCS file: /cvsroot/gaim/gaim/src/win32/nsis/translations/norwegian.nsh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -p -r1.1 -r1.2
--- norwegian.nsh	3 Apr 2004 00:11:49 -0000	1.1
+++ norwegian.nsh	29 Sep 2005 15:37:44 -0000	1.2
@@ -1,54 +1,93 @@
-;;
-;;  norwegian.nsh
-;;
-;;  Norwegian language strings for the Windows Gaim NSIS installer.
-;;  Windows Code page: 1252
-;;
-;;  Jørgen_Vinne_Iversen <jorgenvi@...>
-;;  Version 2
-;;
-
-; Startup GTK+ check
-!define GTK_INSTALLER_NEEDED			"GTK+ runtime environment mangler eller trenger en oppgradering.$\rVennligst installér GTK+ v${GTK_VERSION} eller høyere"
-
-; License Page
-!define GAIM_LICENSE_BUTTON			"Neste >"
-!define GAIM_LICENSE_BOTTOM_TEXT		"$(^Name) er utgitt under GPL (GNU General Public License). Lisensen er oppgitt her kun med henblikk på informasjon. $_CLICK"
-
-; Components Page
-!define GAIM_SECTION_TITLE			"Gaim Hurtigmeldingsklient (obligatorisk)"
-!define GTK_SECTION_TITLE			"GTK+ Runtime Environment (obligatorisk)"
-!define GTK_THEMES_SECTION_TITLE		"GTK+ Tema"
-!define GTK_NOTHEME_SECTION_TITLE		"Ingen tema"
-!define GTK_WIMP_SECTION_TITLE		"Wimp-tema"
-!define GTK_BLUECURVE_SECTION_TITLE		"Bluecurve-tema"
-!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue-tema"
-!define GAIM_SECTION_DESCRIPTION		"Gaims kjernefiler og dll'er"
-!define GTK_SECTION_DESCRIPTION		"Et GUI-verktøy for flere ulike plattformer, brukes av GAIM."
-!define GTK_THEMES_SECTION_DESCRIPTION	"GTK+ Tema kan endre utseendet og følelsen av GTK+ applikasjoner."
-!define GTK_NO_THEME_DESC			"Ikke installér noe GTK+ tema."
-!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows-imitator) er et GTK-tema som passer godt inn i Windows-miljø."
-!define GTK_BLUECURVE_THEME_DESC		"Bluecurve-tema."
-!define GTK_LIGHTHOUSEBLUE_THEME_DESC	"Lighthouseblue-tema."
-
-; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"En eldre versjon av GTK+ runtime ble funnet. Ønsker du å oppgradere?$\rMerk: Gaim vil kanskje ikke virke hvis du ikke oppgraderer."
-
-; Installer Finish Page
-!define GAIM_FINISH_VISIT_WEB_SITE		"Besøk Gaim for Windows' Nettside"
-
-; Gaim Section Prompts and Texts
-!define GAIM_UNINSTALL_DESC			"Gaim (kun avinstallering)"
-!define GAIM_PROMPT_WIPEOUT			"Din gamle Gaim-katalog holder på å slettes. Ønsker du å fortsette?$\r$\rMerk: Eventuelle ikke-standard plugin'er du har installert vil bli slettet.$\rGaims brukerinstillinger vil ikke bli berørt."
-!define GAIM_PROMPT_DIR_EXISTS		"Installasjonskatalogen du har spesifisert finnes fra før. Eventuelt innhold$\rvil bli slettet. Ønsker du å fortsette?"
-
-; GTK+ Section Prompts
-!define GTK_INSTALL_ERROR			"En feil oppstod ved installering av GTK+ runtime."
-!define GTK_BAD_INSTALL_PATH			"Stien du oppga kan ikke aksesseres eller lages."
-
-; GTK+ Themes section
-!define GTK_NO_THEME_INSTALL_RIGHTS		"Du har ikke rettigheter til å installere et GTK+ tema."
-
-; Uninstall Section Prompts
-!define un.GAIM_UNINSTALL_ERROR_1		"Avinstalleringsprogrammet kunne ikke finne noen registeroppføring for Gaim.$\rTrolig har en annen bruker installert denne applikasjonen."
-!define un.GAIM_UNINSTALL_ERROR_2		"Du har ikke rettigheter til å avinstallere denne applikasjonen."
+;;
+;;  norwegian.nsh
+;;
+;;  Norwegian language strings for the Windows Gaim NSIS installer.
+;;  Windows Code page: 1252
+;;
+;;  Jørgen_Vinne_Iversen <jorgenvi@...>
+;;  Version 2
+;;
+
+; Startup Checks
+!define INSTALLER_IS_RUNNING			"Installeren kjører allerede."
+!define GAIM_IS_RUNNING				"En instans av Gaim kjører fra før. Avslutt Gaim og prøv igjen."
+!define GTK_INSTALLER_NEEDED			"GTK+ runtime environment mangler eller trenger en oppgradering.$\rVennligst installér GTK+ v${GTK_VERSION} eller høyere"
+
+; License Page
+!define GAIM_LICENSE_BUTTON			"Neste >"
+!define GAIM_LICENSE_BOTTOM_TEXT		"$(^Name) er utgitt under GPL (GNU General Public License). Lisensen er oppgitt her kun med henblikk på informasjon. $_CLICK"
+
+; Components Page
+!define GAIM_SECTION_TITLE			"Gaim Hurtigmeldingsklient (obligatorisk)"
+!define GTK_SECTION_TITLE			"GTK+ Runtime Environment (obligatorisk)"
+!define GTK_THEMES_SECTION_TITLE		"GTK+ Tema"
+!define GTK_NOTHEME_SECTION_TITLE		"Ingen tema"
+!define GTK_WIMP_SECTION_TITLE			"Wimp-tema"
+!define GTK_BLUECURVE_SECTION_TITLE		"Bluecurve-tema"
+!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue-tema"
+!define GAIM_SHORTCUTS_SECTION_TITLE		"Snarveier"
+!define GAIM_DESKTOP_SHORTCUT_SECTION_TITLE	"Skrivebord"
+!define GAIM_STARTMENU_SHORTCUT_SECTION_TITLE	"Startmeny"
+!define GAIM_SECTION_DESCRIPTION		"Gaims kjernefiler og dll'er"
+!define GTK_SECTION_DESCRIPTION			"Et GUI-verktøy for flere ulike plattformer, brukes av Gaim."
+!define GTK_THEMES_SECTION_DESCRIPTION		"GTK+ Tema kan endre utseendet og følelsen av GTK+ applikasjoner."
+!define GTK_NO_THEME_DESC			"Ikke installér noe GTK+ tema."
+!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows-imitator) er et GTK-tema som passer godt inn i Windows-miljø."
+!define GTK_BLUECURVE_THEME_DESC		"Bluecurve-tema."
+!define GTK_LIGHTHOUSEBLUE_THEME_DESC		"Lighthouseblue-tema."
+!define GAIM_SHORTCUTS_SECTION_DESCRIPTION	"Snarveier for å starte Gaim"
+!define GAIM_DESKTOP_SHORTCUT_DESC		"Lag en snarvei til Gaim på Skrivebordet"
+!define GAIM_STARTMENU_SHORTCUT_DESC		"Legg til Gaim i Startmenyen"
+
+; GTK+ Directory Page
+!define GTK_UPGRADE_PROMPT			"En eldre versjon av GTK+ runtime ble funnet. Ønsker du å oppgradere?$\rMerk: Gaim vil kanskje ikke virke hvis du ikke oppgraderer."
+
+; Installer Finish Page
+!define GAIM_FINISH_VISIT_WEB_SITE		"Besøk Gaim for Windows' Nettside"
+
+; Gaim Section Prompts and Texts
+!define GAIM_UNINSTALL_DESC			"Gaim (kun avinstallering)"
+!define GAIM_PROMPT_WIPEOUT			"Din gamle Gaim-katalog holder på å slettes. Ønsker du å fortsette?$\r$\rMerk: Eventuelle ikke-standard plugin'er du har installert vil bli slettet.$\rGaims brukerinstillinger vil ikke bli berørt."
+!define GAIM_PROMPT_DIR_EXISTS			"Installasjonskatalogen du har spesifisert finnes fra før. Eventuelt innhold$\rvil bli slettet. Ønsker du å fortsette?"
+
+; GTK+ Section Prompts
+!define GTK_INSTALL_ERROR			"En feil oppstod ved installering av GTK+ runtime."
+!define GTK_BAD_INSTALL_PATH			"Stien du oppga kan ikke aksesseres eller lages."
+
+; GTK+ Themes section
+!define GTK_NO_THEME_INSTALL_RIGHTS		"Du har ikke rettigheter til å installere et GTK+ tema."
+
+; Uninstall Section Prompts
+!define un.GAIM_UNINSTALL_ERROR_1		"Avinstalleringsprogrammet kunne ikke finne noen registeroppføring for Gaim.$\rTrolig har en annen bruker avinstallert denne applikasjonen."
+!define un.GAIM_UNINSTALL_ERROR_2		"Du har ikke rettigheter til å avinstallere denne applikasjonen."
+
+
+
+; Spellcheck Section Prompts
+!define GAIM_SPELLCHECK_SECTION_TITLE		"Støtte for stavekontroll"
+!define GAIM_SPELLCHECK_ERROR			"Det oppstod en feil ved installering av stavekontroll"
+!define GAIM_SPELLCHECK_DICT_ERROR		"Det oppstod en feil ved installering av ordboken for stavekontroll"
+!define GAIM_SPELLCHECK_SECTION_DESCRIPTION	"Støtte for stavekontroll. (Internettoppkobling påkrevd for installasjon)"
+!define ASPELL_INSTALL_FAILED			"Installasjonen mislyktes."
+!define GAIM_SPELLCHECK_BRETON			"Bretagnsk"
+!define GAIM_SPELLCHECK_CATALAN			"Katalansk"
+!define GAIM_SPELLCHECK_CZECH			"Tsjekkisk"
+!define GAIM_SPELLCHECK_WELSH			"Walisisk"
+!define GAIM_SPELLCHECK_DANISH			"Dansk"
+!define GAIM_SPELLCHECK_GERMAN			"Tysk"
+!define GAIM_SPELLCHECK_GREEK			"Gresk"
+!define GAIM_SPELLCHECK_ENGLISH			"Engelsk"
+!define GAIM_SPELLCHECK_ESPERANTO		"Esperanto"
+!define GAIM_SPELLCHECK_SPANISH			"Spansk"
+!define GAIM_SPELLCHECK_FAROESE			"Færøysk"
+!define GAIM_SPELLCHECK_FRENCH			"Fransk"
+!define GAIM_SPELLCHECK_ITALIAN			"Italiensk"
+!define GAIM_SPELLCHECK_DUTCH			"Nederlandsk"
+!define GAIM_SPELLCHECK_NORWEGIAN		"Norsk"
+!define GAIM_SPELLCHECK_POLISH			"Polsk"
+!define GAIM_SPELLCHECK_PORTUGUESE		"Portugisisk"
+!define GAIM_SPELLCHECK_ROMANIAN		"Rumensk"
+!define GAIM_SPELLCHECK_RUSSIAN			"Russisk"
+!define GAIM_SPELLCHECK_SLOVAK			"Slovakisk"
+!define GAIM_SPELLCHECK_SWEDISH			"Svensk"
+!define GAIM_SPELLCHECK_UKRAINIAN		"Ukrainsk"

Index: polish.nsh
===================================================================
RCS file: /cvsroot/gaim/gaim/src/win32/nsis/translations/polish.nsh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -p -r1.2 -r1.3
--- polish.nsh	11 Apr 2005 12:24:46 -0000	1.2
+++ polish.nsh	29 Sep 2005 15:37:44 -0000	1.3
@@ -27,7 +27,7 @@
 !define GTK_SECTION_DESCRIPTION		"Wieloplatformowe narzêdzie GUI, u¿ywane w Gaim"
 !define GTK_THEMES_SECTION_DESCRIPTION	"Tematy GTK+ mog¹ zmieniæ wygl¹d i dzia³anie aplikacji GTK+ ."
 !define GTK_NO_THEME_DESC			"Nie instaluj tematów GTK+"
-!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) to temat GTK+ który doskonale wkomponowuje siê w œrodowisko systemu Windows."
+!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) to temat GTK który doskonale wkomponowuje siê w œrodowisko systemu Windows."
 !define GTK_BLUECURVE_THEME_DESC		"Temat The Bluecurve."
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC	"Temat Lighthouseblue."
 

Index: portuguese-br.nsh
===================================================================
RCS file: /cvsroot/gaim/gaim/src/win32/nsis/translations/portuguese-br.nsh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -p -r1.7 -r1.8
--- portuguese-br.nsh	11 Apr 2005 12:24:47 -0000	1.7
+++ portuguese-br.nsh	29 Sep 2005 15:37:44 -0000	1.8
@@ -4,8 +4,8 @@
 ;;  Portuguese (BR) language strings for the Windows Gaim NSIS installer.
 ;;  Windows Code page: 1252
 ;;
-;;  Author: Maurício de Lemos Rodrigues Collares Neto <mauricioc@...>, 2003.
-;;  Version 2
+;;  Author: Maurício de Lemos Rodrigues Collares Neto <mauricioc@...>, 2003-2005.
+;;  Version 3
 ;;
 
 ; Startup GTK+ check
@@ -22,14 +22,20 @@
 !define GTK_NOTHEME_SECTION_TITLE		"Nenhum tema"
 !define GTK_WIMP_SECTION_TITLE		"Tema 'Wimp'"
 !define GTK_BLUECURVE_SECTION_TITLE		"Tema 'Bluecurve'"
-!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Tema 'Light House Blue'"
+!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Tema 'Light House Blue'"
+!define GAIM_SHORTCUTS_SECTION_TITLE "Atalhos"
+!define GAIM_DESKTOP_SHORTCUT_SECTION_TITLE "Área de Trabalho"
+!define GAIM_STARTMENU_SHORTCUT_SECTION_TITLE "Menu Iniciar"
 !define GAIM_SECTION_DESCRIPTION		"Arquivos e bibliotecas principais do Gaim"
 !define GTK_SECTION_DESCRIPTION		"Um conjunto de ferramentas multi-plataforma para interface do usuário, usado pelo Gaim"
 !define GTK_THEMES_SECTION_DESCRIPTION	"Os temas do GTK+ podem mudar a aparência e o funcionamento dos aplicativos GTK+."
 !define GTK_NO_THEME_DESC			"Não instalar um tema do GTK+"
-!define GTK_WIMP_THEME_DESC			"O tema 'GTK-Wimp' ('Windows impersonator', personificador do Windows) é um tema GTK+ que combina bem com o ambiente de área de trabalho do Windows."
+!define GTK_WIMP_THEME_DESC			"O tema 'GTK-Wimp' ('Windows impersonator', personificador do Windows) é um tema GTK que combina bem com o ambiente de área de trabalho do Windows."
 !define GTK_BLUECURVE_THEME_DESC		"O tema 'Bluecurve'."
-!define GTK_LIGHTHOUSEBLUE_THEME_DESC	"O tema 'Lighthouseblue'."
+!define GTK_LIGHTHOUSEBLUE_THEME_DESC	"O tema 'Lighthouseblue'."
+!define GAIM_SHORTCUTS_SECTION_DESCRIPTION   "Atalhos para iniciar o Gaim"
+!define GAIM_DESKTOP_SHORTCUT_DESC   "Crie um atalho para o Gaim na Área de Trabalho"
+!define GAIM_STARTMENU_SHORTCUT_DESC   "Crie uma entrada no Menu Iniciar para o Gaim"
 
 ; GTK+ Directory Page
 !define GTK_UPGRADE_PROMPT			"Uma versão antiga do ambiente de tempo de execução do GTK+ foi encontrada. Você deseja atualizá-lo?$\rNota: O Gaim poderá não funcionar a menos que você o faça."

Index: portuguese.nsh
===================================================================
RCS file: /cvsroot/gaim/gaim/src/win32/nsis/translations/portuguese.nsh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -p -r1.5 -r1.6
--- portuguese.nsh	11 Apr 2005 12:24:47 -0000	1.5
+++ portuguese.nsh	29 Sep 2005 15:37:44 -0000	1.6
@@ -1,54 +1,62 @@
-;;
-;;  portuguese.nsh
-;;
-;;  Portuguese (PT) language strings for the Windows Gaim NSIS installer.
-;;  Windows Code page: 1252
-;;
-;;  Author: Duarte Serrano Gonçalves Henriques <duarte_henriques@...>, 2003.
-;;  Version 2
-;;
-
-; Startup GTK+ check
-!define GTK_INSTALLER_NEEDED			"O ambiente de tempo de execução do GTK+ está ausente ou precisa de ser actualizado.$\rPor favor instale a versão v${GTK_VERSION} ou superior do ambiente de tempo de execução do GTK+."
-
-; License Page
-!define GAIM_LICENSE_BUTTON			"Seguinte >"
-!define GAIM_LICENSE_BOTTOM_TEXT		"$(^Name) está disponível sob alicença GPL. O texto da licença é fornecido meramente a título informativo. $_CLICK" 
-
-; Components Page
-!define GAIM_SECTION_TITLE			"Cliente de mensagens instantâneas Gaim (obrigatório)"
-!define GTK_SECTION_TITLE			"Ambiente de tempo de execução do GTK+ (obrigatório)"
-!define GTK_THEMES_SECTION_TITLE		"Temas do GTK+"
-!define GTK_NOTHEME_SECTION_TITLE		"Nenhum tema"
-!define GTK_WIMP_SECTION_TITLE		"Tema 'Wimp'"
-!define GTK_BLUECURVE_SECTION_TITLE		"Tema 'Bluecurve'"
-!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Tema 'Light House Blue'"
-!define GAIM_SECTION_DESCRIPTION		"Ficheiros e bibliotecas principais do Gaim"
-!define GTK_SECTION_DESCRIPTION		"Um conjunto de ferramentas de interface gráfica multi-plataforma, usado pelo Gaim"
-!define GTK_THEMES_SECTION_DESCRIPTION	"Os temas do GTK+ podem mudar a aparência dos programas GTK+."
-!define GTK_NO_THEME_DESC			"Não instalar um tema do GTK+"
-!define GTK_WIMP_THEME_DESC			"O tema 'GTK-Wimp' ('Windows impersonator', personificador do Windows) é um tema GTK+ que combina bem com o ambiente de trabalho do Windows."
-!define GTK_BLUECURVE_THEME_DESC		"O tema 'Bluecurve'."
-!define GTK_LIGHTHOUSEBLUE_THEME_DESC	"O tema 'Lighthouseblue'."
-
-; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"Foi encontrada ma versão antiga do ambiente de tempo de execução do GTK+. Deseja actualizá-lo?$\rNota: O Gaim poderá não funcionar se não o fizer."
-
-; Installer Finish Page
-!define GAIM_FINISH_VISIT_WEB_SITE		"Visite a página web do Gaim para Windows" 
-
-; Gaim Section Prompts and Texts
-!define GAIM_UNINSTALL_DESC			"Gaim (remover apenas)"
-!define GAIM_PROMPT_WIPEOUT			"A sua antiga instalação do Gaim está prestes a ser removida. Deseja continuar?$\r$\rNota: Quaisquer plugins não-padrão que poderá ter instalado serão removidos.$\rAs configurações de utilizador do Gaim não serão afectadas."
-!define GAIM_PROMPT_DIR_EXISTS		"A directoria de instalação do que especificou já existe. Qualquer conteúdo$\rserá apagado. Deseja continuar?"
-
-; GTK+ Section Prompts
-!define GTK_INSTALL_ERROR			"Erro ao instalar o ambiente de tempo de execução do GTK+."
-!define GTK_BAD_INSTALL_PATH			"Impossível aceder ou criar o caminho que digitou."
-
-; GTK+ Themes section
-!define GTK_NO_THEME_INSTALL_RIGHTS		"Não tem permissão para instalar um tema do GTK+."
-
-; Uninstall Section Prompts
-!define un.GAIM_UNINSTALL_ERROR_1         "O desinstalador não pôde encontrar entradas de registo do Gaim.$\rÉ provável que outro utilizador tenha instalado este programa."
-!define un.GAIM_UNINSTALL_ERROR_2         "Não tem permissão para desinstalar este programa."
+;;
+;;  portuguese.nsh
+;;
+;;  Portuguese (PT) language strings for the Windows Gaim NSIS installer.
+;;  Windows Code page: 1252
+;;
+;;  Author: Duarte Henriques <duarte.henriques@...>, 2003-2005.
+;;  Version 3
+;;
+
+; Startup Checks
+!define INSTALLER_IS_RUNNING			"O instalador já está a ser executado."
+!define GAIM_IS_RUNNING			"Uma instância do Gaim já está a ser executada. Saia do Gaim e tente de novo."
+!define GTK_INSTALLER_NEEDED			"O ambiente de GTK+ está ausente ou precisa de ser actualizado.$\rPor favor instale a versão v${GTK_VERSION} ou mais recente do ambiente de GTK+."
+
+; License Page
+!define GAIM_LICENSE_BUTTON			"Seguinte >"
+!define GAIM_LICENSE_BOTTOM_TEXT		"$(^Name) está disponível sob a licença GNU General Public License (GPL). O texto da licença é fornecido aqui meramente a título informativo. $_CLICK"
+
+; Components Page
+!define GAIM_SECTION_TITLE			"Cliente de Mensagens Instantâneas Gaim (obrigatório)"
+!define GTK_SECTION_TITLE			"Ambiente de Execução GTK+ (obrigatório)"
+!define GTK_THEMES_SECTION_TITLE		"Temas do GTK+"
+!define GTK_NOTHEME_SECTION_TITLE		"Nenhum tema"
+!define GTK_WIMP_SECTION_TITLE		"Tema Wimp"
+!define GTK_BLUECURVE_SECTION_TITLE		"Tema Bluecurve"
+!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Tema Light House Blue"
+!define GAIM_SHORTCUTS_SECTION_TITLE "Atalhos"
+!define GAIM_DESKTOP_SHORTCUT_SECTION_TITLE "Ambiente de Trabalho"
+!define GAIM_STARTMENU_SHORTCUT_SECTION_TITLE "Menu de Iniciar"
+!define GAIM_SECTION_DESCRIPTION		"Ficheiros e bibliotecas principais do Gaim"
+!define GTK_SECTION_DESCRIPTION		"Um conjunto de ferramentas de interface gráfica multi-plataforma, usado pelo Gaim"
+!define GTK_THEMES_SECTION_DESCRIPTION	"Os Temas do GTK+ podem mudar a aparência dos programas GTK+."
+!define GTK_NO_THEME_DESC			"Não instalar um tema do GTK+"
+!define GTK_WIMP_THEME_DESC			"O tema GTK-Wimp (Windows impersonator, personificador do Windows) é um tema GTK+ que combina bem com o ambiente de trabalho do Windows."
+!define GTK_BLUECURVE_THEME_DESC		"O tema Bluecurve."
+!define GTK_LIGHTHOUSEBLUE_THEME_DESC	"O tema Lighthouseblue."
+!define GAIM_SHORTCUTS_SECTION_DESCRIPTION   "Atalhos para iniciar o Gaim"
+!define GAIM_DESKTOP_SHORTCUT_DESC   "Criar um atalho para o Gaim no Ambiente de Trabalho"
+!define GAIM_STARTMENU_SHORTCUT_DESC   "Criar uma entrada para o Gaim na Barra de Iniciar"
+
+; GTK+ Directory Page
+!define GTK_UPGRADE_PROMPT			"Foi encontrada uma versão antiga do ambiente de execução GTK+. Deseja actualizá-lo?$\rNota: O Gaim poderá não funcionar se não o fizer."
+
+; Installer Finish Page
+!define GAIM_FINISH_VISIT_WEB_SITE		"Visite a Página Web do Gaim para Windows"
+
+; Gaim Section Prompts and Texts
+!define GAIM_UNINSTALL_DESC			"Gaim (remover apenas)"
+!define GAIM_PROMPT_WIPEOUT			"A directoria antiga do Gaim está prestes a ser removida. Deseja continuar?$\r$\rNota: Quaisquer plugins não-padrão que poderá ter instalado serão removidos.$\rAs configurações de utilizador do Gaim não serão afectadas."
+!define GAIM_PROMPT_DIR_EXISTS		"A directoria de instalação que especificou já existe. Qualquer conteúdo$\rserá removido. Deseja continuar?"
+
+; GTK+ Section Prompts
+!define GTK_INSTALL_ERROR			"Erro ao instalar o ambiente de execução GTK+."
+!define GTK_BAD_INSTALL_PATH			"O caminho que digitou não pode ser acedido nem criado."
+
+; GTK+ Themes section
+!define GTK_NO_THEME_INSTALL_RIGHTS	"Não tem permissão para instalar um tema do GTK+."
+
+; Uninstall Section Prompts
+!define un.GAIM_UNINSTALL_ERROR_1		"O desinstalador não encontrou entradas de registo do Gaim.$\rÉ provável que outro utilizador tenha instalado este programa."
+!define un.GAIM_UNINSTALL_ERROR_2		"Não tem permissão para desinstalar este programa."

Index: romanian.nsh
===================================================================
RCS file: /cvsroot/gaim/gaim/src/win32/nsis/translations/romanian.nsh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -p -r1.4 -r1.5
--- romanian.nsh	11 Apr 2005 12:24:47 -0000	1.4
+++ romanian.nsh	29 Sep 2005 15:37:44 -0000	1.5
@@ -4,31 +4,46 @@
 ;;  Romanian language strings for the Windows Gaim NSIS installer.
 ;;  Windows Code page: 1250
 ;;
-;;  Author: Miºu Moldovan <dumol@...>
+;;  Author: Miºu Moldovan <dumol@...>, (c) 2004 - 2005.
 ;;
 
-; Startup GTK+ check
+; Startup Checks
+!define INSTALLER_IS_RUNNING                     "Instalarea este deja pornitã."
+!define GAIM_IS_RUNNING                  "O instanþã a programului Gaim este deja pornitã. Închideþi-o ºi încercaþi din nou."
 !define GTK_INSTALLER_NEEDED			"Mediul GTK+ nu e prezent sau aveþi o versiune prea veche.$\rInstalaþi cel puþin versiunea v${GTK_VERSION} a mediului GTK+"
 
+; License Page
+!define GAIM_LICENSE_BUTTON                      "Înainte >"
+!define GAIM_LICENSE_BOTTOM_TEXT         "$(^Name) are licenþã GPL (GNU Public License). Licenþa este inclusã aici doar pentru scopuri informative. $_CLICK"
+
 ; Components Page
-!define GAIM_SECTION_TITLE			"Client de mesagerie instantanee (obligatoriu)"
+!define GAIM_SECTION_TITLE			"Client de mesagerie instant (obligatoriu)"
 !define GTK_SECTION_TITLE			"Mediu GTK+ (obligatoriu)"
 !define GTK_THEMES_SECTION_TITLE		"Teme GTK+"
 !define GTK_NOTHEME_SECTION_TITLE		"Fãrã teme"
 !define GTK_WIMP_SECTION_TITLE		"Temã Wimp"
 !define GTK_BLUECURVE_SECTION_TITLE		"Temã Bluecurve"
 !define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Temã Light House Blue"
+!define GAIM_SHORTCUTS_SECTION_TITLE "Scurtãturi"
+!define GAIM_DESKTOP_SHORTCUT_SECTION_TITLE "Desktop"
+!define GAIM_STARTMENU_SHORTCUT_SECTION_TITLE "Meniu Start"
 !define GAIM_SECTION_DESCRIPTION		"Fiºiere Gaim ºi dll-uri"
 !define GTK_SECTION_DESCRIPTION		"Un mediu de dezvoltare multiplatformã utilizat de Gaim"
 !define GTK_THEMES_SECTION_DESCRIPTION	"Temele GTK+ schimbã aparenþa aplicaþiilor GTK+."
-!define GTK_NO_THEME_DESC			"Nu instala o temã GTK+"
-!define GTK_WIMP_THEME_DESC			"GTK-Wimp este o temã GTK+ în acord cu mediul Windows."
+!define GTK_NO_THEME_DESC			"Fãrã teme GTK+"
+!define GTK_WIMP_THEME_DESC			"GTK-Wimp este o temã GTK+ ce imitã mediul grafic Windows."
 !define GTK_BLUECURVE_THEME_DESC		"Tema Bluecurve."
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC	"Tema Lighthouseblue."
+!define GAIM_SHORTCUTS_SECTION_DESCRIPTION   "Scurtãturi pentru pornirea Gaim"
+!define GAIM_DESKTOP_SHORTCUT_DESC   "Creeazã iconiþe Gaim pe Desktop"
+!define GAIM_STARTMENU_SHORTCUT_DESC   "Creeazã o intrare Gaim în meniul Start"
 
 ; GTK+ Directory Page
 !define GTK_UPGRADE_PROMPT			"Aveþi o versiune veche a mediului GTK+. Doriþi sã o actualizaþi?$\rNotã: E posibil ca Gaim sã nu funcþioneze cu versiunea veche."
 
+; Installer Finish Page
+!define GAIM_FINISH_VISIT_WEB_SITE               "Vizitaþi pagina de web Windows Gaim"
+
 ; Gaim Section Prompts and Texts
 !define GAIM_UNINSTALL_DESC			"Gaim (doar dezinstalare)"
 !define GAIM_PROMPT_WIPEOUT			"Vechiul director Gaim va fi ºters. Doriþi sã continuaþi?$\r$\rNotã: Orice module externe vor fi ºterse.$\rSetãrile utilizatorilor Gaim nu vor fi afectate."

Index: serbian-latin.nsh
===================================================================
RCS file: /cvsroot/gaim/gaim/src/win32/nsis/translations/serbian-latin.nsh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -p -r1.4 -r1.5
--- serbian-latin.nsh	11 Apr 2005 12:24:47 -0000	1.4
+++ serbian-latin.nsh	29 Sep 2005 15:37:44 -0000	1.5
@@ -22,7 +22,7 @@
 !define GTK_SECTION_DESCRIPTION		"Skup oruða za grafièko okruženje, za više platformi, koristi ga Gaim"
 !define GTK_THEMES_SECTION_DESCRIPTION	"GTK+ teme menjaju izgled i naèin rada GTK+ aplikacija."
 !define GTK_NO_THEME_DESC			"Ne instaliraj GTK+ temu"
-!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows imitator) je GTK+ tema koja se dobro uklapa u Windows radno okruženje."
+!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows imitator) je GTK tema koja se dobro uklapa u Windows radno okruženje."
 !define GTK_BLUECURVE_THEME_DESC		"Bluecurve tema."
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC	"Lighthouseblue tema."
 

Index: simp-chinese.nsh
===================================================================
RCS file: /cvsroot/gaim/gaim/src/win32/nsis/translations/simp-chinese.nsh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -p -r1.5 -r1.6
--- simp-chinese.nsh	11 Apr 2005 12:24:47 -0000	1.5
+++ simp-chinese.nsh	29 Sep 2005 15:37:44 -0000	1.6
@@ -1,4 +1,4 @@
-;;
+;;  vim:syn=winbatch:encoding=8bit-cp936:fileencoding=8bit-cp936:
 ;;  simp-chinese.nsh
 ;;
 ;;  Simplified Chinese language strings for the Windows Gaim NSIS installer.
@@ -9,6 +9,8 @@
 ;;
 
 ; Startup GTK+ check
+!define INSTALLER_IS_RUNNING			"°²×°³ÌÐòÒѾ­ÔËÐС£"
+!define GAIM_IS_RUNNING			"Gaim µÄʵÀýÕýÔÚÔËÐÐÖС£ÇëÍ˳ö Gaim È»ºóÔÙÊÔÒ»´Î¡£"
 !define GTK_INSTALLER_NEEDED			"¿ÉÄÜȱÉÙ GTK+ ÔËÐÐʱ¿Ì»·¾³£¬»òÕßÐèÒª¸üиû·¾³¡£$\rÇë°²×° v${GTK_VERSION} »ò¸ü¸ß°æ±¾µÄ GTK+ ÔËÐÐʱ¿Ì»·¾³"
 
 ; License Page
@@ -23,13 +25,19 @@
 !define GTK_WIMP_SECTION_TITLE		"Wimp Ö÷Ìâ"
 !define GTK_BLUECURVE_SECTION_TITLE		"Bluecurve Ö÷Ìâ"
 !define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue Ö÷Ìâ"
+!define GAIM_SHORTCUTS_SECTION_TITLE "¿ì½Ý·½Ê½"
+!define GAIM_DESKTOP_SHORTCUT_SECTION_TITLE "×ÀÃæ"
+!define GAIM_STARTMENU_SHORTCUT_SECTION_TITLE "¿ªÊ¼²Ëµ¥"
 !define GAIM_SECTION_DESCRIPTION		"Gaim ºËÐÄÎļþºÍ DLLs"
 !define GTK_SECTION_DESCRIPTION		"Gaim ËùÓõĶàƽ̨ GUI ¹¤¾ß°ü"
 !define GTK_THEMES_SECTION_DESCRIPTION	"GTK+ Ö÷Ìâ¿ÉÒÔ¸ü¸Ä GTK+ ³ÌÐòµÄ¹Û¸Ð¡£"
 !define GTK_NO_THEME_DESC			"²»°²×° GTK+ Ö÷Ìâ"
-!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator)ÊÇ is a GTK+ theme that blends well into the Windows desktop environment."
+!define GTK_WIMP_THEME_DESC			"GTK-Wimp ÊÇÊÊºÏ Windows ×ÀÃæ»·¾³µÄ GTK+ Ö÷Ìâ¡£"
 !define GTK_BLUECURVE_THEME_DESC		"Bluecurve Ö÷Ìâ¡£"
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC	"Lighthouseblue Ö÷Ìâ¡£"
+!define GAIM_SHORTCUTS_SECTION_DESCRIPTION   "Æô¶¯ Gaim µÄ¿ì½Ý·½Ê½"
+!define GAIM_DESKTOP_SHORTCUT_DESC   "ÔÚ×ÀÃæÉÏ´´½¨ Gaim µÄ¿ì½Ý·½Ê½"
+!define GAIM_STARTMENU_SHORTCUT_DESC   "ÔÚ¿ªÊ¼²Ëµ¥Öд´½¨ Gaim µÄ¿ì½Ý·½Ê½"
 
 ; GTK+ Directory Page
 !define GTK_UPGRADE_PROMPT			"·¢ÏÖÁ˾ɰ汾µÄ GTK+ ÔËÐÐʱ¿Ì¡£ÄúÏëÒªÉý¼¶Âð?$\r×¢Òâ: ³ý·ÇÄú½øÐÐÉý¼¶£¬·ñÔò Gaim ¿ÉÄÜÎÞ·¨¹¤×÷¡£"
@@ -52,3 +60,32 @@
 ; Uninstall Section Prompts
 !define un.GAIM_UNINSTALL_ERROR_1         "жÔسÌÐòÕÒ²»µ½ Gaim µÄ×¢²á±íÏîÄ¿¡£$\r¿ÉÄÜÊÇÁíÍâµÄÓû§°²×°Á˴˳ÌÐò¡£"
 !define un.GAIM_UNINSTALL_ERROR_2         "ÄúûÓÐȨÏÞжÔش˳ÌÐò¡£"
+
+; Spellcheck Section Prompts
+!define GAIM_SPELLCHECK_SECTION_TITLE		"ƴд¼ì²éÖ§³Ö"
+!define GAIM_SPELLCHECK_ERROR			"°²×°Æ´Ð´¼ì²é³ö´í"
+!define GAIM_SPELLCHECK_DICT_ERROR		"°²×°Æ´Ð´¼ì²é×Öµä³ö´í"
+!define GAIM_SPELLCHECK_SECTION_DESCRIPTION	"ƴд¼ì²éÖ§³Ö¡£(°²×°ÐèÒªÁ¬½Óµ½ Internet)"
+!define ASPELL_INSTALL_FAILED			"°²×°Ê§°Ü"
+!define GAIM_SPELLCHECK_BRETON			"²¼Àï¶àÄáÓï"
+!define GAIM_SPELLCHECK_CATALAN			"¼ÓÌ©ÂÞÄáÑÇÓï"
+!define GAIM_SPELLCHECK_CZECH			"½Ý¿ËÓï"
+!define GAIM_SPELLCHECK_WELSH			"Íþ¶ûÊ¿Óï"
+!define GAIM_SPELLCHECK_DANISH			"µ¤ÂóÓï"
+!define GAIM_SPELLCHECK_GERMAN			"µÂÓï"
+!define GAIM_SPELLCHECK_GREEK			"Ï£À°Óï"
+!define GAIM_SPELLCHECK_ENGLISH			"Ó¢Óï"
+!define GAIM_SPELLCHECK_ESPERANTO		"ÊÀ½çÓï"
+!define GAIM_SPELLCHECK_SPANISH			"Î÷°àÑÀÓï"
+!define GAIM_SPELLCHECK_FAROESE			"·¨ÂÞÓï"
+!define GAIM_SPELLCHECK_FRENCH			"·¨Óï"
+!define GAIM_SPELLCHECK_ITALIAN			"Òâ´óÀûÓï"
+!define GAIM_SPELLCHECK_DUTCH			"ºÉÀ¼Óï"
+!define GAIM_SPELLCHECK_NORWEGIAN		"ŲÍþÓï"
+!define GAIM_SPELLCHECK_POLISH			"²¨À¼Óï"
+!define GAIM_SPELLCHECK_PORTUGUESE		"ÆÏÌÑÑÀÓï"
+!define GAIM_SPELLCHECK_ROMANIAN			"ÂÞÂíÄáÑÇÓï"
+!define GAIM_SPELLCHECK_RUSSIAN			"¶íÓï"
+!define GAIM_SPELLCHECK_SLOVAK			"˹Âå·¥¿ËÓï"
+!define GAIM_SPELLCHECK_SWEDISH			"ÈðµäÓï"
+!define GAIM_SPELLCHECK_UKRAINIAN		"ÎÚ¿ËÀ¼Óï"

Index: slovak.nsh
===================================================================
RCS file: /cvsroot/gaim/gaim/src/win32/nsis/translations/slovak.nsh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -p -r1.2 -r1.3
--- slovak.nsh	11 Apr 2005 12:24:47 -0000	1.2
+++ slovak.nsh	29 Sep 2005 15:37:44 -0000	1.3
@@ -1,53 +1,92 @@
-;;
-;;  slovak.nsh
-;;
-;;  Slovak language strings for the Windows Gaim NSIS installer.
-;;  Windows Code page: 1250
-;;
-;;  Author: dominik@...
-;;  Version 2
-
-; Startup GTK+ check
-!define GTK_INSTALLER_NEEDED			"GTK+ runtime prostredie chýba alebo musí by upgradované.$\rNainštalujte, prosím, GTK+ runtime verziu v${GTK_VERSION}, alebo novšiu"
-
-; License Page
-!define GAIM_LICENSE_BUTTON			"Ïalej >"
-!define GAIM_LICENSE_BOTTOM_TEXT		"$(^Name) je vydaný pod GPL licenciou. Táto licencia je len pre informaèné úèely. $_CLICK"
-
-; Components Page
-!define GAIM_SECTION_TITLE			"Gaim Instant Messaging Klient (nevyhnutné)"
-!define GTK_SECTION_TITLE			"GTK+ Runtime prostredie (nevyhnutné)"
-!define GTK_THEMES_SECTION_TITLE		"GTK+ témy"
-!define GTK_NOTHEME_SECTION_TITLE		"Žiadna grafická téma"
-!define GTK_WIMP_SECTION_TITLE		"Wimp grafická téma"
-!define GTK_BLUECURVE_SECTION_TITLE		"Bluecurve grafická téma"
-!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue grafická téma"
-!define GAIM_SECTION_DESCRIPTION		"Jadro Gaim-u a nevyhnutné DLL súbory"
-!define GTK_SECTION_DESCRIPTION		"Multiplatformové GUI nástroje, používané Gaim-om"
-!define GTK_THEMES_SECTION_DESCRIPTION	"Pomocou GTK+ grafických tém môžete zmeni vzh¾ad GTK+ aplikácií."
-!define GTK_NO_THEME_DESC			"Neinštalova GTK+ grafickú tému"
-!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) je GTK+ grafická téma, ktorá pekne ladí s prostredím Windows."
-!define GTK_BLUECURVE_THEME_DESC		"Bluecurve grafická téma."
-!define GTK_LIGHTHOUSEBLUE_THEME_DESC	"Lighthouseblue grafická téma"
-
-; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"Bola nájdená staršia verzia GTK+ runtime. Prajete si upgradova súèasnú verziu?$\rPoznámka: Gaim nemusí po upgradovaní fungova správne."
-
-; Installer Finish Page
-!define GAIM_FINISH_VISIT_WEB_SITE		"Navštívi webstránku Windows Gaim"
-
-; Gaim Section Prompts and Texts
-!define GAIM_UNINSTALL_DESC			"Gaim (len odstráni)"
-!define GAIM_PROMPT_WIPEOUT			"Vᚠadresár Gaim bude zmazaný. Chcete pokraèova?$\r$\rPoznámka: Všetky prídavne pluginy, ktoré ste nainštalovali budú tiež zmazané.$\rNastavenia uživate¾ského úètu Gaim-u budú ponechané."
-!define GAIM_PROMPT_DIR_EXISTS		"Adresár, ktorý ste zadali, už existuje. Jeho obsah bude zmazaný. Chcete pokraèova?"
-
-; GTK+ Section Prompts
-!define GTK_INSTALL_ERROR			"Chyba pri inštalácii GTK+ runtime."
-!define GTK_BAD_INSTALL_PATH			"Zadaná cesta nie je prístupná alebo ju nie je možné vytvori."
-
-; GTK+ Themes section
-!define GTK_NO_THEME_INSTALL_RIGHTS		"Nemáte oprávnenie na inštaláciu GTK+ grafickej témy."
-
-; Uninstall Section Prompts
-!define un.GAIM_UNINSTALL_ERROR_1		"Inštalátoru sa nepodarilo nájs položky v registri pre Gaim.$\rJe možné, že túto aplikáciu nainštaloval iný používate¾."
-!define un.GAIM_UNINSTALL_ERROR_2		"Nemáte oprávnenie na odinštaláciu tejto aplikácie."
+;;  vim:syn=winbatch:encoding=cp1250:
+;;
+;;  slovak.nsh
+;;
+;;  Slovak language strings for the Windows Gaim NSIS installer.
+;;  Windows Code page: 1250
+;;
+;;  Author: dominik@...
+;;  Version 2
+
+; Startup Checks
+!define INSTALLER_IS_RUNNING			"Inštalácia je už spustená"
+!define GAIM_IS_RUNNING				"Gaim je práve spustený. Vypnite ho a skúste znova."
+!define GTK_INSTALLER_NEEDED			"GTK+ runtime prostredie chýba alebo musí by upgradované.$\rNainštalujte, prosím, GTK+ runtime verziu v${GTK_VERSION}, alebo novšiu"
+
+; License Page
+!define GAIM_LICENSE_BUTTON			"Ïalej >"
+!define GAIM_LICENSE_BOTTOM_TEXT		"$(^Name) je vydaný pod GPL licenciou. Táto licencia je len pre informaèné úèely. $_CLICK"
+
+; Components Page
+!define GAIM_SECTION_TITLE			"Gaim Instant Messaging Klient (nevyhnutné)"
+!define GTK_SECTION_TITLE			"GTK+ Runtime prostredie (nevyhnutné)"
+!define GTK_THEMES_SECTION_TITLE		"GTK+ témy"
+!define GTK_NOTHEME_SECTION_TITLE		"Žiadna grafická téma"
+!define GTK_WIMP_SECTION_TITLE			"Wimp grafická téma"
+!define GTK_BLUECURVE_SECTION_TITLE		"Bluecurve grafická téma"
+!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue grafická téma"
+!define GAIM_SHORTCUTS_SECTION_TITLE		"Zástupcovia"
+!define GAIM_DESKTOP_SHORTCUT_SECTION_TITLE	"Plocha"
+!define GAIM_STARTMENU_SHORTCUT_SECTION_TITLE	"Štart Menu"
+!define GAIM_SECTION_DESCRIPTION		"Jadro Gaim-u a nevyhnutné DLL súbory"
+!define GTK_SECTION_DESCRIPTION			"Multiplatformové GUI nástroje, používané Gaim-om"
+!define GTK_THEMES_SECTION_DESCRIPTION		"Pomocou GTK+ grafických tém môžete zmeni vzh¾ad GTK+ aplikácií."
+!define GTK_NO_THEME_DESC			"Neinštalova GTK+ grafickú tému"
+!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) je GTK grafická téma, ktorá pekne ladí s prostredím Windows."
+!define GTK_BLUECURVE_THEME_DESC		"Bluecurve grafická téma."
+!define GTK_LIGHTHOUSEBLUE_THEME_DESC		"Lighthouseblue grafická téma"
+!define GAIM_SHORTCUTS_SECTION_DESCRIPTION	"Zástupcovia pre Gaim"
+!define GAIM_DESKTOP_SHORTCUT_DESC		"Vytvori zástupcu pre Gaim na pracovnej ploche"
+!define GAIM_STARTMENU_SHORTCUT_DESC		"Vytvori odkaz na Gaim v Štart Menu"
+
+; GTK+ Directory Page
+!define GTK_UPGRADE_PROMPT			"Bola nájdená staršia verzia GTK+ runtime. Prajete si upgradova súèasnú verziu?$\rPoznámka: Gaim nemusí po upgradovaní fungova správne."
+
+; Installer Finish Page
+!define GAIM_FINISH_VISIT_WEB_SITE		"Navštívi webstránku Windows Gaim"
+
+; Gaim Section Prompts and Texts
+!define GAIM_UNINSTALL_DESC			"Gaim (len odstráni)"
+!define GAIM_PROMPT_WIPEOUT			"Vᚠadresár Gaim bude zmazaný. Chcete pokraèova?$\r$\rPoznámka: Všetky prídavne pluginy, ktoré ste nainštalovali budú tiež zmazané.$\rNastavenia uživate¾ského úètu Gaim-u budú ponechané."
+!define GAIM_PROMPT_DIR_EXISTS			"Adresár, ktorý ste zadali, už existuje. Jeho obsah bude zmazaný. Chcete pokraèova?"
+
+; GTK+ Section Prompts
+!define GTK_INSTALL_ERROR			"Chyba pri inštalácii GTK+ runtime."
+!define GTK_BAD_INSTALL_PATH			"Zadaná cesta nie je prístupná alebo ju nie je možné vytvori."
+
+; GTK+ Themes section
+!define GTK_NO_THEME_INSTALL_RIGHTS		"Nemáte oprávnenie na inštaláciu GTK+ grafickej témy."
+
+; Uninstall Section Prompts
+!define un.GAIM_UNINSTALL_ERROR_1		"Inštalátoru sa nepodarilo nájs položky v registri pre Gaim.$\rJe možné, že túto aplikáciu nainštaloval iný používate¾."
+!define un.GAIM_UNINSTALL_ERROR_2		"Nemáte oprávnenie na odinštaláciu tejto aplikácie."
+
+; Spellcheck Section Prompts
+!define GAIM_SPELLCHECK_SECTION_TITLE		"Podpora kontroly pravopisu"
+!define GAIM_SPELLCHECK_ERROR			"Chyba pri inštalácii kontroly pravopisu"
+!define GAIM_SPELLCHECK_DICT_ERROR		"Chyba pri inštalácii slovníka kontroly pravopisu"
+!define GAIM_SPELLCHECK_SECTION_DESCRIPTION	"Podpora kontroly pravopisu (Nutné pripojenie k Internetu)"
+!define ASPELL_INSTALL_FAILED			"Inštalácia zlyhala"
+!define GAIM_SPELLCHECK_BRETON			"Bretónsky"
+!define GAIM_SPELLCHECK_CATALAN			"Katalánsky"
+!define GAIM_SPELLCHECK_CZECH			"Èeský"
+!define GAIM_SPELLCHECK_WELSH			"Welshský"
+!define GAIM_SPELLCHECK_DANISH			"Dánsky"
+!define GAIM_SPELLCHECK_GERMAN			"Nemecký"
+!define GAIM_SPELLCHECK_GREEK			"Grécky"
+!define GAIM_SPELLCHECK_ENGLISH			"Anglický"
+!define GAIM_SPELLCHECK_ESPERANTO		"Esperantský"
+!define GAIM_SPELLCHECK_SPANISH			"Španielský"
+!define GAIM_SPELLCHECK_FAROESE			"Faroeský"
+!define GAIM_SPELLCHECK_FRENCH			"Francúzsky"
+!define GAIM_SPELLCHECK_ITALIAN			"Talianský"
+!define GAIM_SPELLCHECK_DUTCH			"Holandský"
+!define GAIM_SPELLCHECK_NORWEGIAN		"Nórsky"
+!define GAIM_SPELLCHECK_POLISH			"Po¾ský"
+!define GAIM_SPELLCHECK_PORTUGUESE		"Portugalský"
+!define GAIM_SPELLCHECK_ROMANIAN		"Rumunský"
+!define GAIM_SPELLCHECK_RUSSIAN			"Ruský"
+!define GAIM_SPELLCHECK_SLOVAK			"Slovenský"
+!define GAIM_SPELLCHECK_SWEDISH			"Švédsky"
+!define GAIM_SPELLCHECK_UKRAINIAN		"Ukrajinský"
+

Index: slovenian.nsh
===================================================================
RCS file: /cvsroot/gaim/gaim/src/win32/nsis/translations/slovenian.nsh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -p -r1.1 -r1.2
--- slovenian.nsh	28 May 2004 15:20:54 -0000	1.1
+++ slovenian.nsh	29 Sep 2005 15:37:44 -0000	1.2
@@ -5,10 +5,12 @@
 ;;  Windows Code page: 1250
 ;;
 ;;  Author: Martin Srebotnjak <miles@...>
-;;  Version 2
+;;  Version 3
 ;;
 
 ; Startup GTK+ check
+!define INSTALLER_IS_RUNNING			"Namešèanje že poteka."
+!define GAIM_IS_RUNNING				"Trenutno že teèe razlièica Gaima. Prosimo zaprite Gaim in poskusite znova."
 !define GTK_INSTALLER_NEEDED			"Izvajalno okolje GTK+ manjka ali pa ga je potrebno nadgraditi.$\rProsimo namestite v${GTK_VERSION} ali višjo razlièico izvajalnega okolja GTK+"
 
 ; License Page
@@ -16,23 +18,29 @@
 !define GAIM_LICENSE_BOTTOM_TEXT		"$(^Name) je na voljo pod licenco GPL. Ta licenca je tu na voljo le v informativne namene. $_CLICK"
 
 ; Components Page
-!define GAIM_SECTION_TITLE			"Gaim - odjemalec za klepet (potrebno)"
+!define GAIM_SECTION_TITLE			"Gaim - odjemalec za klepet (zahtevano)"
 !define GTK_SECTION_TITLE			"GTK+ izvajalno okolje (zahtevano)"
 !define GTK_THEMES_SECTION_TITLE		"Teme GTK+"
 !define GTK_NOTHEME_SECTION_TITLE		"Brez teme"
-!define GTK_WIMP_SECTION_TITLE		"Tema Wimp"
+!define GTK_WIMP_SECTION_TITLE			"Tema Wimp"
 !define GTK_BLUECURVE_SECTION_TITLE		"Tema Bluecurve"
 !define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Tema Light House Blue"
+!define GAIM_SHORTCUTS_SECTION_TITLE		"Bližnjice"
+!define GAIM_DESKTOP_SHORTCUT_SECTION_TITLE	"Namizje"
+!define GAIM_STARTMENU_SHORTCUT_SECTION_TITLE	"Zaèetni meni"
 !define GAIM_SECTION_DESCRIPTION		"Temeljne datoteke Gaima"
-!define GTK_SECTION_DESCRIPTION		"Veèplatformna orodjarna GUI, ki jo uporablja Gaim"
-!define GTK_THEMES_SECTION_DESCRIPTION	"Teme GTK+ lahko spremenijo izgled programov GTK+."
+!define GTK_SECTION_DESCRIPTION			"Veèplatformna orodjarna GUI, ki jo uporablja Gaim"
+!define GTK_THEMES_SECTION_DESCRIPTION		"Teme GTK+ lahko spremenijo izgled programov GTK+."
 !define GTK_NO_THEME_DESC			"Brez namestitve teme GTK+"
 !define GTK_WIMP_THEME_DESC			"GTK-Wimp (oponaševalec Oken) je tema GTK, ki se lepo vklaplja v namizno okolje Windows."
 !define GTK_BLUECURVE_THEME_DESC		"Tema Bluecurve."
-!define GTK_LIGHTHOUSEBLUE_THEME_DESC	"Tema Lighthouseblue."
+!define GTK_LIGHTHOUSEBLUE_THEME_DESC		"Tema Lighthouseblue."
+!define GAIM_SHORTCUTS_SECTION_DESCRIPTION	"Bližnjice za zagon Gaima"
+!define GAIM_DESKTOP_SHORTCUT_DESC		"Ustvari bližnjico za Gaim na namizju"
+!define GAIM_STARTMENU_SHORTCUT_DESC		"Ustvari vnos Gaim v meniju Start"
 
 ; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"Našel sem staro razlièico izvajalnega okolja GTK+. Jo želite nadgraditi?$\rOpomba: Gaim morda ne bo deloval, èe je ne boste nadgradili."
+!define GTK_UPGRADE_PROMPT			"Našel sem starejšo razlièico izvajalnega okolja GTK+. Jo želite nadgraditi?$\rOpomba: èe je ne boste nadgradili, Gaim morda ne bo deloval."
 
 ; Installer Finish Page
 !define GAIM_FINISH_VISIT_WEB_SITE		"Obišèite spletno stran Windows Gaim"
@@ -40,15 +48,45 @@
 ; Gaim Section Prompts and Texts
 !define GAIM_UNINSTALL_DESC			"Gaim (samo odstrani)"
 !define GAIM_PROMPT_WIPEOUT			"Vaš star imenik Gaim bo zbrisan. Želite nadaljevati?$\r$\rOpomba: Vsi nestandardni vtièniki, ki ste jih namestili, bodo zbrisani.$\rUporabniške nastavitve za Gaim se bodo ohranile."
-!define GAIM_PROMPT_DIR_EXISTS		"Namestitveni imenik, ki ste ga navedli, že obstaja. Vsa vsebina$\rbo zbrisana. Želite nadaljevati?"
+!define GAIM_PROMPT_DIR_EXISTS			"Namestitveni imenik, ki ste ga navedli, že obstaja. Vsa vsebina$\rbo zbrisana. Želite nadaljevati?"
 
 ; GTK+ Section Prompts
-!define GTK_INSTALL_ERROR			"Napaka pri namestitvi GTK+ runtime."
+!define GTK_INSTALL_ERROR			"Napaka pri namestitvi izvajalnega okolja GTK+."
 !define GTK_BAD_INSTALL_PATH			"Pot, ki ste jo vnesli, ni dosegljiva ali je ni mogoèe ustvariti."
 
 ; GTK+ Themes section
-!define GTK_NO_THEME_INSTALL_RIGHTS		"Nimate pravic za nametitev teme GTK+."
+!define GTK_NO_THEME_INSTALL_RIGHTS		"Za namestitev teme GTK+ nimate ustreznih pravic."
 
 ; Uninstall Section Prompts
 !define un.GAIM_UNINSTALL_ERROR_1		"Ne morem najti vnosov v registru za Gaim.$\rNajverjetneje je ta program namestil drug uporabnik."
-!define un.GAIM_UNINSTALL_ERROR_2		"Nimate pravic za odstranitev programa."
+!define un.GAIM_UNINSTALL_ERROR_2		"Za odstranitev programa nimate ustreznih pravic."
+
+; Spellcheck Section Prompts
+!define GAIM_SPELLCHECK_SECTION_TITLE		"Podpora preverjanja èrkovanja"
+!define GAIM_SPELLCHECK_ERROR			"Napaka pri namešèanju preverjanja èrkovanja"
+!define GAIM_SPELLCHECK_DICT_ERROR		"Napaka pri namešèanju slovarja za preverjanje èrkovanja"
+!define GAIM_SPELLCHECK_SECTION_DESCRIPTION	"Podpora preverjanja èrkovanja.  (Za namestitev je potrebna spletna povezava)"
+!define ASPELL_INSTALL_FAILED			"Namestitev ni uspela."
+!define GAIM_SPELLCHECK_BRETON			"bretonski"
+!define GAIM_SPELLCHECK_CATALAN			"katalonski"
+!define GAIM_SPELLCHECK_CZECH			"èeški"
+!define GAIM_SPELLCHECK_WELSH			"velški"
+!define GAIM_SPELLCHECK_DANISH			"danski"
+!define GAIM_SPELLCHECK_GERMAN			"nemški"
+!define GAIM_SPELLCHECK_GREEK			"grški"
+!define GAIM_SPELLCHECK_ENGLISH			"angleški"
+!define GAIM_SPELLCHECK_ESPERANTO		"esperantski"
+!define GAIM_SPELLCHECK_SPANISH			"španski"
+!define GAIM_SPELLCHECK_FAROESE			"farojski"
+!define GAIM_SPELLCHECK_FRENCH			"francoski"
+!define GAIM_SPELLCHECK_ITALIAN			"italijanski"
+!define GAIM_SPELLCHECK_DUTCH			"nizozemski"
+!define GAIM_SPELLCHECK_NORWEGIAN		"norveški"
+!define GAIM_SPELLCHECK_POLISH			"poljski"
+!define GAIM_SPELLCHECK_PORTUGUESE		"portugalski"
+!define GAIM_SPELLCHECK_ROMANIAN		"romunski"
+!define GAIM_SPELLCHECK_RUSSIAN			"ruski"
+!define GAIM_SPELLCHECK_SLOVAK			"slovaški"
+!define GAIM_SPELLCHECK_SLOVENIAN		"slovenski"
+!define GAIM_SPELLCHECK_SWEDISH			"švedski"
+!define GAIM_SPELLCHECK_UKRAINIAN		"ukrajinski"

Index: spanish.nsh
===================================================================
RCS file: /cvsroot/gaim/gaim/src/win32/nsis/translations/spanish.nsh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -p -r1.4 -r1.5
--- spanish.nsh	11 Apr 2005 12:24:47 -0000	1.4
+++ spanish.nsh	29 Sep 2005 15:37:44 -0000	1.5
@@ -27,7 +27,7 @@
 !define GTK_SECTION_DESCRIPTION		"Una suite de herramientas GUI multiplataforma, utilizada por Gaim"
 !define GTK_THEMES_SECTION_DESCRIPTION	"Los temas pueden cambiar la apariencia de aplicaciones GTK+."
 !define GTK_NO_THEME_DESC			"No instalar un tema GTK+"
-!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) es un tema GTK+ que se fusiona muy bien con el entorno de escritorio de Windows."
+!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) es un tema GTK que se fusiona muy bien con el entorno de escritorio de Windows."
 !define GTK_BLUECURVE_THEME_DESC		"El tema Bluecurve."
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC	"El tema Lighthouseblue."
 

Index: swedish.nsh
===================================================================
RCS file: /cvsroot/gaim/gaim/src/win32/nsis/translations/swedish.nsh,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -p -r1.8 -r1.9
--- swedish.nsh	26 Jan 2005 23:27:27 -0000	1.8
+++ swedish.nsh	29 Sep 2005 15:37:44 -0000	1.9
@@ -7,7 +7,6 @@
 ;;  Author: Tore Lundqvist <tlt@...>, 2003.
 ;;  Author: Peter Hjalmarsson <xake@...>, 2005.
 ;;  Version 3
-;;
 
 ; Make sure to update the GAIM_MACRO_LANGUAGEFILE_END macro in
 ; langmacros.nsh when updating this file
@@ -28,7 +27,10 @@
 !define GTK_NOTHEME_SECTION_TITLE		"Inget tema"
 !define GTK_WIMP_SECTION_TITLE		"Wimp-tema"
 !define GTK_BLUECURVE_SECTION_TITLE	"Bluecurve-tema"
-!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue-tema"
+!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue-tema"
+!define GAIM_SHORTCUTS_SECTION_TITLE "Genvägar"
+!define GAIM_DESKTOP_SHORTCUT_SECTION_TITLE "Skrivbord"
+!define GAIM_STARTMENU_SHORTCUT_SECTION_TITLE "Startmeny"
 !define GAIM_SECTION_DESCRIPTION		"Gaims kärnfiler och DLL:er"
 !define GTK_SECTION_DESCRIPTION		"En GUI-verktygsuppsättning för flera olika plattformar som Gaim använder."
 !define GTK_THEMES_SECTION_DESCRIPTION	"GTK+-teman kan ändra känslan av och utseendet på GTK+-applikationer."
@@ -36,6 +38,9 @@
 !define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) ett GTK-tema som smälter bra in i Windows-miljön."
 !define GTK_BLUECURVE_THEME_DESC		"The Bluecurve-tema."
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC	"The Lighthouseblue-tema."
+!define GAIM_SHORTCUTS_SECTION_DESCRIPTION   "Genvägar för att starta Gaim"
+!define GAIM_DESKTOP_SHORTCUT_DESC   "Skapar en genväg till Gaim på skrivbordet"
+!define GAIM_STARTMENU_SHORTCUT_DESC   "Skapar ett tillägg i startmenyn för Gaim"
 
 ; GTK+ Directory Page
 !define GTK_UPGRADE_PROMPT			"En äldre version av GTK+ runtime hittades, vill du uppgradera den?$\rOBS! Gaim kommer kanske inte att fungera om du inte uppgraderar."

Index: trad-chinese.nsh
===================================================================
RCS file: /cvsroot/gaim/gaim/src/win32/nsis/translations/trad-chinese.nsh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -p -r1.6 -r1.7
--- trad-chinese.nsh	11 Apr 2005 12:24:47 -0000	1.6
+++ trad-chinese.nsh	29 Sep 2005 15:37:44 -0000	1.7
@@ -1,51 +1,64 @@
-;;
-;;  trad-chinese.nsh
-;;
-;;  Traditional Chineese language strings for the Windows Gaim NSIS installer.
-;;  Windows Code page:950 
-;;
-;;  Author: Paladin R. Liu <paladin@...>
-;;  Minor updates: Ambrose C. Li <acli@...>
-;;
-
-; Startup GTK+ check
-!define GTK_INSTALLER_NEEDED			"§ä¤£¨ì²Å¦Xªº GTK+ °õ¦æÀô¹Ò¡C$\r½Ð¦w¸Ë v${GTK_VERSION} ¥H¤Wª©¥»ªº GTK+ °õ¦æÀô¹Ò¡C"
-
-; License Page
-!define GAIM_LICENSE_BUTTON			"¤U¤@¨B >"
-!define GAIM_LICENSE_BOTTOM_TEXT		"$(^Name) «Y¥H GPL ¤è¦¡±ÂÅvµo§G¡A¦b¦¹¦C¥X±ÂÅv®Ñ¡A¯Âãc«Y§@¬°°Ñ¦Ò¤§¥Î¡C$_CLICK"
-
-; Components Page
-!define GAIM_SECTION_TITLE			"Gaim ¥Dµ{¦¡ (¥²»Ý)"
-!define GTK_SECTION_TITLE			"GTK+ °õ¦æÀô¹Ò (¥²»Ý)"
-!define GTK_THEMES_SECTION_TITLE		"GTK+ §G´º¥DÃD"
-!define GTK_NOTHEME_SECTION_TITLE		"¤£¦w¸Ë"
-!define GTK_WIMP_SECTION_TITLE		"Wimp ¥DÃD"
-!define GTK_BLUECURVE_SECTION_TITLE		"Bluecurve ¥DÃD"
-!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue ¥DÃD"
-!define GAIM_SECTION_DESCRIPTION		"Gaim ®Ö¤ßÀɮפΰʺA¨ç¦¡®w"
-!define GTK_SECTION_DESCRIPTION		"Gaim ©Ò¨Ï¥Îªº¸ó¥­¥x¹Ï§Î¤¶­±¨ç¦¡®w"
-!define GTK_THEMES_SECTION_DESCRIPTION	"GTK+ §G´º¥DÃD¥i¥H¥Î¨Ó§ïÅÜ GTK+ À³¥Îµ{¦¡ªº¥~Æ[¡C"
-!define GTK_NO_THEME_DESC			"¤£¦w¸Ë GTK+ §G´º¥DÃD"
-!define GTK_WIMP_THEME_DESC			"¡uGTK-Wimp¡v(Windows impersonator) ¥DÃD¥iÅý GTK+ ¿Ä¤J Windows ¨ô­±ÀôÀô¤§¤¤¡C"
-!define GTK_BLUECURVE_THEME_DESC		"¡uBluecurve¡v¥DÃD"
-!define GTK_LIGHTHOUSEBLUE_THEME_DESC	"¡uLighthouseblue¡v¥DÃD¡C"
-
-; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"µo²{¤@­Óª©ªº GTK+ °õ¦æÀô¹Ò¡C±z­n±N¥¦¤É¯Å¶Ü¡H$\r½Ðª`·N¡G¦pªG±z¤£¤É¯Å¡AGaim ¥i¯àµLªk¥¿½Tªº³Q°õ¦æ¡C"
-
-; Gaim Section Prompts and Texts
-!define GAIM_UNINSTALL_DESC			"Gaim v${GAIM_VERSION} (¥u¨Ñ²¾°£)"
-!define GAIM_PROMPT_WIPEOUT			"±z¥ý«e¦w¸Ë©ó¥Ø¿ý¤¤ªºÂª© Gaim ±N·|³Q²¾°£¡C±z­nÄ~Äò¶Ü¡H$\r$\r½Ðª`·N¡G¥ô¦ó±z©Ò¦w¸Ëªº«D©x¤èºûÅ@¼Ò²Õ³£±N³Q§R°£¡C$\r¦Ó Gaim ªº¨Ï¥ÎªÌ³]©w±N¤£·|¨ü¨ì¼vÅT¡C"
-!define GAIM_PROMPT_DIR_EXISTS		"±z©Ò¿ï©wªº¦w¸Ë¥Ø¿ý¤Uªº©Ò¦³Àɮ׳£±N³Q²¾°£¡C$\r±z­nÄ~Äò¶Ü¡H"
-
-; GTK+ Section Prompts
-!define GTK_INSTALL_ERROR			"¦w¸Ë GTK+ °õ¦æÀô¹Ò®Éµo¥Í¿ù»~¡C"
-!define GTK_BAD_INSTALL_PATH			"±z©Ò¿é¤Jªº¦w¸Ë¥Ø¿ýµLªk¦s¨ú©Î«Ø¥ß¡C"
-
-; GTK+ Themes section
-!define GTK_NO_THEME_INSTALL_RIGHTS		"±z¥Ø«eªºÅv­­µLªk¦w¸Ë GTK+ §G´º¥DÃD¡C"
-
-; Uninstall Section Prompts
-!define un.GAIM_UNINSTALL_ERROR_1         "²¾°£µ{¦¡µLªk§ä¨ì Gaim ªº¦w¸Ë¸ê°T¡C$\r³oÀ³¸Ó¬O¦³¨ä¥Lªº¨Ï¥ÎªÌ­«·s¦w¸Ë¤F³o­Óµ{¦¡¡C"
-!define un.GAIM_UNINSTALL_ERROR_2         "±z¥Ø«eªºÅv­­µLªk²¾°£ Gaim¡C"
+;;
+;;  trad-chinese.nsh
+;;
+;;  Traditional Chineese language strings for the Windows Gaim NSIS installer.
+;;  Windows Code page:950 
+;;
+;;  Author: Paladin R. Liu <paladin@...>
+;;  Minor updates: Ambrose C. Li <acli@...>
+;;
+;;  Last Updated: July 5, 2005
+;;
+
+; Startup Checks
+!define INSTALLER_IS_RUNNING			"¦w¸Ëµ{¦¡¥¿¦b°õ¦æ¤¤¡C"
+!define GAIM_IS_RUNNING			"Gaim ¥¿¦b°õ¦æ¤¤¡A½Ð¥ýµ²§ô³o­Óµ{¦¡«á¦A¦æ¦w¸Ë¡C"
+!define GTK_INSTALLER_NEEDED			"§ä¤£¨ì²Å¦Xªº GTK+ °õ¦æÀô¹Ò©Î¬O»Ý­n³Q§ó·s¡C$\r½Ð¦w¸Ë v${GTK_VERSION} ¥H¤Wª©¥»ªº GTK+ °õ¦æÀô¹Ò¡C"
+
+; License Page
+!define GAIM_LICENSE_BUTTON			"¤U¤@¨B >"
+!define GAIM_LICENSE_BOTTOM_TEXT		"$(^Name) ±Ä¥Î GNU General Public License (GPL) ±ÂÅvµo§G¡C¦b¦¹¦C¥X±ÂÅv®Ñ¡A¶È§@¬°°Ñ¦Ò¤§¥Î¡C$_CLICK"
+
+; Components Page
+!define GAIM_SECTION_TITLE			"Gaim ¥Dµ{¦¡ (¥²»Ý)"
+!define GTK_SECTION_TITLE			"GTK+ °õ¦æÀô¹Ò (¥²»Ý)"
+!define GTK_THEMES_SECTION_TITLE		"GTK+ §G´º¥DÃD"
+!define GTK_NOTHEME_SECTION_TITLE		"¤£¦w¸Ë§G´º¥DÃD"
+!define GTK_WIMP_SECTION_TITLE		"Wimp §G´º¥DÃD"
+!define GTK_BLUECURVE_SECTION_TITLE		"Bluecurve §G´º¥DÃD"
+!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue §G´º¥DÃD"
+!define GAIM_SHORTCUTS_SECTION_TITLE "±¶®|"
+!define GAIM_DESKTOP_SHORTCUT_SECTION_TITLE "®à­±±¶®|"
+!define GAIM_STARTMENU_SHORTCUT_SECTION_TITLE "¶}©l¥\¯àªí"
+!define GAIM_SECTION_DESCRIPTION		"Gaim ®Ö¤ßÀɮפΰʺA¨ç¦¡®w"
+!define GTK_SECTION_DESCRIPTION		"Gaim ©Ò¨Ï¥Îªº¸ó¥­¥x¹Ï§Î¤¶­±¨ç¦¡®w"
+!define GTK_THEMES_SECTION_DESCRIPTION	"GTK+ §G´º¥DÃD¥i¥H¥Î¨Ó§ïÅÜ GTK+ À³¥Îµ{¦¡ªº¥~Æ[¡C"
+!define GTK_NO_THEME_DESC			"¤£¦w¸Ë GTK+ §G´º¥DÃD"
+!define GTK_WIMP_THEME_DESC			"¡uGTK-Wimp¡v(Windows impersonator) ¥DÃD¥iÅý GTK+ ¿Ä¤J Windows ¨ô­±ÀôÀô¤§¤¤¡C"
+!define GTK_BLUECURVE_THEME_DESC		"¡uBluecurve¡v¥DÃD"
+!define GTK_LIGHTHOUSEBLUE_THEME_DESC	"¡uLighthouseblue¡v¥DÃD¡C"
+!define GAIM_SHORTCUTS_SECTION_DESCRIPTION   "«Ø¥ß Gaim ±¶®|"
+!define GAIM_DESKTOP_SHORTCUT_DESC   "¦b®à­±«Ø¥ß±¶®|"
+!define GAIM_STARTMENU_SHORTCUT_DESC   "¦b¶}©l¥\¯àªí«Ø¥ß±¶®|"
+
+; GTK+ Directory Page
+!define GTK_UPGRADE_PROMPT			"µo²{¤@­Óª©ªº GTK+ °õ¦æÀô¹Ò¡C±z­n±N¥¦¤É¯Å¶Ü¡H$\r½Ðª`·N¡G¦pªG±z¤£¤É¯Å¡AGaim ¥i¯àµLªk¥¿½Tªº³Q°õ¦æ¡C"
+
+; Installer Finish Page
+!define GAIM_FINISH_VISIT_WEB_SITE		"«ô³X Windows Gaim ºô­¶"
+
+; Gaim Section Prompts and Texts
+!define GAIM_UNINSTALL_DESC			"Gaim v${GAIM_VERSION} (¥u¨Ñ²¾°£)"
+!define GAIM_PROMPT_WIPEOUT			"±z¥ý«e¦w¸Ë©ó¥Ø¿ý¤¤ªºÂª© Gaim ±N·|³Q²¾°£¡C±z­nÄ~Äò¶Ü¡H$\r$\r½Ðª`·N¡G¥ô¦ó±z©Ò¦w¸Ëªº«D©x¤èºûÅ@¼Ò²Õ³£±N³Q§R°£¡C$\r¦Ó Gaim ªº¨Ï¥ÎªÌ³]©w±N¤£·|¨ü¨ì¼vÅT¡C"
+!define GAIM_PROMPT_DIR_EXISTS		"±z©Ò¿ï©wªº¦w¸Ë¥Ø¿ý¤Uªº©Ò¦³Àɮ׳£±N³Q²¾°£¡C$\r±z­nÄ~Äò¶Ü¡H"
+
+; GTK+ Section Prompts
+!define GTK_INSTALL_ERROR			"¦w¸Ë GTK+ °õ¦æÀô¹Ò®Éµo¥Í¿ù»~¡C"
+!define GTK_BAD_INSTALL_PATH			"±z©Ò¿é¤Jªº¦w¸Ë¥Ø¿ýµLªk¦s¨ú©Î«Ø¥ß¡C"
+
+; GTK+ Themes section
+!define GTK_NO_THEME_INSTALL_RIGHTS		"±z¥Ø«eªºÅv­­µLªk¦w¸Ë GTK+ §G´º¥DÃD¡C"
+
+; Uninstall Section Prompts
+!define un.GAIM_UNINSTALL_ERROR_1         "²¾°£µ{¦¡µLªk§ä¨ì Gaim ªº¦w¸Ë¸ê°T¡C$\r³oÀ³¸Ó¬O¦³¨ä¥Lªº¨Ï¥ÎªÌ­«·s¦w¸Ë¤F³o­Óµ{¦¡¡C"
+!define un.GAIM_UNINSTALL_ERROR_2         "±z¥Ø«eªºÅv­­µLªk²¾°£ Gaim¡C"
\ No newline at end of file

Index: vietnamese.nsh
===================================================================
RCS file: /cvsroot/gaim/gaim/src/win32/nsis/translations/vietnamese.nsh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -p -r1.3 -r1.4
--- vietnamese.nsh	11 Apr 2005 12:24:47 -0000	1.3
+++ vietnamese.nsh	29 Sep 2005 15:37:44 -0000	1.4
@@ -28,7 +28,7 @@
 !define GTK_SECTION_DESCRIPTION		"Bộ công cụ giao diện đồ họa đa nền để dùng cho Gaim"
 !define GTK_THEMES_SECTION_DESCRIPTION	"GTK+ Themes có thể thay đổi diệm mạo và sác thái của các ứng dụng GTK+."
 !define GTK_NO_THEME_DESC			"Không cài đặt GTK+ theme"
-!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) là một GTK+ theme tích hợp tốt trong môi trường desktop của Windows."
+!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) là một GTK theme tích hợp tốt trong môi trường desktop của Windows."
 !define GTK_BLUECURVE_THEME_DESC		"Bluecurve theme."
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC	"Lighthouseblue theme."

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7457/src

Modified Files:
	gtkblist.c 
Log Message:
this fixes a crash for me (trying to get the emblems for a buddy in an account thats offline

we also need to get rid of buddy->present in the real near future


Index: gtkblist.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkblist.c,v
retrieving revision 1.277
retrieving revision 1.278
diff -u -d -p -r1.277 -r1.278
--- gtkblist.c	19 Sep 2005 16:18:49 -0000	1.277
+++ gtkblist.c	29 Sep 2005 13:59:36 -0000	1.278
@@ -4006,10 +4006,10 @@ static void gaim_gtk_blist_update_contac
 	contact = (GaimContact*)node;
 	buddy = gaim_contact_get_priority_buddy(contact);
 
-	if (buddy && (gaim_presence_is_online(buddy->presence) ||
+	if (buddy && gaim_account_is_connected(buddy->account) &&
+			(gaim_presence_is_online(buddy->presence) ||
 		buddy->present == GAIM_BUDDY_SIGNING_OFF ||
-		(gaim_account_is_connected(buddy->account) &&
-			gaim_prefs_get_bool("/gaim/gtk/blist/show_offline_buddies")) ||
+		gaim_prefs_get_bool("/gaim/gtk/blist/show_offline_buddies") ||
 			gaim_blist_node_get_bool(node, "show_offline")))
 	{
 		GtkTreeIter iter;

Update of /cvsroot/gaim/gaim/src/protocols/jabber
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16341/src/protocols/jabber

Modified Files:
	message.c 
Log Message:
This makes invites to password protected chatrooms to work for me. People who care should test their servers.


Index: message.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/jabber/message.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -p -r1.44 -r1.45
--- message.c	11 Aug 2005 04:36:11 -0000	1.44
+++ message.c	29 Sep 2005 04:05:06 -0000	1.45
@@ -335,7 +335,7 @@ void jabber_message_parse(JabberStream *
 						g_free(jm->body);
 						jm->body = xmlnode_get_data(reason);
 					}
-					if((password = xmlnode_get_child(invite, "password")))
+					if((password = xmlnode_get_child(child, "password")))
 						jm->password = xmlnode_get_data(password);
 
 					jm->type = JABBER_MESSAGE_GROUPCHAT_INVITE;

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27258/src

Modified Files:
	status.c 
Log Message:
surely once is enough


Index: status.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/status.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -p -r1.66 -r1.67
--- status.c	15 Sep 2005 14:54:23 -0000	1.66
+++ status.c	28 Sep 2005 12:44:35 -0000	1.67
@@ -1149,8 +1149,6 @@ gaim_presence_new_for_buddy(GaimBuddy *b
 	g_return_val_if_fail(buddy != NULL, NULL);
 	account = buddy->account;
 
-	account = buddy->account;
-
 	key = g_new0(GaimStatusBuddyKey, 1);
 	key->account = buddy->account;
 	key->name    = g_strdup(buddy->name);

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17346/src

Modified Files:
	gtkconn.c 
Log Message:
"due" to an error, not "do" to an error :)

Index: gtkconn.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkconn.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -p -r1.74 -r1.75
--- gtkconn.c	20 Sep 2005 23:48:20 -0000	1.74
+++ gtkconn.c	28 Sep 2005 04:05:56 -0000	1.75
@@ -186,9 +186,9 @@ static void gaim_gtk_connection_report_d
 				  gaim_account_get_username(account),
 				  gaim_account_get_protocol_name(account));
 	    }
-	    
+	
 	    p = g_strdup_printf(_("%s could not connect"), n);
-	    s = g_strdup_printf(_("%s was unable to connect do to an error. %s The account has been disabled. "
+	    s = g_strdup_printf(_("%s was unable to connect due to an error. %s The account has been disabled. "
 				  "Correct the error and reenable to account to connect."), n, text);
 	    gaim_notify_error(NULL, NULL, p, s);
 	    g_free(p);

Update of /cvsroot/gaim/gaim/src/protocols/msn
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16746/src/protocols/msn

Modified Files:
	slp.c 
Log Message:
This closes the file handle when the file transfer is done.  As far as I can tell, everything else still works correctly.

Index: slp.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/msn/slp.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -p -r1.35 -r1.36
--- slp.c	11 Sep 2005 17:22:28 -0000	1.35
+++ slp.c	28 Sep 2005 04:02:35 -0000	1.36
@@ -156,6 +156,7 @@ msn_xfer_completed_cb(MsnSlpCall *slpcal
 					  gsize size)
 {
 	gaim_xfer_set_completed(slpcall->xfer, TRUE);
+	msn_slp_call_close(slpcall);
 }
 
 /**************************************************************************

Update of /cvsroot/gaim/web/htdocs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30722/htdocs

Modified Files:
	faq.txt 
Log Message:
(13:17:30) lesshaste: LSchiere2: cool... the link at
http://gaim.sourceforge.net/faq.php#q17 should be gaim-vv.sf.net


Index: faq.txt
===================================================================
RCS file: /cvsroot/gaim/web/htdocs/faq.txt,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -d -p -r1.219 -r1.220
--- faq.txt	26 Sep 2005 21:48:26 -0000	1.219
+++ faq.txt	27 Sep 2005 17:19:28 -0000	1.220
@@ -1,6 +1,7 @@
 !SECTION	Compiling and Installing
 
 Q:	What does "Gaim" stand for?
+
 A:	For freedom!  No, seriously, it doesn't stand for anything.  It's
 our name and we're sticking to it.  The two acceptable forms of
 capitalization are "Gaim" and "gaim" (and <i>not</i> "GAIM").
@@ -264,7 +265,7 @@ Q:	How do I use Google Talk?
 A:	Create a Jabber account as per <a
 href="http://www.google.com/support/talk/bin/answer.py?answer=24073">Google's
 FAQ</a>.  The Audio component is not currently supported and will not be
-until 1)the protocol is published and 2)<a href="http://gaim.sf.net">Gaim-vv</a> is ready for
+until 1)the protocol is published and 2)<a href="http://gaim-vv.sf.net">Gaim-vv</a> is ready for
 mainstream use.
 
 Q:	How do I change the font Gaim uses?  The empty left padding?  The

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18672

Modified Files:
	gtkimhtml.c 
Log Message:
This should be more robust when dealing with different versions of iconv - we parse out the BOM and explicitly tell iconv what to do.  This was lifted from the gtkhtml source.  Ethan was concerned that some iconv implementations might be confused with the naming of the explicit charsets (UCS-2LE and UCS-2BE), so we should keep that in mind if people are having problems. This fixes the problem I was having that was caused by the BOM being removed by iconv during the UCS-2 to UTF-8 conversion. There is also some distracting whitespace fixing here to obscure any mistakes that I might have made.

Index: gtkimhtml.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.c,v
retrieving revision 1.443
retrieving revision 1.444
diff -u -d -p -r1.443 -r1.444
--- gtkimhtml.c	12 Sep 2005 13:25:41 -0000	1.443
+++ gtkimhtml.c	27 Sep 2005 14:26:11 -0000	1.444
@@ -550,7 +550,7 @@ gboolean gtk_motion_event_notify(GtkWidg
 	} else {
 		GTK_IMHTML(imhtml)->prelit_tag = NULL;
 	}
-	
+
 	if ((oldprelit_tag != NULL) && (GTK_IMHTML(imhtml)->prelit_tag != oldprelit_tag)) {
 		gtk_widget_style_get(GTK_WIDGET(imhtml), "hyperlink-color", &norm, NULL);
 		if (norm)
@@ -683,28 +683,27 @@ gtk_imhtml_expose_event (GtkWidget      
 	                                      event->area.x, event->area.y, &buf_x, &buf_y);
 
 	if (GTK_IMHTML(widget)->editable || GTK_IMHTML(widget)->wbfo) {
-		
+
 		if (GTK_IMHTML(widget)->edit.background) {
 			gdk_color_parse(GTK_IMHTML(widget)->edit.background, &gcolor);
 			gdk_gc_set_rgb_fg_color(gc, &gcolor);
 		} else {
 			gdk_gc_set_rgb_fg_color(gc, &(widget->style->base[GTK_WIDGET_STATE(widget)]));
 		}
-		
+
 		gdk_draw_rectangle(event->window,
 				   gc,
 				   TRUE,
 				   visible_rect.x, visible_rect.y, visible_rect.width, visible_rect.height);
 		gdk_gc_unref(gc);
-		
+
 		if (GTK_WIDGET_CLASS (parent_class)->expose_event)
 			return (* GTK_WIDGET_CLASS (parent_class)->expose_event)
 				(widget, event);
-		
 		return FALSE;
 
 	}
-	
+
 	gtk_text_view_get_iter_at_location(GTK_TEXT_VIEW(widget), &start, buf_x, buf_y);
 	gtk_text_view_get_iter_at_location(GTK_TEXT_VIEW(widget), &end,
 	                                   buf_x + event->area.width, buf_y + event->area.height);
@@ -722,7 +721,7 @@ gtk_imhtml_expose_event (GtkWidget      
 			GdkRectangle rect;
 			GdkRectangle tag_area;
 			const char *color;
-		
+
 			if (strncmp(tag->name, "BACKGROUND ", 11))
 				continue;
 
@@ -754,10 +753,10 @@ gtk_imhtml_expose_event (GtkWidget      
 			rect.width = visible_rect.width;
 			if (gtk_text_iter_is_end(&cur))
 				rect.height = visible_rect.y + visible_rect.height - rect.y;
-			else 
+			else
 				rect.height = tag_area.y + tag_area.height - rect.y
 				              + gtk_text_view_get_pixels_below_lines(GTK_TEXT_VIEW(widget));
-			
+
 			color = tag->name + 11;
 
 			if (!gdk_color_parse(color, &gcolor)) {
@@ -770,7 +769,6 @@ gtk_imhtml_expose_event (GtkWidget      
 			}
 			gdk_gc_set_rgb_fg_color(gc, &gcolor);
 
-	
 			gdk_draw_rectangle(event->window,
 			                   gc,
 			                   TRUE,
@@ -787,8 +785,8 @@ gtk_imhtml_expose_event (GtkWidget      
 		while (gtk_text_iter_forward_to_tag_toggle(&cur, NULL) &&
 		       !gtk_text_iter_is_end(&cur) &&
 		       !gtk_text_iter_begins_tag(&cur, NULL));
-	} 
-	
+	}
+
 	gdk_gc_unref(gc);
 
 	if (GTK_WIDGET_CLASS (parent_class)->expose_event)
@@ -826,6 +824,60 @@ static void hijack_menu_cb(GtkIMHtml *im
 					 G_CALLBACK(paste_unformatted_cb), imhtml);
 }
 
+static char *
+ucs2_order(gboolean swap)
+{
+	gboolean be;
+
+	be = G_BYTE_ORDER == G_BIG_ENDIAN;
+	be = swap ? be : !be;
+
+	if (be)
+		return "UCS-2BE";
+	else
+		return "UCS-2LE";
+
+}
+
+/* Convert from UCS-2 to UTF-8, stripping the BOM if one is present.*/
+static gchar *
+ucs2_to_utf8_with_bom_check(guchar *data, guint len) {
+	char *fromcode = NULL;
+	GError *error = NULL;
+	guint16 c;
+	gchar *utf8_ret;
+
+	/*
+	 * Unicode Techinical Report 20
+	 * ( http://www.unicode.org/unicode/reports/tr20/ ) says to treat an
+	 * initial 0xfeff (ZWNBSP) as a byte order indicator so that is
+	 * what we do.  If there is no indicator assume it is in the default
+	 * order
+	 */
+
+	memcpy(&c, data, 2);
+	switch (c) {
+	case 0xfeff:
+	case 0xfffe:
+		fromcode = ucs2_order(c == 0xfeff);
+		data += 2;
+		len -= 2;
+		break;
+	default:
+		fromcode = "UCS-2";
+		break;
+	}
+
+	utf8_ret = g_convert(data, len, "UTF-8", fromcode, NULL, NULL, &error);
+
+	if (error) {
+		gaim_debug_warning("gtkimhtml", "g_convert error: %s\n", error->message);
+		g_error_free(error);
+	}
+	return utf8_ret;
+}
+
+
 static void gtk_imhtml_clipboard_get(GtkClipboard *clipboard, GtkSelectionData *selection_data, guint info, GtkIMHtml *imhtml) {
 	char *text;
 	gboolean primary;
@@ -1015,18 +1067,15 @@ static void paste_received_cb (GtkClipbo
 	if (selection_data->length >= 2 &&
 		(*(guint16 *)text == 0xfeff || *(guint16 *)text == 0xfffe)) {
 		/* This is UCS-2 */
-		char *tmp;
-		char *utf8 = g_convert(text, selection_data->length, "UTF-8", "UCS-2", NULL, NULL, NULL);
+		char *utf8 = ucs2_to_utf8_with_bom_check(text, selection_data->length);
 		g_free(text);
 		text = utf8;
 		if (!text) {
 			gaim_debug_warning("gtkimhtml", "g_convert from UCS-2 failed in paste_received_cb\n");
 			return;
 		}
-		tmp = g_utf8_next_char(text);
-		memmove(text, tmp, strlen(tmp) + 1);
 	}
-	
+
 	if (!(*text) || !g_utf8_validate(text, -1, NULL)) {
 		gaim_debug_warning("gtkimhtml", "empty string or invalid UTF-8 in paste_received_cb\n");
 		g_free(text);
@@ -1363,11 +1412,11 @@ static void gtk_imhtml_init (GtkIMHtml *
 	imhtml->edit.fontsize = 0;
 	imhtml->edit.link = NULL;
 
-	
+
 	imhtml->scalables = NULL;
 
 	gtk_imhtml_set_editable(imhtml, FALSE);
-	g_signal_connect(G_OBJECT(imhtml), "populate-popup", 
+	g_signal_connect(G_OBJECT(imhtml), "populate-popup",
 					 G_CALLBACK(hijack_menu_cb), NULL);
 
 #ifdef _WIN32
@@ -1534,10 +1583,10 @@ gtk_text_view_drag_motion (GtkWidget    
                            gint              y,
                            guint             time)
 {
-	GdkDragAction suggested_action = 0;	
+	GdkDragAction suggested_action = 0;
 
 	if (gtk_drag_dest_find_target (widget, context, NULL) == GDK_NONE) {
-    		/* can't accept any of the offered targets */
+		/* can't accept any of the offered targets */
 	} else {
 		GtkWidget *source_widget;
 		suggested_action = context->suggested_action;
@@ -1549,10 +1598,10 @@ gtk_text_view_drag_motion (GtkWidget    
 			if ((context->actions & GDK_ACTION_MOVE) != 0)
 				suggested_action = GDK_ACTION_MOVE;
 		}
-	} 
-	
+	}
+
 	gdk_drag_status (context, suggested_action, time);
-	
+
   /* TRUE return means don't propagate the drag motion to parent
    * widgets that may also be drop sites.
    */
@@ -1563,7 +1612,7 @@ static void
 gtk_imhtml_link_drop_cb(GtkWidget *widget, GdkDragContext *context, gint x, gint y, guint time, gpointer user_data)
 {
 	GdkAtom target = gtk_drag_dest_find_target (widget, context, NULL);
-	
+
 	if (target != GDK_NONE)
 		gtk_drag_get_data (widget, context, target, time);
 	else
@@ -1634,18 +1683,12 @@ gtk_imhtml_link_drag_rcv_cb(GtkWidget *w
 			 * http://mail.gnome.org/archives/gtk-devel-list/2001-September/msg00114.html
 			 */
 			if (sd->length >= 2 && !g_utf8_validate(text, sd->length - 1, NULL)) {
-				utf8 = g_convert(text, sd->length, "UTF-8", "UCS-2", NULL, NULL, NULL);
+				utf8 = ucs2_to_utf8_with_bom_check(text, sd->length);
 
 				if (!utf8) {
 					gaim_debug_warning("gtkimhtml", "g_convert from UCS-2 failed in drag_rcv_cb\n");
 					return;
 				}
-
-				if (*(guint16 *)text == 0xfeff || *(guint16 *)text == 0xfffe || TRUE) {
-					char *tmp;
-					tmp = g_utf8_next_char(utf8);
-					memmove(utf8, tmp, strlen(tmp) + 1);
-				}
 			} else if (!(*text) || !g_utf8_validate(text, -1, NULL)) {
 				gaim_debug_warning("gtkimhtml", "empty string or invalid UTF-8 in drag_rcv_cb\n");
 				return;
@@ -1739,7 +1782,7 @@ gtk_smiley_tree_lookup (GtkSmileyTree *t
 
 			pos = strchr (t->values->str, *amp);
 		}
-		else if (*x == '<') /* Because we're all WYSIWYG now, a '<' 
+		else if (*x == '<') /* Because we're all WYSIWYG now, a '<'
 				     * char should only appear as the start of a tag.  Perhaps a safer (but costlier)
 				     * check would be to call gtk_imhtml_is_tag on it */
 			break;
@@ -1856,7 +1899,7 @@ gtk_smiley_tree_image (GtkIMHtml     *im
 
 	smiley = gtk_imhtml_smiley_get(imhtml,sml,text);
 
-	if (!smiley) 
+	if (!smiley)
 		return NULL;
 
 	if (!smiley->icon && smiley->file) {
@@ -1866,7 +1909,7 @@ gtk_smiley_tree_image (GtkIMHtml     *im
 		if (smiley->icon)
 			g_object_ref(G_OBJECT(smiley->icon));
 	}
-	
+
 	return smiley->icon;
 }
 
@@ -2181,7 +2224,7 @@ static const char *accepted_protocols[] 
 	"https://",
 	"ftp://"
 };
-                                                                                                              
+
 static const int accepted_protocols_size = 3;
 
 /* returns if the beginning of the text is a protocol. If it is the protocol, returns the length so
@@ -2204,7 +2247,7 @@ int gtk_imhtml_is_protocol(const char *t
 
 [19:58] <Robot101> marv: images go into the imgstore, a refcounted... well.. hash. :)
 [19:59] <KingAnt> marv: I think the image tag used by the core is something like <img id="#"/>
-[19:59] Ro0tSiEgE robert42 RobFlynn Robot101 ross22 roz 
+[19:59] Ro0tSiEgE robert42 RobFlynn Robot101 ross22 roz
 [20:00] <KingAnt> marv: Where the ID is the what is returned when you add the image to the imgstore using gaim_imgstore_add
 [20:00] <marv> Robot101: so how does the image get passed to serv_got_im() and serv_send_im()? just as the <img id="#" and then the prpl looks it up from the store?
 [20:00] <KingAnt> marv: Right
@@ -2771,8 +2814,8 @@ void gtk_imhtml_insert_html_at_iter(GtkI
 							font->face = g_strdup(oldfont->face);
 						if (font->face && (atoi(font->face) > 100)) {
 							/* WTF is this? */
-							/* Maybe it sets a max size on the font face?  I seem to 
-							 * remember bad things happening if the font size was 
+							/* Maybe it sets a max size on the font face?  I seem to
+							 * remember bad things happening if the font size was
 							 * 2 billion */
 							g_free(font->face);
 							font->face = g_strdup("100");
@@ -4532,7 +4575,7 @@ char *gtk_imhtml_get_markup_range(GtkIMH
 		tag = sl->data;
 		if (!gtk_text_iter_toggles_tag(start, GTK_TEXT_TAG(tag))) {
 			if (strlen(tag_to_html_end(tag)) > 0)
-		 		g_string_append(str, tag_to_html_start(tag));
+				g_string_append(str, tag_to_html_start(tag));
 			g_queue_push_tail(q, tag);
 		}
 	}
@@ -4546,7 +4589,7 @@ char *gtk_imhtml_get_markup_range(GtkIMH
 			tag = sl->data;
 			if (gtk_text_iter_begins_tag(&iter, GTK_TEXT_TAG(tag))) {
 				if (strlen(tag_to_html_end(tag)) > 0)
-		 			g_string_append(str, tag_to_html_start(tag));
+					g_string_append(str, tag_to_html_start(tag));
 				g_queue_push_tail(q, tag);
 			}
 		}
@@ -4559,7 +4602,7 @@ char *gtk_imhtml_get_markup_range(GtkIMH
 				if (text)
 					str = g_string_append(str, text);
 			}
-		} else 	if (c == '<') {
+		} else if (c == '<') {
 			str = g_string_append(str, "&lt;");
 		} else if (c == '>') {
 			str = g_string_append(str, "&gt;");
@@ -4587,12 +4630,12 @@ char *gtk_imhtml_get_markup_range(GtkIMH
 
 					if (!tag_ends_here(tmp, &iter, &nextiter) && strlen(tag_to_html_end(tmp)) > 0)
 						g_queue_push_tail(r, tmp);
-		 			g_string_append(str, tag_to_html_end(GTK_TEXT_TAG(tmp)));
+					g_string_append(str, tag_to_html_end(GTK_TEXT_TAG(tmp)));
 				}
 
 				if (tmp == NULL)
 					gaim_debug_warning("gtkimhtml", "empty queue, more closing tags than open tags!\n");
-		 		else
+				else
 					g_string_append(str, tag_to_html_end(GTK_TEXT_TAG(tag)));
 
 				while ((tmp = g_queue_pop_head(r))) {

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18204/src

Modified Files:
	win_gaim.c 
Log Message:
Apparently we don't use "no" anymore. Use "nb" and "nn" as appropriate.

Index: win_gaim.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/win_gaim.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -p -r1.27 -r1.28
--- win_gaim.c	26 Sep 2005 22:44:41 -0000	1.27
+++ win_gaim.c	26 Sep 2005 22:46:28 -0000	1.28
@@ -252,7 +252,8 @@ static char* wgaim_lcid_to_posix(LCID lc
 		case 1042: return "ko"; /* korean */
 		case 1063: return "lt"; /* lithuanian */
 		case 1071: return "mk"; /* macedonian */
-		case 1044: return "no"; /* norwegian */
+		case 1044: return "nb"; /* norwegian (Bokmal)*/
+		case 2068: return "nn"; /* norwegian (Nynorsk)*/
 		case 1045: return "pl"; /* polish */
 		case 2070: return "pt"; /* portuguese - portugal */
 		case 1046: return "pt_BR"; /* portuguese - brazil */

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17827/src

Modified Files:
	Makefile.mingw win_gaim.c 
Log Message:
So... it turns out that the getaddrinfo situation on win32 is far worse than I thought.  On < XP, there really is no getaddrinfo, apparently it is hacked into a header (which the win32-api doesn't support).  Until the win32-api supports it, we will not be doing the getaddrinfo thing.

Index: Makefile.mingw
===================================================================
RCS file: /cvsroot/gaim/gaim/src/Makefile.mingw,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -d -p -r1.90 -r1.91
--- Makefile.mingw	21 Sep 2005 02:05:08 -0000	1.90
+++ Makefile.mingw	26 Sep 2005 22:44:41 -0000	1.91
@@ -29,7 +29,7 @@ TARGET = gaim
 
 CFLAGS =
 
-DEFINES = -D_WIN32_WINNT=0x0501
+DEFINES =
 
 ifeq ($(MAKECMDGOALS), $(TARGET)-portable.exe)
 DEFINES := $(DEFINES) -DPORTABLE

Index: win_gaim.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/win_gaim.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -p -r1.26 -r1.27
--- win_gaim.c	21 Sep 2005 02:05:08 -0000	1.26
+++ win_gaim.c	26 Sep 2005 22:44:41 -0000	1.27
@@ -25,6 +25,10 @@
  *
  */
 
+/* This is for ATTACH_PARENT_PROCESS */
+#ifndef _WIN32_WINNT
+#define _WIN32_WINNT 0x501
+#endif
 #include <windows.h>
 #include <fcntl.h>
 #include <stdlib.h>

Update of /cvsroot/gaim/gaim
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17827

Modified Files:
	config.h.mingw 
Log Message:
So... it turns out that the getaddrinfo situation on win32 is far worse than I thought.  On < XP, there really is no getaddrinfo, apparently it is hacked into a header (which the win32-api doesn't support).  Until the win32-api supports it, we will not be doing the getaddrinfo thing.

Index: config.h.mingw
===================================================================
RCS file: /cvsroot/gaim/gaim/config.h.mingw,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -p -r1.7 -r1.8
--- config.h.mingw	23 Feb 2005 02:35:51 -0000	1.7
+++ config.h.mingw	26 Sep 2005 22:44:41 -0000	1.8
@@ -125,7 +125,7 @@
 /* #undef HAVE_FGETS_UNLOCKED */
 
 /* Define if you have the getaddrinfo function.  */
-#define HAVE_GETADDRINFO 1
+/* #define HAVE_GETADDRINFO 1 */
 
 /* Define if you have the getcwd function.  */
 #define HAVE_GETCWD 1

Update of /cvsroot/gaim/web/htdocs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1544/htdocs

Modified Files:
	faq.txt 
Log Message:
This seemed a bit condescending to me


Index: faq.txt
===================================================================
RCS file: /cvsroot/gaim/web/htdocs/faq.txt,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -d -p -r1.218 -r1.219
--- faq.txt	23 Sep 2005 15:06:49 -0000	1.218
+++ faq.txt	26 Sep 2005 21:48:26 -0000	1.219
@@ -1321,16 +1321,20 @@ dictionaries are available or to switch 
 long been promised for gtkspell version 3, which has been delayed somewhat
 indefinitely.  See <a href="http://gtkspell.sf.net">gtkspell.sf.net</a>.
 
-Q:	Can I make gaim transparent?
-
-A:	Transparency would make Gaim invisible.  You probably want
-translucency.  Translucency is not a feature of X11, therefore we do not
-support it.  X.org provides a COMPOSITE extension to do this, but not only
-is it X.org-specific, it requires support at the GTK+ level (if it is to
-be per-widget).  We also have no interest in the psuedo-translucency
-offered by some other programs.  While WinGaim has a plugin to do this, we
-have no intention of including it for X11 platforms until supported by
-GTK+.
+Q:	Can I make Gaim transparent/translucent?
 
+A:	You can make Gaim translucent in most versions of Windows using
+the "Transparency" plugin.  It is not possible to make Gaim
+translucent in Linux and other platforms that use X11.
+<p>
+X.org provides a COMPOSITE extension that allows
+applications to have true translucency, but it is X.org-specific
+and it requires support at the GTK+ level (if it is to be
+per-widget).  We do not wish to support this form of translucency
+until it is supported by GTK+.  We also do not wish to implement
+the psuedo-translucency offered by other programs (by copying
+a section of your background image, tinting it, and plastering
+it onto a Gaim window).
+</p>
 
 !COMMENT	vim: syntax=gaimfaq tw=75

Update of /cvsroot/gaim/gaim/src/protocols/jabber
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2335/src/protocols/jabber

Modified Files:
	jabber.c 
Log Message:
ok, I got the priority stuff backwords


Index: jabber.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/jabber/jabber.c,v
retrieving revision 1.299
retrieving revision 1.300
diff -u -d -p -r1.299 -r1.300
--- jabber.c	26 Sep 2005 00:08:08 -0000	1.299
+++ jabber.c	26 Sep 2005 01:07:53 -0000	1.300
@@ -1007,7 +1007,7 @@ static GList *jabber_status_types(GaimAc
 	types = g_list_append(types, type);
 
 	priority_value = gaim_value_new(GAIM_TYPE_INT);
-	gaim_value_set_int(priority_value, 0);
+	gaim_value_set_int(priority_value, 1);
 	type = gaim_status_type_new_with_attrs(GAIM_STATUS_AVAILABLE, "available",
 			_("Available"), TRUE, TRUE, FALSE, "priority", _("Priority"),
 			priority_value, "message", _("Message"),
@@ -1015,7 +1015,7 @@ static GList *jabber_status_types(GaimAc
 	types = g_list_append(types, type);
 
 	priority_value = gaim_value_new(GAIM_TYPE_INT);
-	gaim_value_set_int(priority_value, 0);
+	gaim_value_set_int(priority_value, 1);
 	type = gaim_status_type_new_with_attrs(GAIM_STATUS_AVAILABLE, "chat",
 			_("Chatty"), TRUE, TRUE, FALSE, "priority", _("Priority"),
 			priority_value, "message", _("Message"),
@@ -1023,7 +1023,7 @@ static GList *jabber_status_types(GaimAc
 	types = g_list_append(types, type);
 
 	priority_value = gaim_value_new(GAIM_TYPE_INT);
-	gaim_value_set_int(priority_value, 5);
+	gaim_value_set_int(priority_value, 0);
 	type = gaim_status_type_new_with_attrs(GAIM_STATUS_AWAY, "away",
 			_("Away"), TRUE, TRUE, FALSE, "priority", _("Priority"),
 			priority_value, "message", _("Message"),
@@ -1031,7 +1031,7 @@ static GList *jabber_status_types(GaimAc
 	types = g_list_append(types, type);
 
 	priority_value = gaim_value_new(GAIM_TYPE_INT);
-	gaim_value_set_int(priority_value, 10);
+	gaim_value_set_int(priority_value, 0);
 	type = gaim_status_type_new_with_attrs(GAIM_STATUS_EXTENDED_AWAY, "xa",
 			_("Extended Away"), TRUE, TRUE, FALSE, "priority", _("Priority"),
 			priority_value, "message", _("Message"),
@@ -1039,7 +1039,7 @@ static GList *jabber_status_types(GaimAc
 	types = g_list_append(types, type);
 
 	priority_value = gaim_value_new(GAIM_TYPE_INT);
-	gaim_value_set_int(priority_value, 20);
+	gaim_value_set_int(priority_value, 0);
 	type = gaim_status_type_new_with_attrs(GAIM_STATUS_UNAVAILABLE, "dnd",
 			_("Do Not Disturb"), TRUE, TRUE, FALSE, "priority", _("Priority"),
 			priority_value, "message", _("Message"),

Update of /cvsroot/gaim/gaim/src/protocols/jabber
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22062/src/protocols/jabber

Modified Files:
	jabber.c presence.c 
Log Message:
real live jabber presence support (at least in the prpl)


Index: jabber.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/jabber/jabber.c,v
retrieving revision 1.298
retrieving revision 1.299
diff -u -d -p -r1.298 -r1.299
--- jabber.c	12 Sep 2005 06:04:26 -0000	1.298
+++ jabber.c	26 Sep 2005 00:08:08 -0000	1.299
@@ -999,39 +999,50 @@ static GList *jabber_status_types(GaimAc
 {
 	GaimStatusType *type;
 	GList *types = NULL;
+	GaimValue *priority_value;
 
 	type = gaim_status_type_new_with_attrs(GAIM_STATUS_OFFLINE, "offline",
 			_("Offline"), FALSE, TRUE, FALSE, "message", _("Message"),
 			gaim_value_new(GAIM_TYPE_STRING), NULL);
 	types = g_list_append(types, type);
 
+	priority_value = gaim_value_new(GAIM_TYPE_INT);
+	gaim_value_set_int(priority_value, 0);
 	type = gaim_status_type_new_with_attrs(GAIM_STATUS_AVAILABLE, "available",
 			_("Available"), TRUE, TRUE, FALSE, "priority", _("Priority"),
-			gaim_value_new(GAIM_TYPE_INT), "message", _("Message"),
+			priority_value, "message", _("Message"),
 			gaim_value_new(GAIM_TYPE_STRING), NULL);
 	types = g_list_append(types, type);
 
+	priority_value = gaim_value_new(GAIM_TYPE_INT);
+	gaim_value_set_int(priority_value, 0);
 	type = gaim_status_type_new_with_attrs(GAIM_STATUS_AVAILABLE, "chat",
 			_("Chatty"), TRUE, TRUE, FALSE, "priority", _("Priority"),
-			gaim_value_new(GAIM_TYPE_INT), "message", _("Message"),
+			priority_value, "message", _("Message"),
 			gaim_value_new(GAIM_TYPE_STRING), NULL);
 	types = g_list_append(types, type);
 
+	priority_value = gaim_value_new(GAIM_TYPE_INT);
+	gaim_value_set_int(priority_value, 5);
 	type = gaim_status_type_new_with_attrs(GAIM_STATUS_AWAY, "away",
 			_("Away"), TRUE, TRUE, FALSE, "priority", _("Priority"),
-			gaim_value_new(GAIM_TYPE_INT), "message", _("Message"),
+			priority_value, "message", _("Message"),
 			gaim_value_new(GAIM_TYPE_STRING), NULL);
 	types = g_list_append(types, type);
 
+	priority_value = gaim_value_new(GAIM_TYPE_INT);
+	gaim_value_set_int(priority_value, 10);
 	type = gaim_status_type_new_with_attrs(GAIM_STATUS_EXTENDED_AWAY, "xa",
 			_("Extended Away"), TRUE, TRUE, FALSE, "priority", _("Priority"),
-			gaim_value_new(GAIM_TYPE_INT), "message", _("Message"),
+			priority_value, "message", _("Message"),
 			gaim_value_new(GAIM_TYPE_STRING), NULL);
 	types = g_list_append(types, type);
 
+	priority_value = gaim_value_new(GAIM_TYPE_INT);
+	gaim_value_set_int(priority_value, 20);
 	type = gaim_status_type_new_with_attrs(GAIM_STATUS_UNAVAILABLE, "dnd",
 			_("Do Not Disturb"), TRUE, TRUE, FALSE, "priority", _("Priority"),
-			gaim_value_new(GAIM_TYPE_INT), "message", _("Message"),
+			priority_value, "message", _("Message"),
 			gaim_value_new(GAIM_TYPE_STRING), NULL);
 	types = g_list_append(types, type);
 

Index: presence.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/jabber/presence.c,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -d -p -r1.81 -r1.82
--- presence.c	29 Aug 2005 04:53:17 -0000	1.81
+++ presence.c	26 Sep 2005 00:08:08 -0000	1.82
@@ -144,7 +144,7 @@ void jabber_presence_send(GaimAccount *a
 
 xmlnode *jabber_presence_create(JabberBuddyState state, const char *msg, int priority)
 {
-	xmlnode *show, *status, *presence;
+	xmlnode *show, *status, *presence, *pri;
 	const char *show_string = NULL;
 
 
@@ -168,6 +168,13 @@ xmlnode *jabber_presence_create(JabberBu
 		xmlnode_insert_data(status, msg, -1);
 	}
 
+	if(priority) {
+		char *pstr = g_strdup_printf("%d", priority);
+		pri = xmlnode_new_child(presence, "priority");
+		xmlnode_insert_data(pri, pstr, -1);
+		g_free(pstr);
+	}
+
 	return presence;
 }

Update of /cvsroot/gaim/gaim/src/protocols/oscar
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24192/src/protocols/oscar

Modified Files:
	oscar.c 
Log Message:
Make sure that we have a reason.

Index: oscar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.789
retrieving revision 1.790
diff -u -d -p -r1.789 -r1.790
--- oscar.c	14 Sep 2005 01:15:28 -0000	1.789
+++ oscar.c	25 Sep 2005 16:45:29 -0000	1.790
@@ -7214,7 +7214,7 @@ static int gaim_ssi_authrequest(aim_sess
 	char *msg;
 	GaimAccount *account = gaim_connection_get_account(gc);
 	gchar *nombre;
-	gchar *reason;
+	gchar *reason = NULL;
 	gchar *dialog_msg;
 	struct name_data *data;
 	GaimBuddy *buddy;
@@ -7235,7 +7235,8 @@ static int gaim_ssi_authrequest(aim_sess
 
 	if (msg != NULL)
 		reason = gaim_plugin_oscar_decode_im_part(account, sn, AIM_CHARSET_CUSTOM, 0x0000, msg, strlen(msg));
-	else
+
+	if (reason == NULL)
 		reason = g_strdup(_("No reason given."));
 
 	dialog_msg = g_strdup_printf(

Update of /cvsroot/gaim/web/htdocs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6511/htdocs

Modified Files:
	faq.txt 
Log Message:
At bleeter's motivation, with nearly all the text by rekka|laptop, and
most of the rest by robo101


Index: faq.txt
===================================================================
RCS file: /cvsroot/gaim/web/htdocs/faq.txt,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -d -p -r1.217 -r1.218
--- faq.txt	16 Sep 2005 20:49:35 -0000	1.217
+++ faq.txt	23 Sep 2005 15:06:49 -0000	1.218
@@ -1321,5 +1321,16 @@ dictionaries are available or to switch 
 long been promised for gtkspell version 3, which has been delayed somewhat
 indefinitely.  See <a href="http://gtkspell.sf.net">gtkspell.sf.net</a>.
 
+Q:	Can I make gaim transparent?
+
+A:	Transparency would make Gaim invisible.  You probably want
+translucency.  Translucency is not a feature of X11, therefore we do not
+support it.  X.org provides a COMPOSITE extension to do this, but not only
+is it X.org-specific, it requires support at the GTK+ level (if it is to
+be per-widget).  We also have no interest in the psuedo-translucency
+offered by some other programs.  While WinGaim has a plugin to do this, we
+have no intention of including it for X11 platforms until supported by
+GTK+.
+
 
 !COMMENT	vim: syntax=gaimfaq tw=75

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10688

Modified Files:
	upnp.c 
Log Message:
Don't use the gtk wrapper when you can use glib directly - upnp shouldn't depend on gtk. Also some trailing whitespace fixes - this whole file is using spaces instead of tabs.

Index: upnp.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/upnp.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -p -r1.6 -r1.7
--- upnp.c	10 Sep 2005 18:42:32 -0000	1.6
+++ upnp.c	23 Sep 2005 02:39:32 -0000	1.7
@@ -23,7 +23,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #include "internal.h"
-#include "gtkgaim.h"
+#include "gaim.h"
 
 #include "debug.h"
 #include "util.h"
@@ -200,7 +200,7 @@ gaim_upnp_http_read(gpointer data,
   }
 }
 
-static void 
+static void
 gaim_upnp_http_send(gpointer data,
                     gint sock,
                     GaimInputCondition cond)
@@ -232,7 +232,7 @@ gaim_upnp_http_send(gpointer data,
   nrd->inpa = gaim_input_add(sock, GAIM_INPUT_READ,
                               gaim_upnp_http_read, nrd);
   while (!nrd->done) {
-    gtk_main_iteration();
+    g_main_context_iteration(NULL, TRUE);
   }
   close(sock);
 }
@@ -250,10 +250,10 @@ gaim_upnp_http_request(const gchar* addr
   nrd->tima = gaim_timeout_add(RECEIVE_TIMEOUT,
                                (GSourceFunc)gaim_upnp_timeout, nrd);
 
-  if(gaim_proxy_connect(NULL, address, port, 
+  if(gaim_proxy_connect(NULL, address, port,
       gaim_upnp_http_send, nrd)) {
 
-    gaim_debug_error("upnp", "Connect Failed: Address: %s @@@ Port %d @@@ Request %s\n\n", 
+    gaim_debug_error("upnp", "Connect Failed: Address: %s @@@ Port %d @@@ Request %s\n\n",
                     address, port, nrd->sendBuffer);
 
     gaim_timeout_remove(nrd->tima);
@@ -261,7 +261,7 @@ gaim_upnp_http_request(const gchar* addr
     nrd->recvBuffer = NULL;
   } else {
     while (!nrd->done) {
-      gtk_main_iteration();
+      g_main_context_iteration(NULL, TRUE);
     }
   }
 
@@ -299,7 +299,7 @@ gaim_upnp_compare_service(const xmlnode*
 
 
 static gchar*
-gaim_upnp_parse_description_response(const gchar* httpResponse, 
+gaim_upnp_parse_description_response(const gchar* httpResponse,
                                      const gchar* httpURL,
                                      const gchar* serviceType)
 {
@@ -320,7 +320,7 @@ gaim_upnp_parse_description_response(con
   }
 
   /* find the root of the xml document */
-  if((xmlRoot = g_strstr_len(httpResponse, strlen(httpResponse), 
+  if((xmlRoot = g_strstr_len(httpResponse, strlen(httpResponse),
                             "<root")) == NULL) {
     gaim_debug_error("upnp",
           "parse_description_response(): Failed finding root\n\n");
@@ -344,7 +344,7 @@ gaim_upnp_parse_description_response(con
 
   /* get the serviceType child that has the service type as it's data */
 
-  /* get urn:schemas-upnp-org:device:InternetGatewayDevice:1 
+  /* get urn:schemas-upnp-org:device:InternetGatewayDevice:1
      and it's devicelist */
   serviceTypeNode = xmlnode_get_child(xmlRootNode, "device");
   while(!gaim_upnp_compare_device(serviceTypeNode,
@@ -364,7 +364,7 @@ gaim_upnp_parse_description_response(con
     return NULL;
   }
 
-  /* get urn:schemas-upnp-org:device:WANDevice:1 
+  /* get urn:schemas-upnp-org:device:WANDevice:1
      and it's devicelist */
   serviceTypeNode = xmlnode_get_child(serviceTypeNode, "device");
   while(!gaim_upnp_compare_device(serviceTypeNode,
@@ -384,7 +384,7 @@ gaim_upnp_parse_description_response(con
     return NULL;
   }
 
-  /* get urn:schemas-upnp-org:device:WANConnectionDevice:1 
+  /* get urn:schemas-upnp-org:device:WANConnectionDevice:1
      and it's servicelist */
   serviceTypeNode = xmlnode_get_child(serviceTypeNode, "device");
   while(!gaim_upnp_compare_device(serviceTypeNode,
@@ -420,18 +420,18 @@ gaim_upnp_parse_description_response(con
   }
 
   /* get the controlURL of the service */
-  if((controlURLNode = xmlnode_get_child(serviceTypeNode, 
+  if((controlURLNode = xmlnode_get_child(serviceTypeNode,
                                          "controlURL")) == NULL) {
     gaim_debug_error("upnp",
          "parse_description_response(): Could not find controlURL\n\n");
     return NULL;
   }
 
-  if(g_strstr_len(xmlnode_get_data(controlURLNode), 
+  if(g_strstr_len(xmlnode_get_data(controlURLNode),
                   SIZEOF_HTTP, "http://") == NULL &&
-     g_strstr_len(xmlnode_get_data(controlURLNode), 
+     g_strstr_len(xmlnode_get_data(controlURLNode),
                   SIZEOF_HTTP, "HTTP://") == NULL) {
-    controlURL = g_strdup_printf("%s%s", baseURL, 
+    controlURL = g_strdup_printf("%s%s", baseURL,
                                  xmlnode_get_data(controlURLNode));
   }else{
     controlURL = g_strdup(xmlnode_get_data(controlURLNode));
@@ -458,7 +458,7 @@ gaim_upnp_parse_description(const gchar*
   gchar descriptionPort[MAX_PORT_SIZE];
   int port = 0;
 
-  /* parse the 4 above variables out of the descriptionURL 
+  /* parse the 4 above variables out of the descriptionURL
      example description URL: http://192.168.1.1:5678/rootDesc.xml */
 
   /* parse the url into address, port, path variables */
@@ -470,7 +470,7 @@ gaim_upnp_parse_description(const gchar*
     port = DEFAULT_HTTP_PORT;
   }
   g_ascii_dtostr(descriptionPort, MAX_PORT_SIZE, port);
-  descriptionAddressPort = g_strdup_printf("%s:%s", descriptionAddress, 
+  descriptionAddressPort = g_strdup_printf("%s:%s", descriptionAddress,
                                            descriptionPort);
 
   fullURL = g_strdup_printf("http://%s", descriptionAddressPort);
@@ -493,7 +493,7 @@ gaim_upnp_parse_description(const gchar*
     return NULL;
   }
 
-  controlURL = gaim_upnp_parse_description_response(httpResponse, 
+  controlURL = gaim_upnp_parse_description_response(httpResponse,
                                             fullURL, serviceType);
 
   g_free(descriptionXMLAddress);
@@ -611,11 +611,11 @@ gaim_upnp_discover(void)
   gchar wanPPP[] = "WANPPPConnection:1";
   gchar* serviceToUse;
   gchar* sendMessage = NULL;
-  
+
   /* UDP RECEIVE VARIABLES */
   GaimUPnPControlInfo* controlInfo = g_malloc(sizeof(GaimUPnPControlInfo));
   NetResponseData* nrd = g_malloc(sizeof(NetResponseData));
-  
+
   /* Set up the sockets */
   sock = socket(AF_INET, SOCK_DGRAM, 0);
   if (sock == -1) {
@@ -643,7 +643,7 @@ gaim_upnp_discover(void)
 
   /* because we are sending over UDP, if there is a failure
      we should retry the send NUM_UDP_ATTEMPTS times. Also,
-     try different requests for WANIPConnection and 
+     try different requests for WANIPConnection and
      WANPPPConnection*/
   for(i = 0; i < NUM_UDP_ATTEMPTS; i++) {
     sentSuccess = TRUE;
@@ -682,12 +682,12 @@ gaim_upnp_discover(void)
     }
 
     if(sentSuccess) {
-      nrd->tima = gaim_timeout_add(DISCOVERY_TIMEOUT, 
+      nrd->tima = gaim_timeout_add(DISCOVERY_TIMEOUT,
                                   (GSourceFunc)gaim_upnp_timeout, nrd);
       nrd->inpa = gaim_input_add(sock, GAIM_INPUT_READ,
                                  gaim_upnp_discover_udp_read, nrd);
       while (!nrd->done) {
-        gtk_main_iteration();
+        g_main_context_iteration(NULL, TRUE);
       }
       if(nrd->recvBuffer == NULL) {
         recvSuccess = FALSE;
@@ -736,7 +736,7 @@ gaim_upnp_discover(void)
 
 static char*
 gaim_upnp_generate_action_message_and_send(const GaimUPnPControlInfo* controlInfo,
-                                          const gchar* actionName, 
+                                          const gchar* actionName,
                                           const gchar* actionParams)
 {
   gchar* actionMessage;
@@ -776,14 +776,14 @@ gaim_upnp_generate_action_message_and_se
   /* set the HTTP Header */
   actionMessage = g_strdup_printf(HTTP_HEADER_ACTION,
                   pathOfControl, addressPortOfControl,
-                  controlInfo->serviceType, actionName, 
+                  controlInfo->serviceType, actionName,
                   strlen(soapMessage));
 
   /* append to the header the body */
   totalSendMessage = g_strdup_printf("%s%s", actionMessage, soapMessage);
 
   /* get the return of the http response */
-  httpResponse = gaim_upnp_http_request(addressOfControl, 
+  httpResponse = gaim_upnp_http_request(addressOfControl,
                                         port, totalSendMessage);
   if(httpResponse == NULL) {
     gaim_debug_error("upnp",
@@ -813,7 +813,7 @@ gaim_upnp_get_public_ip(const GaimUPnPCo
   gchar* temp, *temp2;
 
   httpResponse = gaim_upnp_generate_action_message_and_send(controlInfo,
-                                                            actionName, 
+                                                            actionName,
                                                             actionParams);
   if(httpResponse == NULL) {
     gaim_debug_error("upnp",
@@ -865,14 +865,14 @@ gaim_upnp_get_local_system_ip(gpointer d
 }
 
 static gchar*
-gaim_upnp_get_local_ip_address(const gchar* address) 
+gaim_upnp_get_local_ip_address(const gchar* address)
 {
   gchar* ip;
   gchar* pathOfControl;
   gchar* addressOfControl;
   int port = 0;
   NetResponseData* nrd = (NetResponseData*)g_malloc0(sizeof(NetResponseData));
-  
+
   if(!gaim_url_parse(address, &addressOfControl,
                      &port, &pathOfControl, NULL, NULL)) {
     gaim_debug_error("upnp",
@@ -886,16 +886,16 @@ gaim_upnp_get_local_ip_address(const gch
   nrd->tima = gaim_timeout_add(RECEIVE_TIMEOUT,
                                (GSourceFunc)gaim_upnp_timeout, nrd);
 
-  if(gaim_proxy_connect(NULL, addressOfControl, port, 
+  if(gaim_proxy_connect(NULL, addressOfControl, port,
       gaim_upnp_get_local_system_ip, nrd)) {
 
-    gaim_debug_error("upnp", "Get Local IP Connect Failed: Address: %s @@@ Port %d @@@ Request %s\n\n", 
+    gaim_debug_error("upnp", "Get Local IP Connect Failed: Address: %s @@@ Port %d @@@ Request %s\n\n",
                     address, port, nrd->sendBuffer);
 
     gaim_timeout_remove(nrd->tima);
   } else {
     while (!nrd->done) {
-      gtk_main_iteration();
+      g_main_context_iteration(NULL, TRUE);
     }
   }
 
@@ -910,7 +910,7 @@ gaim_upnp_get_local_ip_address(const gch
 
 
 gboolean
-gaim_upnp_set_port_mapping(const GaimUPnPControlInfo* controlInfo, 
+gaim_upnp_set_port_mapping(const GaimUPnPControlInfo* controlInfo,
                            unsigned short portMap,
                            const gchar* protocol)
 {
@@ -928,11 +928,11 @@ gaim_upnp_set_port_mapping(const GaimUPn
   }
 
   /* make the portMappingParams variable */
-  actionParams = g_strdup_printf(ADD_PORT_MAPPING_PARAMS, portMap, 
+  actionParams = g_strdup_printf(ADD_PORT_MAPPING_PARAMS, portMap,
                                  protocol, portMap, internalIP);
 
   httpResponse = gaim_upnp_generate_action_message_and_send(controlInfo,
-                                                            actionName, 
+                                                            actionName,
                                                             actionParams);
   if(httpResponse == NULL) {
     gaim_debug_error("upnp",
@@ -962,7 +962,7 @@ gaim_upnp_set_port_mapping(const GaimUPn
 
 
 gboolean
-gaim_upnp_remove_port_mapping(const GaimUPnPControlInfo* controlInfo, 
+gaim_upnp_remove_port_mapping(const GaimUPnPControlInfo* controlInfo,
                               unsigned short portMap,
                               const char* protocol)
 {
@@ -975,7 +975,7 @@ gaim_upnp_remove_port_mapping(const Gaim
                                  portMap, protocol);
 
   httpResponse = gaim_upnp_generate_action_message_and_send(controlInfo,
-                                                            actionName, 
+                                                            actionName,
                                                             actionParams);
 
   if(httpResponse == NULL) {

Update of /cvsroot/gaim/gaim/src/protocols/gg
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20712

Modified Files:
	gg.c 
Log Message:
Default type of the outgoing messages is CHAT.


Index: gg.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/gg/gg.c,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -d -p -r1.152 -r1.153
--- gg.c	14 Sep 2005 19:01:33 -0000	1.152
+++ gg.c	22 Sep 2005 22:20:21 -0000	1.153
@@ -295,6 +295,9 @@ exit_err:
 }
 /* }}} */
 
+/*
+ */
+/* static void ggp_callback_register_account_cancel(GaimConnection *gc, GaimRequestFields *fields) {{{ */
 static void ggp_callback_register_account_cancel(GaimConnection *gc, GaimRequestFields *fields)
 {
 	GGPInfo *info = gc->proto_data;
@@ -306,6 +309,7 @@ static void ggp_callback_register_accoun
 	g_free(token);
 
 }
+/* }}} */
 
 /* ----- PUBLIC DIRECTORY SEARCH ---------------------------------------- */
 
@@ -1233,13 +1237,16 @@ static int ggp_send_im(GaimConnection *g
 	if (strlen(msg) == 0)
 		return 1;
 
+	gaim_debug_info("gg", "ggp_send_im: msg = %s\n", msg);
 	tmp = charset_convert(msg, "UTF-8", "CP1250");
 
 	if (tmp != NULL && strlen(tmp) > 0) {
-		if (gg_send_message(info->session, GG_CLASS_MSG, ggp_str_to_uin(who), (unsigned char *)tmp) < 0) {
+		if (gg_send_message(info->session, GG_CLASS_CHAT, ggp_str_to_uin(who),
+					        (unsigned char *)tmp) < 0) {
 			return -1;
 		}
 	}
+	g_free(tmp);
 
 	return 1;
 }
@@ -1637,6 +1644,7 @@ static GaimPluginInfo info = {
 };
 /* }}} */
 
+/* static void gaim_gg_debug_handler(int level, const char * format, va_list args) {{{ */
 static void gaim_gg_debug_handler(int level, const char * format, va_list args) {
 	GaimDebugLevel gaim_level;
 	char *msg = g_strdup_vprintf(format, args);
@@ -1659,6 +1667,7 @@ static void gaim_gg_debug_handler(int le
 	gaim_debug(gaim_level, "gg", msg);
 	g_free(msg);
 }
+/* }}} */
 
 /*
  */

Update of /cvsroot/gaim/gaim/src/win32
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8804/src/win32

Modified Files:
	win32dep.h 
Log Message:
This has been gone for a very long time.

Index: win32dep.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/win32/win32dep.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -p -r1.29 -r1.30
--- win32dep.h	11 Jun 2005 23:29:56 -0000	1.29
+++ win32dep.h	22 Sep 2005 21:39:09 -0000	1.30
@@ -48,8 +48,6 @@ extern char*     wgaim_install_dir(void)
 extern char*     wgaim_lib_dir(void);
 extern char*     wgaim_locale_dir(void);
 extern char*     wgaim_data_dir(void);
-/* UI related */
-extern void      wgaim_gtk_window_move(GtkWindow *window, gint x, gint y);
 /* Utility */
 extern int       wgaim_gz_decompress(const char* in, const char* out);
 extern int       wgaim_gz_untar(const char* filename, const char* destdir);