diff --git a/messagecomposer/src/job/attachmentclipboardjob.h b/messagecomposer/src/job/attachmentclipboardjob.h --- a/messagecomposer/src/job/attachmentclipboardjob.h +++ b/messagecomposer/src/job/attachmentclipboardjob.h @@ -2,8 +2,9 @@ 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. + 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/messagecomposer/src/job/attachmentclipboardjob.cpp b/messagecomposer/src/job/attachmentclipboardjob.cpp --- a/messagecomposer/src/job/attachmentclipboardjob.cpp +++ b/messagecomposer/src/job/attachmentclipboardjob.cpp @@ -2,8 +2,9 @@ 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. + 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/messagecomposer/src/job/attachmentvcardfromaddressbookjob.h b/messagecomposer/src/job/attachmentvcardfromaddressbookjob.h --- a/messagecomposer/src/job/attachmentvcardfromaddressbookjob.h +++ b/messagecomposer/src/job/attachmentvcardfromaddressbookjob.h @@ -2,8 +2,9 @@ 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. + 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/messagecomposer/src/job/attachmentvcardfromaddressbookjob.cpp b/messagecomposer/src/job/attachmentvcardfromaddressbookjob.cpp --- a/messagecomposer/src/job/attachmentvcardfromaddressbookjob.cpp +++ b/messagecomposer/src/job/attachmentvcardfromaddressbookjob.cpp @@ -2,8 +2,9 @@ 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. + 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/messagecomposer/src/utils/kleo_util.h b/messagecomposer/src/utils/kleo_util.h --- a/messagecomposer/src/utils/kleo_util.h +++ b/messagecomposer/src/utils/kleo_util.h @@ -5,8 +5,9 @@ Copyright (c) 2004 Marc Mutz KMail 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. + 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. KMail is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/messagecore/src/misc/imagecollector.h b/messagecore/src/misc/imagecollector.h --- a/messagecore/src/misc/imagecollector.h +++ b/messagecore/src/misc/imagecollector.h @@ -6,8 +6,9 @@ * Copyright (c) 2011 Torgny Nyblom * * KMail 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. + * 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. * * KMail is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/messagecore/src/misc/imagecollector.cpp b/messagecore/src/misc/imagecollector.cpp --- a/messagecore/src/misc/imagecollector.cpp +++ b/messagecore/src/misc/imagecollector.cpp @@ -6,8 +6,9 @@ * Copyright (c) 2011 Torgny Nyblom * * KMail 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. + * 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. * * KMail is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/messagelist/src/core/widgets/quicksearchwarning.h b/messagelist/src/core/widgets/quicksearchwarning.h --- a/messagelist/src/core/widgets/quicksearchwarning.h +++ b/messagelist/src/core/widgets/quicksearchwarning.h @@ -2,8 +2,9 @@ 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. + 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/messagelist/src/core/widgets/quicksearchwarning.cpp b/messagelist/src/core/widgets/quicksearchwarning.cpp --- a/messagelist/src/core/widgets/quicksearchwarning.cpp +++ b/messagelist/src/core/widgets/quicksearchwarning.cpp @@ -2,8 +2,9 @@ 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. + 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/messagelist/src/core/widgets/searchlinestatus.h b/messagelist/src/core/widgets/searchlinestatus.h --- a/messagelist/src/core/widgets/searchlinestatus.h +++ b/messagelist/src/core/widgets/searchlinestatus.h @@ -2,8 +2,9 @@ Copyright (c) 2016-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. + 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/messagelist/src/core/widgets/searchlinestatus.cpp b/messagelist/src/core/widgets/searchlinestatus.cpp --- a/messagelist/src/core/widgets/searchlinestatus.cpp +++ b/messagelist/src/core/widgets/searchlinestatus.cpp @@ -2,8 +2,9 @@ Copyright (c) 2016-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. + 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/messagelist/src/messagelistutil.h b/messagelist/src/messagelistutil.h --- a/messagelist/src/messagelistutil.h +++ b/messagelist/src/messagelistutil.h @@ -3,8 +3,9 @@ Copyright (c) 2011-2018 Montel Laurent KMail 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. + 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. KMail is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/messagelist/src/messagelistutil.cpp b/messagelist/src/messagelistutil.cpp --- a/messagelist/src/messagelistutil.cpp +++ b/messagelist/src/messagelistutil.cpp @@ -3,8 +3,9 @@ Copyright (c) 2011-2018 Montel Laurent KMail 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. + 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. KMail is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/messagelist/src/messagelistutil_p.h b/messagelist/src/messagelistutil_p.h --- a/messagelist/src/messagelistutil_p.h +++ b/messagelist/src/messagelistutil_p.h @@ -3,8 +3,9 @@ Copyright (c) 2011-2018 Montel Laurent KMail 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. + 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. KMail is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/mimetreeparser/src/bodypartformatter.cpp b/mimetreeparser/src/bodypartformatter.cpp --- a/mimetreeparser/src/bodypartformatter.cpp +++ b/mimetreeparser/src/bodypartformatter.cpp @@ -5,8 +5,9 @@ Copyright (c) 2003 Marc Mutz KMail 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. + 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. KMail is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/mimetreeparser/src/memento/cryptobodypartmemento.h b/mimetreeparser/src/memento/cryptobodypartmemento.h --- a/mimetreeparser/src/memento/cryptobodypartmemento.h +++ b/mimetreeparser/src/memento/cryptobodypartmemento.h @@ -2,8 +2,9 @@ Copyright (c) 2014-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. + 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/mimetreeparser/src/memento/cryptobodypartmemento.cpp b/mimetreeparser/src/memento/cryptobodypartmemento.cpp --- a/mimetreeparser/src/memento/cryptobodypartmemento.cpp +++ b/mimetreeparser/src/memento/cryptobodypartmemento.cpp @@ -2,8 +2,9 @@ Copyright (c) 2014-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. + 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/mimetreeparser/src/memento/decryptverifybodypartmemento.h b/mimetreeparser/src/memento/decryptverifybodypartmemento.h --- a/mimetreeparser/src/memento/decryptverifybodypartmemento.h +++ b/mimetreeparser/src/memento/decryptverifybodypartmemento.h @@ -2,8 +2,9 @@ Copyright (c) 2014-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. + 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/mimetreeparser/src/memento/decryptverifybodypartmemento.cpp b/mimetreeparser/src/memento/decryptverifybodypartmemento.cpp --- a/mimetreeparser/src/memento/decryptverifybodypartmemento.cpp +++ b/mimetreeparser/src/memento/decryptverifybodypartmemento.cpp @@ -2,8 +2,9 @@ Copyright (c) 2014-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. + 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/mimetreeparser/src/memento/verifydetachedbodypartmemento.h b/mimetreeparser/src/memento/verifydetachedbodypartmemento.h --- a/mimetreeparser/src/memento/verifydetachedbodypartmemento.h +++ b/mimetreeparser/src/memento/verifydetachedbodypartmemento.h @@ -2,8 +2,9 @@ Copyright (c) 2014-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. + 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/mimetreeparser/src/memento/verifydetachedbodypartmemento.cpp b/mimetreeparser/src/memento/verifydetachedbodypartmemento.cpp --- a/mimetreeparser/src/memento/verifydetachedbodypartmemento.cpp +++ b/mimetreeparser/src/memento/verifydetachedbodypartmemento.cpp @@ -2,8 +2,9 @@ Copyright (c) 2014-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. + 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/mimetreeparser/src/memento/verifyopaquebodypartmemento.h b/mimetreeparser/src/memento/verifyopaquebodypartmemento.h --- a/mimetreeparser/src/memento/verifyopaquebodypartmemento.h +++ b/mimetreeparser/src/memento/verifyopaquebodypartmemento.h @@ -2,8 +2,9 @@ Copyright (c) 2014-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. + 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/mimetreeparser/src/memento/verifyopaquebodypartmemento.cpp b/mimetreeparser/src/memento/verifyopaquebodypartmemento.cpp --- a/mimetreeparser/src/memento/verifyopaquebodypartmemento.cpp +++ b/mimetreeparser/src/memento/verifyopaquebodypartmemento.cpp @@ -2,8 +2,9 @@ Copyright (c) 2014-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. + 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/mimetreeparser/src/objecttreeparser.h b/mimetreeparser/src/objecttreeparser.h --- a/mimetreeparser/src/objecttreeparser.h +++ b/mimetreeparser/src/objecttreeparser.h @@ -7,8 +7,9 @@ Copyright (c) 2009 Andras Mantia KMail 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. + 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. KMail is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/mimetreeparser/src/objecttreeparser.cpp b/mimetreeparser/src/objecttreeparser.cpp --- a/mimetreeparser/src/objecttreeparser.cpp +++ b/mimetreeparser/src/objecttreeparser.cpp @@ -8,8 +8,9 @@ Copyright (c) 2015 Sandro Knauß KMail 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. + 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. KMail is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/mimetreeparser/src/partmetadata.h b/mimetreeparser/src/partmetadata.h --- a/mimetreeparser/src/partmetadata.h +++ b/mimetreeparser/src/partmetadata.h @@ -6,8 +6,9 @@ Copyright (c) 2003 Marc Mutz This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License, - version 2.0, as published by the Free Software Foundation. + 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. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, US diff --git a/templateparser/src/templatestexteditor.h b/templateparser/src/templatestexteditor.h --- a/templateparser/src/templatestexteditor.h +++ b/templateparser/src/templatestexteditor.h @@ -2,8 +2,9 @@ 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. + 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/templateparser/src/templatestexteditor.cpp b/templateparser/src/templatestexteditor.cpp --- a/templateparser/src/templatestexteditor.cpp +++ b/templateparser/src/templatestexteditor.cpp @@ -2,8 +2,9 @@ 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. + 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/templateparser/src/templatesutil.h b/templateparser/src/templatesutil.h --- a/templateparser/src/templatesutil.h +++ b/templateparser/src/templatesutil.h @@ -2,8 +2,9 @@ Copyright (c) 2011-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. + 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 progam is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/templateparser/src/templatesutil.cpp b/templateparser/src/templatesutil.cpp --- a/templateparser/src/templatesutil.cpp +++ b/templateparser/src/templatesutil.cpp @@ -2,8 +2,9 @@ Copyright (c) 2011-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. + 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/templateparser/src/templatesutil_p.h b/templateparser/src/templatesutil_p.h --- a/templateparser/src/templatesutil_p.h +++ b/templateparser/src/templatesutil_p.h @@ -2,8 +2,9 @@ Copyright (c) 2011-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. + 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 progam is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of