[popfile-commit] windows CBP.nsh,1.33.4.1,1.33.4.2 MonitorCC.nsi,1.19.4.1,1.19.4.2 WriteEnvStr.nsh,1

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15516

Modified Files:
      Tag: b0_22_2
	CBP.nsh MonitorCC.nsi WriteEnvStr.nsh adduser-EmailConfig.nsh 
	adduser-Uninstall.nsh adduser.nsi getssl.nsh 
	installer-SecMinPerl-body.nsh installer-SecPOPFile-body.nsh 
	installer-SecPOPFile-func.nsh installer-Uninstall.nsh 
	installer.nsi ioA.ini ioB.ini ioC.ini ioE.ini ioF.ini ioG.ini 
	msgcapture.nsi pfi-languages.nsh pfi-library.nsh 
	runpopfile.nsi runsqlite.nsi stop_popfile.nsi 
Log Message:
Change GPL license to remove the option for the person using POPFile to license it under any version of the GPL other than v2

Index: CBP.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/CBP.nsh,v
retrieving revision 1.33.4.1
retrieving revision 1.33.4.2
diff -C2 -d -r1.33.4.1 -r1.33.4.2
*** CBP.nsh	13 Sep 2005 19:01:55 -0000	1.33.4.1
--- CBP.nsh	19 Dec 2005 11:45:36 -0000	1.33.4.2
***************
*** 10,17 ****
  #   This file is part of POPFile
  #
! #   POPFile is free software; you can redistribute it and/or modify
! #   it under the terms of the GNU General Public License as published by
! #   the Free Software Foundation; either version 2 of the License, or
! #   (at your option) any later version.
  #
  #   POPFile is distributed in the hope that it will be useful,
--- 10,16 ----
  #   This file is part of POPFile
  #
! #   POPFile is free software; you can redistribute it and/or modify it
! #   under the terms version 2 of the GNU General Public License as
! #   published by the Free Software Foundation.
  #
  #   POPFile is distributed in the hope that it will be useful,

Index: MonitorCC.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/MonitorCC.nsi,v
retrieving revision 1.19.4.1
retrieving revision 1.19.4.2
diff -C2 -d -r1.19.4.1 -r1.19.4.2
*** MonitorCC.nsi	13 Sep 2005 19:01:55 -0000	1.19.4.1
--- MonitorCC.nsi	19 Dec 2005 11:45:36 -0000	1.19.4.2
***************
*** 9,16 ****
  #   This file is part of POPFile
  #
! #   POPFile is free software; you can redistribute it and/or modify
! #   it under the terms of the GNU General Public License as published by
! #   the Free Software Foundation; either version 2 of the License, or
! #   (at your option) any later version.
  #
  #   POPFile is distributed in the hope that it will be useful,
--- 9,15 ----
  #   This file is part of POPFile
  #
! #   POPFile is free software; you can redistribute it and/or modify it
! #   under the terms version 2 of the GNU General Public License as
! #   published by the Free Software Foundation.
  #
  #   POPFile is distributed in the hope that it will be useful,

Index: getssl.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/getssl.nsh,v
retrieving revision 1.6.2.4
retrieving revision 1.6.2.5
diff -C2 -d -r1.6.2.4 -r1.6.2.5
*** getssl.nsh	2 Oct 2005 14:57:43 -0000	1.6.2.4
--- getssl.nsh	19 Dec 2005 11:45:36 -0000	1.6.2.5
***************
*** 13,20 ****
  #   This file is part of POPFile
  #
! #   POPFile is free software; you can redistribute it and/or modify
! #   it under the terms of the GNU General Public License as published by
! #   the Free Software Foundation; either version 2 of the License, or
! #   (at your option) any later version.
  #
  #   POPFile is distributed in the hope that it will be useful,
--- 13,19 ----
  #   This file is part of POPFile
  #
! #   POPFile is free software; you can redistribute it and/or modify it
! #   under the terms version 2 of the GNU General Public License as
! #   published by the Free Software Foundation.
  #
  #   POPFile is distributed in the hope that it will be useful,

Index: installer-SecMinPerl-body.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/installer-SecMinPerl-body.nsh,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -C2 -d -r1.2.2.3 -r1.2.2.4
*** installer-SecMinPerl-body.nsh	16 Sep 2005 10:43:33 -0000	1.2.2.3
--- installer-SecMinPerl-body.nsh	19 Dec 2005 11:45:36 -0000	1.2.2.4
***************
*** 14,21 ****
  #   This file is part of POPFile
  #
! #   POPFile is free software; you can redistribute it and/or modify
! #   it under the terms of the GNU General Public License as published by
! #   the Free Software Foundation; either version 2 of the License, or
! #   (at your option) any later version.
  #
  #   POPFile is distributed in the hope that it will be useful,
--- 14,20 ----
  #   This file is part of POPFile
  #
! #   POPFile is free software; you can redistribute it and/or modify it
! #   under the terms version 2 of the GNU General Public License as
! #   published by the Free Software Foundation.
  #
  #   POPFile is distributed in the hope that it will be useful,

Index: ioB.ini
===================================================================
RCS file: /cvsroot/popfile/windows/ioB.ini,v
retrieving revision 1.14
retrieving revision 1.14.6.1
diff -C2 -d -r1.14 -r1.14.6.1
*** ioB.ini	9 Jun 2004 15:06:04 -0000	1.14
--- ioB.ini	19 Dec 2005 11:45:36 -0000	1.14.6.1
***************
*** 1,164 ****
! #-------------------------------------------------------------------
! #
! # ioB.ini --- This file is used by "adduser.nsi", one of the NSIS scripts
! #             used to create the Windows installer for POPFile. This file
! #             defines the layout of the custom page used to configure the
! #             Outlook Express and Outlook accounts.
! #
! # Copyright (c) 2003-2004 John Graham-Cumming
! #
! #   This file is part of POPFile
! #
! #   POPFile is free software; you can redistribute it and/or modify
! #   it under the terms of the GNU General Public License as published by
! #   the Free Software Foundation; either version 2 of the License, or
! #   (at your option) any later version.
! #
! #   POPFile is distributed in the hope that it will be useful,
! #   but WITHOUT ANY WARRANTY; without even the implied warranty of
! #   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
! #   GNU General Public License for more details.
! #
! #   You should have received a copy of the GNU General Public License
! #   along with POPFile; if not, write to the Free Software
! #   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
! #
! #-------------------------------------------------------------------
! 
! [Settings]
! NumFields=17
! BackEnabled=1
! CancelEnabled=0
! 
! [Field 1]
! Type=Label
! Text=
! Left=0
! Right=298
! Top=0
! Bottom=8
! 
! [Field 2]
! Type=GroupBox
! Left=0
! Right=300
! Top=6
! Bottom=117
! 
! [Field 3]
! Type=Label
! Text=
! Left=0
! Right=300
! Top=120
! Bottom=139
! 
! [Field 4]
! Type=Label
! Text=
! Left=15
! Right=71
! Top=12
! Bottom=20
! 
! [Field 5]
! Type=Label
! Text=
! Left=73
! Right=171
! Top=12
! Bottom=20
! 
! [Field 6]
! Type=Label
! Text=
! Left=173
! Right=239
! Top=12
! Bottom=20
! 
! [Field 7]
! Type=Label
! Text=
! Left=241
! Right=298
! Top=12
! Bottom=20
! 
! [Field 8]
! Type=Text
! Left=11
! Right=71
! Top=21
! Bottom=115
! Flags=READONLY|MULTILINE|NOWORDWRAP
! 
! [Field 9]
! Type=Text
! Left=70
! Right=171
! Top=21
! Bottom=115
! Flags=READONLY|MULTILINE|NOWORDWRAP
! 
! [Field 10]
! Type=Text
! Left=170
! Right=239
! Top=21
! Bottom=115
! Flags=READONLY|MULTILINE|NOWORDWRAP
! 
! [Field 11]
! Type=Text
! Left=238
! Right=298
! Top=21
! Bottom=115
! Flags=READONLY|MULTILINE|NOWORDWRAP
! 
! [Field 12]
! Type=CheckBox
! Left=2
! Right=10
! Top=23
! Bottom=31
! 
! [Field 13]
! Type=CheckBox
! Left=2
! Right=10
! Top=39
! Bottom=47
! 
! [Field 14]
! Type=CheckBox
! Left=2
! Right=10
! Top=55
! Bottom=63
! 
! [Field 15]
! Type=CheckBox
! Left=2
! Right=10
! Top=71
! Bottom=79
! 
! [Field 16]
! Type=CheckBox
! Left=2
! Right=10
! Top=87
! Bottom=95
! 
! [Field 17]
! Type=CheckBox
! Left=2
! Right=10
! Top=103
! Bottom=111
! 
! #--------------------
! # End of ioB.ini
! #--------------------
--- 1,163 ----
! #-------------------------------------------------------------------
! #
! # ioB.ini --- This file is used by "adduser.nsi", one of the NSIS scripts
! #             used to create the Windows installer for POPFile. This file
! #             defines the layout of the custom page used to configure the
! #             Outlook Express and Outlook accounts.
! #
! # Copyright (c) 2003-2004 John Graham-Cumming
! #
! #   This file is part of POPFile
! #
! #   POPFile is free software; you can redistribute it and/or modify it
! #   under the terms version 2 of the GNU General Public License as
! #   published by the Free Software Foundation.
! #
! #   POPFile is distributed in the hope that it will be useful,
! #   but WITHOUT ANY WARRANTY; without even the implied warranty of
! #   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
! #   GNU General Public License for more details.
! #
! #   You should have received a copy of the GNU General Public License
! #   along with POPFile; if not, write to the Free Software
! #   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
! #
! #-------------------------------------------------------------------
! 
! [Settings]
! NumFields=17
! BackEnabled=1
! CancelEnabled=0
! 
! [Field 1]
! Type=Label
! Text=
! Left=0
! Right=298
! Top=0
! Bottom=8
! 
! [Field 2]
! Type=GroupBox
! Left=0
! Right=300
! Top=6
! Bottom=117
! 
! [Field 3]
! Type=Label
! Text=
! Left=0
! Right=300
! Top=120
! Bottom=139
! 
! [Field 4]
! Type=Label
! Text=
! Left=15
! Right=71
! Top=12
! Bottom=20
! 
! [Field 5]
! Type=Label
! Text=
! Left=73
! Right=171
! Top=12
! Bottom=20
! 
! [Field 6]
! Type=Label
! Text=
! Left=173
! Right=239
! Top=12
! Bottom=20
! 
! [Field 7]
! Type=Label
! Text=
! Left=241
! Right=298
! Top=12
! Bottom=20
! 
! [Field 8]
! Type=Text
! Left=11
! Right=71
! Top=21
! Bottom=115
! Flags=READONLY|MULTILINE|NOWORDWRAP
! 
! [Field 9]
! Type=Text
! Left=70
! Right=171
! Top=21
! Bottom=115
! Flags=READONLY|MULTILINE|NOWORDWRAP
! 
! [Field 10]
! Type=Text
! Left=170
! Right=239
! Top=21
! Bottom=115
! Flags=READONLY|MULTILINE|NOWORDWRAP
! 
! [Field 11]
! Type=Text
! Left=238
! Right=298
! Top=21
! Bottom=115
! Flags=READONLY|MULTILINE|NOWORDWRAP
! 
! [Field 12]
! Type=CheckBox
! Left=2
! Right=10
! Top=23
! Bottom=31
! 
! [Field 13]
! Type=CheckBox
! Left=2
! Right=10
! Top=39
! Bottom=47
! 
! [Field 14]
! Type=CheckBox
! Left=2
! Right=10
! Top=55
! Bottom=63
! 
! [Field 15]
! Type=CheckBox
! Left=2
! Right=10
! Top=71
! Bottom=79
! 
! [Field 16]
! Type=CheckBox
! Left=2
! Right=10
! Top=87
! Bottom=95
! 
! [Field 17]
! Type=CheckBox
! Left=2
! Right=10
! Top=103
! Bottom=111
! 
! #--------------------
! # End of ioB.ini
! #--------------------

Index: runsqlite.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/runsqlite.nsi,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -C2 -d -r1.1.4.1 -r1.1.4.2
*** runsqlite.nsi	13 Sep 2005 19:01:55 -0000	1.1.4.1
--- runsqlite.nsi	19 Dec 2005 11:45:36 -0000	1.1.4.2
***************
*** 14,21 ****
  #   This file is part of POPFile
  #
! #   POPFile is free software; you can redistribute it and/or modify
! #   it under the terms of the GNU General Public License as published by
! #   the Free Software Foundation; either version 2 of the License, or
! #   (at your option) any later version.
  #
  #   POPFile is distributed in the hope that it will be useful,
--- 14,20 ----
  #   This file is part of POPFile
  #
! #   POPFile is free software; you can redistribute it and/or modify it
! #   under the terms version 2 of the GNU General Public License as
! #   published by the Free Software Foundation.
  #
  #   POPFile is distributed in the hope that it will be useful,

Index: installer-SecPOPFile-body.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/installer-SecPOPFile-body.nsh,v
retrieving revision 1.3.2.3
retrieving revision 1.3.2.4
diff -C2 -d -r1.3.2.3 -r1.3.2.4
*** installer-SecPOPFile-body.nsh	13 Sep 2005 19:06:48 -0000	1.3.2.3
--- installer-SecPOPFile-body.nsh	19 Dec 2005 11:45:36 -0000	1.3.2.4
***************
*** 12,19 ****
  #   This file is part of POPFile
  #
! #   POPFile is free software; you can redistribute it and/or modify
! #   it under the terms of the GNU General Public License as published by
! #   the Free Software Foundation; either version 2 of the License, or
! #   (at your option) any later version.
  #
  #   POPFile is distributed in the hope that it will be useful,
--- 12,18 ----
  #   This file is part of POPFile
  #
! #   POPFile is free software; you can redistribute it and/or modify it
! #   under the terms version 2 of the GNU General Public License as
! #   published by the Free Software Foundation.
  #
  #   POPFile is distributed in the hope that it will be useful,

Index: stop_popfile.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/stop_popfile.nsi,v
retrieving revision 1.14.4.1
retrieving revision 1.14.4.2
diff -C2 -d -r1.14.4.1 -r1.14.4.2
*** stop_popfile.nsi	13 Sep 2005 19:01:55 -0000	1.14.4.1
--- stop_popfile.nsi	19 Dec 2005 11:45:36 -0000	1.14.4.2
***************
*** 7,14 ****
  #   This file is part of POPFile
  #
! #   POPFile is free software; you can redistribute it and/or modify
! #   it under the terms of the GNU General Public License as published by
! #   the Free Software Foundation; either version 2 of the License, or
! #   (at your option) any later version.
  #
  #   POPFile is distributed in the hope that it will be useful,
--- 7,13 ----
  #   This file is part of POPFile
  #
! #   POPFile is free software; you can redistribute it and/or modify it
! #   under the terms version 2 of the GNU General Public License as
! #   published by the Free Software Foundation.
  #
  #   POPFile is distributed in the hope that it will be useful,

Index: ioA.ini
===================================================================
RCS file: /cvsroot/popfile/windows/ioA.ini,v
retrieving revision 1.19
retrieving revision 1.19.6.1
diff -C2 -d -r1.19 -r1.19.6.1
*** ioA.ini	9 Jun 2004 15:06:04 -0000	1.19
--- ioA.ini	19 Dec 2005 11:45:36 -0000	1.19.6.1
***************
*** 1,90 ****
! #-------------------------------------------------------------------
! #
! # ioA.ini --- This file is used by "adduser.nsi", one of the NSIS scripts
! #             used to create the Windows installer for POPFile. This file
! #             defines the layout of the custom page used to choose the port
! #             and startup options.
! #
! # Copyright (c) 2002-2004 John Graham-Cumming
! #
! #   This file is part of POPFile
! #
! #   POPFile is free software; you can redistribute it and/or modify
! #   it under the terms of the GNU General Public License as published by
! #   the Free Software Foundation; either version 2 of the License, or
! #   (at your option) any later version.
! #
! #   POPFile is distributed in the hope that it will be useful,
! #   but WITHOUT ANY WARRANTY; without even the implied warranty of
! #   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
! #   GNU General Public License for more details.
! #
! #   You should have received a copy of the GNU General Public License
! #   along with POPFile; if not, write to the Free Software
! #   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
! #
! #-------------------------------------------------------------------
! 
! [Settings]
! NumFields=7
! 
! [Field 1]
! Type=label
! Text=
! Left=0
! Right=300
! Top=0
! Bottom=16
! 
! [Field 2]
! Type=combobox
! ListItems=110|111|8110|8111
! Left=0
! Right=70
! Top=17
! Bottom=72
! 
! [Field 3]
! Type=label
! Text=
! Left=0
! Right=300
! Top=38
! Bottom=54
! 
! [Field 4]
! Type=combobox
! ListItems=8080|8081|9090|9091
! Left=0
! Right=70
! Top=55
! Bottom=110
! 
! [Field 5]
! Type=checkbox
! Text=
! Left=0
! Right=300
! Top=70
! Bottom=94
! State=1
! 
! [Field 6]
! Type=GroupBox
! Text=
! Left=0
! Right=300
! Top=100
! Bottom=140
! 
! [Field 7]
! Type=label
! Text=
! Left=5
! Right=298
! Top=115
! Bottom=139
! 
! #--------------------
! # End of ioA.ini
! #--------------------
--- 1,89 ----
! #-------------------------------------------------------------------
! #
! # ioA.ini --- This file is used by "adduser.nsi", one of the NSIS scripts
! #             used to create the Windows installer for POPFile. This file
! #             defines the layout of the custom page used to choose the port
! #             and startup options.
! #
! # Copyright (c) 2002-2004 John Graham-Cumming
! #
! #   This file is part of POPFile
! #
! #   POPFile is free software; you can redistribute it and/or modify it
! #   under the terms version 2 of the GNU General Public License as
! #   published by the Free Software Foundation.
! #
! #   POPFile is distributed in the hope that it will be useful,
! #   but WITHOUT ANY WARRANTY; without even the implied warranty of
! #   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
! #   GNU General Public License for more details.
! #
! #   You should have received a copy of the GNU General Public License
! #   along with POPFile; if not, write to the Free Software
! #   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
! #
! #-------------------------------------------------------------------
! 
! [Settings]
! NumFields=7
! 
! [Field 1]
! Type=label
! Text=
! Left=0
! Right=300
! Top=0
! Bottom=16
! 
! [Field 2]
! Type=combobox
! ListItems=110|111|8110|8111
! Left=0
! Right=70
! Top=17
! Bottom=72
! 
! [Field 3]
! Type=label
! Text=
! Left=0
! Right=300
! Top=38
! Bottom=54
! 
! [Field 4]
! Type=combobox
! ListItems=8080|8081|9090|9091
! Left=0
! Right=70
! Top=55
! Bottom=110
! 
! [Field 5]
! Type=checkbox
! Text=
! Left=0
! Right=300
! Top=70
! Bottom=94
! State=1
! 
! [Field 6]
! Type=GroupBox
! Text=
! Left=0
! Right=300
! Top=100
! Bottom=140
! 
! [Field 7]
! Type=label
! Text=
! Left=5
! Right=298
! Top=115
! Bottom=139
! 
! #--------------------
! # End of ioA.ini
! #--------------------

Index: ioC.ini
===================================================================
RCS file: /cvsroot/popfile/windows/ioC.ini,v
retrieving revision 1.13
retrieving revision 1.13.6.1
diff -C2 -d -r1.13 -r1.13.6.1
*** ioC.ini	9 Jun 2004 15:06:04 -0000	1.13
--- ioC.ini	19 Dec 2005 11:45:36 -0000	1.13.6.1
***************
*** 1,104 ****
! #-------------------------------------------------------------------
! #
! # ioC.ini --- This file is used by "adduser.nsi", one of the NSIS scripts
! #             used to create the Windows installer for POPFile. This file
! #             defines the layout of the custom page which offers to start
! #             POPFile.
! #
! # Copyright (c) 2003-2004 John Graham-Cumming
! #
! #   This file is part of POPFile
! #
! #   POPFile is free software; you can redistribute it and/or modify
! #   it under the terms of the GNU General Public License as published by
! #   the Free Software Foundation; either version 2 of the License, or
! #   (at your option) any later version.
! #
! #   POPFile is distributed in the hope that it will be useful,
! #   but WITHOUT ANY WARRANTY; without even the implied warranty of
! #   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
! #   GNU General Public License for more details.
! #
! #   You should have received a copy of the GNU General Public License
! #   along with POPFile; if not, write to the Free Software
! #   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
! #
! #-------------------------------------------------------------------
! 
! [Settings]
! NumFields=8
! BackEnabled=0
! CancelEnabled=0
! 
! [Field 1]
! Type=GroupBox
! Text=
! Left=0
! Right=300
! Top=0
! Bottom=70
! 
! [Field 2]
! Type=RadioButton
! Text=
! Left=5
! Right=298
! Top=10
! Bottom=26
! Flags=Group
! State=0
! 
! [Field 3]
! Type=RadioButton
! Text=
! Left=5
! Right=298
! Top=30
! Bottom=46
! State=0
! 
! [Field 4]
! Type=RadioButton
! Text=
! Left=5
! Right=298
! Top=50
! Bottom=66
! State=1
! 
! [Field 5]
! Type=GroupBox
! Text=
! Left=0
! Right=300
! Top=75
! Bottom=139
! Flags=Group
! 
! [Field 6]
! Type=Label
! Text=
! Left=5
! Right=298
! Top=85
! Bottom=101
! 
! [Field 7]
! Type=Label
! Text=
! Left=5
! Right=298
! Top=103
! Bottom=119
! 
! [Field 8]
! Type=Label
! Text=
! Left=5
! Right=298
! Top=121
! Bottom=137
! 
! #--------------------
! # End of ioC.ini
! #--------------------
--- 1,103 ----
! #-------------------------------------------------------------------
! #
! # ioC.ini --- This file is used by "adduser.nsi", one of the NSIS scripts
! #             used to create the Windows installer for POPFile. This file
! #             defines the layout of the custom page which offers to start
! #             POPFile.
! #
! # Copyright (c) 2003-2004 John Graham-Cumming
! #
! #   This file is part of POPFile
! #
! #   POPFile is free software; you can redistribute it and/or modify it
! #   under the terms version 2 of the GNU General Public License as
! #   published by the Free Software Foundation.
! #
! #   POPFile is distributed in the hope that it will be useful,
! #   but WITHOUT ANY WARRANTY; without even the implied warranty of
! #   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
! #   GNU General Public License for more details.
! #
! #   You should have received a copy of the GNU General Public License
! #   along with POPFile; if not, write to the Free Software
! #   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
! #
! #-------------------------------------------------------------------
! 
! [Settings]
! NumFields=8
! BackEnabled=0
! CancelEnabled=0
! 
! [Field 1]
! Type=GroupBox
! Text=
! Left=0
! Right=300
! Top=0
! Bottom=70
! 
! [Field 2]
! Type=RadioButton
! Text=
! Left=5
! Right=298
! Top=10
! Bottom=26
! Flags=Group
! State=0
! 
! [Field 3]
! Type=RadioButton
! Text=
! Left=5
! Right=298
! Top=30
! Bottom=46
! State=0
! 
! [Field 4]
! Type=RadioButton
! Text=
! Left=5
! Right=298
! Top=50
! Bottom=66
! State=1
! 
! [Field 5]
! Type=GroupBox
! Text=
! Left=0
! Right=300
! Top=75
! Bottom=139
! Flags=Group
! 
! [Field 6]
! Type=Label
! Text=
! Left=5
! Right=298
! Top=85
! Bottom=101
! 
! [Field 7]
! Type=Label
! Text=
! Left=5
! Right=298
! Top=103
! Bottom=119
! 
! [Field 8]
! Type=Label
! Text=
! Left=5
! Right=298
! Top=121
! Bottom=137
! 
! #--------------------
! # End of ioC.ini
! #--------------------

Index: ioE.ini
===================================================================
RCS file: /cvsroot/popfile/windows/ioE.ini,v
retrieving revision 1.4
retrieving revision 1.4.6.1
diff -C2 -d -r1.4 -r1.4.6.1
*** ioE.ini	9 Jun 2004 15:06:04 -0000	1.4
--- ioE.ini	19 Dec 2005 11:45:36 -0000	1.4.6.1
***************
*** 1,131 ****
! #-------------------------------------------------------------------
! #
! # ioE.ini --- This file is used by "adduser.nsi", one of the NSIS scripts
! #             used to create the Windows installer for POPFile. This file
! #             defines the layout of the custom page used to configure the
! #             Eudora personalities.
! #
! # Copyright (c) 2003-2004 John Graham-Cumming
! #
! #   This file is part of POPFile
! #
! #   POPFile is free software; you can redistribute it and/or modify
! #   it under the terms of the GNU General Public License as published by
! #   the Free Software Foundation; either version 2 of the License, or
! #   (at your option) any later version.
! #
! #   POPFile is distributed in the hope that it will be useful,
! #   but WITHOUT ANY WARRANTY; without even the implied warranty of
! #   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
! #   GNU General Public License for more details.
! #
! #   You should have received a copy of the GNU General Public License
! #   along with POPFile; if not, write to the Free Software
! #   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
! #
! #-------------------------------------------------------------------
! 
! [Settings]
! NumFields=12
! BackEnabled=1
! CancelEnabled=0
! 
! [Field 1]
! Type=label
! Text=
! Left=0
! Right=300
! Top=0
! Bottom=16
! 
! [Field 2]
! Type=checkbox
! Text=
! Left=0
! Right=300
! Top=18
! Bottom=34
! 
! [Field 3]
! Type=label
! Text=
! Left=0
! Right=300
! Top=123
! Bottom=139
! 
! [Field 4]
! Type=GroupBox
! Text=
! Left=0
! Right=300
! Top=38
! Bottom=120
! 
! [Field 5]
! Type=label
! Text=
! Left=5
! Right=95
! Top=54
! Bottom=70
! 
! [Field 6]
! Type=label
! Text=
! Left=5
! Right=95
! Top=71
! Bottom=87
! 
! [Field 7]
! Type=label
! Text=
! Left=5
! Right=95
! Top=88
! Bottom=104
! 
! [Field 8]
! Type=label
! Text=
! Left=5
! Right=95
! Top=105
! Bottom=113
! 
! [Field 9]
! Type=label
! Text=
! Left=96
! Right=298
! Top=54
! Bottom=70
! 
! [Field 10]
! Type=label
! Text=
! Left=96
! Right=298
! Top=71
! Bottom=87
! 
! [Field 11]
! Type=label
! Text=
! Left=96
! Right=298
! Top=88
! Bottom=104
! 
! [Field 12]
! Type=label
! Text=
! Left=96
! Right=298
! Top=105
! Bottom=113
! 
! #--------------------
! # End of ioE.ini
! #--------------------
--- 1,130 ----
! #-------------------------------------------------------------------
! #
! # ioE.ini --- This file is used by "adduser.nsi", one of the NSIS scripts
! #             used to create the Windows installer for POPFile. This file
! #             defines the layout of the custom page used to configure the
! #             Eudora personalities.
! #
! # Copyright (c) 2003-2004 John Graham-Cumming
! #
! #   This file is part of POPFile
! #
! #   POPFile is free software; you can redistribute it and/or modify it
! #   under the terms version 2 of the GNU General Public License as
! #   published by the Free Software Foundation.
! #
! #   POPFile is distributed in the hope that it will be useful,
! #   but WITHOUT ANY WARRANTY; without even the implied warranty of
! #   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
! #   GNU General Public License for more details.
! #
! #   You should have received a copy of the GNU General Public License
! #   along with POPFile; if not, write to the Free Software
! #   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
! #
! #-------------------------------------------------------------------
! 
! [Settings]
! NumFields=12
! BackEnabled=1
! CancelEnabled=0
! 
! [Field 1]
! Type=label
! Text=
! Left=0
! Right=300
! Top=0
! Bottom=16
! 
! [Field 2]
! Type=checkbox
! Text=
! Left=0
! Right=300
! Top=18
! Bottom=34
! 
! [Field 3]
! Type=label
! Text=
! Left=0
! Right=300
! Top=123
! Bottom=139
! 
! [Field 4]
! Type=GroupBox
! Text=
! Left=0
! Right=300
! Top=38
! Bottom=120
! 
! [Field 5]
! Type=label
! Text=
! Left=5
! Right=95
! Top=54
! Bottom=70
! 
! [Field 6]
! Type=label
! Text=
! Left=5
! Right=95
! Top=71
! Bottom=87
! 
! [Field 7]
! Type=label
! Text=
! Left=5
! Right=95
! Top=88
! Bottom=104
! 
! [Field 8]
! Type=label
! Text=
! Left=5
! Right=95
! Top=105
! Bottom=113
! 
! [Field 9]
! Type=label
! Text=
! Left=96
! Right=298
! Top=54
! Bottom=70
! 
! [Field 10]
! Type=label
! Text=
! Left=96
! Right=298
! Top=71
! Bottom=87
! 
! [Field 11]
! Type=label
! Text=
! Left=96
! Right=298
! Top=88
! Bottom=104
! 
! [Field 12]
! Type=label
! Text=
! Left=96
! Right=298
! Top=105
! Bottom=113
! 
! #--------------------
! # End of ioE.ini
! #--------------------

Index: pfi-library.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/pfi-library.nsh,v
retrieving revision 1.53.4.1
retrieving revision 1.53.4.2
diff -C2 -d -r1.53.4.1 -r1.53.4.2
*** pfi-library.nsh	13 Sep 2005 19:01:55 -0000	1.53.4.1
--- pfi-library.nsh	19 Dec 2005 11:45:36 -0000	1.53.4.2
***************
*** 9,16 ****
  #   This file is part of POPFile
  #
! #   POPFile is free software; you can redistribute it and/or modify
! #   it under the terms of the GNU General Public License as published by
! #   the Free Software Foundation; either version 2 of the License, or
! #   (at your option) any later version.
  #
  #   POPFile is distributed in the hope that it will be useful,
--- 9,15 ----
  #   This file is part of POPFile
  #
! #   POPFile is free software; you can redistribute it and/or modify it
! #   under the terms version 2 of the GNU General Public License as
! #   published by the Free Software Foundation.
  #
  #   POPFile is distributed in the hope that it will be useful,

Index: adduser.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/adduser.nsi,v
retrieving revision 1.59.4.4
retrieving revision 1.59.4.5
diff -C2 -d -r1.59.4.4 -r1.59.4.5
*** adduser.nsi	27 Sep 2005 11:47:33 -0000	1.59.4.4
--- adduser.nsi	19 Dec 2005 11:45:36 -0000	1.59.4.5
***************
*** 12,19 ****
  #   This file is part of POPFile
  #
! #   POPFile is free software; you can redistribute it and/or modify
! #   it under the terms of the GNU General Public License as published by
! #   the Free Software Foundation; either version 2 of the License, or
! #   (at your option) any later version.
  #
  #   POPFile is distributed in the hope that it will be useful,
--- 12,18 ----
  #   This file is part of POPFile
  #
! #   POPFile is free software; you can redistribute it and/or modify it
! #   under the terms version 2 of the GNU General Public License as
! #   published by the Free Software Foundation.
  #
  #   POPFile is distributed in the hope that it will be useful,

Index: installer-SecPOPFile-func.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/installer-SecPOPFile-func.nsh,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** installer-SecPOPFile-func.nsh	13 Sep 2005 19:01:55 -0000	1.1.2.2
--- installer-SecPOPFile-func.nsh	19 Dec 2005 11:45:36 -0000	1.1.2.3
***************
*** 8,15 ****
  #   This file is part of POPFile
  #
! #   POPFile is free software; you can redistribute it and/or modify
! #   it under the terms of the GNU General Public License as published by
! #   the Free Software Foundation; either version 2 of the License, or
! #   (at your option) any later version.
  #
  #   POPFile is distributed in the hope that it will be useful,
--- 8,14 ----
  #   This file is part of POPFile
  #
! #   POPFile is free software; you can redistribute it and/or modify it
! #   under the terms version 2 of the GNU General Public License as
! #   published by the Free Software Foundation.
  #
  #   POPFile is distributed in the hope that it will be useful,

Index: pfi-languages.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/pfi-languages.nsh,v
retrieving revision 1.2.6.2
retrieving revision 1.2.6.3
diff -C2 -d -r1.2.6.2 -r1.2.6.3
*** pfi-languages.nsh	15 Sep 2005 12:03:34 -0000	1.2.6.2
--- pfi-languages.nsh	19 Dec 2005 11:45:36 -0000	1.2.6.3
***************
*** 9,16 ****
  #   This file is part of POPFile
  #
! #   POPFile is free software; you can redistribute it and/or modify
! #   it under the terms of the GNU General Public License as published by
! #   the Free Software Foundation; either version 2 of the License, or
! #   (at your option) any later version.
  #
  #   POPFile is distributed in the hope that it will be useful,
--- 9,15 ----
  #   This file is part of POPFile
  #
! #   POPFile is free software; you can redistribute it and/or modify it
! #   under the terms version 2 of the GNU General Public License as
! #   published by the Free Software Foundation.
  #
  #   POPFile is distributed in the hope that it will be useful,

Index: adduser-Uninstall.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/adduser-Uninstall.nsh,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -C2 -d -r1.2.2.2 -r1.2.2.3
*** adduser-Uninstall.nsh	13 Sep 2005 19:01:55 -0000	1.2.2.2
--- adduser-Uninstall.nsh	19 Dec 2005 11:45:36 -0000	1.2.2.3
***************
*** 8,15 ****
  #   This file is part of POPFile
  #
! #   POPFile is free software; you can redistribute it and/or modify
! #   it under the terms of the GNU General Public License as published by
! #   the Free Software Foundation; either version 2 of the License, or
! #   (at your option) any later version.
  #
  #   POPFile is distributed in the hope that it will be useful,
--- 8,14 ----
  #   This file is part of POPFile
  #
! #   POPFile is free software; you can redistribute it and/or modify it
! #   under the terms version 2 of the GNU General Public License as
! #   published by the Free Software Foundation.
  #
  #   POPFile is distributed in the hope that it will be useful,

Index: ioF.ini
===================================================================
RCS file: /cvsroot/popfile/windows/ioF.ini,v
retrieving revision 1.5
retrieving revision 1.5.6.1
diff -C2 -d -r1.5 -r1.5.6.1
*** ioF.ini	9 Jun 2004 15:06:04 -0000	1.5
--- ioF.ini	19 Dec 2005 11:45:36 -0000	1.5.6.1
***************
*** 1,59 ****
! #-------------------------------------------------------------------
! #
! # ioF.ini --- This file is used by "adduser.nsi", one of the NSIS scripts
! #             used to create the Windows installer for POPFile. This file
! #             defines the layout of the custom page used to list the email
! #             clients found in the registry.
! #
! # Copyright (c) 2003-2004 John Graham-Cumming
! #
! #   This file is part of POPFile
! #
! #   POPFile is free software; you can redistribute it and/or modify
! #   it under the terms of the GNU General Public License as published by
! #   the Free Software Foundation; either version 2 of the License, or
! #   (at your option) any later version.
! #
! #   POPFile is distributed in the hope that it will be useful,
! #   but WITHOUT ANY WARRANTY; without even the implied warranty of
! #   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
! #   GNU General Public License for more details.
! #
! #   You should have received a copy of the GNU General Public License
! #   along with POPFile; if not, write to the Free Software
! #   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
! #
! #-------------------------------------------------------------------
! 
! [Settings]
! NumFields=3
! BackEnabled=1
! CancelEnabled=0
! 
! [Field 1]
! Type=label
! Text=
! Left=0
! Right=300
! Top=0
! Bottom=40
! 
! [Field 2]
! Type=text
! Left=0
! Right=300
! Top=43
! Bottom=79
! Flags=READONLY|MULTILINE|VSCROLL
! 
! [Field 3]
! Type=label
! Text=
! Left=0
! Right=300
! Top=83
! Bottom=139
! 
! #--------------------
! # End of ioF.ini
! #--------------------
--- 1,58 ----
! #-------------------------------------------------------------------
! #
! # ioF.ini --- This file is used by "adduser.nsi", one of the NSIS scripts
! #             used to create the Windows installer for POPFile. This file
! #             defines the layout of the custom page used to list the email
! #             clients found in the registry.
! #
! # Copyright (c) 2003-2004 John Graham-Cumming
! #
! #   This file is part of POPFile
! #
! #   POPFile is free software; you can redistribute it and/or modify it
! #   under the terms version 2 of the GNU General Public License as
! #   published by the Free Software Foundation.
! #
! #   POPFile is distributed in the hope that it will be useful,
! #   but WITHOUT ANY WARRANTY; without even the implied warranty of
! #   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
! #   GNU General Public License for more details.
! #
! #   You should have received a copy of the GNU General Public License
! #   along with POPFile; if not, write to the Free Software
! #   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
! #
! #-------------------------------------------------------------------
! 
! [Settings]
! NumFields=3
! BackEnabled=1
! CancelEnabled=0
! 
! [Field 1]
! Type=label
! Text=
! Left=0
! Right=300
! Top=0
! Bottom=40
! 
! [Field 2]
! Type=text
! Left=0
! Right=300
! Top=43
! Bottom=79
! Flags=READONLY|MULTILINE|VSCROLL
! 
! [Field 3]
! Type=label
! Text=
! Left=0
! Right=300
! Top=83
! Bottom=139
! 
! #--------------------
! # End of ioF.ini
! #--------------------

Index: installer-Uninstall.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/installer-Uninstall.nsh,v
retrieving revision 1.4.2.3
retrieving revision 1.4.2.4
diff -C2 -d -r1.4.2.3 -r1.4.2.4
*** installer-Uninstall.nsh	13 Sep 2005 19:06:48 -0000	1.4.2.3
--- installer-Uninstall.nsh	19 Dec 2005 11:45:36 -0000	1.4.2.4
***************
*** 8,15 ****
  #   This file is part of POPFile
  #
! #   POPFile is free software; you can redistribute it and/or modify
! #   it under the terms of the GNU General Public License as published by
! #   the Free Software Foundation; either version 2 of the License, or
! #   (at your option) any later version.
  #
  #   POPFile is distributed in the hope that it will be useful,
--- 8,14 ----
  #   This file is part of POPFile
  #
! #   POPFile is free software; you can redistribute it and/or modify it
! #   under the terms version 2 of the GNU General Public License as
! #   published by the Free Software Foundation.
  #
  #   POPFile is distributed in the hope that it will be useful,

Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.242.4.2
retrieving revision 1.242.4.3
diff -C2 -d -r1.242.4.2 -r1.242.4.3
*** installer.nsi	13 Sep 2005 19:06:48 -0000	1.242.4.2
--- installer.nsi	19 Dec 2005 11:45:36 -0000	1.242.4.3
***************
*** 26,33 ****
  #   This file is part of POPFile
  #
! #   POPFile is free software; you can redistribute it and/or modify
! #   it under the terms of the GNU General Public License as published by
! #   the Free Software Foundation; either version 2 of the License, or
! #   (at your option) any later version.
  #
  #   POPFile is distributed in the hope that it will be useful,
--- 26,32 ----
  #   This file is part of POPFile
  #
! #   POPFile is free software; you can redistribute it and/or modify it
! #   under the terms version 2 of the GNU General Public License as
! #   published by the Free Software Foundation.
  #
  #   POPFile is distributed in the hope that it will be useful,

Index: WriteEnvStr.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/WriteEnvStr.nsh,v
retrieving revision 1.12.4.1
retrieving revision 1.12.4.2
diff -C2 -d -r1.12.4.1 -r1.12.4.2
*** WriteEnvStr.nsh	13 Sep 2005 19:01:55 -0000	1.12.4.1
--- WriteEnvStr.nsh	19 Dec 2005 11:45:36 -0000	1.12.4.2
***************
*** 9,16 ****
  #   This file is part of POPFile
  #
! #   POPFile is free software; you can redistribute it and/or modify
! #   it under the terms of the GNU General Public License as published by
! #   the Free Software Foundation; either version 2 of the License, or
! #   (at your option) any later version.
  #
  #   POPFile is distributed in the hope that it will be useful,
--- 9,15 ----
  #   This file is part of POPFile
  #
! #   POPFile is free software; you can redistribute it and/or modify it
! #   under the terms version 2 of the GNU General Public License as
! #   published by the Free Software Foundation.
  #
  #   POPFile is distributed in the hope that it will be useful,

Index: runpopfile.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/runpopfile.nsi,v
retrieving revision 1.11.4.1
retrieving revision 1.11.4.2
diff -C2 -d -r1.11.4.1 -r1.11.4.2
*** runpopfile.nsi	13 Sep 2005 19:01:55 -0000	1.11.4.1
--- runpopfile.nsi	19 Dec 2005 11:45:36 -0000	1.11.4.2
***************
*** 15,22 ****
  #   This file is part of POPFile
  #
! #   POPFile is free software; you can redistribute it and/or modify
! #   it under the terms of the GNU General Public License as published by
! #   the Free Software Foundation; either version 2 of the License, or
! #   (at your option) any later version.
  #
  #   POPFile is distributed in the hope that it will be useful,
--- 15,21 ----
  #   This file is part of POPFile
  #
! #   POPFile is free software; you can redistribute it and/or modify it
! #   under the terms version 2 of the GNU General Public License as
! #   published by the Free Software Foundation.
  #
  #   POPFile is distributed in the hope that it will be useful,

Index: ioG.ini
===================================================================
RCS file: /cvsroot/popfile/windows/ioG.ini,v
retrieving revision 1.5
retrieving revision 1.5.6.1
diff -C2 -d -r1.5 -r1.5.6.1
*** ioG.ini	9 Jun 2004 15:06:04 -0000	1.5
--- ioG.ini	19 Dec 2005 11:45:36 -0000	1.5.6.1
***************
*** 1,48 ****
! #-------------------------------------------------------------------
! #
! # ioG.ini --- This file is used by "installer.nsi", one of the NSIS scripts
! #             used to create the Windows installer for POPFile. This file
! #             defines the layout of the custom page used for messages.
! #
! # Copyright (c) 2003-2004 John Graham-Cumming
! #
! #   This file is part of POPFile
! #
! #   POPFile is free software; you can redistribute it and/or modify
! #   it under the terms of the GNU General Public License as published by
! #   the Free Software Foundation; either version 2 of the License, or
! #   (at your option) any later version.
! #
! #   POPFile is distributed in the hope that it will be useful,
! #   but WITHOUT ANY WARRANTY; without even the implied warranty of
! #   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
! #   GNU General Public License for more details.
! #
! #   You should have received a copy of the GNU General Public License
! #   along with POPFile; if not, write to the Free Software
! #   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
! #
! #-------------------------------------------------------------------
! 
! [Settings]
! NumFields=2
! 
! [Field 1]
! Type=label
! Text=
! Left=0
! Right=300
! Top=0
! Bottom=72
! 
! [Field 2]
! Type=label
! Text=
! Left=0
! Right=300
! Top=75
! Bottom=139
! 
! #--------------------
! # End of ioG.ini
! #--------------------
--- 1,47 ----
! #-------------------------------------------------------------------
! #
! # ioG.ini --- This file is used by "installer.nsi", one of the NSIS scripts
! #             used to create the Windows installer for POPFile. This file
! #             defines the layout of the custom page used for messages.
! #
! # Copyright (c) 2003-2004 John Graham-Cumming
! #
! #   This file is part of POPFile
! #
! #   POPFile is free software; you can redistribute it and/or modify it
! #   under the terms version 2 of the GNU General Public License as
! #   published by the Free Software Foundation.
! #
! #   POPFile is distributed in the hope that it will be useful,
! #   but WITHOUT ANY WARRANTY; without even the implied warranty of
! #   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
! #   GNU General Public License for more details.
! #
! #   You should have received a copy of the GNU General Public License
! #   along with POPFile; if not, write to the Free Software
! #   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
! #
! #-------------------------------------------------------------------
! 
! [Settings]
! NumFields=2
! 
! [Field 1]
! Type=label
! Text=
! Left=0
! Right=300
! Top=0
! Bottom=72
! 
! [Field 2]
! Type=label
! Text=
! Left=0
! Right=300
! Top=75
! Bottom=139
! 
! #--------------------
! # End of ioG.ini
! #--------------------

Index: adduser-EmailConfig.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/adduser-EmailConfig.nsh,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** adduser-EmailConfig.nsh	13 Sep 2005 19:01:55 -0000	1.1.2.2
--- adduser-EmailConfig.nsh	19 Dec 2005 11:45:36 -0000	1.1.2.3
***************
*** 9,16 ****
  #   This file is part of POPFile
  #
! #   POPFile is free software; you can redistribute it and/or modify
! #   it under the terms of the GNU General Public License as published by
! #   the Free Software Foundation; either version 2 of the License, or
! #   (at your option) any later version.
  #
  #   POPFile is distributed in the hope that it will be useful,
--- 9,15 ----
  #   This file is part of POPFile
  #
! #   POPFile is free software; you can redistribute it and/or modify it
! #   under the terms version 2 of the GNU General Public License as
! #   published by the Free Software Foundation.
  #
  #   POPFile is distributed in the hope that it will be useful,

Index: msgcapture.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/msgcapture.nsi,v
retrieving revision 1.7.4.1
retrieving revision 1.7.4.2
diff -C2 -d -r1.7.4.1 -r1.7.4.2
*** msgcapture.nsi	13 Sep 2005 19:01:55 -0000	1.7.4.1
--- msgcapture.nsi	19 Dec 2005 11:45:36 -0000	1.7.4.2
***************
*** 11,18 ****
  #   This file is part of POPFile
  #
! #   POPFile is free software; you can redistribute it and/or modify
! #   it under the terms of the GNU General Public License as published by
! #   the Free Software Foundation; either version 2 of the License, or
! #   (at your option) any later version.
  #
  #   POPFile is distributed in the hope that it will be useful,
--- 11,17 ----
  #   This file is part of POPFile
  #
! #   POPFile is free software; you can redistribute it and/or modify it
! #   under the terms version 2 of the GNU General Public License as
! #   published by the Free Software Foundation.
  #
  #   POPFile is distributed in the hope that it will be useful,