LinGui: fix license and po file merges

45 files changed, 46 insertions, 88 deletions

diff --git a/gtk/po/Makevars b/gtk/po/Makevars
index 9b02d79ba..c9e3208c1 100644
--- a/gtk/po/Makevars
+++ b/gtk/po/Makevars
@@ -69,7 +69,7 @@ MSGINIT_OPTIONS =
 # has changed.  Possible values are "yes" and "no".  Set this to no if
 # the POT file is checked in the repository and the version control
 # program ignores timestamps.
-PO_DEPENDS_ON_POT = yes
+PO_DEPENDS_ON_POT = no
 
 # This tells whether or not to forcibly update $(DOMAIN).pot and
 # regenerate PO files on "make dist".  Possible values are "yes" and
diff --git a/gtk/po/ghb.pot b/gtk/po/ghb.pot
index a708c3743..36f6b7d46 100644
--- a/gtk/po/ghb.pot
+++ b/gtk/po/ghb.pot
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ghb 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-13 08:41-0700\n"
+"POT-Creation-Date: 2019-11-06 12:44-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -328,8 +328,7 @@ msgstr ""
 msgid ""
 "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, or (at your option) "
-"any later version.\n"
+"Software Foundation; either version 2 of the License.\n"
 "\n"
 "HandBrake is distributed in the hope that it will be useful, but WITHOUT ANY "
 "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
diff --git a/gtk/src/appcast.c b/gtk/src/appcast.c
index 31a307f70..a045b7a59 100644
--- a/gtk/src/appcast.c
+++ b/gtk/src/appcast.c
@@ -7,8 +7,7 @@
  *
  * 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, or (at your option)
- * any later version.
+ * Foundation; either version 2 of the License.
  *
  * 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 8c6269659..5d80bb334 100644
--- a/gtk/src/appcast.h
+++ b/gtk/src/appcast.h
@@ -6,8 +6,7 @@
  *
  * 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, or (at your option)
- * any later version.
+ * Foundation; either version 2 of the License.
  *
  * 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 404c37659..9b2f18214 100644
--- a/gtk/src/audiohandler.c
+++ b/gtk/src/audiohandler.c
@@ -7,8 +7,7 @@
  *
  * 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, or (at your option)
- * any later version.
+ * Foundation; either version 2 of the License.
  *
  * 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 33353ebaa..0ba517ef1 100644
--- a/gtk/src/audiohandler.h
+++ b/gtk/src/audiohandler.h
@@ -7,8 +7,7 @@
  *
  * 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, or (at your option)
- * any later version.
+ * Foundation; either version 2 of the License.
  *
  * 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 0a9442c9b..334fd7b7f 100644
--- a/gtk/src/callbacks.c
+++ b/gtk/src/callbacks.c
@@ -7,8 +7,7 @@
  *
  * 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, or (at your option)
- * any later version.
+ * Foundation; either version 2 of the License.
  *
  * 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 d2390e0ff..8b689dd4e 100644
--- a/gtk/src/callbacks.h
+++ b/gtk/src/callbacks.h
@@ -7,8 +7,7 @@
  *
  * 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, or (at your option)
- * any later version.
+ * Foundation; either version 2 of the License.
  *
  * 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 4e81c4d71..68f6dea9f 100644
--- a/gtk/src/chapters.c
+++ b/gtk/src/chapters.c
@@ -7,8 +7,7 @@
  *
  * 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, or (at your option)
- * any later version.
+ * Foundation; either version 2 of the License.
  *
  * 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 7286f8623..2d73d3e6c 100644
--- a/gtk/src/chapters.h
+++ b/gtk/src/chapters.h
@@ -7,8 +7,7 @@
  *
  * 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, or (at your option)
- * any later version.
+ * Foundation; either version 2 of the License.
  *
  * 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 cfad92d53..31d77bb10 100644
--- a/gtk/src/ghb-dvd.c
+++ b/gtk/src/ghb-dvd.c
@@ -6,8 +6,7 @@
  *
  * 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, or (at your option)
- * any later version.
+ * Foundation; either version 2 of the License.
  *
  * 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 c8abdf90e..0a72c3e66 100644
--- a/gtk/src/ghb-dvd.h
+++ b/gtk/src/ghb-dvd.h
@@ -6,8 +6,7 @@
  *
  * 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, or (at your option)
- * any later version.
+ * Foundation; either version 2 of the License.
  *
  * 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 1a7eea08a..2f68119d0 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, or (at your option) any later version.
+    <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.
 
 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 ca4d3d36a..9675cc02c 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, or (at your option) any later version.
+    <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.
 
 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 ce7623962..a647eb6cf 100644
--- a/gtk/src/ghbcompat.c
+++ b/gtk/src/ghbcompat.c
@@ -6,8 +6,7 @@
  *
  * 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, or (at your option)
- * any later version.
+ * Foundation; either version 2 of the License.
  *
  * 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 0db9d27ea..5e9f6e748 100644
--- a/gtk/src/ghbcompat.h
+++ b/gtk/src/ghbcompat.h
@@ -6,8 +6,7 @@
  *
  * 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, or (at your option)
- * any later version.
+ * Foundation; either version 2 of the License.
  *
  * 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 535d60f93..85b0c5668 100644
--- a/gtk/src/hb-backend.c
+++ b/gtk/src/hb-backend.c
@@ -6,8 +6,7 @@
  *
  * 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, or (at your option)
- * any later version.
+ * Foundation; either version 2 of the License.
  *
  * 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 38b1545a8..6552c71eb 100644
--- a/gtk/src/hb-backend.h
+++ b/gtk/src/hb-backend.h
@@ -6,8 +6,7 @@
  *
  * 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, or (at your option)
- * any later version.
+ * Foundation; either version 2 of the License.
  *
  * 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 f84b39915..94a390d6f 100644
--- a/gtk/src/icons.c
+++ b/gtk/src/icons.c
@@ -6,8 +6,7 @@
  *
  * 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, or (at your option)
- * any later version.
+ * Foundation; either version 2 of the License.
  *
  * 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 e5ff65d4f..0cf7739b8 100644
--- a/gtk/src/icons.h
+++ b/gtk/src/icons.h
@@ -6,8 +6,7 @@
  *
  * 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, or (at your option)
- * any later version.
+ * Foundation; either version 2 of the License.
  *
  * 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 32438e7ed..82ad98b0a 100644
--- a/gtk/src/jobdict.c
+++ b/gtk/src/jobdict.c
@@ -7,8 +7,7 @@
  *
  * 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, or (at your option)
- * any later version.
+ * Foundation; either version 2 of the License.
  *
  * 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 66a39a6e7..532955c50 100644
--- a/gtk/src/jobdict.h
+++ b/gtk/src/jobdict.h
@@ -6,8 +6,7 @@
  *
  * 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, or (at your option)
- * any later version.
+ * Foundation; either version 2 of the License.
  *
  * 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 c7c422724..aaddf1f2d 100644
--- a/gtk/src/main.c
+++ b/gtk/src/main.c
@@ -7,8 +7,7 @@
  *
  * 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, or (at your option)
- * any later version.
+ * Foundation; either version 2 of the License.
  *
  * 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 37ec094b0..e6214accf 100644
--- a/gtk/src/plist.c
+++ b/gtk/src/plist.c
@@ -6,8 +6,7 @@
  *
  * 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, or (at your option)
- * any later version.
+ * Foundation; either version 2 of the License.
  *
  * 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 b56b2c46e..4ea4724b4 100644
--- a/gtk/src/plist.h
+++ b/gtk/src/plist.h
@@ -6,8 +6,7 @@
  *
  * 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, or (at your option)
- * any later version.
+ * Foundation; either version 2 of the License.
  *
  * 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 8e94cfb6c..a3c66c050 100644
--- a/gtk/src/presets.c
+++ b/gtk/src/presets.c
@@ -7,8 +7,7 @@
  *
  * 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, or (at your option)
- * any later version.
+ * Foundation; either version 2 of the License.
  *
  * 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 aed1d5d56..ddb954fa3 100644
--- a/gtk/src/presets.h
+++ b/gtk/src/presets.h
@@ -6,8 +6,7 @@
  *
  * 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, or (at your option)
- * any later version.
+ * Foundation; either version 2 of the License.
  *
  * 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 be97edbe8..7330b2b80 100644
--- a/gtk/src/preview.c
+++ b/gtk/src/preview.c
@@ -7,8 +7,7 @@
  *
  * 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, or (at your option)
- * any later version.
+ * Foundation; either version 2 of the License.
  *
  * 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 1be9589cb..5166597cf 100644
--- a/gtk/src/preview.h
+++ b/gtk/src/preview.h
@@ -6,8 +6,7 @@
  *
  * 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, or (at your option)
- * any later version.
+ * Foundation; either version 2 of the License.
  *
  * 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 d22c99856..c156c10b6 100644
--- a/gtk/src/queuehandler.c
+++ b/gtk/src/queuehandler.c
@@ -7,8 +7,7 @@
  *
  * 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, or (at your option)
- * any later version.
+ * Foundation; either version 2 of the License.
  *
  * 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 e2680141a..12b09198e 100644
--- a/gtk/src/queuehandler.h
+++ b/gtk/src/queuehandler.h
@@ -7,8 +7,7 @@
  *
  * 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, or (at your option)
- * any later version.
+ * Foundation; either version 2 of the License.
  *
  * 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 d10745cc0..ac48c65b0 100644
--- a/gtk/src/renderer_button.c
+++ b/gtk/src/renderer_button.c
@@ -6,8 +6,7 @@
  *
  * 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, or (at your option)
- * any later version.
+ * Foundation; either version 2 of the License.
  *
  * 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 1f913869d..1bfaf2fdf 100644
--- a/gtk/src/renderer_button.h
+++ b/gtk/src/renderer_button.h
@@ -6,8 +6,7 @@
  *
  * 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, or (at your option)
- * any later version.
+ * Foundation; either version 2 of the License.
  *
  * 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 ce24facab..7dbe84614 100644
--- a/gtk/src/resources.c
+++ b/gtk/src/resources.c
@@ -7,8 +7,7 @@
  *
  * 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, or (at your option)
- * any later version.
+ * Foundation; either version 2 of the License.
  *
  * 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 ca2ec805e..b928145b1 100644
--- a/gtk/src/resources.h
+++ b/gtk/src/resources.h
@@ -6,8 +6,7 @@
  *
  * 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, or (at your option)
- * any later version.
+ * Foundation; either version 2 of the License.
  *
  * 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 b95b85301..811613b91 100644
--- a/gtk/src/settings.c
+++ b/gtk/src/settings.c
@@ -7,8 +7,7 @@
  *
  * 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, or (at your option)
- * any later version.
+ * Foundation; either version 2 of the License.
  *
  * 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 b0a170a6a..255e02122 100644
--- a/gtk/src/settings.h
+++ b/gtk/src/settings.h
@@ -6,8 +6,7 @@
  *
  * 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, or (at your option)
- * any later version.
+ * Foundation; either version 2 of the License.
  *
  * 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 d7d0c7e9c..191de9df5 100644
--- a/gtk/src/subtitlehandler.c
+++ b/gtk/src/subtitlehandler.c
@@ -7,8 +7,7 @@
  *
  * 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, or (at your option)
- * any later version.
+ * Foundation; either version 2 of the License.
  *
  * 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 5fcef833b..af02d4f7b 100644
--- a/gtk/src/subtitlehandler.h
+++ b/gtk/src/subtitlehandler.h
@@ -7,8 +7,7 @@
  *
  * 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, or (at your option)
- * any later version.
+ * Foundation; either version 2 of the License.
  *
  * 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 a4d65230c..6e35ef0ca 100644
--- a/gtk/src/titledict.c
+++ b/gtk/src/titledict.c
@@ -7,8 +7,7 @@
  *
  * 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, or (at your option)
- * any later version.
+ * Foundation; either version 2 of the License.
  *
  * 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 4d2ed0c6e..888c7f13e 100644
--- a/gtk/src/titledict.h
+++ b/gtk/src/titledict.h
@@ -6,8 +6,7 @@
  *
  * 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, or (at your option)
- * any later version.
+ * Foundation; either version 2 of the License.
  *
  * 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 a6d37525e..0609ba032 100644
--- a/gtk/src/values.c
+++ b/gtk/src/values.c
@@ -7,8 +7,7 @@
  *
  * 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, or (at your option)
- * any later version.
+ * Foundation; either version 2 of the License.
  *
  * 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 a6369a7a1..ff352db83 100644
--- a/gtk/src/values.h
+++ b/gtk/src/values.h
@@ -6,8 +6,7 @@
  *
  * 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, or (at your option)
- * any later version.
+ * Foundation; either version 2 of the License.
  *
  * 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 926fac6e0..36dc3d849 100644
--- a/gtk/src/videohandler.c
+++ b/gtk/src/videohandler.c
@@ -7,8 +7,7 @@
  *
  * 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, or (at your option)
- * any later version.
+ * Foundation; either version 2 of the License.
  *
  * 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 ebf122663..ecdf7e04b 100644
--- a/gtk/src/videohandler.h
+++ b/gtk/src/videohandler.h
@@ -7,8 +7,7 @@
  *
  * 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, or (at your option)
- * any later version.
+ * Foundation; either version 2 of the License.
  *
  * videohandler.h is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of