[gnome-control-center] desktop: Remove obsolete Bugzilla entries

From: Georges Basile Stavracas Neto <gbsneto src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-control-center] desktop: Remove obsolete Bugzilla entries
Date: Thu, 20 Oct 2022 13:29:32 +0000 (UTC)
commit 89443fe55011126774b36ae4d62bee57d153d10e
Author: Jake Dane <3689-jakedane users noreply gitlab gnome org>
Date:   Sun Sep 11 16:09:23 2022 +0000

    desktop: Remove obsolete Bugzilla entries
    
    The `X-GNOME-Bugzilla-*` entries were for use by bug-buddy, a GNOME 2
    technology that's been gone for over a decade. These entries are
    obsolete and can be removed from all desktop files.
    
    The `X-GNOME-Settings-Panel` entry is also obsolete as far as I can
    tell and only these panels had it in their desktop file: notifications,
    sharing, sound and user-accounts. These entries can also be removed.
    
    After removing the `X-GNOME-Bugzilla-*` entries, the desktop files have
    no more variables in them. The meson `configure_file` step is therefor
    pointless—there are no variables to configure. As such the
    `*.desktop.in.in` files are renamed to `*.desktop.in` to reflect this
    and `meson.build` files are modified to remove `configure_file` step.

 meson.build                                        |  3 -
 ...p.in.in => gnome-applications-panel.desktop.in} |  0
 panels/applications/meson.build                    |  8 +--
 ...top.in.in => gnome-background-panel.desktop.in} |  0
 panels/background/meson.build                      |  8 +--
 ...ktop.in.in => gnome-bluetooth-panel.desktop.in} |  4 --
 panels/bluetooth/meson.build                       |  8 +--
 ...desktop.in.in => gnome-camera-panel.desktop.in} |  4 --
 panels/camera/meson.build                          |  8 +--
 ....desktop.in.in => gnome-color-panel.desktop.in} |  4 --
 panels/color/meson.build                           |  8 +--
 ...sktop.in.in => gnome-datetime-panel.desktop.in} |  0
 panels/datetime/meson.build                        |  8 +--
 ...p.in.in => gnome-default-apps-panel.desktop.in} |  4 --
 panels/default-apps/meson.build                    |  8 +--
 ...op.in.in => gnome-diagnostics-panel.desktop.in} |  4 --
 panels/diagnostics/meson.build                     |  8 +--
 ...esktop.in.in => gnome-display-panel.desktop.in} |  4 --
 panels/display/meson.build                         |  8 +--
 ...in => gnome-firmware-security-panel.desktop.in} |  4 --
 panels/firmware-security/meson.build               |  8 +--
 ....in.in => gnome-info-overview-panel.desktop.in} |  4 --
 panels/info-overview/meson.build                   |  8 +--
 ...sktop.in.in => gnome-keyboard-panel.desktop.in} |  4 --
 panels/keyboard/meson.build                        |  8 +--
 ...sktop.in.in => gnome-location-panel.desktop.in} |  4 --
 panels/location/meson.build                        |  8 +--
 ...top.in.in => gnome-microphone-panel.desktop.in} |  4 --
 panels/microphone/meson.build                      |  8 +--
 ....desktop.in.in => gnome-mouse-panel.desktop.in} |  4 --
 panels/mouse/meson.build                           |  8 +--
 ...p.in.in => gnome-multitasking-panel.desktop.in} |  0
 panels/multitasking/meson.build                    |  8 +--
 ...esktop.in.in => gnome-network-panel.desktop.in} |  4 --
 ...l.desktop.in.in => gnome-wifi-panel.desktop.in} |  4 --
 panels/network/meson.build                         |  8 +--
 ....in.in => gnome-notifications-panel.desktop.in} |  5 --
 panels/notifications/meson.build                   |  8 +--
 ...n.in => gnome-online-accounts-panel.desktop.in} |  4 --
 panels/online-accounts/meson.build                 |  8 +--
 ....desktop.in.in => gnome-power-panel.desktop.in} |  4 --
 panels/power/meson.build                           |  8 +--
 ...sktop.in.in => gnome-printers-panel.desktop.in} |  0
 panels/printers/meson.build                        |  8 +--
 ...desktop.in.in => gnome-region-panel.desktop.in} |  4 --
 panels/region/meson.build                          |  8 +--
 ...n.in => gnome-removable-media-panel.desktop.in} |  4 --
 panels/removable-media/meson.build                 |  8 +--
 ...desktop.in.in => gnome-screen-panel.desktop.in} |  4 --
 panels/screen/meson.build                          |  8 +--
 ...desktop.in.in => gnome-search-panel.desktop.in} |  4 --
 panels/search/meson.build                          |  8 +--
 ...esktop.in.in => gnome-sharing-panel.desktop.in} |  1 -
 panels/sharing/meson.build                         |  8 +--
 ....desktop.in.in => gnome-sound-panel.desktop.in} |  5 --
 panels/sound/meson.build                           |  8 +--
 ...op.in.in => gnome-thunderbolt-panel.desktop.in} |  4 --
 panels/thunderbolt/meson.build                     |  8 +--
 ....in => gnome-universal-access-panel.desktop.in} |  4 --
 panels/universal-access/meson.build                |  8 +--
 ....desktop.in.in => gnome-usage-panel.desktop.in} |  4 --
 panels/usage/meson.build                           |  8 +--
 ....in.in => gnome-user-accounts-panel.desktop.in} |  5 --
 panels/user-accounts/meson.build                   |  8 +--
 ....desktop.in.in => gnome-wacom-panel.desktop.in} |  4 --
 panels/wacom/meson.build                           |  8 +--
 ...l.desktop.in.in => gnome-wwan-panel.desktop.in} |  0
 panels/wwan/meson.build                            |  8 +--
 po/POTFILES.in                                     | 70 +++++++++++-----------
 shell/cc-shell-model.c                             |  4 --
 shell/meson.build                                  |  8 +--
 ...desktop.in.in => org.gnome.Settings.desktop.in} |  4 --
 72 files changed, 69 insertions(+), 396 deletions(-)
---
diff --git a/meson.build b/meson.build
index b76c09ec7..149b18713 100644
--- a/meson.build
+++ b/meson.build
@@ -267,9 +267,6 @@ gnome = import('gnome')
 i18n = import('i18n')
 pkg = import('pkgconfig')
 
-desktop_conf = configuration_data()
-desktop_conf.set('VERSION', meson.project_version())
-
 po_dir = join_paths(meson.source_root(), 'po')
 its_dir = join_paths(meson.source_root(), 'gettext')
 
diff --git a/panels/applications/gnome-applications-panel.desktop.in.in 
b/panels/applications/gnome-applications-panel.desktop.in
similarity index 100%
rename from panels/applications/gnome-applications-panel.desktop.in.in
rename to panels/applications/gnome-applications-panel.desktop.in
diff --git a/panels/applications/meson.build b/panels/applications/meson.build
index 6a1dd5d59..8daff4ee9 100644
--- a/panels/applications/meson.build
+++ b/panels/applications/meson.build
@@ -1,15 +1,9 @@
 panels_list += cappletname
 desktop = 'gnome-@0@-panel.desktop'.format(cappletname)
 
-desktop_in = configure_file(
-          input : desktop + '.in.in',
-         output : desktop + '.in',
-  configuration : desktop_conf
-)
-
 i18n.merge_file(
          type : 'desktop',
-        input : desktop_in,
+        input : desktop + '.in',
        output : desktop,
        po_dir : po_dir,
       install : true,
diff --git a/panels/background/gnome-background-panel.desktop.in.in 
b/panels/background/gnome-background-panel.desktop.in
similarity index 100%
rename from panels/background/gnome-background-panel.desktop.in.in
rename to panels/background/gnome-background-panel.desktop.in
diff --git a/panels/background/meson.build b/panels/background/meson.build
index 3634c4727..69af0cfea 100644
--- a/panels/background/meson.build
+++ b/panels/background/meson.build
@@ -1,15 +1,9 @@
 panels_list += cappletname
 desktop = 'gnome-@0@-panel.desktop'.format(cappletname)
 
-desktop_in = configure_file(
-  input: desktop + '.in.in',
-  output: desktop + '.in',
-  configuration: desktop_conf
-)
-
 i18n.merge_file(
   type: 'desktop',
-  input: desktop_in,
+  input: desktop + '.in',
   output: desktop,
   po_dir: po_dir,
   install: true,
diff --git a/panels/bluetooth/gnome-bluetooth-panel.desktop.in.in 
b/panels/bluetooth/gnome-bluetooth-panel.desktop.in
similarity index 81%
rename from panels/bluetooth/gnome-bluetooth-panel.desktop.in.in
rename to panels/bluetooth/gnome-bluetooth-panel.desktop.in
index 4d81f079a..901e03225 100644
--- a/panels/bluetooth/gnome-bluetooth-panel.desktop.in.in
+++ b/panels/bluetooth/gnome-bluetooth-panel.desktop.in
@@ -10,9 +10,5 @@ NoDisplay=true
 
Categories=GTK;GNOME;Settings;X-GNOME-NetworkSettings;HardwareSettings;X-GNOME-Settings-Panel;X-GNOME-ConnectivitySettings;
 OnlyShowIn=GNOME;Unity;
 StartupNotify=true
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=gnome-bluetooth
-X-GNOME-Bugzilla-Component=properties
-X-GNOME-Bugzilla-Version=@VERSION@
 # Translators: Search terms to find the Bluetooth panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
 Keywords=share;sharing;bluetooth;obex;
diff --git a/panels/bluetooth/meson.build b/panels/bluetooth/meson.build
index e5be2b448..5a17827aa 100644
--- a/panels/bluetooth/meson.build
+++ b/panels/bluetooth/meson.build
@@ -1,15 +1,9 @@
 panels_list += cappletname
 desktop = 'gnome-@0@-panel.desktop'.format(cappletname)
 
-desktop_in = configure_file(
-  input: desktop + '.in.in',
-  output: desktop + '.in',
-  configuration: desktop_conf
-)
-
 i18n.merge_file(
   type: 'desktop',
-  input: desktop_in,
+  input: desktop + '.in',
   output: desktop,
   po_dir: po_dir,
   install: true,
diff --git a/panels/camera/gnome-camera-panel.desktop.in.in b/panels/camera/gnome-camera-panel.desktop.in
similarity index 80%
rename from panels/camera/gnome-camera-panel.desktop.in.in
rename to panels/camera/gnome-camera-panel.desktop.in
index e05d5a2ab..21c283022 100644
--- a/panels/camera/gnome-camera-panel.desktop.in.in
+++ b/panels/camera/gnome-camera-panel.desktop.in
@@ -11,9 +11,5 @@ NoDisplay=true
 StartupNotify=true
 Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-PrivacySettings;
 OnlyShowIn=GNOME;Unity;
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=gnome-control-center
-X-GNOME-Bugzilla-Component=privacy
-X-GNOME-Bugzilla-Version=@VERSION@
 # Translators: Search terms to find the Camera panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
 Keywords=camera;photos;video;webcam;lock;private;privacy;
diff --git a/panels/camera/meson.build b/panels/camera/meson.build
index a69227b40..0c8396dab 100644
--- a/panels/camera/meson.build
+++ b/panels/camera/meson.build
@@ -1,15 +1,9 @@
 panels_list += cappletname
 desktop = 'gnome-@0@-panel.desktop'.format(cappletname)
 
-desktop_in = configure_file(
-  input: desktop + '.in.in',
-  output: desktop + '.in',
-  configuration: desktop_conf
-)
-
 i18n.merge_file(
   type: 'desktop',
-  input: desktop_in,
+  input: desktop + '.in',
   output: desktop,
   po_dir: po_dir,
   install: true,
diff --git a/panels/color/gnome-color-panel.desktop.in.in b/panels/color/gnome-color-panel.desktop.in
similarity index 83%
rename from panels/color/gnome-color-panel.desktop.in.in
rename to panels/color/gnome-color-panel.desktop.in
index 75e3f2c4f..977a7cd58 100644
--- a/panels/color/gnome-color-panel.desktop.in.in
+++ b/panels/color/gnome-color-panel.desktop.in
@@ -10,10 +10,6 @@ NoDisplay=true
 StartupNotify=true
 Categories=GNOME;GTK;Settings;X-GNOME-Settings-Panel;HardwareSettings;X-GNOME-DevicesSettings;
 OnlyShowIn=GNOME;Unity;
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=gnome-control-center
-X-GNOME-Bugzilla-Component=color
-X-GNOME-Bugzilla-Version=@VERSION@
 # Translators: Search terms to find the Color panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
 Keywords=Color;ICC;Profile;Calibrate;Printer;Display;
 # Notifications are emitted by gnome-settings-daemon
diff --git a/panels/color/meson.build b/panels/color/meson.build
index 9368ae97f..d668b1c73 100644
--- a/panels/color/meson.build
+++ b/panels/color/meson.build
@@ -1,15 +1,9 @@
 panels_list += cappletname
 desktop = 'gnome-@0@-panel.desktop'.format(cappletname)
 
-desktop_in = configure_file(
-  input: desktop + '.in.in',
-  output: desktop + '.in',
-  configuration: desktop_conf
-)
-
 i18n.merge_file(
   type: 'desktop',
-  input: desktop_in,
+  input: desktop + '.in',
   output: desktop,
   po_dir: po_dir,
   install: true,
diff --git a/panels/datetime/gnome-datetime-panel.desktop.in.in 
b/panels/datetime/gnome-datetime-panel.desktop.in
similarity index 100%
rename from panels/datetime/gnome-datetime-panel.desktop.in.in
rename to panels/datetime/gnome-datetime-panel.desktop.in
diff --git a/panels/datetime/meson.build b/panels/datetime/meson.build
index a3c8c164c..bbaae9982 100644
--- a/panels/datetime/meson.build
+++ b/panels/datetime/meson.build
@@ -1,15 +1,9 @@
 panels_list += cappletname
 desktop = 'gnome-@0@-panel.desktop'.format(cappletname)
 
-desktop_in = configure_file(
-  input: desktop + '.in.in',
-  output: desktop + '.in',
-  configuration: desktop_conf
-)
-
 i18n.merge_file(
   type: 'desktop',
-  input: desktop_in,
+  input: desktop + '.in',
   output: desktop,
   po_dir: po_dir,
   install: true,
diff --git a/panels/default-apps/gnome-default-apps-panel.desktop.in.in 
b/panels/default-apps/gnome-default-apps-panel.desktop.in
similarity index 81%
rename from panels/default-apps/gnome-default-apps-panel.desktop.in.in
rename to panels/default-apps/gnome-default-apps-panel.desktop.in
index f03c3eefb..a3842a436 100644
--- a/panels/default-apps/gnome-default-apps-panel.desktop.in.in
+++ b/panels/default-apps/gnome-default-apps-panel.desktop.in
@@ -10,9 +10,5 @@ NoDisplay=true
 StartupNotify=true
 Categories=GNOME;GTK;Settings;X-GNOME-Settings-Panel;X-GNOME-DetailsSettings;
 OnlyShowIn=GNOME;Unity;
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=gnome-control-center
-X-GNOME-Bugzilla-Component=info
-X-GNOME-Bugzilla-Version=@VERSION@
 # Translators: Search terms to find the Default Applications panel. Do NOT translate or localize the 
semicolons! The list MUST also end with a semicolon!
 Keywords=default;application;preferred;media;
diff --git a/panels/default-apps/meson.build b/panels/default-apps/meson.build
index 3edf34d3a..22a57da4a 100644
--- a/panels/default-apps/meson.build
+++ b/panels/default-apps/meson.build
@@ -1,15 +1,9 @@
 panels_list += cappletname
 desktop = 'gnome-@0@-panel.desktop'.format(cappletname)
 
-desktop_in = configure_file(
-  input: desktop + '.in.in',
-  output: desktop + '.in',
-  configuration: desktop_conf
-)
-
 i18n.merge_file(
   type: 'desktop',
-  input: desktop_in,
+  input: desktop + '.in',
   output: desktop,
   po_dir: po_dir,
   install: true,
diff --git a/panels/diagnostics/gnome-diagnostics-panel.desktop.in.in 
b/panels/diagnostics/gnome-diagnostics-panel.desktop.in
similarity index 80%
rename from panels/diagnostics/gnome-diagnostics-panel.desktop.in.in
rename to panels/diagnostics/gnome-diagnostics-panel.desktop.in
index 68d4cb0d5..dbdbfd58b 100644
--- a/panels/diagnostics/gnome-diagnostics-panel.desktop.in.in
+++ b/panels/diagnostics/gnome-diagnostics-panel.desktop.in
@@ -11,9 +11,5 @@ NoDisplay=true
 StartupNotify=true
 Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-PrivacySettings;
 OnlyShowIn=GNOME;Unity;
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=gnome-control-center
-X-GNOME-Bugzilla-Component=privacy
-X-GNOME-Bugzilla-Version=@VERSION@
 # Translators: Search terms to find the Diagnostics panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
 Keywords=diagnostics;crash;
diff --git a/panels/diagnostics/meson.build b/panels/diagnostics/meson.build
index 0061d3850..a17f0b8e4 100644
--- a/panels/diagnostics/meson.build
+++ b/panels/diagnostics/meson.build
@@ -1,15 +1,9 @@
 panels_list += cappletname
 desktop = 'gnome-@0@-panel.desktop'.format(cappletname)
 
-desktop_in = configure_file(
-  input: desktop + '.in.in',
-  output: desktop + '.in',
-  configuration: desktop_conf
-)
-
 i18n.merge_file(
   type: 'desktop',
-  input: desktop_in,
+  input: desktop + '.in',
   output: desktop,
   po_dir: po_dir,
   install: true,
diff --git a/panels/display/gnome-display-panel.desktop.in.in b/panels/display/gnome-display-panel.desktop.in
similarity index 81%
rename from panels/display/gnome-display-panel.desktop.in.in
rename to panels/display/gnome-display-panel.desktop.in
index 61f5ee73c..c7a123500 100644
--- a/panels/display/gnome-display-panel.desktop.in.in
+++ b/panels/display/gnome-display-panel.desktop.in
@@ -10,9 +10,5 @@ NoDisplay=true
 StartupNotify=true
 Categories=GNOME;GTK;Settings;HardwareSettings;X-GNOME-Settings-Panel;X-GNOME-DevicesSettings;
 OnlyShowIn=GNOME;Unity;
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=gnome-control-center
-X-GNOME-Bugzilla-Component=Screen resolution
-X-GNOME-Bugzilla-Version=@VERSION@
 # Translators: Search terms to find the Displays panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
 
Keywords=Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;Night;Light;Blue;redshift;color;sunset;sunrise;
diff --git a/panels/display/meson.build b/panels/display/meson.build
index 726a898b9..a0260da65 100644
--- a/panels/display/meson.build
+++ b/panels/display/meson.build
@@ -1,15 +1,9 @@
 panels_list += cappletname
 desktop = 'gnome-@0@-panel.desktop'.format(cappletname)
 
-desktop_in = configure_file(
-  input: desktop + '.in.in',
-  output: desktop + '.in',
-  configuration: desktop_conf
-)
-
 i18n.merge_file(
   type: 'desktop',
-  input: desktop_in,
+  input: desktop + '.in',
   output: desktop,
   po_dir: po_dir,
   install: true,
diff --git a/panels/firmware-security/gnome-firmware-security-panel.desktop.in.in 
b/panels/firmware-security/gnome-firmware-security-panel.desktop.in
similarity index 81%
rename from panels/firmware-security/gnome-firmware-security-panel.desktop.in.in
rename to panels/firmware-security/gnome-firmware-security-panel.desktop.in
index 184ee2252..b399b3d5f 100644
--- a/panels/firmware-security/gnome-firmware-security-panel.desktop.in.in
+++ b/panels/firmware-security/gnome-firmware-security-panel.desktop.in
@@ -11,9 +11,5 @@ NoDisplay=true
 StartupNotify=true
 Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-PrivacySettings;
 OnlyShowIn=GNOME;Unity;
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=gnome-control-center
-X-GNOME-Bugzilla-Component=privacy
-X-GNOME-Bugzilla-Version=@VERSION@
 # Translators: Search terms to find the Privacy panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
 Keywords=screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;network;identity;privacy;
diff --git a/panels/firmware-security/meson.build b/panels/firmware-security/meson.build
index 0325568ff..826eb864d 100644
--- a/panels/firmware-security/meson.build
+++ b/panels/firmware-security/meson.build
@@ -1,15 +1,9 @@
 panels_list += cappletname
 desktop = 'gnome-@0@-panel.desktop'.format(cappletname)
 
-desktop_in = configure_file(
-  input: desktop + '.in.in',
-  output: desktop + '.in',
-  configuration: desktop_conf
-)
-
 i18n.merge_file(
   type: 'desktop',
-  input: desktop_in,
+  input: desktop + '.in',
   output: desktop,
   po_dir: po_dir,
   install: true,
diff --git a/panels/info-overview/gnome-info-overview-panel.desktop.in.in 
b/panels/info-overview/gnome-info-overview-panel.desktop.in
similarity index 85%
rename from panels/info-overview/gnome-info-overview-panel.desktop.in.in
rename to panels/info-overview/gnome-info-overview-panel.desktop.in
index e3cf37749..c2d71d9b9 100644
--- a/panels/info-overview/gnome-info-overview-panel.desktop.in.in
+++ b/panels/info-overview/gnome-info-overview-panel.desktop.in
@@ -10,10 +10,6 @@ NoDisplay=true
 StartupNotify=true
 Categories=GNOME;GTK;Settings;X-GNOME-Settings-Panel;X-GNOME-DetailsSettings;
 OnlyShowIn=GNOME;Unity;
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=gnome-control-center
-X-GNOME-Bugzilla-Component=info
-X-GNOME-Bugzilla-Version=@VERSION@
 # Translators: Search terms to find the About panel.
 # Do NOT translate or localize the semicolons!
 # The list MUST also end with a semicolon!
diff --git a/panels/info-overview/meson.build b/panels/info-overview/meson.build
index 45251ab26..68b0d259c 100644
--- a/panels/info-overview/meson.build
+++ b/panels/info-overview/meson.build
@@ -1,15 +1,9 @@
 panels_list += cappletname
 desktop = 'gnome-@0@-panel.desktop'.format(cappletname)
 
-desktop_in = configure_file(
-  input: desktop + '.in.in',
-  output: desktop + '.in',
-  configuration: desktop_conf
-)
-
 i18n.merge_file(
   type: 'desktop',
-  input: desktop_in,
+  input: desktop + '.in',
   output: desktop,
   po_dir: po_dir,
   install: true,
diff --git a/panels/keyboard/gnome-keyboard-panel.desktop.in.in 
b/panels/keyboard/gnome-keyboard-panel.desktop.in
similarity index 82%
rename from panels/keyboard/gnome-keyboard-panel.desktop.in.in
rename to panels/keyboard/gnome-keyboard-panel.desktop.in
index 872fcaf8c..2aac985de 100644
--- a/panels/keyboard/gnome-keyboard-panel.desktop.in.in
+++ b/panels/keyboard/gnome-keyboard-panel.desktop.in
@@ -10,9 +10,5 @@ NoDisplay=true
 StartupNotify=true
 Categories=GNOME;GTK;Settings;HardwareSettings;X-GNOME-Settings-Panel;X-GNOME-DevicesSettings;
 OnlyShowIn=GNOME;Unity;
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=gnome-control-center
-X-GNOME-Bugzilla-Component=keyboard
-X-GNOME-Bugzilla-Version=@VERSION@
 # Translators: Search terms to find the Keyboard panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
 Keywords=Shortcut;Workspace;Window;Resize;Zoom;Contrast;Input;Source;Lock;Volume;
diff --git a/panels/keyboard/meson.build b/panels/keyboard/meson.build
index cb886148a..b4ace6469 100644
--- a/panels/keyboard/meson.build
+++ b/panels/keyboard/meson.build
@@ -1,15 +1,9 @@
 panels_list += cappletname
 desktop = 'gnome-@0@-panel.desktop'.format(cappletname)
 
-desktop_in = configure_file(
-  input: desktop + '.in.in',
-  output: desktop + '.in',
-  configuration: desktop_conf
-)
-
 i18n.merge_file(
   type: 'desktop',
-  input: desktop_in,
+  input: desktop + '.in',
   output: desktop,
   po_dir: po_dir,
   install: true,
diff --git a/panels/location/gnome-location-panel.desktop.in.in 
b/panels/location/gnome-location-panel.desktop.in
similarity index 80%
rename from panels/location/gnome-location-panel.desktop.in.in
rename to panels/location/gnome-location-panel.desktop.in
index bb3c220ce..d0095a0d2 100644
--- a/panels/location/gnome-location-panel.desktop.in.in
+++ b/panels/location/gnome-location-panel.desktop.in
@@ -11,9 +11,5 @@ NoDisplay=true
 StartupNotify=true
 Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-PrivacySettings;
 OnlyShowIn=GNOME;Unity;
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=gnome-control-center
-X-GNOME-Bugzilla-Component=privacy
-X-GNOME-Bugzilla-Version=@VERSION@
 # Translators: Search terms to find the Location panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
 Keywords=location;gps;private;privacy;
diff --git a/panels/location/meson.build b/panels/location/meson.build
index 084b338c4..c30131c46 100644
--- a/panels/location/meson.build
+++ b/panels/location/meson.build
@@ -1,15 +1,9 @@
 panels_list += cappletname
 desktop = 'gnome-@0@-panel.desktop'.format(cappletname)
 
-desktop_in = configure_file(
-  input: desktop + '.in.in',
-  output: desktop + '.in',
-  configuration: desktop_conf
-)
-
 i18n.merge_file(
   type: 'desktop',
-  input: desktop_in,
+  input: desktop + '.in',
   output: desktop,
   po_dir: po_dir,
   install: true,
diff --git a/panels/microphone/gnome-microphone-panel.desktop.in.in 
b/panels/microphone/gnome-microphone-panel.desktop.in
similarity index 80%
rename from panels/microphone/gnome-microphone-panel.desktop.in.in
rename to panels/microphone/gnome-microphone-panel.desktop.in
index 1db40c424..2016805e1 100644
--- a/panels/microphone/gnome-microphone-panel.desktop.in.in
+++ b/panels/microphone/gnome-microphone-panel.desktop.in
@@ -11,9 +11,5 @@ NoDisplay=true
 StartupNotify=true
 Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-PrivacySettings;
 OnlyShowIn=GNOME;Unity;
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=gnome-control-center
-X-GNOME-Bugzilla-Component=privacy
-X-GNOME-Bugzilla-Version=@VERSION@
 # Translators: Search terms to find the Microphone panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
 Keywords=microphone;recording;application;privacy;
diff --git a/panels/microphone/meson.build b/panels/microphone/meson.build
index 16647a502..a77cec253 100644
--- a/panels/microphone/meson.build
+++ b/panels/microphone/meson.build
@@ -1,15 +1,9 @@
 panels_list += cappletname
 desktop = 'gnome-@0@-panel.desktop'.format(cappletname)
 
-desktop_in = configure_file(
-  input: desktop + '.in.in',
-  output: desktop + '.in',
-  configuration: desktop_conf
-)
-
 i18n.merge_file(
   type: 'desktop',
-  input: desktop_in,
+  input: desktop + '.in',
   output: desktop,
   po_dir: po_dir,
   install: true,
diff --git a/panels/mouse/gnome-mouse-panel.desktop.in.in b/panels/mouse/gnome-mouse-panel.desktop.in
similarity index 82%
rename from panels/mouse/gnome-mouse-panel.desktop.in.in
rename to panels/mouse/gnome-mouse-panel.desktop.in
index 2d9ed7c4c..43b393474 100644
--- a/panels/mouse/gnome-mouse-panel.desktop.in.in
+++ b/panels/mouse/gnome-mouse-panel.desktop.in
@@ -10,9 +10,5 @@ NoDisplay=true
 StartupNotify=true
 Categories=GNOME;GTK;Settings;HardwareSettings;X-GNOME-Settings-Panel;X-GNOME-DevicesSettings;
 OnlyShowIn=GNOME;Unity;
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=gnome-control-center
-X-GNOME-Bugzilla-Component=mouse
-X-GNOME-Bugzilla-Version=@VERSION@
 # Translators: Search terms to find the Mouse and Touchpad panel. Do NOT translate or localize the 
semicolons! The list MUST also end with a semicolon!
 Keywords=Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;
diff --git a/panels/mouse/meson.build b/panels/mouse/meson.build
index 8ebf3fc2f..cbc025ec3 100644
--- a/panels/mouse/meson.build
+++ b/panels/mouse/meson.build
@@ -1,15 +1,9 @@
 panels_list += cappletname
 desktop = 'gnome-@0@-panel.desktop'.format(cappletname)
 
-desktop_in = configure_file(
-  input: desktop + '.in.in',
-  output: desktop + '.in',
-  configuration: desktop_conf
-)
-
 i18n.merge_file(
   type: 'desktop',
-  input: desktop_in,
+  input: desktop + '.in',
   output: desktop,
   po_dir: po_dir,
   install: true,
diff --git a/panels/multitasking/gnome-multitasking-panel.desktop.in.in 
b/panels/multitasking/gnome-multitasking-panel.desktop.in
similarity index 100%
rename from panels/multitasking/gnome-multitasking-panel.desktop.in.in
rename to panels/multitasking/gnome-multitasking-panel.desktop.in
diff --git a/panels/multitasking/meson.build b/panels/multitasking/meson.build
index 53fd0d8ea..6d1e9dbca 100644
--- a/panels/multitasking/meson.build
+++ b/panels/multitasking/meson.build
@@ -1,15 +1,9 @@
 panels_list += cappletname
 desktop = 'gnome-@0@-panel.desktop'.format(cappletname)
 
-desktop_in = configure_file(
-  input: desktop + '.in.in',
-  output: desktop + '.in',
-  configuration: desktop_conf
-)
-
 i18n.merge_file(
   type: 'desktop',
-  input: desktop_in,
+  input: desktop + '.in',
   output: desktop,
   po_dir: po_dir,
   install: true,
diff --git a/panels/network/gnome-network-panel.desktop.in.in b/panels/network/gnome-network-panel.desktop.in
similarity index 81%
rename from panels/network/gnome-network-panel.desktop.in.in
rename to panels/network/gnome-network-panel.desktop.in
index d9ab05ca7..53f633cef 100644
--- a/panels/network/gnome-network-panel.desktop.in.in
+++ b/panels/network/gnome-network-panel.desktop.in
@@ -10,9 +10,5 @@ NoDisplay=true
 StartupNotify=true
 Categories=GNOME;GTK;Settings;HardwareSettings;X-GNOME-Settings-Panel;X-GNOME-ConnectivitySettings;
 OnlyShowIn=GNOME;Unity;
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=gnome-control-center
-X-GNOME-Bugzilla-Component=network
-X-GNOME-Bugzilla-Version=@VERSION@
 # Translators: Search terms to find the Network panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
 Keywords=Network;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;DNS;
diff --git a/panels/network/gnome-wifi-panel.desktop.in.in b/panels/network/gnome-wifi-panel.desktop.in
similarity index 80%
rename from panels/network/gnome-wifi-panel.desktop.in.in
rename to panels/network/gnome-wifi-panel.desktop.in
index 8104ede50..8e10e70e5 100644
--- a/panels/network/gnome-wifi-panel.desktop.in.in
+++ b/panels/network/gnome-wifi-panel.desktop.in
@@ -10,9 +10,5 @@ NoDisplay=true
 StartupNotify=true
 Categories=GNOME;GTK;Settings;HardwareSettings;X-GNOME-Settings-Panel;X-GNOME-ConnectivitySettings;
 OnlyShowIn=GNOME;Unity;
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=gnome-control-center
-X-GNOME-Bugzilla-Component=network
-X-GNOME-Bugzilla-Version=@VERSION@
 # Translators: Search terms to find the Wi-Fi panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
 Keywords=Network;Wireless;Wi-Fi;Wifi;IP;LAN;Broadband;DNS;Hotspot;
diff --git a/panels/network/meson.build b/panels/network/meson.build
index e6340cedb..482a8c165 100644
--- a/panels/network/meson.build
+++ b/panels/network/meson.build
@@ -19,15 +19,9 @@ panels_list += panel_names
 foreach name: panel_names
   desktop = 'gnome-' + name + '-panel.desktop'
 
-  desktop_in = configure_file(
-    input: desktop + '.in.in',
-    output: desktop + '.in',
-    configuration: desktop_conf
-  )
-
   i18n.merge_file(
     type: 'desktop',
-    input: desktop_in,
+    input: desktop + '.in',
     output: desktop,
     po_dir: po_dir,
     install: true,
diff --git a/panels/notifications/gnome-notifications-panel.desktop.in.in 
b/panels/notifications/gnome-notifications-panel.desktop.in
similarity index 77%
rename from panels/notifications/gnome-notifications-panel.desktop.in.in
rename to panels/notifications/gnome-notifications-panel.desktop.in
index 325a26406..b63e005f6 100644
--- a/panels/notifications/gnome-notifications-panel.desktop.in.in
+++ b/panels/notifications/gnome-notifications-panel.desktop.in
@@ -10,10 +10,5 @@ NoDisplay=true
 StartupNotify=true
 Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-PersonalizationSettings;
 OnlyShowIn=GNOME;Unity;
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=gnome-control-center
-X-GNOME-Bugzilla-Component=Notifications
-X-GNOME-Bugzilla-Version=@VERSION@
-X-GNOME-Settings-Panel=notifications
 # Translators: Search terms to find the Notifications panel. Do NOT translate or localize the semicolons! 
The list MUST also end with a semicolon!
 Keywords=Notifications;Banner;Message;Tray;Popup;
diff --git a/panels/notifications/meson.build b/panels/notifications/meson.build
index 89233b22f..0a80208e4 100644
--- a/panels/notifications/meson.build
+++ b/panels/notifications/meson.build
@@ -1,15 +1,9 @@
 panels_list += cappletname
 desktop = 'gnome-@0@-panel.desktop'.format(cappletname)
 
-desktop_in = configure_file(
-  input: desktop + '.in.in',
-  output: desktop + '.in',
-  configuration: desktop_conf
-)
-
 i18n.merge_file(
   type: 'desktop',
-  input: desktop_in,
+  input: desktop + '.in',
   output: desktop,
   po_dir: po_dir,
   install: true,
diff --git a/panels/online-accounts/gnome-online-accounts-panel.desktop.in.in 
b/panels/online-accounts/gnome-online-accounts-panel.desktop.in
similarity index 84%
rename from panels/online-accounts/gnome-online-accounts-panel.desktop.in.in
rename to panels/online-accounts/gnome-online-accounts-panel.desktop.in
index fe77f8ea4..1e15406c4 100644
--- a/panels/online-accounts/gnome-online-accounts-panel.desktop.in.in
+++ b/panels/online-accounts/gnome-online-accounts-panel.desktop.in
@@ -10,10 +10,6 @@ NoDisplay=true
 StartupNotify=true
 Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-AccountSettings;
 OnlyShowIn=GNOME;Unity;
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=gnome-control-center
-X-GNOME-Bugzilla-Component=Online Accounts
-X-GNOME-Bugzilla-Version=@VERSION@
 # Translators: Search terms to find the Online Accounts panel.
 # Do NOT translate or localize the semicolons!
 # The list MUST also end with a semicolon!
diff --git a/panels/online-accounts/meson.build b/panels/online-accounts/meson.build
index 9d1b918e8..1ae6d495d 100644
--- a/panels/online-accounts/meson.build
+++ b/panels/online-accounts/meson.build
@@ -1,15 +1,9 @@
 panels_list += cappletname
 desktop = 'gnome-@0@-panel.desktop'.format(cappletname)
 
-desktop_in = configure_file(
-  input: desktop + '.in.in',
-  output: desktop + '.in',
-  configuration: desktop_conf
-)
-
 i18n.merge_file(
   type: 'desktop',
-  input: desktop_in,
+  input: desktop + '.in',
   output: desktop,
   po_dir: po_dir,
   install: true,
diff --git a/panels/power/gnome-power-panel.desktop.in.in b/panels/power/gnome-power-panel.desktop.in
similarity index 83%
rename from panels/power/gnome-power-panel.desktop.in.in
rename to panels/power/gnome-power-panel.desktop.in
index 18a1cda0c..7e970f93e 100644
--- a/panels/power/gnome-power-panel.desktop.in.in
+++ b/panels/power/gnome-power-panel.desktop.in
@@ -10,10 +10,6 @@ NoDisplay=true
 StartupNotify=true
 Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-DevicesSettings;
 OnlyShowIn=GNOME;Unity;
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=gnome-control-center
-X-GNOME-Bugzilla-Component=power
-X-GNOME-Bugzilla-Version=@VERSION@
 # Translators: Search terms to find the Power panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
 Keywords=Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;Energy;
 # Notifications are emitted by gnome-settings-daemon
diff --git a/panels/power/meson.build b/panels/power/meson.build
index 1cafe2a1b..36d520897 100644
--- a/panels/power/meson.build
+++ b/panels/power/meson.build
@@ -1,15 +1,9 @@
 panels_list += cappletname
 desktop = 'gnome-@0@-panel.desktop'.format(cappletname)
 
-desktop_in = configure_file(
-  input: desktop + '.in.in',
-  output: desktop + '.in',
-  configuration: desktop_conf
-)
-
 i18n.merge_file(
   type: 'desktop',
-  input: desktop_in,
+  input: desktop + '.in',
   output: desktop,
   po_dir: po_dir,
   install: true,
diff --git a/panels/printers/gnome-printers-panel.desktop.in.in 
b/panels/printers/gnome-printers-panel.desktop.in
similarity index 100%
rename from panels/printers/gnome-printers-panel.desktop.in.in
rename to panels/printers/gnome-printers-panel.desktop.in
diff --git a/panels/printers/meson.build b/panels/printers/meson.build
index 3f50979b4..87c76c4d7 100644
--- a/panels/printers/meson.build
+++ b/panels/printers/meson.build
@@ -1,15 +1,9 @@
 panels_list += cappletname
 desktop = 'gnome-@0@-panel.desktop'.format(cappletname)
 
-desktop_in = configure_file(
-  input: desktop + '.in.in',
-  output: desktop + '.in',
-  configuration: desktop_conf
-)
-
 i18n.merge_file(
   type: 'desktop',
-  input: desktop_in,
+  input: desktop + '.in',
   output: desktop,
   po_dir: po_dir,
   install: true,
diff --git a/panels/region/gnome-region-panel.desktop.in.in b/panels/region/gnome-region-panel.desktop.in
similarity index 81%
rename from panels/region/gnome-region-panel.desktop.in.in
rename to panels/region/gnome-region-panel.desktop.in
index 0bdc8ffe2..b28b43213 100644
--- a/panels/region/gnome-region-panel.desktop.in.in
+++ b/panels/region/gnome-region-panel.desktop.in
@@ -10,9 +10,5 @@ NoDisplay=true
 StartupNotify=true
 Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-DetailsSettings;
 OnlyShowIn=GNOME;Unity;
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=gnome-control-center
-X-GNOME-Bugzilla-Component=region
-X-GNOME-Bugzilla-Version=@VERSION@
 # Translators: Search terms to find the Region and Language panel. Do NOT translate or localize the 
semicolons! The list MUST also end with a semicolon!
 Keywords=Language;Layout;Keyboard;Input;
diff --git a/panels/region/meson.build b/panels/region/meson.build
index 71f9a6290..45683010b 100644
--- a/panels/region/meson.build
+++ b/panels/region/meson.build
@@ -1,15 +1,9 @@
 panels_list += cappletname
 desktop = 'gnome-@0@-panel.desktop'.format(cappletname)
 
-desktop_in = configure_file(
-  input: desktop + '.in.in',
-  output: desktop + '.in',
-  configuration: desktop_conf
-)
-
 i18n.merge_file(
   type: 'desktop',
-  input: desktop_in,
+  input: desktop + '.in',
   output: desktop,
   po_dir: po_dir,
   install: true,
diff --git a/panels/removable-media/gnome-removable-media-panel.desktop.in.in 
b/panels/removable-media/gnome-removable-media-panel.desktop.in
similarity index 82%
rename from panels/removable-media/gnome-removable-media-panel.desktop.in.in
rename to panels/removable-media/gnome-removable-media-panel.desktop.in
index 0f5a6d14a..1c1934f2f 100644
--- a/panels/removable-media/gnome-removable-media-panel.desktop.in.in
+++ b/panels/removable-media/gnome-removable-media-panel.desktop.in
@@ -10,9 +10,5 @@ NoDisplay=true
 StartupNotify=true
 Categories=GNOME;GTK;Settings;X-GNOME-Settings-Panel;X-GNOME-DevicesSettings;
 OnlyShowIn=GNOME;Unity;
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=gnome-control-center
-X-GNOME-Bugzilla-Component=info
-X-GNOME-Bugzilla-Version=@VERSION@
 # Translators: Search terms to find the Removable Media panel. Do NOT translate or localize the semicolons! 
The list MUST also end with a semicolon!
 Keywords=device;system;default;application;preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;
diff --git a/panels/removable-media/meson.build b/panels/removable-media/meson.build
index 647565924..ac98cee64 100644
--- a/panels/removable-media/meson.build
+++ b/panels/removable-media/meson.build
@@ -1,15 +1,9 @@
 panels_list += cappletname
 desktop = 'gnome-@0@-panel.desktop'.format(cappletname)
 
-desktop_in = configure_file(
-  input: desktop + '.in.in',
-  output: desktop + '.in',
-  configuration: desktop_conf
-)
-
 i18n.merge_file(
   type: 'desktop',
-  input: desktop_in,
+  input: desktop + '.in',
   output: desktop,
   po_dir: po_dir,
   install: true,
diff --git a/panels/screen/gnome-screen-panel.desktop.in.in b/panels/screen/gnome-screen-panel.desktop.in
similarity index 79%
rename from panels/screen/gnome-screen-panel.desktop.in.in
rename to panels/screen/gnome-screen-panel.desktop.in
index e095264c1..8e2053ace 100644
--- a/panels/screen/gnome-screen-panel.desktop.in.in
+++ b/panels/screen/gnome-screen-panel.desktop.in
@@ -11,9 +11,5 @@ NoDisplay=true
 StartupNotify=true
 Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-PrivacySettings;
 OnlyShowIn=GNOME;Unity;
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=gnome-control-center
-X-GNOME-Bugzilla-Component=screen
-X-GNOME-Bugzilla-Version=@VERSION@
 # Translators: Search terms to find the Screen panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
 Keywords=screen;lock;private;privacy;
diff --git a/panels/screen/meson.build b/panels/screen/meson.build
index 48482b843..6a452b2a1 100644
--- a/panels/screen/meson.build
+++ b/panels/screen/meson.build
@@ -1,15 +1,9 @@
 panels_list += cappletname
 desktop = 'gnome-@0@-panel.desktop'.format(cappletname)
 
-desktop_in = configure_file(
-  input: desktop + '.in.in',
-  output: desktop + '.in',
-  configuration: desktop_conf
-)
-
 i18n.merge_file(
   type: 'desktop',
-  input: desktop_in,
+  input: desktop + '.in',
   output: desktop,
   po_dir: po_dir,
   install: true,
diff --git a/panels/search/gnome-search-panel.desktop.in.in b/panels/search/gnome-search-panel.desktop.in
similarity index 81%
rename from panels/search/gnome-search-panel.desktop.in.in
rename to panels/search/gnome-search-panel.desktop.in
index 5df64e474..ab8883d8e 100644
--- a/panels/search/gnome-search-panel.desktop.in.in
+++ b/panels/search/gnome-search-panel.desktop.in
@@ -10,9 +10,5 @@ NoDisplay=true
 StartupNotify=true
 Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-PersonalizationSettings;
 OnlyShowIn=GNOME;Unity;
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=gnome-control-center
-X-GNOME-Bugzilla-Component=search
-X-GNOME-Bugzilla-Version=@VERSION@
 # Translators: Search terms to find the Search panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
 Keywords=Search;Find;Index;Hide;Privacy;Results;
diff --git a/panels/search/meson.build b/panels/search/meson.build
index 3b66562cd..400d33886 100644
--- a/panels/search/meson.build
+++ b/panels/search/meson.build
@@ -1,15 +1,9 @@
 panels_list += cappletname
 desktop = 'gnome-@0@-panel.desktop'.format(cappletname)
 
-desktop_in = configure_file(
-  input: desktop + '.in.in',
-  output: desktop + '.in',
-  configuration: desktop_conf
-)
-
 i18n.merge_file(
   type: 'desktop',
-  input: desktop_in,
+  input: desktop + '.in',
   output: desktop,
   po_dir: po_dir,
   install: true,
diff --git a/panels/sharing/gnome-sharing-panel.desktop.in.in b/panels/sharing/gnome-sharing-panel.desktop.in
similarity index 95%
rename from panels/sharing/gnome-sharing-panel.desktop.in.in
rename to panels/sharing/gnome-sharing-panel.desktop.in
index 8dc340c42..3dc5acdb0 100644
--- a/panels/sharing/gnome-sharing-panel.desktop.in.in
+++ b/panels/sharing/gnome-sharing-panel.desktop.in
@@ -10,6 +10,5 @@ NoDisplay=true
 StartupNotify=true
 Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-AccountSettings;
 OnlyShowIn=GNOME;Unity;
-X-GNOME-Settings-Panel=sharing
 # Translators: Search terms to find the Sharing panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
 Keywords=share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;movies;server;renderer;
diff --git a/panels/sharing/meson.build b/panels/sharing/meson.build
index c674cfba1..5fadf279a 100644
--- a/panels/sharing/meson.build
+++ b/panels/sharing/meson.build
@@ -1,15 +1,9 @@
 panels_list += cappletname
 desktop = 'gnome-@0@-panel.desktop'.format(cappletname)
 
-desktop_in = configure_file(
-  input: desktop + '.in.in',
-  output: desktop + '.in',
-  configuration: desktop_conf
-)
-
 i18n.merge_file(
   type: 'desktop',
-  input: desktop_in,
+  input: desktop + '.in',
   output: desktop,
   po_dir: po_dir,
   install: true,
diff --git a/panels/sound/gnome-sound-panel.desktop.in.in b/panels/sound/gnome-sound-panel.desktop.in
similarity index 78%
rename from panels/sound/gnome-sound-panel.desktop.in.in
rename to panels/sound/gnome-sound-panel.desktop.in
index 8b0286113..e7853acb5 100644
--- a/panels/sound/gnome-sound-panel.desktop.in.in
+++ b/panels/sound/gnome-sound-panel.desktop.in
@@ -10,10 +10,5 @@ NoDisplay=true
 StartupNotify=true
 Categories=GNOME;GTK;Settings;X-GNOME-Settings-Panel;X-GNOME-DevicesSettings;
 OnlyShowIn=GNOME;Unity;
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=gnome-control-center
-X-GNOME-Bugzilla-Component=sound
-X-GNOME-Bugzilla-Version=@VERSION@
-X-GNOME-Settings-Panel=sound
 # Translators: Search terms to find the Sound panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
 Keywords=Card;Microphone;Volume;Fade;Balance;Bluetooth;Headset;Audio;Output;Input;
diff --git a/panels/sound/meson.build b/panels/sound/meson.build
index 458377d49..c991ac5cd 100644
--- a/panels/sound/meson.build
+++ b/panels/sound/meson.build
@@ -1,15 +1,9 @@
 panels_list += cappletname
 desktop = 'gnome-@0@-panel.desktop'.format(cappletname)
 
-desktop_in = configure_file(
-  input: desktop + '.in.in',
-  output: desktop + '.in',
-  configuration: desktop_conf
-)
-
 i18n.merge_file(
   type: 'desktop',
-  input: desktop_in,
+  input: desktop + '.in',
   output: desktop,
   po_dir: po_dir,
   install: true,
diff --git a/panels/thunderbolt/gnome-thunderbolt-panel.desktop.in.in 
b/panels/thunderbolt/gnome-thunderbolt-panel.desktop.in
similarity index 80%
rename from panels/thunderbolt/gnome-thunderbolt-panel.desktop.in.in
rename to panels/thunderbolt/gnome-thunderbolt-panel.desktop.in
index 05d33a20e..c78fa4a88 100644
--- a/panels/thunderbolt/gnome-thunderbolt-panel.desktop.in.in
+++ b/panels/thunderbolt/gnome-thunderbolt-panel.desktop.in
@@ -10,9 +10,5 @@ NoDisplay=true
 StartupNotify=true
 Categories=GNOME;GTK;Settings;X-GNOME-Settings-Panel;HardwareSettings;X-GNOME-PrivacySettings;
 OnlyShowIn=GNOME;Unity;
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=gnome-control-center
-X-GNOME-Bugzilla-Component=thunderbolt
-X-GNOME-Bugzilla-Version=@VERSION@
 # Translators: those are keywords for the thunderbolt control-center panel. Do NOT translate or localize the 
semicolons! The list MUST also end with a semicolon!
 Keywords=Thunderbolt;privacy;
diff --git a/panels/thunderbolt/meson.build b/panels/thunderbolt/meson.build
index 241114f6e..e300c5061 100644
--- a/panels/thunderbolt/meson.build
+++ b/panels/thunderbolt/meson.build
@@ -1,15 +1,9 @@
 panels_list += cappletname
-
 desktop = 'gnome-@0@-panel.desktop'.format(cappletname)
-desktop_in = configure_file(
-  input: desktop + '.in.in',
-  output: desktop + '.in',
-  configuration: desktop_conf
-)
 
 i18n.merge_file(
   type: 'desktop',
-  input: desktop_in,
+  input: desktop + '.in',
   output: desktop,
   po_dir: po_dir,
   install: true,
diff --git a/panels/universal-access/gnome-universal-access-panel.desktop.in.in 
b/panels/universal-access/gnome-universal-access-panel.desktop.in
similarity index 84%
rename from panels/universal-access/gnome-universal-access-panel.desktop.in.in
rename to panels/universal-access/gnome-universal-access-panel.desktop.in
index ef770fed0..a78c9f96f 100644
--- a/panels/universal-access/gnome-universal-access-panel.desktop.in.in
+++ b/panels/universal-access/gnome-universal-access-panel.desktop.in
@@ -10,9 +10,5 @@ NoDisplay=true
 StartupNotify=true
 Categories=GNOME;GTK;Settings;X-GNOME-Settings-Panel;X-GNOME-DetailsSettings;
 OnlyShowIn=GNOME;Unity;
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=gnome-control-center
-X-GNOME-Bugzilla-Component=Universal Access
-X-GNOME-Bugzilla-Version=@VERSION@
 # Translators: Search terms to find the Accessibility panel. Do NOT translate or localize the semicolons! 
The list MUST also end with a semicolon!
 Keywords=Keyboard;Mouse;a11y;Accessibility;Universal 
Access;Contrast;Cursor;Sound;Zoom;Screen;Reader;big;high;large;text;font;size;AccessX;Sticky;Keys;Slow;Bounce;Mouse;Double;click;Delay;Speed;Assist;Repeat;Blink;visual;hearing;audio;typing;animations;
diff --git a/panels/universal-access/meson.build b/panels/universal-access/meson.build
index b86b8c36a..fd5989efa 100644
--- a/panels/universal-access/meson.build
+++ b/panels/universal-access/meson.build
@@ -1,15 +1,9 @@
 panels_list += cappletname
 desktop = 'gnome-@0@-panel.desktop'.format(cappletname)
 
-desktop_in = configure_file(
-  input: desktop + '.in.in',
-  output: desktop + '.in',
-  configuration: desktop_conf
-)
-
 i18n.merge_file(
   type: 'desktop',
-  input: desktop_in,
+  input: desktop + '.in',
   output: desktop,
   po_dir: po_dir,
   install: true,
diff --git a/panels/usage/gnome-usage-panel.desktop.in.in b/panels/usage/gnome-usage-panel.desktop.in
similarity index 81%
rename from panels/usage/gnome-usage-panel.desktop.in.in
rename to panels/usage/gnome-usage-panel.desktop.in
index 8a6230378..eec3482c3 100644
--- a/panels/usage/gnome-usage-panel.desktop.in.in
+++ b/panels/usage/gnome-usage-panel.desktop.in
@@ -11,9 +11,5 @@ NoDisplay=true
 StartupNotify=true
 Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-PrivacySettings;
 OnlyShowIn=GNOME;Unity;
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=gnome-control-center
-X-GNOME-Bugzilla-Component=privacy
-X-GNOME-Bugzilla-Version=@VERSION@
 # Translators: Search terms to find the Usage panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
 Keywords=usage;recent;history;files;temporary;tmp;private;privacy;trash;purge;retain;
diff --git a/panels/usage/meson.build b/panels/usage/meson.build
index 8365b8365..0390b5f34 100644
--- a/panels/usage/meson.build
+++ b/panels/usage/meson.build
@@ -1,15 +1,9 @@
 panels_list += cappletname
 desktop = 'gnome-@0@-panel.desktop'.format(cappletname)
 
-desktop_in = configure_file(
-  input: desktop + '.in.in',
-  output: desktop + '.in',
-  configuration: desktop_conf
-)
-
 i18n.merge_file(
   type: 'desktop',
-  input: desktop_in,
+  input: desktop + '.in',
   output: desktop,
   po_dir: po_dir,
   install: true,
diff --git a/panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in 
b/panels/user-accounts/data/gnome-user-accounts-panel.desktop.in
similarity index 78%
rename from panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in
rename to panels/user-accounts/data/gnome-user-accounts-panel.desktop.in
index b91b37f58..a8d333089 100644
--- a/panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in
+++ b/panels/user-accounts/data/gnome-user-accounts-panel.desktop.in
@@ -10,10 +10,5 @@ NoDisplay=true
 StartupNotify=true
 Categories=GNOME;GTK;Settings;X-GNOME-Settings-Panel;X-GNOME-DetailsSettings;
 OnlyShowIn=GNOME;Unity;
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=gnome-control-center
-X-GNOME-Bugzilla-Component=user-accounts
-X-GNOME-Bugzilla-Version=@VERSION@
-X-GNOME-Settings-Panel=user-accounts
 # Translators: Search terms to find the Users panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
 Keywords=Login;Name;Fingerprint;Avatar;Logo;Face;Password;Parental Controls;Screen Time;App Restrictions;Web 
Restrictions;Usage;Usage Limit;Kid;Child;
diff --git a/panels/user-accounts/meson.build b/panels/user-accounts/meson.build
index d9efd1fd8..2d6d85910 100644
--- a/panels/user-accounts/meson.build
+++ b/panels/user-accounts/meson.build
@@ -1,15 +1,9 @@
 panels_list += cappletname
 desktop = 'gnome-@0@-panel.desktop'.format(cappletname)
 
-desktop_in = configure_file(
-  input: 'data/' + desktop + '.in.in',
-  output: desktop + '.in',
-  configuration: desktop_conf
-)
-
 i18n.merge_file(
   type: 'desktop',
-  input: desktop_in,
+  input: 'data/' + desktop + '.in',
   output: desktop,
   po_dir: po_dir,
   install: true,
diff --git a/panels/wacom/gnome-wacom-panel.desktop.in.in b/panels/wacom/gnome-wacom-panel.desktop.in
similarity index 81%
rename from panels/wacom/gnome-wacom-panel.desktop.in.in
rename to panels/wacom/gnome-wacom-panel.desktop.in
index 87cebd78f..002a14f71 100644
--- a/panels/wacom/gnome-wacom-panel.desktop.in.in
+++ b/panels/wacom/gnome-wacom-panel.desktop.in
@@ -10,9 +10,5 @@ NoDisplay=true
 StartupNotify=true
 Categories=GNOME;GTK;Settings;HardwareSettings;X-GNOME-Settings-Panel;X-GNOME-DevicesSettings;
 OnlyShowIn=GNOME;Unity;
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=gnome-control-center
-X-GNOME-Bugzilla-Component=wacom
-X-GNOME-Bugzilla-Version=@VERSION@
 # Translators: Search terms to find the Wacom Tablet panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
 Keywords=Tablet;Wacom;Stylus;Eraser;Mouse;
diff --git a/panels/wacom/meson.build b/panels/wacom/meson.build
index f65a3db66..0b5b354f5 100644
--- a/panels/wacom/meson.build
+++ b/panels/wacom/meson.build
@@ -23,15 +23,9 @@ subdir('calibrator')
 panels_list += cappletname
 desktop = 'gnome-@0@-panel.desktop'.format(cappletname)
 
-desktop_in = configure_file(
-          input : desktop + '.in.in',
-         output : desktop + '.in',
-  configuration : desktop_conf
-)
-
 i18n.merge_file(
          type : 'desktop',
-        input : desktop_in,
+        input : desktop + '.in',
        output : desktop,
        po_dir : po_dir,
       install : true,
diff --git a/panels/wwan/gnome-wwan-panel.desktop.in.in b/panels/wwan/gnome-wwan-panel.desktop.in
similarity index 100%
rename from panels/wwan/gnome-wwan-panel.desktop.in.in
rename to panels/wwan/gnome-wwan-panel.desktop.in
diff --git a/panels/wwan/meson.build b/panels/wwan/meson.build
index 9b73b5bb1..61bee1ff1 100644
--- a/panels/wwan/meson.build
+++ b/panels/wwan/meson.build
@@ -3,15 +3,9 @@ deps = common_deps + network_manager_deps + [gcr_dep, polkit_gobject_dep]
 panels_list += cappletname
 desktop = 'gnome-@0@-panel.desktop'.format(cappletname)
 
-desktop_in = configure_file(
-          input : desktop + '.in.in',
-         output : desktop + '.in',
-  configuration : desktop_conf
-)
-
 i18n.merge_file(
          type : 'desktop',
-        input : desktop_in,
+        input : desktop + '.in',
        output : desktop,
        po_dir : po_dir,
       install : true,
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 0728cc362..b108b770d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,7 +2,7 @@
 # Please keep this file sorted alphabetically.
 panels/applications/cc-applications-panel.c
 panels/applications/cc-applications-panel.ui
-panels/applications/gnome-applications-panel.desktop.in.in
+panels/applications/gnome-applications-panel.desktop.in
 panels/background/bg-colors-source.c
 panels/background/cc-background-chooser.c
 panels/background/cc-background-chooser.ui
@@ -10,11 +10,11 @@ panels/background/cc-background-item.c
 panels/background/cc-background-panel.c
 panels/background/cc-background-panel.ui
 panels/background/cc-background-preview.ui
-panels/background/gnome-background-panel.desktop.in.in
+panels/background/gnome-background-panel.desktop.in
 panels/bluetooth/cc-bluetooth-panel.ui
-panels/bluetooth/gnome-bluetooth-panel.desktop.in.in
+panels/bluetooth/gnome-bluetooth-panel.desktop.in
 panels/camera/cc-camera-panel.ui
-panels/camera/gnome-camera-panel.desktop.in.in
+panels/camera/gnome-camera-panel.desktop.in
 panels/color/cc-color-calibrate.c
 panels/color/cc-color-calibrate.ui
 panels/color/cc-color-common.c
@@ -22,7 +22,7 @@ panels/color/cc-color-device.c
 panels/color/cc-color-panel.c
 panels/color/cc-color-panel.ui
 panels/color/cc-color-profile.c
-panels/color/gnome-color-panel.desktop.in.in
+panels/color/gnome-color-panel.desktop.in
 panels/common/cc-common-language.c
 panels/common/cc-language-chooser.c
 panels/common/cc-language-chooser.ui
@@ -34,20 +34,20 @@ panels/common/cc-util.c
 panels/common/hostname-helper.c
 panels/datetime/cc-datetime-panel.c
 panels/datetime/cc-datetime-panel.ui
-panels/datetime/gnome-datetime-panel.desktop.in.in
+panels/datetime/gnome-datetime-panel.desktop.in
 panels/datetime/org.gnome.controlcenter.datetime.policy.in
 panels/default-apps/cc-default-apps-panel.ui
-panels/default-apps/gnome-default-apps-panel.desktop.in.in
+panels/default-apps/gnome-default-apps-panel.desktop.in
 panels/diagnostics/cc-diagnostics-panel.c
 panels/diagnostics/cc-diagnostics-panel.ui
-panels/diagnostics/gnome-diagnostics-panel.desktop.in.in
+panels/diagnostics/gnome-diagnostics-panel.desktop.in
 panels/display/cc-display-panel.c
 panels/display/cc-display-panel.ui
 panels/display/cc-display-settings.c
 panels/display/cc-display-settings.ui
 panels/display/cc-night-light-page.c
 panels/display/cc-night-light-page.ui
-panels/display/gnome-display-panel.desktop.in.in
+panels/display/gnome-display-panel.desktop.in
 panels/firmware-security/cc-firmware-security-boot-dialog.c
 panels/firmware-security/cc-firmware-security-boot-dialog.ui
 panels/firmware-security/cc-firmware-security-dialog.c
@@ -55,10 +55,10 @@ panels/firmware-security/cc-firmware-security-dialog.ui
 panels/firmware-security/cc-firmware-security-panel.c
 panels/firmware-security/cc-firmware-security-panel.ui
 panels/firmware-security/cc-firmware-security-utils.c
-panels/firmware-security/gnome-firmware-security-panel.desktop.in.in
+panels/firmware-security/gnome-firmware-security-panel.desktop.in
 panels/info-overview/cc-info-overview-panel.c
 panels/info-overview/cc-info-overview-panel.ui
-panels/info-overview/gnome-info-overview-panel.desktop.in.in
+panels/info-overview/gnome-info-overview-panel.desktop.in
 panels/keyboard/00-multimedia.xml.in
 panels/keyboard/01-input-sources.xml.in
 panels/keyboard/01-launchers.xml.in
@@ -78,18 +78,18 @@ panels/keyboard/cc-keyboard-shortcut-editor.ui
 panels/keyboard/cc-keyboard-shortcut-row.ui
 panels/keyboard/cc-xkb-modifier-dialog.c
 panels/keyboard/cc-xkb-modifier-dialog.ui
-panels/keyboard/gnome-keyboard-panel.desktop.in.in
+panels/keyboard/gnome-keyboard-panel.desktop.in
 panels/keyboard/keyboard-shortcuts.c
 panels/location/cc-location-panel.ui
-panels/location/gnome-location-panel.desktop.in.in
+panels/location/gnome-location-panel.desktop.in
 panels/microphone/cc-microphone-panel.ui
-panels/microphone/gnome-microphone-panel.desktop.in.in
+panels/microphone/gnome-microphone-panel.desktop.in
 panels/mouse/cc-mouse-panel.ui
 panels/mouse/cc-mouse-test.c
 panels/mouse/cc-mouse-test.ui
-panels/mouse/gnome-mouse-panel.desktop.in.in
+panels/mouse/gnome-mouse-panel.desktop.in
 panels/multitasking/cc-multitasking-panel.ui
-panels/multitasking/gnome-multitasking-panel.desktop.in.in
+panels/multitasking/gnome-multitasking-panel.desktop.in
 panels/network/cc-network-panel.c
 panels/network/cc-network-panel.ui
 panels/network/cc-wifi-connection-row.c
@@ -118,8 +118,8 @@ panels/network/connection-editor/security-page.ui
 panels/network/connection-editor/vpn-helpers.c
 panels/network/connection-editor/vpn-page.ui
 panels/network/connection-editor/wifi-page.ui
-panels/network/gnome-network-panel.desktop.in.in
-panels/network/gnome-wifi-panel.desktop.in.in
+panels/network/gnome-network-panel.desktop.in
+panels/network/gnome-wifi-panel.desktop.in
 panels/network/net-device-ethernet.c
 panels/network/net-device-mobile.c
 panels/network/net-device-wifi.c
@@ -160,20 +160,20 @@ panels/network/wireless-security/ws-wpa-psk.ui
 panels/notifications/cc-app-notifications-dialog.ui
 panels/notifications/cc-notifications-panel.c
 panels/notifications/cc-notifications-panel.ui
-panels/notifications/gnome-notifications-panel.desktop.in.in
+panels/notifications/gnome-notifications-panel.desktop.in
 panels/online-accounts/cc-online-account-provider-row.c
 panels/online-accounts/cc-online-accounts-panel.c
 panels/online-accounts/cc-online-accounts-panel.ui
 panels/online-accounts/gnome-control-center-goa-helper.c
-panels/online-accounts/gnome-online-accounts-panel.desktop.in.in
+panels/online-accounts/gnome-online-accounts-panel.desktop.in
 panels/power/cc-battery-row.c
 panels/power/cc-power-panel.c
 panels/power/cc-power-panel.ui
 panels/power/cc-power-profile-row.c
 panels/power/cc-power-profile-row.ui
-panels/power/gnome-power-panel.desktop.in.in
+panels/power/gnome-power-panel.desktop.in
 panels/printers/cc-printers-panel.c
-panels/printers/gnome-printers-panel.desktop.in.in
+panels/printers/gnome-printers-panel.desktop.in
 panels/printers/new-printer-dialog.ui
 panels/printers/pp-details-dialog.c
 panels/printers/pp-details-dialog.ui
@@ -198,24 +198,24 @@ panels/region/cc-format-preview.c
 panels/region/cc-format-preview.ui
 panels/region/cc-region-panel.c
 panels/region/cc-region-panel.ui
-panels/region/gnome-region-panel.desktop.in.in
+panels/region/gnome-region-panel.desktop.in
 panels/removable-media/cc-removable-media-panel.c
 panels/removable-media/cc-removable-media-panel.ui
-panels/removable-media/gnome-removable-media-panel.desktop.in.in
+panels/removable-media/gnome-removable-media-panel.desktop.in
 panels/screen/cc-screen-panel.c
 panels/screen/cc-screen-panel.ui
-panels/screen/gnome-screen-panel.desktop.in.in
+panels/screen/gnome-screen-panel.desktop.in
 panels/search/cc-search-locations-dialog.c
 panels/search/cc-search-locations-dialog.ui
 panels/search/cc-search-panel.c
 panels/search/cc-search-panel-row.ui
 panels/search/cc-search-panel.ui
-panels/search/gnome-search-panel.desktop.in.in
+panels/search/gnome-search-panel.desktop.in
 panels/sharing/cc-sharing-networks.c
 panels/sharing/cc-sharing-networks.ui
 panels/sharing/cc-sharing-panel.c
 panels/sharing/cc-sharing-panel.ui
-panels/sharing/gnome-sharing-panel.desktop.in.in
+panels/sharing/gnome-sharing-panel.desktop.in
 panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in
 panels/sound/cc-alert-chooser.c
 panels/sound/cc-alert-chooser.ui
@@ -227,13 +227,13 @@ panels/sound/cc-sound-panel.ui
 panels/sound/cc-subwoofer-slider.ui
 panels/sound/cc-volume-slider.c
 panels/sound/cc-volume-slider.ui
-panels/sound/gnome-sound-panel.desktop.in.in
+panels/sound/gnome-sound-panel.desktop.in
 panels/thunderbolt/cc-bolt-device-dialog.c
 panels/thunderbolt/cc-bolt-device-dialog.ui
 panels/thunderbolt/cc-bolt-device-entry.c
 panels/thunderbolt/cc-bolt-panel.c
 panels/thunderbolt/cc-bolt-panel.ui
-panels/thunderbolt/gnome-thunderbolt-panel.desktop.in.in
+panels/thunderbolt/gnome-thunderbolt-panel.desktop.in
 panels/universal-access/cc-cursor-blinking-dialog.ui
 panels/universal-access/cc-cursor-size-dialog.ui
 panels/universal-access/cc-pointing-dialog.ui
@@ -244,10 +244,10 @@ panels/universal-access/cc-ua-panel.ui
 panels/universal-access/cc-visual-alerts-dialog.ui
 panels/universal-access/cc-zoom-options-dialog.c
 panels/universal-access/cc-zoom-options-dialog.ui
-panels/universal-access/gnome-universal-access-panel.desktop.in.in
+panels/universal-access/gnome-universal-access-panel.desktop.in
 panels/usage/cc-usage-panel.c
 panels/usage/cc-usage-panel.ui
-panels/usage/gnome-usage-panel.desktop.in.in
+panels/usage/gnome-usage-panel.desktop.in
 panels/user-accounts/cc-add-user-dialog.c
 panels/user-accounts/cc-add-user-dialog.ui
 panels/user-accounts/cc-avatar-chooser.c
@@ -261,7 +261,7 @@ panels/user-accounts/cc-password-dialog.ui
 panels/user-accounts/cc-realm-manager.c
 panels/user-accounts/cc-user-panel.c
 panels/user-accounts/cc-user-panel.ui
-panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in
+panels/user-accounts/data/gnome-user-accounts-panel.desktop.in
 panels/user-accounts/data/join-dialog.ui
 panels/user-accounts/org.gnome.controlcenter.user-accounts.policy.in
 panels/user-accounts/pw-utils.c
@@ -280,7 +280,7 @@ panels/wacom/cc-wacom-panel.ui
 panels/wacom/cc-wacom-stylus-page.c
 panels/wacom/cc-wacom-stylus-page.ui
 panels/wacom/cc-wacom-tool.c
-panels/wacom/gnome-wacom-panel.desktop.in.in
+panels/wacom/gnome-wacom-panel.desktop.in
 panels/wacom/gsd-wacom-key-shortcut-button.c
 panels/wwan/cc-wwan-apn-dialog.c
 panels/wwan/cc-wwan-apn-dialog.ui
@@ -297,7 +297,7 @@ panels/wwan/cc-wwan-panel.c
 panels/wwan/cc-wwan-panel.ui
 panels/wwan/cc-wwan-sim-lock-dialog.c
 panels/wwan/cc-wwan-sim-lock-dialog.ui
-panels/wwan/gnome-wwan-panel.desktop.in.in
+panels/wwan/gnome-wwan-panel.desktop.in
 shell/appdata/org.gnome.Settings.appdata.xml.in
 shell/cc-application.c
 shell/cc-panel-list.ui
@@ -305,7 +305,7 @@ shell/cc-panel-loader.c
 shell/cc-window.c
 shell/cc-window.ui
 shell/help-overlay.ui
-shell/org.gnome.Settings.desktop.in.in
+shell/org.gnome.Settings.desktop.in
 shell/org.gnome.Settings.gschema.xml
 # Please do not remove this file from POTFILES.in. Run "git submodule init && git submodule update" to get 
it.
 subprojects/gvc/gvc-mixer-control.c
diff --git a/shell/cc-shell-model.c b/shell/cc-shell-model.c
index 19fc9c6d4..1dbb85055 100644
--- a/shell/cc-shell-model.c
+++ b/shell/cc-shell-model.c
@@ -26,10 +26,6 @@
 
 #include <gio/gdesktopappinfo.h>
 
-#define GNOME_SETTINGS_PANEL_ID_KEY "X-GNOME-Settings-Panel"
-#define GNOME_SETTINGS_PANEL_CATEGORY GNOME_SETTINGS_PANEL_ID_KEY
-#define GNOME_SETTINGS_PANEL_ID_KEYWORDS "Keywords"
-
 struct _CcShellModel
 {
   GtkListStore parent;
diff --git a/shell/meson.build b/shell/meson.build
index 9553c35ce..3d894a7ac 100644
--- a/shell/meson.build
+++ b/shell/meson.build
@@ -16,15 +16,9 @@ configure_file(
 
 desktop = 'org.gnome.Settings.desktop'
 
-desktop_in = configure_file(
-          input : desktop + '.in.in',
-         output : desktop + '.in',
-  configuration : desktop_conf
-)
-
 i18n.merge_file(
          type : 'desktop',
-        input : desktop_in,
+        input : desktop + '.in',
        output : desktop,
        po_dir : po_dir,
       install : true,
diff --git a/shell/org.gnome.Settings.desktop.in.in b/shell/org.gnome.Settings.desktop.in
similarity index 79%
rename from shell/org.gnome.Settings.desktop.in.in
rename to shell/org.gnome.Settings.desktop.in
index 1cb049c8c..fb2530116 100644
--- a/shell/org.gnome.Settings.desktop.in.in
+++ b/shell/org.gnome.Settings.desktop.in
@@ -8,10 +8,6 @@ Type=Application
 StartupNotify=true
 Categories=GNOME;GTK;Settings;
 OnlyShowIn=GNOME;Unity;
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=gnome-control-center
-X-GNOME-Bugzilla-Component=shell
-X-GNOME-Bugzilla-Version=@VERSION@
 # Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
 Keywords=Preferences;Settings;
 # Translators: Do NOT translate or transliterate this text (these are enum types)!
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]