LinGui: update license per BradleyS suggestion

43 files changed, 84 insertions, 84 deletions

diff --git a/gtk/src/appcast.c b/gtk/src/appcast.c
index a045b7a59..43e08b4bc 100644
--- a/gtk/src/appcast.c
+++ b/gtk/src/appcast.c
@@ -6,8 +6,8 @@
  * appcast.c is free software.
  *
  * You may 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.
+ * GNU General Public License version 2, as published by the Free Software
+ * Foundation.
  *
  * appcast.c is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/gtk/src/appcast.h b/gtk/src/appcast.h
index 5d80bb334..1510648b0 100644
--- a/gtk/src/appcast.h
+++ b/gtk/src/appcast.h
@@ -5,8 +5,8 @@
  * appcast.h is free software.
  *
  * You may 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.
+ * GNU General Public License version 2, as published by the Free Software
+ * Foundation.
  *
  * appcast.h is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/gtk/src/audiohandler.c b/gtk/src/audiohandler.c
index 9b2f18214..e03026fc4 100644
--- a/gtk/src/audiohandler.c
+++ b/gtk/src/audiohandler.c
@@ -6,8 +6,8 @@
  * audiohandler.c is free software.
  *
  * You may 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.
+ * GNU General Public License version 2, as published by the Free Software
+ * Foundation.
  *
  * audiohandler.c is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/gtk/src/audiohandler.h b/gtk/src/audiohandler.h
index 0ba517ef1..14849c179 100644
--- a/gtk/src/audiohandler.h
+++ b/gtk/src/audiohandler.h
@@ -6,8 +6,8 @@
  * audiohandler.h is free software.
  *
  * You may 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.
+ * GNU General Public License version 2, as published by the Free Software
+ * Foundation.
  *
  * audiohandler.h is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/gtk/src/callbacks.c b/gtk/src/callbacks.c
index 334fd7b7f..1302b6fb8 100644
--- a/gtk/src/callbacks.c
+++ b/gtk/src/callbacks.c
@@ -6,8 +6,8 @@
  * callbacks.c is free software.
  *
  * You may 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.
+ * GNU General Public License version 2, as published by the Free Software
+ * Foundation.
  *
  * callbacks.c is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/gtk/src/callbacks.h b/gtk/src/callbacks.h
index 8b689dd4e..110d1daaf 100644
--- a/gtk/src/callbacks.h
+++ b/gtk/src/callbacks.h
@@ -6,8 +6,8 @@
  * callbacks.h is free software.
  *
  * You may 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.
+ * GNU General Public License version 2, as published by the Free Software
+ * Foundation.
  *
  * callbacks.h is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/gtk/src/chapters.c b/gtk/src/chapters.c
index 68f6dea9f..eb911579a 100644
--- a/gtk/src/chapters.c
+++ b/gtk/src/chapters.c
@@ -6,8 +6,8 @@
  * chapters.c is free software.
  *
  * You may 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.
+ * GNU General Public License version 2, as published by the Free Software
+ * Foundation.
  *
  * chapters.c is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/gtk/src/chapters.h b/gtk/src/chapters.h
index 2d73d3e6c..264ad5886 100644
--- a/gtk/src/chapters.h
+++ b/gtk/src/chapters.h
@@ -6,8 +6,8 @@
  * callbacks.h is free software.
  *
  * You may 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.
+ * GNU General Public License version 2, as published by the Free Software
+ * Foundation.
  *
  * callbacks.h is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/gtk/src/ghb-dvd.c b/gtk/src/ghb-dvd.c
index 31d77bb10..d42cdc4b3 100644
--- a/gtk/src/ghb-dvd.c
+++ b/gtk/src/ghb-dvd.c
@@ -5,8 +5,8 @@
  * ghb-dvd.c is free software.
  *
  * You may 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.
+ * GNU General Public License version 2, as published by the Free Software
+ * Foundation.
  *
  * ghb-dvd.c is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/gtk/src/ghb-dvd.h b/gtk/src/ghb-dvd.h
index 0a72c3e66..e1963821d 100644
--- a/gtk/src/ghb-dvd.h
+++ b/gtk/src/ghb-dvd.h
@@ -5,8 +5,8 @@
  * ghb-dvd.h is free software.
  *
  * You may 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.
+ * GNU General Public License version 2, as published by the Free Software
+ * Foundation.
  *
  * ghb-dvd.h is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/gtk/src/ghb3.ui b/gtk/src/ghb3.ui
index 2f68119d0..e2c530b5a 100644
--- a/gtk/src/ghb3.ui
+++ b/gtk/src/ghb3.ui
@@ -1678,7 +1678,7 @@ Copyright © 2004 - , HandBrake Devs</property>
     <property name="comments" translatable="yes">HandBrake is a GPL-licensed, multiplatform, multithreaded video transcoder.</property>
     <property name="website">https://handbrake.fr</property>
     <property name="website_label" translatable="yes">https://handbrake.fr</property>
-    <property name="license" translatable="yes">HandBrake 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.
+    <property name="license" translatable="yes">HandBrake 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.
 
 HandBrake 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.
 
diff --git a/gtk/src/ghb4.ui b/gtk/src/ghb4.ui
index 9675cc02c..a04a2e3e6 100644
--- a/gtk/src/ghb4.ui
+++ b/gtk/src/ghb4.ui
@@ -1430,7 +1430,7 @@ Copyright © 2004 - , HandBrake Devs</property>
     <property name="website">https://handbrake.fr</property>
     <property name="website_label" translatable="yes">https://handbrake.fr</property>
     <property name="license-type">GTK_LICENSE_GPL_2_0_ONLY</property>
-    <property name="license" translatable="yes">HandBrake 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.
+    <property name="license" translatable="yes">HandBrake 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.
 
 HandBrake 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.
 
diff --git a/gtk/src/ghbcompat.c b/gtk/src/ghbcompat.c
index a647eb6cf..1eafdb093 100644
--- a/gtk/src/ghbcompat.c
+++ b/gtk/src/ghbcompat.c
@@ -5,8 +5,8 @@
  * ghbcompat.h is free software.
  *
  * You may 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.
+ * GNU General Public License version 2, as published by the Free Software
+ * Foundation.
  *
  * ghbcompat.h is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/gtk/src/ghbcompat.h b/gtk/src/ghbcompat.h
index 5e9f6e748..215964041 100644
--- a/gtk/src/ghbcompat.h
+++ b/gtk/src/ghbcompat.h
@@ -5,8 +5,8 @@
  * ghbcompat.h is free software.
  *
  * You may 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.
+ * GNU General Public License version 2, as published by the Free Software
+ * Foundation.
  *
  * ghbcompat.h is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/gtk/src/hb-backend.c b/gtk/src/hb-backend.c
index 85b0c5668..7f2ab45a4 100644
--- a/gtk/src/hb-backend.c
+++ b/gtk/src/hb-backend.c
@@ -5,8 +5,8 @@
  * hb-backend.c is free software.
  *
  * You may 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.
+ * GNU General Public License version 2, as published by the Free Software
+ * Foundation.
  *
  * hb-backend.c is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/gtk/src/hb-backend.h b/gtk/src/hb-backend.h
index 6552c71eb..09bcc3823 100644
--- a/gtk/src/hb-backend.h
+++ b/gtk/src/hb-backend.h
@@ -5,8 +5,8 @@
  * hb-backend.h is free software.
  *
  * You may 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.
+ * GNU General Public License version 2, as published by the Free Software
+ * Foundation.
  *
  * hb-backend.h is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/gtk/src/icons.c b/gtk/src/icons.c
index 94a390d6f..292adc194 100644
--- a/gtk/src/icons.c
+++ b/gtk/src/icons.c
@@ -5,8 +5,8 @@
  * icons.c is free software.
  *
  * You may 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.
+ * GNU General Public License version 2, as published by the Free Software
+ * Foundation.
  *
  * icons.c is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/gtk/src/icons.h b/gtk/src/icons.h
index 0cf7739b8..083d469cc 100644
--- a/gtk/src/icons.h
+++ b/gtk/src/icons.h
@@ -5,8 +5,8 @@
  * icons.h is free software.
  *
  * You may 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.
+ * GNU General Public License version 2, as published by the Free Software
+ * Foundation.
  *
  * icons.h is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/gtk/src/jobdict.c b/gtk/src/jobdict.c
index 82ad98b0a..b28c617da 100644
--- a/gtk/src/jobdict.c
+++ b/gtk/src/jobdict.c
@@ -6,8 +6,8 @@
  * settings.c is free software.
  *
  * You may 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.
+ * GNU General Public License version 2, as published by the Free Software
+ * Foundation.
  *
  * settings.c is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/gtk/src/jobdict.h b/gtk/src/jobdict.h
index 532955c50..c860f722b 100644
--- a/gtk/src/jobdict.h
+++ b/gtk/src/jobdict.h
@@ -5,8 +5,8 @@
  * settings.h is free software.
  *
  * You may 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.
+ * GNU General Public License version 2, as published by the Free Software
+ * Foundation.
  *
  * settings.h is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/gtk/src/main.c b/gtk/src/main.c
index aaddf1f2d..ae707de41 100644
--- a/gtk/src/main.c
+++ b/gtk/src/main.c
@@ -6,8 +6,8 @@
  * main.c is free software.
  *
  * You may 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.
+ * GNU General Public License version 2, as published by the Free Software
+ * Foundation.
  *
  * main.c is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/gtk/src/plist.c b/gtk/src/plist.c
index e6214accf..e06069f72 100644
--- a/gtk/src/plist.c
+++ b/gtk/src/plist.c
@@ -5,8 +5,8 @@
  * plist.c is free software.
  *
  * You may 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.
+ * GNU General Public License version 2, as published by the Free Software
+ * Foundation.
  *
  * plist.c is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/gtk/src/plist.h b/gtk/src/plist.h
index 4ea4724b4..a9190b1b9 100644
--- a/gtk/src/plist.h
+++ b/gtk/src/plist.h
@@ -5,8 +5,8 @@
  * plist.h is free software.
  *
  * You may 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.
+ * GNU General Public License version 2, as published by the Free Software
+ * Foundation.
  *
  * plist.h is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/gtk/src/presets.c b/gtk/src/presets.c
index a3c66c050..c3e98b434 100644
--- a/gtk/src/presets.c
+++ b/gtk/src/presets.c
@@ -6,8 +6,8 @@
  * presets.c is free software.
  *
  * You may 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.
+ * GNU General Public License version 2, as published by the Free Software
+ * Foundation.
  *
  * presets.c is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/gtk/src/presets.h b/gtk/src/presets.h
index ddb954fa3..d1d3da73c 100644
--- a/gtk/src/presets.h
+++ b/gtk/src/presets.h
@@ -5,8 +5,8 @@
  * presets.h is free software.
  *
  * You may 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.
+ * GNU General Public License version 2, as published by the Free Software
+ * Foundation.
  *
  * presets.h is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/gtk/src/preview.c b/gtk/src/preview.c
index 7330b2b80..bc4477693 100644
--- a/gtk/src/preview.c
+++ b/gtk/src/preview.c
@@ -6,8 +6,8 @@
  * preview.c is free software.
  *
  * You may 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.
+ * GNU General Public License version 2, as published by the Free Software
+ * Foundation.
  *
  * preview.c is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/gtk/src/preview.h b/gtk/src/preview.h
index 5166597cf..8dd7a9f1c 100644
--- a/gtk/src/preview.h
+++ b/gtk/src/preview.h
@@ -5,8 +5,8 @@
  * preview.h is free software.
  *
  * You may 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.
+ * GNU General Public License version 2, as published by the Free Software
+ * Foundation.
  *
  * preview.h is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/gtk/src/queuehandler.c b/gtk/src/queuehandler.c
index c156c10b6..cf6c596ac 100644
--- a/gtk/src/queuehandler.c
+++ b/gtk/src/queuehandler.c
@@ -6,8 +6,8 @@
  * queuehandler.c is free software.
  *
  * You may 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.
+ * GNU General Public License version 2, as published by the Free Software
+ * Foundation.
  *
  * queuehandler.c is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/gtk/src/queuehandler.h b/gtk/src/queuehandler.h
index 12b09198e..aca59aade 100644
--- a/gtk/src/queuehandler.h
+++ b/gtk/src/queuehandler.h
@@ -6,8 +6,8 @@
  * queuehandler.h is free software.
  *
  * You may 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.
+ * GNU General Public License version 2, as published by the Free Software
+ * Foundation.
  *
  * queuehandler.h is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/gtk/src/renderer_button.c b/gtk/src/renderer_button.c
index ac48c65b0..de9d92bac 100644
--- a/gtk/src/renderer_button.c
+++ b/gtk/src/renderer_button.c
@@ -5,8 +5,8 @@
  * render_button.c is free software.
  *
  * You may 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.
+ * GNU General Public License version 2, as published by the Free Software
+ * Foundation.
  *
  * render_button.c is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/gtk/src/renderer_button.h b/gtk/src/renderer_button.h
index 1bfaf2fdf..2685b9819 100644
--- a/gtk/src/renderer_button.h
+++ b/gtk/src/renderer_button.h
@@ -5,8 +5,8 @@
  * render_button.h is free software.
  *
  * You may 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.
+ * GNU General Public License version 2, as published by the Free Software
+ * Foundation.
  *
  * render_button.h is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/gtk/src/resources.c b/gtk/src/resources.c
index 7dbe84614..08d8c794a 100644
--- a/gtk/src/resources.c
+++ b/gtk/src/resources.c
@@ -6,8 +6,8 @@
  * resources.c is free software.
  *
  * You may 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.
+ * GNU General Public License version 2, as published by the Free Software
+ * Foundation.
  *
  * resources.c is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/gtk/src/resources.h b/gtk/src/resources.h
index b928145b1..12c4eed9b 100644
--- a/gtk/src/resources.h
+++ b/gtk/src/resources.h
@@ -5,8 +5,8 @@
  * resources.h is free software.
  *
  * You may 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.
+ * GNU General Public License version 2, as published by the Free Software
+ * Foundation.
  *
  * resources.h is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/gtk/src/settings.c b/gtk/src/settings.c
index 811613b91..67292810a 100644
--- a/gtk/src/settings.c
+++ b/gtk/src/settings.c
@@ -6,8 +6,8 @@
  * settings.c is free software.
  *
  * You may 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.
+ * GNU General Public License version 2, as published by the Free Software
+ * Foundation.
  *
  * settings.c is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/gtk/src/settings.h b/gtk/src/settings.h
index 255e02122..cd7061a1d 100644
--- a/gtk/src/settings.h
+++ b/gtk/src/settings.h
@@ -5,8 +5,8 @@
  * settings.h is free software.
  *
  * You may 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.
+ * GNU General Public License version 2, as published by the Free Software
+ * Foundation.
  *
  * settings.h is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/gtk/src/subtitlehandler.c b/gtk/src/subtitlehandler.c
index 191de9df5..e01974ac7 100644
--- a/gtk/src/subtitlehandler.c
+++ b/gtk/src/subtitlehandler.c
@@ -6,8 +6,8 @@
  * subtitlehandler.c is free software.
  *
  * You may 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.
+ * GNU General Public License version 2, as published by the Free Software
+ * Foundation.
  *
  * subtitlehandler.c is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/gtk/src/subtitlehandler.h b/gtk/src/subtitlehandler.h
index af02d4f7b..d857fe297 100644
--- a/gtk/src/subtitlehandler.h
+++ b/gtk/src/subtitlehandler.h
@@ -6,8 +6,8 @@
  * subtitlehandler.h is free software.
  *
  * You may 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.
+ * GNU General Public License version 2, as published by the Free Software
+ * Foundation.
  *
  * subtitlehandler.h is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/gtk/src/titledict.c b/gtk/src/titledict.c
index 6e35ef0ca..277c07192 100644
--- a/gtk/src/titledict.c
+++ b/gtk/src/titledict.c
@@ -6,8 +6,8 @@
  * settings.c is free software.
  *
  * You may 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.
+ * GNU General Public License version 2, as published by the Free Software
+ * Foundation.
  *
  * settings.c is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/gtk/src/titledict.h b/gtk/src/titledict.h
index 888c7f13e..e86c2e18f 100644
--- a/gtk/src/titledict.h
+++ b/gtk/src/titledict.h
@@ -5,8 +5,8 @@
  * settings.h is free software.
  *
  * You may 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.
+ * GNU General Public License version 2, as published by the Free Software
+ * Foundation.
  *
  * settings.h is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/gtk/src/values.c b/gtk/src/values.c
index 0609ba032..ad31a9606 100644
--- a/gtk/src/values.c
+++ b/gtk/src/values.c
@@ -6,8 +6,8 @@
  * values.c is free software.
  *
  * You may 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.
+ * GNU General Public License version 2, as published by the Free Software
+ * Foundation.
  *
  * values.c is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/gtk/src/values.h b/gtk/src/values.h
index ff352db83..c7aae6337 100644
--- a/gtk/src/values.h
+++ b/gtk/src/values.h
@@ -5,8 +5,8 @@
  * values.h is free software.
  *
  * You may 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.
+ * GNU General Public License version 2, as published by the Free Software
+ * Foundation.
  *
  * values.h is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/gtk/src/videohandler.c b/gtk/src/videohandler.c
index 36dc3d849..dcd73dd59 100644
--- a/gtk/src/videohandler.c
+++ b/gtk/src/videohandler.c
@@ -6,8 +6,8 @@
  * videohandler.c is free software.
  *
  * You may 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.
+ * GNU General Public License version 2, as published by the Free Software
+ * Foundation.
  *
  * videohandler.c is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/gtk/src/videohandler.h b/gtk/src/videohandler.h
index ecdf7e04b..1b6d603d4 100644
--- a/gtk/src/videohandler.h
+++ b/gtk/src/videohandler.h
@@ -6,8 +6,8 @@
  * videohandler.h is free software.
  *
  * You may 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.
+ * GNU General Public License version 2, as published by the Free Software
+ * Foundation.
  *
  * videohandler.h is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of