Merge branch 'jakedane-master-patch-48480' into 'master'

desktop: Remove obsolete Bugzilla entries

See merge request GNOME/glade!119

data/meson.build

@@ -3,11 +3,7 @@ desktop_conf.set('VERSION', glade_version)
 
 i18n.merge_file(
   type: 'desktop',
-  input: configure_file(
+  input: 'org.gnome.Glade.desktop.in',
-    input: 'org.gnome.Glade.desktop.in.in',
-    output: '@BASENAME@',
-    configuration: desktop_conf,
-  ),
   output: '@BASENAME@',
   po_dir: po_dir,
   install: true,

po/POTFILES.in

@@ -1,7 +1,7 @@
 # List of source files containing translatable strings.
 
 # Main application
-data/org.gnome.Glade.desktop.in.in
+data/org.gnome.Glade.desktop.in
 data/org.gnome.Glade.appdata.xml.in
 src/glade-window.c
 src/main.c

po/POTFILES.skip

@@ -1,8 +1,5 @@
 # List of source files to skip.
 
-# Main application
-data/glade.desktop.in
-
 # Test data
 tests/toplevel_order_test5.glade
 tests/toplevel_order_test6.glade