diff --git a/src/mailimporter/filterimporterbase.h b/src/mailimporter/filterimporterbase.h --- a/src/mailimporter/filterimporterbase.h +++ b/src/mailimporter/filterimporterbase.h @@ -1,9 +1,10 @@ /* Copyright (C) 2017-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + This program 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. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/mailimporter/filterimporterbase.cpp b/src/mailimporter/filterimporterbase.cpp --- a/src/mailimporter/filterimporterbase.cpp +++ b/src/mailimporter/filterimporterbase.cpp @@ -1,9 +1,10 @@ /* Copyright (C) 2017-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + This program 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. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/mailimporter/filterinfogui.h b/src/mailimporter/filterinfogui.h --- a/src/mailimporter/filterinfogui.h +++ b/src/mailimporter/filterinfogui.h @@ -1,9 +1,10 @@ /* Copyright (c) 2012-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + This program 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. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/mailimporter/filterinfogui.cpp b/src/mailimporter/filterinfogui.cpp --- a/src/mailimporter/filterinfogui.cpp +++ b/src/mailimporter/filterinfogui.cpp @@ -1,9 +1,10 @@ /* Copyright (c) 2012-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + This program 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. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/mailimporter/filters/filterbalsa.h b/src/mailimporter/filters/filterbalsa.h --- a/src/mailimporter/filters/filterbalsa.h +++ b/src/mailimporter/filters/filterbalsa.h @@ -1,9 +1,10 @@ /* Copyright (c) 2012-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + This program 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. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/mailimporter/filters/filterbalsa.cpp b/src/mailimporter/filters/filterbalsa.cpp --- a/src/mailimporter/filters/filterbalsa.cpp +++ b/src/mailimporter/filters/filterbalsa.cpp @@ -1,9 +1,10 @@ /* Copyright (c) 2012-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + This program 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. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/mailimporter/filters/filterclawsmail.h b/src/mailimporter/filters/filterclawsmail.h --- a/src/mailimporter/filters/filterclawsmail.h +++ b/src/mailimporter/filters/filterclawsmail.h @@ -1,9 +1,10 @@ /* Copyright (c) 2012-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + This program 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. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/mailimporter/filters/filterclawsmail.cpp b/src/mailimporter/filters/filterclawsmail.cpp --- a/src/mailimporter/filters/filterclawsmail.cpp +++ b/src/mailimporter/filters/filterclawsmail.cpp @@ -1,9 +1,10 @@ /* Copyright (c) 2012-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + This program 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. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/mailimporter/filters/filterevolution_v3.h b/src/mailimporter/filters/filterevolution_v3.h --- a/src/mailimporter/filters/filterevolution_v3.h +++ b/src/mailimporter/filters/filterevolution_v3.h @@ -1,9 +1,10 @@ /* Copyright (c) 2012-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + This program 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. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/mailimporter/filters/filterevolution_v3.cpp b/src/mailimporter/filters/filterevolution_v3.cpp --- a/src/mailimporter/filters/filterevolution_v3.cpp +++ b/src/mailimporter/filters/filterevolution_v3.cpp @@ -1,9 +1,10 @@ /* Copyright (c) 2012-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + This program 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. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/mailimporter/filters/filtericedove.h b/src/mailimporter/filters/filtericedove.h --- a/src/mailimporter/filters/filtericedove.h +++ b/src/mailimporter/filters/filtericedove.h @@ -1,9 +1,10 @@ /* Copyright (c) 2015-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + This program 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. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/mailimporter/filters/filtericedove.cpp b/src/mailimporter/filters/filtericedove.cpp --- a/src/mailimporter/filters/filtericedove.cpp +++ b/src/mailimporter/filters/filtericedove.cpp @@ -1,9 +1,10 @@ /* Copyright (c) 2015-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + This program 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. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/mailimporter/filters/filtermailmangzip.h b/src/mailimporter/filters/filtermailmangzip.h --- a/src/mailimporter/filters/filtermailmangzip.h +++ b/src/mailimporter/filters/filtermailmangzip.h @@ -1,9 +1,10 @@ /* Copyright (c) 2013-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + This program 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. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/mailimporter/filters/filtermailmangzip.cpp b/src/mailimporter/filters/filtermailmangzip.cpp --- a/src/mailimporter/filters/filtermailmangzip.cpp +++ b/src/mailimporter/filters/filtermailmangzip.cpp @@ -1,9 +1,10 @@ /* Copyright (c) 2013-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + This program 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. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/mailimporter/filters/filterseamonkey.h b/src/mailimporter/filters/filterseamonkey.h --- a/src/mailimporter/filters/filterseamonkey.h +++ b/src/mailimporter/filters/filterseamonkey.h @@ -1,9 +1,10 @@ /* Copyright (C) 2017-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + This program 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. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/mailimporter/filters/filterseamonkey.cpp b/src/mailimporter/filters/filterseamonkey.cpp --- a/src/mailimporter/filters/filterseamonkey.cpp +++ b/src/mailimporter/filters/filterseamonkey.cpp @@ -1,9 +1,10 @@ /* Copyright (C) 2017-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + This program 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. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/mailimporter/importmailswidget.h b/src/mailimporter/importmailswidget.h --- a/src/mailimporter/importmailswidget.h +++ b/src/mailimporter/importmailswidget.h @@ -1,9 +1,10 @@ /* Copyright (c) 2012-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + This program 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. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/mailimporter/importmailswidget.cpp b/src/mailimporter/importmailswidget.cpp --- a/src/mailimporter/importmailswidget.cpp +++ b/src/mailimporter/importmailswidget.cpp @@ -1,9 +1,10 @@ /* Copyright (c) 2012-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + This program 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. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/mailimporter/mailimporter_utils.h b/src/mailimporter/mailimporter_utils.h --- a/src/mailimporter/mailimporter_utils.h +++ b/src/mailimporter/mailimporter_utils.h @@ -1,9 +1,10 @@ /* Copyright (c) 2012-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + This program 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. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/mailimporter/messagestatus.h b/src/mailimporter/messagestatus.h --- a/src/mailimporter/messagestatus.h +++ b/src/mailimporter/messagestatus.h @@ -1,9 +1,10 @@ /* Copyright (C) 2017-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + This program 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. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/mailimporter/messagestatus.cpp b/src/mailimporter/messagestatus.cpp --- a/src/mailimporter/messagestatus.cpp +++ b/src/mailimporter/messagestatus.cpp @@ -1,9 +1,10 @@ /* Copyright (C) 2017-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + This program 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. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/mailimporter/othermailerutil.h b/src/mailimporter/othermailerutil.h --- a/src/mailimporter/othermailerutil.h +++ b/src/mailimporter/othermailerutil.h @@ -1,9 +1,10 @@ /* Copyright (c) 2013-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + This program 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. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/mailimporter/othermailerutil.cpp b/src/mailimporter/othermailerutil.cpp --- a/src/mailimporter/othermailerutil.cpp +++ b/src/mailimporter/othermailerutil.cpp @@ -1,9 +1,10 @@ /* Copyright (c) 2013-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + This program 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. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/mailimporter/selectthunderbirdprofilewidget.h b/src/mailimporter/selectthunderbirdprofilewidget.h --- a/src/mailimporter/selectthunderbirdprofilewidget.h +++ b/src/mailimporter/selectthunderbirdprofilewidget.h @@ -1,9 +1,10 @@ /* Copyright (c) 2012-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + This program 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. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/mailimporter/selectthunderbirdprofilewidget.cpp b/src/mailimporter/selectthunderbirdprofilewidget.cpp --- a/src/mailimporter/selectthunderbirdprofilewidget.cpp +++ b/src/mailimporter/selectthunderbirdprofilewidget.cpp @@ -1,9 +1,10 @@ /* Copyright (c) 2012-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + This program 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. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/mailimporterakonadi/filterimporterakonadi.h b/src/mailimporterakonadi/filterimporterakonadi.h --- a/src/mailimporterakonadi/filterimporterakonadi.h +++ b/src/mailimporterakonadi/filterimporterakonadi.h @@ -1,9 +1,10 @@ /* Copyright (C) 2017-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + This program 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. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/mailimporterakonadi/filterimporterakonadi.cpp b/src/mailimporterakonadi/filterimporterakonadi.cpp --- a/src/mailimporterakonadi/filterimporterakonadi.cpp +++ b/src/mailimporterakonadi/filterimporterakonadi.cpp @@ -1,9 +1,10 @@ /* Copyright (C) 2017-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + This program 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. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/mailimporterakonadi/filterimportertestutil.h b/src/mailimporterakonadi/filterimportertestutil.h --- a/src/mailimporterakonadi/filterimportertestutil.h +++ b/src/mailimporterakonadi/filterimportertestutil.h @@ -1,9 +1,10 @@ /* Copyright (C) 2017-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + This program 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. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/mailimporterakonadi/filterimportertestutil.cpp b/src/mailimporterakonadi/filterimportertestutil.cpp --- a/src/mailimporterakonadi/filterimportertestutil.cpp +++ b/src/mailimporterakonadi/filterimportertestutil.cpp @@ -1,9 +1,10 @@ /* Copyright (c) 2017 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + This program 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. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of