build: Make sure distcheck passes

Rename files in POTFILES to match new names. Rename the universal access
.desktop file to be consistent with the other desktop files.

5 files changed, 16 insertions, 15 deletions

diff --git a/configure.ac b/configure.ac
index cfae9b5d8..e5cce8747 100644
--- a/configure.ac
+++ b/configure.ac
@@ -391,7 +391,7 @@ panels/keybindings/Makefile
 panels/keybindings/gnome-keybindings.pc
 panels/keybindings/gnome-keybindings-panel.desktop.in
 panels/universal-access/Makefile
-panels/universal-access/gnome-universal-access.desktop.in
+panels/universal-access/gnome-universal-access-panel.desktop.in
 docs/Makefile
 docs/reference/Makefile
 docs/reference/libgnome-control-center/Makefile
diff --git a/panels/universal-access/Makefile.am b/panels/universal-access/Makefile.am
index 35048a1a8..fe8e51052 100644
--- a/panels/universal-access/Makefile.am
+++ b/panels/universal-access/Makefile.am
@@ -17,13 +17,13 @@ libuniversal_access_la_LIBADD = $(PANEL_LIBS)
 libuniversal_access_la_LDFLAGS = $(PANEL_LDFLAGS)
 
 uidir = $(pkgdatadir)/ui
-ui_DATA = uap.ui
+dist_ui_DATA = uap.ui
 
 
 @INTLTOOL_DESKTOP_RULE@
 
 desktopdir = $(datadir)/applications
-desktop_in_files = gnome-universal-access.desktop.in
+desktop_in_files = gnome-universal-access-panel.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 
 CLEANFILES = $(desktop_in_files) $(desktop_DATA)
diff --git a/panels/universal-access/gnome-universal-access.desktop.in.in b/panels/universal-access/gnome-universal-access-panel.desktop.in.in
index 204981b81..204981b81 100644
--- a/panels/universal-access/gnome-universal-access.desktop.in.in
+++ b/panels/universal-access/gnome-universal-access-panel.desktop.in.in
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 7ee53fc22..1bd4f9ad5 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -36,7 +36,7 @@ capplets/common/file-transfer-dialog.c
 capplets/common/gconf-property-editor.c
 libgnome-control-center/gconf-property-editor.c
 capplets/common/gnome-theme-info.c
-panels/default-applications/default-applications.desktop.in.in
+panels/default-applications/gnome-default-applications-panel.desktop.in.in
 panels/default-applications/gnome-at-session.desktop.in.in
 panels/default-applications/gnome-da-capplet.c
 [type: gettext/glade]panels/default-applications/gnome-default-applications-properties.ui
@@ -51,7 +51,7 @@ panels/keybindings/01-desktop-key.xml.in
 panels/keybindings/eggcellrendererkeys.c
 panels/keybindings/gnome-keybinding-properties.c
 [type: gettext/glade]panels/keybindings/gnome-keybinding-properties.ui
-panels/keybindings/keybinding.desktop.in.in
+panels/keybindings/gnome-keybindings-panel.desktop.in.in
 panels/keyboard/gnome-keyboard-properties.c
 [type: gettext/glade]panels/keyboard/gnome-keyboard-properties-a11y-notifications.ui
 [type: gettext/glade]panels/keyboard/gnome-keyboard-properties-dialog.ui
@@ -64,15 +64,17 @@ panels/keyboard/gnome-keyboard-properties-xkblt.c
 panels/keyboard/gnome-keyboard-properties-xkbmc.c
 panels/keyboard/gnome-keyboard-properties-xkbot.c
 panels/keyboard/gnome-keyboard-properties-xkbpv.c
-panels/keyboard/keyboard.desktop.in.in
+panels/keyboard/gnome-keyboard-panel.desktop.in.in
 panels/mouse/capplet-stock-icons.c
 panels/mouse/gnome-mouse-accessibility.c
 panels/mouse/gnome-mouse-properties.c
 [type: gettext/glade]panels/mouse/gnome-mouse-properties.ui
-panels/mouse/gnome-settings-mouse.desktop.in.in
+panels/mouse/gnome-mouse-panel.desktop.in.in
 panels/network/gnome-network-properties.c
-panels/network/gnome-network-properties.desktop.in.in
+panels/network/gnome-network-panel.desktop.in.in
 [type: gettext/glade]panels/network/gnome-network-properties.ui
+panels/universal-access/gnome-universal-access-panel.desktop.in.in
+[type: gettext/glade]panels/universal-access/uap.ui
 libwindow-settings/gnome-wm-manager.c
 libwindow-settings/metacity-window-manager.c
 shell/control-center.c
@@ -87,7 +89,6 @@ font-viewer/font-view.c
 font-viewer/gnome-font-viewer.desktop.in.in
 font-viewer/font-thumbnailer.c
 examples/gnome-example-panel.desktop.in.in
-panels/mouse/gnome-settings-mouse.desktop.in.in
 shell/gnome-control-center.desktop.in.in
 [type: gettext/glade]shell/shell.ui
 
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 42eb6a730..18e06f521 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -4,14 +4,14 @@ capplets/accessibility/keyboard/accessibility-keyboard.desktop.in
 capplets/appearance/data/gnome-appearance-properties.desktop.in
 capplets/appearance/data/gnome-theme-installer.desktop.in
 capplets/appearance/data/gnome-theme-package.xml
-panels/default-applications/default-applications.desktop.in
+panels/default-applications/gnome-default-applications-panel.desktop.in
 panels/default-applications/gnome-at-session.desktop.in
 capplets/display/display-properties.desktop.in
-panels/keybindings/keybinding.desktop.in
-panels/keyboard/keyboard.desktop.in
+panels/keybindings/gnome-keybindings-panel.desktop.in
+panels/keyboard/gnome-keyboard-panel.desktop.in
 capplets/localization/localization.desktop.in
 capplets/mouse/gnome-settings-mouse.desktop.in
-panels/network/gnome-network-properties.desktop.in
+panels/network/gnome-network-panel.desktop.in
 capplets/sound/gnome-settings-sound.desktop.in
 font-viewer/gnome-font-viewer.desktop.in
 schemas/desktop_gnome_font_rendering.schemas.in
@@ -22,9 +22,9 @@ schemas/apps_gnome_settings_daemon_default_editor.schemas.in
 schemas/apps_gnome_settings_daemon_keybindings.schemas.in
 schemas/apps_gnome_settings_daemon_screensaver.schemas.in
 examples/gnome-example-panel.desktop.in
-panels/mouse/gnome-settings-mouse.desktop.in
 shell/gnome-control-center.desktop.in
 examples/gnome-example-panel.desktop.in
-panels/mouse/gnome-settings-mouse.desktop.in
+panels/mouse/gnome-mouse-panel.desktop.in
+panels/universal-access/gnome-universal-access-panel.desktop.in
 shell/gnome-control-center.desktop.in