Various upgrades and fixes for cinnamon:

- Upgrade cinnamon, cinnamon-control-center, nemo and mutter [1]. - Add staging support - While here change lib_depends to the new style - Add some USES+=pkgconfig missing - Sort USE_GNOME - Update the pkg-plist for all the ports changed - Fix the COMMENT knobs - Fix the nemo patches. Remove patch-autogen.sh - Remove patch-panels_common_cc-common-language.c and add patch-panels_user-accounts_um-utils.c for c-c-c Reviewed by: kwm [1] 1.8.8.1, 1.8.2, 1.8.5 and 3.6.2 git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18785 df743ca5-7f9a-e211-a948-0013205c9059
author: gusi <gusi@df743ca5-7f9a-e211-a948-0013205c9059> 2013-10-10 06:38:54 +0800
committer: gusi <gusi@df743ca5-7f9a-e211-a948-0013205c9059> 2013-10-10 06:38:54 +0800
commit: b27260bec4dec433d91f86459586a4c5e8c45e5a (patch)
tree: 52412a380d2a3bc3dc456ac020d2ea5dfd3925c5
parent: fa32e601e6ae5eacda9dbdb05ce809f98be6af21 (diff)
download: marcuscom-ports-b27260bec4dec433d91f86459586a4c5e8c45e5a.tar
marcuscom-ports-b27260bec4dec433d91f86459586a4c5e8c45e5a.tar.gz
marcuscom-ports-b27260bec4dec433d91f86459586a4c5e8c45e5a.tar.bz2
marcuscom-ports-b27260bec4dec433d91f86459586a4c5e8c45e5a.tar.lz
marcuscom-ports-b27260bec4dec433d91f86459586a4c5e8c45e5a.tar.xz
marcuscom-ports-b27260bec4dec433d91f86459586a4c5e8c45e5a.tar.zst
marcuscom-ports-b27260bec4dec433d91f86459586a4c5e8c45e5a.zip
16 files changed, 473 insertions, 619 deletions
diff --git a/sysutils/cinnamon-control-center/Makefile b/sysutils/cinnamon-control-center/Makefile
index dc4d2be0c..348ac6f83 100644
--- a/sysutils/cinnamon-control-center/Makefile
+++ b/sysutils/cinnamon-control-center/Makefile
@@ -3,12 +3,12 @@
 #
 
 PORTNAME=	cinnamon-control-center
-PORTVERSION=	1.7.1
+PORTVERSION=	1.8.2
 CATEGORIES=	sysutils gnome
 DIST_SUBDIR=	gnome3
 
 MAINTAINER=	gustau.perez@gmail.com
-COMMENT=	A gnome-control-center replacement for Cinnamon
+COMMENT=	gnome-control-center replacement for Cinnamon
 
 BUILD_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss \
 		gnome-settings-daemon>=3.4.0:${PORTSDIR}/sysutils/gnome-settings-daemon3 \
@@ -18,29 +18,30 @@ LIB_DEPENDS=	libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification \
 		libcheese.so:${PORTSDIR}/multimedia/cheese3 \
 		libkrb5support.so:${PORTSDIR}/security/krb5 \
 		libcaribou.so:${PORTSDIR}/accessibility/caribou \
-		libgtop.so:${PORTSDIR}/devel/libgtop \
+		libgtop-2.0.so:${PORTSDIR}/devel/libgtop \
 		libmuffin.so:${PORTSDIR}/x11-wm/muffin \
 		libtelepathy-glib.so:${PORTSDIR}/net-im/telepathy-glib \
 		libtelepathy-logger.so:${PORTSDIR}/net-im/telepathy-logger \
 		libfolks.so:${PORTSDIR}/net-im/folks \
 		libpulse.so:${PORTSDIR}/audio/pulseaudio \
-		libcroco.so:${PORTSDIR}/textproc/libcroco \
+		libcroco-0.6.so:${PORTSDIR}/textproc/libcroco \
 		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libclutter-glx-1.so:${PORTSDIR}/graphics/clutter \
-		libclutter-gst-1.so:${PORTSDIR}/multimedia/clutter-gst \
+		libclutter-glx-1.0.so:${PORTSDIR}/graphics/clutter \
+		libclutter-gst-2.0.so:${PORTSDIR}/multimedia/clutter-gst \
 		libgjs.so:${PORTSDIR}/lang/gjs
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dbus-python.pc:${PORTSDIR}/devel/py-dbus \
 		${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss \
 		${LOCALBASE}/share/doc/py-lxml/CREDITS.txt:${PORTSDIR}/devel/py-lxml
 
+WRKSRC=		${WRKDIR}/linuxmint-cinnamon-control-center-2249c94
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	linuxmint
-GH_TAGNAME=	1.7.1
-GH_COMMIT=	a3883df
+GH_TAGNAME=	1.8.2
+GH_COMMIT=	3b93fd2
 
-NO_STAGE=	yes
 USE_XORG=	x11 xfixes sm
-USES=		gettext gmake pathfix
+USES=		gettext gmake pathfix pkgconfig
 USE_GNOME=	gnomeprefix intlhack gtk30 gconf2 gnomemenus3 \
 		gnomedesktop3 evolutiondataserver3
 USE_LDCONFIG=	yes
@@ -69,22 +70,13 @@ PLIST_SUB+=	CUPS="@comment "
 .endif
 
 post-patch:
-	@${MKDIR} ${WRKSRC}/files${PREFIX}
-
-	@${MV} ${WRKSRC}/files/usr/share ${WRKSRC}/files${PREFIX}
-
 	@${REINPLACE_CMD} -e 's|find|find ${WRKSRC}/files|g' \
 		${WRKSRC}/files/Makefile.in
 
-	@${REINPLACE_CMD} -e 's|/usr/share/|${PREFIX}/share/|g ;\
-		s|"usr/lib|"${PREFIX}/share/|g ;\
-		s|.utf8|.UTF-8|g' \
-			${WRKSRC}/files${PREFIX}/share/cinnamon-control-center/language-options
-
 	@${REINPLACE_CMD} -e 's|/usr/share/|${PREFIX}/share/|g' \
 		${WRKSRC}/panels/common/cc-common-language.c
 
 pre-configure:
-	cd ${WRKSRC} && ${PREFIX}/bin/autoreconf && :> panels/info/hostnames-test.txt
+	cd ${WRKSRC} && ${PREFIX}/bin/autoreconf
 
 .include <bsd.port.mk>
diff --git a/sysutils/cinnamon-control-center/distinfo b/sysutils/cinnamon-control-center/distinfo
index 118d2a57c..70b31cb05 100644
--- a/sysutils/cinnamon-control-center/distinfo
+++ b/sysutils/cinnamon-control-center/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/cinnamon-control-center-1.7.1.tar.gz) = 56dc2ee75569a23ad1e850939c864274cfa10e4f2b3408a248087cd5bb4f6f9a
-SIZE (gnome3/cinnamon-control-center-1.7.1.tar.gz) = 8435750
+SHA256 (gnome3/cinnamon-control-center-1.8.2.tar.gz) = c1bb0e1851b3379d62fce6fe7659ca114df8b2637dc8ad3fe237147fe0371562
+SIZE (gnome3/cinnamon-control-center-1.8.2.tar.gz) = 8434741
diff --git a/sysutils/cinnamon-control-center/files/patch-panels_common_cc-common-language.c b/sysutils/cinnamon-control-center/files/patch-panels_common_cc-common-language.c
deleted file mode 100644
index 0e9225c3c..000000000
--- a/sysutils/cinnamon-control-center/files/patch-panels_common_cc-common-language.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- panels/common/cc-common-language.orig.c	2013-02-28 12:16:01.054493856 +0100
-+++ panels/common/cc-common-language.c	2013-02-28 12:16:14.526494237 +0100
-@@ -580,7 +580,7 @@
-                             &error )) {
-                 g_debug ("Couldn't get available languages: %s", error->message);
-                 g_error_free (error);
--                return;
-+                return ht;
-         }
- 
-         name = strtok (avail_languages, "\n");
diff --git a/sysutils/cinnamon-control-center/files/patch-panels_user-accounts_um-utils.c b/sysutils/cinnamon-control-center/files/patch-panels_user-accounts_um-utils.c
index 30e931a14..565411a89 100644
--- a/sysutils/cinnamon-control-center/files/patch-panels_user-accounts_um-utils.c
+++ b/sysutils/cinnamon-control-center/files/patch-panels_user-accounts_um-utils.c
@@ -1,23 +1,19 @@
---- panels/user-accounts/um-utils.orig.c	2013-02-28 12:30:49.816494890 +0100
-+++ panels/user-accounts/um-utils.c	2013-02-28 12:32:17.656493654 +0100
-@@ -23,9 +23,10 @@
- 
- #include <math.h>
+--- panels/user-accounts/um-utils.c.orig	2013-05-22 16:25:19.000000000 +0000
++++ panels/user-accounts/um-utils.c	2013-10-09 16:50:07.978760476 +0000
+@@ -25,7 +25,15 @@
  #include <stdlib.h>
-+#include <sys/param.h>
  #include <sys/types.h>
  #include <pwd.h>
 -#include <utmp.h>
++
++#include <sys/param.h>
++#if __FreeBSD_version < 900000
++ #include <utmp.h>
++#else
 +#include <utmpx.h>
++/* from the old utmp.h */
++#define UT_NAMESIZE 16
++#endif
  
  #include <glib.h>
- #include <glib/gi18n.h>
-@@ -445,7 +446,7 @@
- }
- 
- 
--#define MAXNAMELEN  (UT_NAMESIZE - 1)
-+#define MAXNAMELEN  (MAXLOGNAME - 1)
- 
- static gboolean
- is_username_used (const gchar *username)
+ #include <glib/gi18n-lib.h>
diff --git a/sysutils/cinnamon-control-center/pkg-plist b/sysutils/cinnamon-control-center/pkg-plist
index 1936ef76a..057bb3791 100644
--- a/sysutils/cinnamon-control-center/pkg-plist
+++ b/sysutils/cinnamon-control-center/pkg-plist
@@ -8,30 +8,18 @@ include/cinnamon-control-center-1/libcinnamon-control-center/cc-shell.h
 lib/cinnamon-control-center-1/panels/libcolor.a
 lib/cinnamon-control-center-1/panels/libcolor.la
 lib/cinnamon-control-center-1/panels/libcolor.so
-lib/cinnamon-control-center-1/panels/libdate_time.a
-lib/cinnamon-control-center-1/panels/libdate_time.la
-lib/cinnamon-control-center-1/panels/libdate_time.so
 lib/cinnamon-control-center-1/panels/libdisplay.a
 lib/cinnamon-control-center-1/panels/libdisplay.la
 lib/cinnamon-control-center-1/panels/libdisplay.so
-lib/cinnamon-control-center-1/panels/libinfo.a
-lib/cinnamon-control-center-1/panels/libinfo.la
-lib/cinnamon-control-center-1/panels/libinfo.so
 lib/cinnamon-control-center-1/panels/libpower.a
 lib/cinnamon-control-center-1/panels/libpower.la
 lib/cinnamon-control-center-1/panels/libpower.so
-%%CUPS%%lib/cinnamon-control-center-1/panels/libprinters.a
-%%CUPS%%lib/cinnamon-control-center-1/panels/libprinters.la
-%%CUPS%%lib/cinnamon-control-center-1/panels/libprinters.so
 lib/cinnamon-control-center-1/panels/libregion.a
 lib/cinnamon-control-center-1/panels/libregion.la
 lib/cinnamon-control-center-1/panels/libregion.so
 lib/cinnamon-control-center-1/panels/libscreen.a
 lib/cinnamon-control-center-1/panels/libscreen.la
 lib/cinnamon-control-center-1/panels/libscreen.so
-lib/cinnamon-control-center-1/panels/libsound.a
-lib/cinnamon-control-center-1/panels/libsound.la
-lib/cinnamon-control-center-1/panels/libsound.so
 lib/cinnamon-control-center-1/panels/libsoundnua.a
 lib/cinnamon-control-center-1/panels/libsoundnua.la
 lib/cinnamon-control-center-1/panels/libsoundnua.so
@@ -47,183 +35,85 @@ lib/libcinnamon-control-center.so.1
 libdata/pkgconfig/libcinnamon-control-center.pc
 share/applications/cinnamon-color-panel.desktop
 share/applications/cinnamon-control-center.desktop
-share/applications/cinnamon-datetime-panel.desktop
 share/applications/cinnamon-display-panel.desktop
-share/applications/cinnamon-info-panel.desktop
 share/applications/cinnamon-power-panel.desktop
-%%CUPS%%share/applications/cinnamon-printers-panel.desktop
 share/applications/cinnamon-region-panel.desktop
 share/applications/cinnamon-screen-panel.desktop
 share/applications/cinnamon-sound-nua-panel.desktop
 share/applications/cinnamon-sound-panel.desktop
 share/applications/cinnamon-universal-access-panel.desktop
 share/applications/cinnamon-user-accounts-panel.desktop
-share/cinnamon-control-center/datetime/backward
-share/cinnamon-control-center/icons/hicolor/16x16/devices/cin-audio-headset.svg
-share/cinnamon-control-center/icons/hicolor/16x16/status/cin-audio-input-microphone-high.png
-share/cinnamon-control-center/icons/hicolor/16x16/status/cin-audio-input-microphone-low.png
-share/cinnamon-control-center/icons/hicolor/16x16/status/cin-audio-input-microphone-medium.png
-share/cinnamon-control-center/icons/hicolor/16x16/status/cin-audio-input-microphone-muted.png
-share/cinnamon-control-center/icons/hicolor/22x22/status/cin-audio-input-microphone-high.png
-share/cinnamon-control-center/icons/hicolor/22x22/status/cin-audio-input-microphone-low.png
-share/cinnamon-control-center/icons/hicolor/22x22/status/cin-audio-input-microphone-medium.png
-share/cinnamon-control-center/icons/hicolor/22x22/status/cin-audio-input-microphone-muted.png
-share/cinnamon-control-center/icons/hicolor/24x24/devices/cin-audio-headset.svg
-share/cinnamon-control-center/icons/hicolor/24x24/status/cin-audio-input-microphone-high.png
-share/cinnamon-control-center/icons/hicolor/24x24/status/cin-audio-input-microphone-low.png
-share/cinnamon-control-center/icons/hicolor/24x24/status/cin-audio-input-microphone-medium.png
-share/cinnamon-control-center/icons/hicolor/24x24/status/cin-audio-input-microphone-muted.png
-share/cinnamon-control-center/icons/hicolor/32x32/devices/cin-audio-headset.svg
-share/cinnamon-control-center/icons/hicolor/32x32/status/cin-audio-input-microphone-high.png
-share/cinnamon-control-center/icons/hicolor/32x32/status/cin-audio-input-microphone-low.png
-share/cinnamon-control-center/icons/hicolor/32x32/status/cin-audio-input-microphone-medium.png
-share/cinnamon-control-center/icons/hicolor/32x32/status/cin-audio-input-microphone-muted.png
-share/cinnamon-control-center/icons/hicolor/4%%XAWVER%%x4%%XAWVER%%/devices/audio-speaker-center-back-testing.svg
-share/cinnamon-control-center/icons/hicolor/4%%XAWVER%%x4%%XAWVER%%/devices/audio-speaker-center-back.svg
-share/cinnamon-control-center/icons/hicolor/4%%XAWVER%%x4%%XAWVER%%/devices/audio-speaker-center-testing.svg
-share/cinnamon-control-center/icons/hicolor/4%%XAWVER%%x4%%XAWVER%%/devices/audio-speaker-center.svg
-share/cinnamon-control-center/icons/hicolor/4%%XAWVER%%x4%%XAWVER%%/devices/audio-speaker-left-back-testing.svg
-share/cinnamon-control-center/icons/hicolor/4%%XAWVER%%x4%%XAWVER%%/devices/audio-speaker-left-back.svg
-share/cinnamon-control-center/icons/hicolor/4%%XAWVER%%x4%%XAWVER%%/devices/audio-speaker-left-side-testing.svg
-share/cinnamon-control-center/icons/hicolor/4%%XAWVER%%x4%%XAWVER%%/devices/audio-speaker-left-side.svg
-share/cinnamon-control-center/icons/hicolor/4%%XAWVER%%x4%%XAWVER%%/devices/audio-speaker-left-testing.svg
-share/cinnamon-control-center/icons/hicolor/4%%XAWVER%%x4%%XAWVER%%/devices/audio-speaker-left.svg
-share/cinnamon-control-center/icons/hicolor/4%%XAWVER%%x4%%XAWVER%%/devices/audio-speaker-right-back-testing.svg
-share/cinnamon-control-center/icons/hicolor/4%%XAWVER%%x4%%XAWVER%%/devices/audio-speaker-right-back.svg
-share/cinnamon-control-center/icons/hicolor/4%%XAWVER%%x4%%XAWVER%%/devices/audio-speaker-right-side-testing.svg
-share/cinnamon-control-center/icons/hicolor/4%%XAWVER%%x4%%XAWVER%%/devices/audio-speaker-right-side.svg
-share/cinnamon-control-center/icons/hicolor/4%%XAWVER%%x4%%XAWVER%%/devices/audio-speaker-right-testing.svg
-share/cinnamon-control-center/icons/hicolor/4%%XAWVER%%x4%%XAWVER%%/devices/audio-speaker-right.svg
-share/cinnamon-control-center/icons/hicolor/4%%XAWVER%%x4%%XAWVER%%/devices/audio-subwoofer-testing.svg
-share/cinnamon-control-center/icons/hicolor/4%%XAWVER%%x4%%XAWVER%%/devices/audio-subwoofer.svg
-share/cinnamon-control-center/language-options
-share/cinnamon-control-center/language-options.bak
-share/cinnamon-control-center/pixmaps/about-me-lock-open.png
-share/cinnamon-control-center/pixmaps/about-me-lock.png
-share/cinnamon-control-center/pixmaps/left-index-finger.png
-share/cinnamon-control-center/pixmaps/left-index-finger.svg
-share/cinnamon-control-center/pixmaps/left-little-finger.png
-share/cinnamon-control-center/pixmaps/left-little-finger.svg
-share/cinnamon-control-center/pixmaps/left-middle-finger.png
-share/cinnamon-control-center/pixmaps/left-middle-finger.svg
-share/cinnamon-control-center/pixmaps/left-ring-finger.png
-share/cinnamon-control-center/pixmaps/left-ring-finger.svg
-share/cinnamon-control-center/pixmaps/left-thumb.png
-share/cinnamon-control-center/pixmaps/left-thumb.svg
-share/cinnamon-control-center/pixmaps/print_error.png
-share/cinnamon-control-center/pixmaps/print_error.svg
-share/cinnamon-control-center/pixmaps/print_ok.png
-share/cinnamon-control-center/pixmaps/print_ok.svg
-share/cinnamon-control-center/pixmaps/right-index-finger.png
-share/cinnamon-control-center/pixmaps/right-index-finger.svg
-share/cinnamon-control-center/pixmaps/right-little-finger.png
-share/cinnamon-control-center/pixmaps/right-little-finger.svg
-share/cinnamon-control-center/pixmaps/right-middle-finger.png
-share/cinnamon-control-center/pixmaps/right-middle-finger.svg
-share/cinnamon-control-center/pixmaps/right-ring-finger.png
-share/cinnamon-control-center/pixmaps/right-ring-finger.svg
-share/cinnamon-control-center/pixmaps/right-thumb.png
-share/cinnamon-control-center/pixmaps/right-thumb.svg
+%%DATADIR%%/icons/hicolor/16x16/devices/cin-audio-headset.svg
+%%DATADIR%%/icons/hicolor/16x16/status/cin-audio-input-microphone-high.png
+%%DATADIR%%/icons/hicolor/16x16/status/cin-audio-input-microphone-low.png
+%%DATADIR%%/icons/hicolor/16x16/status/cin-audio-input-microphone-medium.png
+%%DATADIR%%/icons/hicolor/16x16/status/cin-audio-input-microphone-muted.png
+%%DATADIR%%/icons/hicolor/22x22/status/cin-audio-input-microphone-high.png
+%%DATADIR%%/icons/hicolor/22x22/status/cin-audio-input-microphone-low.png
+%%DATADIR%%/icons/hicolor/22x22/status/cin-audio-input-microphone-medium.png
+%%DATADIR%%/icons/hicolor/22x22/status/cin-audio-input-microphone-muted.png
+%%DATADIR%%/icons/hicolor/24x24/devices/cin-audio-headset.svg
+%%DATADIR%%/icons/hicolor/24x24/status/cin-audio-input-microphone-high.png
+%%DATADIR%%/icons/hicolor/24x24/status/cin-audio-input-microphone-low.png
+%%DATADIR%%/icons/hicolor/24x24/status/cin-audio-input-microphone-medium.png
+%%DATADIR%%/icons/hicolor/24x24/status/cin-audio-input-microphone-muted.png
+%%DATADIR%%/icons/hicolor/32x32/devices/cin-audio-headset.svg
+%%DATADIR%%/icons/hicolor/32x32/status/cin-audio-input-microphone-high.png
+%%DATADIR%%/icons/hicolor/32x32/status/cin-audio-input-microphone-low.png
+%%DATADIR%%/icons/hicolor/32x32/status/cin-audio-input-microphone-medium.png
+%%DATADIR%%/icons/hicolor/32x32/status/cin-audio-input-microphone-muted.png
+%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-center-back-testing.svg
+%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-center-back.svg
+%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-center-testing.svg
+%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-center.svg
+%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-left-back-testing.svg
+%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-left-back.svg
+%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-left-testing.svg
+%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-left-side-testing.svg
+%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-left-side.svg
+%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-left.svg
+%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-right-back-testing.svg
+%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-right-back.svg
+%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-right-side-testing.svg
+%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-right-side.svg
+%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-right-testing.svg
+%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-right.svg
+%%DATADIR%%/icons/hicolor/48x48/devices/audio-subwoofer-testing.svg
+%%DATADIR%%/icons/hicolor/48x48/devices/audio-subwoofer.svg
+%%DATADIR%%/pixmaps/about-me-lock-open.png
+%%DATADIR%%/pixmaps/about-me-lock.png
+%%DATADIR%%/pixmaps/left-index-finger.png
+%%DATADIR%%/pixmaps/left-index-finger.svg
+%%DATADIR%%/pixmaps/left-little-finger.png
+%%DATADIR%%/pixmaps/left-little-finger.svg
+%%DATADIR%%/pixmaps/left-middle-finger.png
+%%DATADIR%%/pixmaps/left-middle-finger.svg
+%%DATADIR%%/pixmaps/left-ring-finger.png
+%%DATADIR%%/pixmaps/left-ring-finger.svg
+%%DATADIR%%/pixmaps/left-thumb.png
+%%DATADIR%%/pixmaps/left-thumb.svg
+%%DATADIR%%/pixmaps/print_error.png
+%%DATADIR%%/pixmaps/print_error.svg
+%%DATADIR%%/pixmaps/print_ok.png
+%%DATADIR%%/pixmaps/print_ok.svg
+%%DATADIR%%/pixmaps/right-index-finger.png
+%%DATADIR%%/pixmaps/right-index-finger.svg
+%%DATADIR%%/pixmaps/right-little-finger.png
+%%DATADIR%%/pixmaps/right-little-finger.svg
+%%DATADIR%%/pixmaps/right-middle-finger.png
+%%DATADIR%%/pixmaps/right-middle-finger.svg
+%%DATADIR%%/pixmaps/right-ring-finger.png
+%%DATADIR%%/pixmaps/right-ring-finger.svg
+%%DATADIR%%/pixmaps/right-thumb.png
+%%DATADIR%%/pixmaps/right-thumb.svg
 share/cinnamon-control-center/sounds/cinnamon-sounds-default.xml
 share/cinnamon-control-center/ui/cinnamon-region-panel-layout-chooser.ui
 share/cinnamon-control-center/ui/cinnamon-region-panel-options-dialog.ui
 share/cinnamon-control-center/ui/cinnamon-region-panel.ui
-share/cinnamon-control-center/ui/cinnamon.png
 share/cinnamon-control-center/ui/color.ui
-share/cinnamon-control-center/ui/datetime/bg.png
-share/cinnamon-control-center/ui/datetime/bg_dim.png
-share/cinnamon-control-center/ui/datetime/cc.png
-share/cinnamon-control-center/ui/datetime/datetime.ui
-share/cinnamon-control-center/ui/datetime/pin.png
-share/cinnamon-control-center/ui/datetime/timezone_%%XAWVER%%.75.png
-share/cinnamon-control-center/ui/datetime/timezone_%%XAWVER%%.75_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_%%XAWVER%%.png
-share/cinnamon-control-center/ui/datetime/timezone_%%XAWVER%%_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_-%%XAWVER%%.png
-share/cinnamon-control-center/ui/datetime/timezone_-%%XAWVER%%_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_-1.png
-share/cinnamon-control-center/ui/datetime/timezone_-10.png
-share/cinnamon-control-center/ui/datetime/timezone_-10_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_-11.png
-share/cinnamon-control-center/ui/datetime/timezone_-11_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_-1_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_-2.png
-share/cinnamon-control-center/ui/datetime/timezone_-2_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_-3.5.png
-share/cinnamon-control-center/ui/datetime/timezone_-3.5_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_-3.png
-share/cinnamon-control-center/ui/datetime/timezone_-3_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_-4.5.png
-share/cinnamon-control-center/ui/datetime/timezone_-4.5_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_-4.png
-share/cinnamon-control-center/ui/datetime/timezone_-4_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_-5.5.png
-share/cinnamon-control-center/ui/datetime/timezone_-5.5_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_-5.png
-share/cinnamon-control-center/ui/datetime/timezone_-5_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_-6.png
-share/cinnamon-control-center/ui/datetime/timezone_-6_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_-7.png
-share/cinnamon-control-center/ui/datetime/timezone_-7_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_-9.5.png
-share/cinnamon-control-center/ui/datetime/timezone_-9.5_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_-9.png
-share/cinnamon-control-center/ui/datetime/timezone_-9_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_0.png
-share/cinnamon-control-center/ui/datetime/timezone_0_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_1.png
-share/cinnamon-control-center/ui/datetime/timezone_10.5.png
-share/cinnamon-control-center/ui/datetime/timezone_10.5_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_10.png
-share/cinnamon-control-center/ui/datetime/timezone_10_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_11.5.png
-share/cinnamon-control-center/ui/datetime/timezone_11.5_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_11.png
-share/cinnamon-control-center/ui/datetime/timezone_11_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_12.75.png
-share/cinnamon-control-center/ui/datetime/timezone_12.75_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_12.png
-share/cinnamon-control-center/ui/datetime/timezone_12_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_13.png
-share/cinnamon-control-center/ui/datetime/timezone_13_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_14.png
-share/cinnamon-control-center/ui/datetime/timezone_14_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_1_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_2.png
-share/cinnamon-control-center/ui/datetime/timezone_2_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_3.5.png
-share/cinnamon-control-center/ui/datetime/timezone_3.5_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_3.png
-share/cinnamon-control-center/ui/datetime/timezone_3_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_4.5.png
-share/cinnamon-control-center/ui/datetime/timezone_4.5_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_4.png
-share/cinnamon-control-center/ui/datetime/timezone_4_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_5.5.png
-share/cinnamon-control-center/ui/datetime/timezone_5.5_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_5.75.png
-share/cinnamon-control-center/ui/datetime/timezone_5.75_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_5.png
-share/cinnamon-control-center/ui/datetime/timezone_5_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_6.5.png
-share/cinnamon-control-center/ui/datetime/timezone_6.5_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_6.png
-share/cinnamon-control-center/ui/datetime/timezone_6_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_7.png
-share/cinnamon-control-center/ui/datetime/timezone_7_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_9.5.png
-share/cinnamon-control-center/ui/datetime/timezone_9.5_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_9.png
-share/cinnamon-control-center/ui/datetime/timezone_9_dim.png
 share/cinnamon-control-center/ui/display-capplet.ui
-share/cinnamon-control-center/ui/info.ui
 share/cinnamon-control-center/ui/language-chooser.ui
 share/cinnamon-control-center/ui/power.ui
-%%CUPS%%share/cinnamon-control-center/ui/printers/jobs-dialog.ui
-%%CUPS%%share/cinnamon-control-center/ui/printers/new-printer-dialog.ui
-%%CUPS%%share/cinnamon-control-center/ui/printers/options-dialog.ui
-%%CUPS%%share/cinnamon-control-center/ui/printers/ppd-selection-dialog.ui
-%%CUPS%%share/cinnamon-control-center/ui/printers/printers.ui
 share/cinnamon-control-center/ui/screen.ui
 share/cinnamon-control-center/ui/shell.ui
 share/cinnamon-control-center/ui/uap.ui
@@ -239,206 +129,131 @@ share/icons/hicolor/16x16/apps/cin-multimedia-volume-control.svg
 share/icons/hicolor/16x16/apps/cinnamon-power-manager.png
 share/icons/hicolor/16x16/apps/cinnamon-preferences-color.png
 share/icons/hicolor/16x16/apps/cinnamon-preferences-desktop-display.png
-share/icons/hicolor/16x16/apps/cinnamon-preferences-system-time.png
 share/icons/hicolor/22x22/apps/cin-multimedia-volume-control.png
 share/icons/hicolor/22x22/apps/cin-multimedia-volume-control.svg
 share/icons/hicolor/22x22/apps/cinnamon-power-manager.png
 share/icons/hicolor/22x22/apps/cinnamon-preferences-color.png
 share/icons/hicolor/22x22/apps/cinnamon-preferences-desktop-display.png
-share/icons/hicolor/22x22/apps/cinnamon-preferences-system-time.png
 share/icons/hicolor/24x24/apps/cin-multimedia-volume-control.png
 share/icons/hicolor/24x24/apps/cinnamon-power-manager.png
 share/icons/hicolor/24x24/apps/cinnamon-preferences-color.png
 share/icons/hicolor/24x24/apps/cinnamon-preferences-desktop-display.png
 share/icons/hicolor/256x256/apps/cinnamon-power-manager.png
 share/icons/hicolor/256x256/apps/cinnamon-preferences-color.png
-share/icons/hicolor/256x256/apps/cinnamon-preferences-system-time.png
 share/icons/hicolor/32x32/apps/cin-multimedia-volume-control.png
 share/icons/hicolor/32x32/apps/cin-multimedia-volume-control.svg
 share/icons/hicolor/32x32/apps/cinnamon-power-manager.png
 share/icons/hicolor/32x32/apps/cinnamon-preferences-color.png
 share/icons/hicolor/32x32/apps/cinnamon-preferences-desktop-display.png
-share/icons/hicolor/32x32/apps/cinnamon-preferences-system-time.png
-share/icons/hicolor/4%%XAWVER%%x4%%XAWVER%%/apps/cin-multimedia-volume-control.png
-share/icons/hicolor/4%%XAWVER%%x4%%XAWVER%%/apps/cinnamon-power-manager.png
-share/icons/hicolor/4%%XAWVER%%x4%%XAWVER%%/apps/cinnamon-preferences-color.png
-share/icons/hicolor/4%%XAWVER%%x4%%XAWVER%%/apps/cinnamon-preferences-system-time.png
-share/icons/hicolor/4%%XAWVER%%x4%%XAWVER%%/devices/cin-audio-headset.svg
+share/icons/hicolor/48x48/apps/cin-multimedia-volume-control.png
+share/icons/hicolor/48x48/apps/cinnamon-power-manager.png
+share/icons/hicolor/48x48/apps/cinnamon-preferences-color.png
+share/icons/hicolor/48x48/devices/cin-audio-headset.svg
 share/icons/hicolor/64x64/apps/cinnamon-preferences-color.png
 share/icons/hicolor/scalable/apps/cin-multimedia-volume-control.svg
 share/icons/hicolor/scalable/apps/cinnamon-preferences-color.svg
 share/icons/hicolor/scalable/apps/cinnamon-preferences-desktop-display.svg
-share/icons/hicolor/scalable/apps/cinnamon-preferences-system-time.svg
 share/icons/hicolor/scalable/status/cin-audio-input-microphone-high-symbolic.svg
 share/icons/hicolor/scalable/status/cin-audio-input-microphone-low-symbolic.svg
 share/icons/hicolor/scalable/status/cin-audio-input-microphone-medium-symbolic.svg
 share/icons/hicolor/scalable/status/cin-audio-input-microphone-muted-symbolic.svg
 share/locale/af/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/am/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/am/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/ar/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/ar/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/as/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/as/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/ast/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/ast/LC_MESSAGES/cinnamon-control-center-1.0.mo
 share/locale/az/LC_MESSAGES/cinnamon-control-center-1.0.mo
 share/locale/be/LC_MESSAGES/cinnamon-control-center-1.0.mo
 share/locale/be@latin/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/bg/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/bg/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/bn/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/bn/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/bn_IN/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/bn_IN/LC_MESSAGES/cinnamon-control-center-1.0.mo
 share/locale/br/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/bs/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/bs/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/ca/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/ca/LC_MESSAGES/cinnamon-control-center-1.0.mo
 share/locale/ca@valencia/LC_MESSAGES/cinnamon-control-center-1.0.mo
 share/locale/crh/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/cs/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/cs/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/cy/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/cy/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/da/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/da/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/de/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/de/LC_MESSAGES/cinnamon-control-center-1.0.mo
 share/locale/dz/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/el/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/el/LC_MESSAGES/cinnamon-control-center-1.0.mo
 share/locale/en/LC_MESSAGES/cinnamon-control-center-1.0.mo
 share/locale/en@shaw/LC_MESSAGES/cinnamon-control-center-1.0.mo
 share/locale/en_CA/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/en_GB/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/en_GB/LC_MESSAGES/cinnamon-control-center-1.0.mo
 share/locale/eo/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/es/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/es/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/et/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/et/LC_MESSAGES/cinnamon-control-center-1.0.mo
 share/locale/eu/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/fa/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/fa/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/fi/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/fi/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/fr/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/fr/LC_MESSAGES/cinnamon-control-center-1.0.mo
 share/locale/ga/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/gl/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/gl/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/gu/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/gu/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/he/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/he/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/hi/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/hi/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/hr/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/hr/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/hu/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/hu/LC_MESSAGES/cinnamon-control-center-1.0.mo
 share/locale/hy/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/id/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/id/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/ilo/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
-share/locale/is/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/is/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/it/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/it/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/ja/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/ja/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/ka/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/ka/LC_MESSAGES/cinnamon-control-center-1.0.mo
 share/locale/kk/LC_MESSAGES/cinnamon-control-center-1.0.mo
 share/locale/km/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/kn/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/kn/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/ko/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/ko/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/ku/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/ku/LC_MESSAGES/cinnamon-control-center-1.0.mo
 share/locale/ky/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/lo/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
-share/locale/lt/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/lt/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/lv/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/lv/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/mai/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/mai/LC_MESSAGES/cinnamon-control-center-1.0.mo
 share/locale/mg/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/mk/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/mk/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/ml/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/ml/LC_MESSAGES/cinnamon-control-center-1.0.mo
 share/locale/mn/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/mr/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/mr/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/ms/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/ms/LC_MESSAGES/cinnamon-control-center-1.0.mo
 share/locale/my/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/nb/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/nb/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/nds/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/nds/LC_MESSAGES/cinnamon-control-center-1.0.mo
 share/locale/ne/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/nl/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/nl/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/nn/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/nn/LC_MESSAGES/cinnamon-control-center-1.0.mo
 share/locale/nso/LC_MESSAGES/cinnamon-control-center-1.0.mo
 share/locale/oc/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/or/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/or/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/pa/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/pa/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/pl/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/pl/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/pt/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/pt/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/pt_BR/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/pt_BR/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/ro/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/ro/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/ru/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/ru/LC_MESSAGES/cinnamon-control-center-1.0.mo
 share/locale/rw/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/si/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/si/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/sk/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/sk/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/sl/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/sl/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/sq/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/sq/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/sr/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/sr/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/sr@latin/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/sr@latin/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/sv/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/sv/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/ta/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/ta/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/te/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/te/LC_MESSAGES/cinnamon-control-center-1.0.mo
 share/locale/th/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/tr/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/tr/LC_MESSAGES/cinnamon-control-center-1.0.mo
 share/locale/ug/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/uk/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/uk/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/ur/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/uz/LC_MESSAGES/cinnamon-control-center-1.0.mo
 share/locale/uz@cyrillic/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/vi/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/vi/LC_MESSAGES/cinnamon-control-center-1.0.mo
 share/locale/wa/LC_MESSAGES/cinnamon-control-center-1.0.mo
 share/locale/xh/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/zh_CN/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/zh_CN/LC_MESSAGES/cinnamon-control-center-1.0.mo
 share/locale/zh_HK/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/zh_TW/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/zh_TW/LC_MESSAGES/cinnamon-control-center-1.0.mo
 share/locale/zu/LC_MESSAGES/cinnamon-control-center-1.0.mo
 share/pixmaps/cinnamon/faces/astronaut.jpg
@@ -474,19 +289,14 @@ share/sounds/cinnamon/default/alerts/sonar.ogg
 @dirrm share/sounds/cinnamon/default/alerts
 @dirrm share/sounds/cinnamon/default
 @dirrm share/sounds/cinnamon
-@dirrmtry share/polkit-1/rules.d
 @dirrm share/pixmaps/cinnamon/faces
 @dirrm share/pixmaps/cinnamon
-@dirrmtry share/locale/ilo/LC_MESSAGES
-@dirrmtry share/locale/ilo
 @dirrm share/cinnamon-control-center/ui/user-accounts
-%%CUPS%%@dirrmtry share/cinnamon-control-center/ui/printers
-@dirrm share/cinnamon-control-center/ui/datetime
 @dirrm share/cinnamon-control-center/ui
 @dirrm share/cinnamon-control-center/sounds
 @dirrm share/cinnamon-control-center/pixmaps
-@dirrm share/cinnamon-control-center/icons/hicolor/4%%XAWVER%%x4%%XAWVER%%/devices
-@dirrm share/cinnamon-control-center/icons/hicolor/4%%XAWVER%%x4%%XAWVER%%
+@dirrm share/cinnamon-control-center/icons/hicolor/48x48/devices
+@dirrm share/cinnamon-control-center/icons/hicolor/48x48
 @dirrm share/cinnamon-control-center/icons/hicolor/32x32/status
 @dirrm share/cinnamon-control-center/icons/hicolor/32x32/devices
 @dirrm share/cinnamon-control-center/icons/hicolor/32x32
@@ -500,7 +310,6 @@ share/sounds/cinnamon/default/alerts/sonar.ogg
 @dirrm share/cinnamon-control-center/icons/hicolor/16x16
 @dirrm share/cinnamon-control-center/icons/hicolor
 @dirrm share/cinnamon-control-center/icons
-@dirrm share/cinnamon-control-center/datetime
 @dirrm share/cinnamon-control-center
 @dirrm lib/cinnamon-control-center-1/panels
 @dirrm lib/cinnamon-control-center-1
diff --git a/x11-fm/nemo/Makefile b/x11-fm/nemo/Makefile
index 0286b06d7..f872eaeaf 100644
--- a/x11-fm/nemo/Makefile
+++ b/x11-fm/nemo/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	nemo
-PORTVERSION=	1.7.1
+PORTVERSION=	1.8.5
 CATEGORIES=	x11-fm gnome
 DIST_SUBDIR=	gnome3
 
@@ -19,15 +19,18 @@ LIB_DEPENDS=	libexif.so:${PORTSDIR}/graphics/libexif \
 RUN_DEPENDS=	${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme \
 		${LOCALBASE}/libdata/pkgconfig/gsettings-desktop-schemas.pc:${PORTSDIR}/devel/gsettings-desktop-schemas
 
+WRKSRC=		${WRKDIR}/linuxmint-nemo-63f7b44
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	linuxmint
-GH_TAGNAME=	1.7.1
-GH_COMMIT=	63f7b44
+GH_TAGNAME=	1.8.5
+GH_COMMIT=	40f84d6
 
-NO_STAGE=	yes
 INSTALLS_ICONS=	yes
-USES=		desktop-file-utils gettext gmake pathfix
-USE_GNOME=	gnomeprefix intlhack gnomedesktop3 libxml2 introspection:build
+USES=		desktop-file-utils gettext gmake pathfix \
+		pkgconfig shared-mime-info
+USE_GNOME=	gnomeprefix intlhack gnomedesktop3 libxml2 \
+		introspection:build
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool autoconf automake
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -37,9 +40,6 @@ MAKE_ENV=	G_CHARSET_ALIAS="${LOCALBASE}/libdata/charset.alias"
 
 GLIB_SCHEMAS=	org.nemo.gschema.xml
 
-MAN1=		nemo-connect-server.1 \
-		nemo.1
-
 post-patch:
 	@${MKDIR} ${WRKSRC}/files${PREFIX}
 
diff --git a/x11-fm/nemo/distinfo b/x11-fm/nemo/distinfo
index 01d9ae6a0..9eb88fdf1 100644
--- a/x11-fm/nemo/distinfo
+++ b/x11-fm/nemo/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/nemo-1.7.1.tar.gz) = 5574915a9440086887ed234e51524c8b55d66f933f6e2ca71b2859c00bd4bcb5
-SIZE (gnome3/nemo-1.7.1.tar.gz) = 6571229
+SHA256 (gnome3/nemo-1.8.5.tar.gz) = 5574915a9440086887ed234e51524c8b55d66f933f6e2ca71b2859c00bd4bcb5
+SIZE (gnome3/nemo-1.8.5.tar.gz) = 6571229
diff --git a/x11-fm/nemo/files/patch-autogen.sh b/x11-fm/nemo/files/patch-autogen.sh
new file mode 100644
index 000000000..245362b24
--- /dev/null
+++ b/x11-fm/nemo/files/patch-autogen.sh
@@ -0,0 +1,10 @@
+--- autogen.sh.orig	2013-07-20 21:14:17.454775429 +0000
++++ autogen.sh	2013-07-20 21:14:26.096159846 +0000
+@@ -4,6 +4,7 @@
+ test -z "$srcdir" && srcdir=.
+ 
+ PKG_NAME="nemo"
++REQUIRED_AUTOMAKE_VERSION=1.14
+ 
+ which gnome-autogen.sh || {
+     echo "You need to install gnome-common from GNOME Git (or from"
diff --git a/x11-fm/nemo/files/patch-src_nemo-icon-view.c b/x11-fm/nemo/files/patch-src_nemo-icon-view.c
index 6f91b72a4..53f37fd24 100644
--- a/x11-fm/nemo/files/patch-src_nemo-icon-view.c
+++ b/x11-fm/nemo/files/patch-src_nemo-icon-view.c
@@ -5,7 +5,7 @@
  nemo_icon_view_get_default_zoom_level (NemoView *view)
  {
 -    g_return_if_fail (NEMO_IS_ICON_VIEW (view));
-+    g_return_val_if_fail (NEMO_IS_ICON_VIEW (view), NULL);
++    g_return_val_if_fail (NEMO_IS_ICON_VIEW (view), NEMO_ZOOM_LEVEL_STANDARD);
  
      return get_default_zoom_level(NEMO_ICON_VIEW (view));
  }
diff --git a/x11-fm/nemo/files/patch-src_nemo-list-view.c b/x11-fm/nemo/files/patch-src_nemo-list-view.c
index 68b75b839..40fac57d5 100644
--- a/x11-fm/nemo/files/patch-src_nemo-list-view.c
+++ b/x11-fm/nemo/files/patch-src_nemo-list-view.c
@@ -5,7 +5,7 @@
  nemo_list_view_get_default_zoom_level (NemoView *view)
  {
 -    g_return_if_fail (NEMO_IS_LIST_VIEW (view));
-+    g_return_val_if_fail (NEMO_IS_LIST_VIEW (view), NULL);
++    g_return_val_if_fail (NEMO_IS_LIST_VIEW (view), NEMO_ZOOM_LEVEL_STANDARD);
  
      return get_default_zoom_level();
  }
diff --git a/x11-fm/nemo/files/patch-src_nemo-view.c b/x11-fm/nemo/files/patch-src_nemo-view.c
index 41b53e6dc..b50b32d24 100644
--- a/x11-fm/nemo/files/patch-src_nemo-view.c
+++ b/x11-fm/nemo/files/patch-src_nemo-view.c
@@ -5,7 +5,7 @@
  nemo_view_get_default_zoom_level (NemoView *view)
  {
 -    g_return_if_fail (NEMO_IS_VIEW (view));
-+    g_return_val_if_fail (NEMO_IS_VIEW (view), NULL);
++    g_return_val_if_fail (NEMO_IS_VIEW (view), NEMO_ZOOM_LEVEL_STANDARD);
  
      if (!nemo_view_supports_zooming (view)) {
          return -1;
diff --git a/x11-fm/nemo/pkg-plist b/x11-fm/nemo/pkg-plist
index 5077ce2bd..79d5dcb97 100644
--- a/x11-fm/nemo/pkg-plist
+++ b/x11-fm/nemo/pkg-plist
@@ -20,6 +20,8 @@ lib/libnemo-extension.so
 lib/libnemo-extension.so.5
 libdata/pkgconfig/libnemo-extension.pc
 libexec/nemo-convert-metadata
+man/man1/nemo-connect-server.1.gz
+man/man1/nemo.1.gz
 share/GConf/gsettings/nemo.convert
 share/applications/nemo-autorun-software.desktop
 share/applications/nemo.desktop
@@ -33,7 +35,6 @@ share/icons/hicolor/16x16/apps/nemo.png
 share/icons/hicolor/22x22/apps/nemo.png
 share/icons/hicolor/24x24/apps/nemo.png
 share/icons/hicolor/32x32/apps/nemo.png
-share/icons/hicolor/icon-theme.cache
 share/icons/hicolor/scalable/actions/location-symbolic.svg
 share/icons/hicolor/scalable/actions/sidebar-hide-symbolic.svg
 share/icons/hicolor/scalable/actions/sidebar-places-symbolic.svg
@@ -160,11 +161,11 @@ share/mime/packages/nemo.xml
 %%DATADIR%%/actions/sample.nemo_action
 %%DATADIR%%/icons/hicolor/16x16/emblems/emblem-note.png
 %%DATADIR%%/icons/hicolor/24x24/emblems/emblem-note.png
-%%DATADIR%%/icons/hicolor/4%%XAWVER%%x4%%XAWVER%%/emblems/emblem-note.png
+%%DATADIR%%/icons/hicolor/48x48/emblems/emblem-note.png
 %%DATADIR%%/nemo-extras.placeholder
 %%DATADIR%%/nemo-suggested.placeholder
-@dirrm %%DATADIR%%/icons/hicolor/4%%XAWVER%%x4%%XAWVER%%/emblems
-@dirrm %%DATADIR%%/icons/hicolor/4%%XAWVER%%x4%%XAWVER%%
+@dirrm %%DATADIR%%/icons/hicolor/48x48/emblems
+@dirrm %%DATADIR%%/icons/hicolor/48x48
 @dirrm %%DATADIR%%/icons/hicolor/24x24/emblems
 @dirrm %%DATADIR%%/icons/hicolor/24x24
 @dirrm %%DATADIR%%/icons/hicolor/16x16/emblems
diff --git a/x11/cinnamon/Makefile b/x11/cinnamon/Makefile
index 63f741325..3bad08a49 100644
--- a/x11/cinnamon/Makefile
+++ b/x11/cinnamon/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	cinnamon
-PORTVERSION=	1.7.1
+PORTVERSION=	1.8.8.1
 CATEGORIES=	x11 gnome
 DIST_SUBDIR=	gnome3
 
@@ -18,9 +18,9 @@ LIB_DEPENDS=	libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification \
 		libtelepathy-logger.so:${PORTSDIR}/net-im/telepathy-logger \
 		libfolks.so:${PORTSDIR}/net-im/folks \
 		libpulse.so:${PORTSDIR}/audio/pulseaudio \
-		libcroco.so:${PORTSDIR}/textproc/libcroco \
+		libcroco-0.6.so:${PORTSDIR}/textproc/libcroco \
 		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libclutter-glx-1.so:${PORTSDIR}/graphics/clutter \
+		libclutter-glx-1.0.so:${PORTSDIR}/graphics/clutter \
 		libgjs.so:${PORTSDIR}/lang/gjs
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dbus-python.pc:${PORTSDIR}/devel/py-dbus \
 		${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss \
@@ -29,19 +29,18 @@ RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dbus-python.pc:${PORTSDIR}/devel/py-
 		${PYTHONPREFIX_INCLUDEDIR}/Imaging.h:${PORTSDIR}/graphics/py-imaging \
 		${LOCALBASE}/share/doc/py-lxml/CREDITS.txt:${PORTSDIR}/devel/py-lxml
 
+WRKSRC=		${WRKDIR}/linuxmint-Cinnamon-aa9fb31
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	linuxmint
-GH_TAGNAME=	1.7.1
-GH_COMMIT=	941456a
-
-WRKSRC=		${WRKDIR}/${GH_ACCOUNT}-Cinnamon-${GH_COMMIT}
+GH_TAGNAME=	1.8.8.1
+GH_COMMIT=	6d44281
 
-NO_STAGE=	yes
 USE_XORG=	x11 xfixes sm
-USES=		gettext gmake pathfix
+USES=		gettext gmake pathfix pkgconfig
 USE_AUTOTOOLS=	libtool autoconf automake
-USE_GNOME=	gnomeprefix intlhack gtk30 gconf2 gnomemenus3 \
-		gnomedesktop3 evolutiondataserver3 pygnome2
+USE_GNOME=	evolutiondataserver3 gconf2 gnomedesktop3 gnomemenus3 \
+		gnomeprefix gtk30 intlhack introspection:build
 USE_GSTREAMER=	theora vp8 ogg
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
@@ -49,25 +48,18 @@ USE_PYTHON=	yes
 
 GLIB_SCHEMAS=	org.cinnamon.gschema.xml
 
-MAN1=		cinnamon.1 \
-		cinnamon-extension-tool.1 \
-		cinnamon-launcher.1 \
-		cinnamon-menu-editor.1 \
-		cinnamon-settings.1 \
-		cinnamon2d.1 \
-		gnome-session-cinnamon.1 \
-		gnome-session-cinnamon2d.1
-
 CONFIGURE_ARGS+=--enable-compile-warnings=no \
 		--with-ca-certificates=${LOCALBASE}/share/certs/ca-root-nss.crt
 CPPFLAGS+=	-I${LOCALASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
-	@${MKDIR} ${WRKSRC}/files${PREFIX}
+	@${MKDIR} ${WRKSRC}/files${STAGE}${PREFIX}
 .for d in bin lib share
 	@${MV} ${WRKSRC}/files/usr/${d} ${WRKSRC}/files${PREFIX}
 .endfor
+	@${MV} ${WRKSRC}/files/${PREFIX}/share/cinnamon/locale \
+		${WRKSRC}/files/${PREFIX}/share/locale
 	@${MV} ${WRKSRC}/files/etc ${WRKSRC}/files${PREFIX}
 	@${MV} ${WRKSRC}/files/${PREFIX}/lib/* ${WRKSRC}/files${PREFIX}/share/
 	@${RMDIR} ${WRKSRC}/files/${PREFIX}/lib
@@ -75,6 +67,9 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/lib|${PREFIX}/lib/|g' \
 		${WRKSRC}/files${PREFIX}/share/cinnamon-settings/bin/capi.py
 
+	@${FIND} ${WRKSRC} -name \* | ${XARGS} ${EGREP} -l "/usr/share/cinnamon/locale" | \
+		${XARGS} ${REINPLACE_CMD} -e "s|/usr/share/cinnamon/locale|${PREFIX}/share/locale|g"
+
 	@${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share/|g ;\
 		s|/usr/lib|${PREFIX}/share/|g' \
 			${WRKSRC}/data/theme/cinnamon.css \
@@ -83,7 +78,6 @@ post-patch:
 			${WRKSRC}/js/ui/expo.js \
 			${WRKSRC}/makepot \
 			${WRKSRC}/src/st/st-background-effect.c \
-			${WRKSRC}/files/generate_desktop_files \
 			${WRKSRC}/files${PREFIX}/bin/cinnamon-launcher \
 			${WRKSRC}/files${PREFIX}/share/cinnamon/applets/brightness@cinnamon.org/applet.js \
 			${WRKSRC}/files${PREFIX}/share/cinnamon/applets/panel-launchers@cinnamon.org/cinnamon-add-panel-launcher.py \
@@ -118,9 +112,6 @@ post-patch:
 		s|const GnomeBluetooth = imports.gi.GnomeBluetooth;||g' \
 			${WRKSRC}/files${PREFIX}/share/cinnamon/applets/bluetooth\@cinnamon.org/applet.js
 
-	@${FIND} ${WRKSRC} -name \* | ${XARGS} ${EGREP} -l "\/usr\/share\/cinnamon\/locale" | \
-		${XARGS} ${REINPLACE_CMD} -e "s|/usr/share/cinnamon/locale/|${PREFIX}cinnamon/locale|g"
-
 	@${REINPLACE_CMD} -e 's|/usr/lib/gnome-session|${PREFIX}/libexec|g' \
 		${WRKSRC}/files${PREFIX}/share/gnome-session/sessions/cinnamon.session
 
@@ -131,8 +122,12 @@ post-patch:
 		/datadir/s|/usr|${PREFIX}|g' \
 			${WRKSRC}/files${PREFIX}/share/cinnamon-menu-editor/cme/config.py
 
-	@${REINPLACE_CMD} -e 's|"usr/lib|"${PREFIX}/share/|g ;\
-		s|"usr/share|"${PREFIX}/share/|g' \
+	@${REINPLACE_CMD} -e 's|/usr/share|${STAGEDIR}${PREFIX}/share/|g ;\
+		s|/usr/lib|${PREFIX}/share/|g' \
+			${WRKSRC}/files/generate_desktop_files
+
+	@${REINPLACE_CMD} -e 's|"usr/lib|"${STAGEDIR}${PREFIX}/share/|g ;\
+		s|"usr/share|"${STAGEDIR}${PREFIX}/share/|g' \
 			${WRKSRC}/files/generate_desktop_files
 
 	@${REINPLACE_CMD} -e 's|/usr/bin|${PREFIX}/bin|g' \
diff --git a/x11/cinnamon/distinfo b/x11/cinnamon/distinfo
index 7cef36ea6..f74253d36 100644
--- a/x11/cinnamon/distinfo
+++ b/x11/cinnamon/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/cinnamon-1.7.1.tar.gz) = ecc79b5152301e86856bad9c644ec34abcd209b1bba3ccde2d1bdf067f1c77f3
-SIZE (gnome3/cinnamon-1.7.1.tar.gz) = 4109183
+SHA256 (gnome3/cinnamon-1.8.8.1.tar.gz) = 521df0204f0e892eaddd106b8e237565ee30d456141bd3a39b863126637e5095
+SIZE (gnome3/cinnamon-1.8.8.1.tar.gz) = 4348754
diff --git a/x11/cinnamon/files/patch-src_Makefile.am b/x11/cinnamon/files/patch-src_Makefile.am
index 598f8567a..7cb70c87b 100644
--- a/x11/cinnamon/files/patch-src_Makefile.am
+++ b/x11/cinnamon/files/patch-src_Makefile.am
@@ -1,5 +1,5 @@
---- src/Makefile.orig.am	2013-02-24 19:16:59.321514462 +0100
-+++ src/Makefile.am	2013-02-24 19:17:19.571521488 +0100
+--- src/Makefile.am.orig	2013-08-28 11:05:53.000000000 +0000
++++ src/Makefile.am	2013-09-21 10:43:42.963634930 +0000
 @@ -110,9 +110,7 @@
  	cinnamon-generic-container.h	\
  	cinnamon-gtk-embed.h		\
@@ -24,8 +24,8 @@
  libcinnamon_la_CPPFLAGS = $(cinnamon_cflags)
  
  Cinnamon-0.1.gir: libcinnamon.la St-1.0.gir
--Cinnamon_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-3.0 Soup-2.4 GMenu-3.0 NetworkManager-1.0 NMClient-1.0
-+Cinnamon_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-3.0 Soup-2.4 GMenu-3.0
+-Cinnamon_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-Muffin.0 Soup-2.4 GMenu-3.0 NetworkManager-1.0 NMClient-1.0
++Cinnamon_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-Muffin.0 Soup-2.4 GMenu-3.0
  Cinnamon_0_1_gir_CFLAGS = $(libcinnamon_la_CPPFLAGS) -I $(srcdir)
  Cinnamon_0_1_gir_LIBS = libcinnamon.la
  Cinnamon_0_1_gir_FILES = $(libcinnamon_la_gir_sources)
diff --git a/x11/cinnamon/pkg-plist b/x11/cinnamon/pkg-plist
index 839400b34..3a0c601e3 100644
--- a/x11/cinnamon/pkg-plist
+++ b/x11/cinnamon/pkg-plist
@@ -9,6 +9,7 @@ bin/cinnamon2d
 bin/gnome-session-cinnamon
 bin/gnome-session-cinnamon2d
 etc/xdg/menus/cinnamon-applications.menu
+etc/xdg/menus/cinnamon-applications-merged
 lib/cinnamon/Cinnamon-0.1.typelib
 lib/cinnamon/Gvc-1.0.typelib
 lib/cinnamon/St-1.0.typelib
@@ -18,12 +19,21 @@ lib/mozilla/plugins/libcinnamon-browser-plugin.la
 lib/mozilla/plugins/libcinnamon-browser-plugin.so
 libexec/cinnamon/cinnamon-hotplug-sniffer
 libexec/cinnamon/cinnamon-perf-helper
+man/man1/cinnamon-extension-tool.1.gz
+man/man1/cinnamon-launcher.1.gz
+man/man1/cinnamon-menu-editor.1.gz
+man/man1/cinnamon-settings.1.gz
+man/man1/cinnamon.1.gz
+man/man1/cinnamon2d.1.gz
+man/man1/gnome-session-cinnamon.1.gz
+man/man1/gnome-session-cinnamon2d.1.gz
 share/applications/cinnamon-add-panel-launcher.desktop
 share/applications/cinnamon-menu-editor.desktop
 share/applications/cinnamon-settings.desktop
 share/applications/cinnamon.desktop
 share/applications/cinnamon2d.desktop
 share/cinnamon-looking-glass/cinnamon-looking-glass.py
+%%DATADIR%%-looking-glass/lookingglass_proxy.py
 share/cinnamon-looking-glass/page_extensions.py
 share/cinnamon-looking-glass/page_inspect.py
 share/cinnamon-looking-glass/page_log.py
@@ -37,14 +47,20 @@ share/cinnamon-menu-editor/cme/MenuEditor.py
 share/cinnamon-menu-editor/cme/__init__.py
 share/cinnamon-menu-editor/cme/config.py
 share/cinnamon-menu-editor/cme/util.py
-share/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.glade
-share/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.py
+share/cinnamon-settings/bin/ExtensionCore.py
 share/cinnamon-settings/bin/SettingsWidgets.py
 share/cinnamon-settings/bin/Spices.py
+share/cinnamon-settings/bin/XletSettings.py
+share/cinnamon-settings/bin/XletSettingsWidgets.py
 share/cinnamon-settings/bin/capi.py
+share/cinnamon-settings/bin/eyedropper.py
 share/cinnamon-settings/bin/imtools.py
+share/cinnamon-settings/bin/installSchema.py
+share/cinnamon-settings/bin/removeSchema.py
+share/cinnamon-settings/bin/xlet-settings.ui
 share/cinnamon-settings/cinnamon-settings.py
 share/cinnamon-settings/cinnamon-settings.ui
+share/cinnamon-settings/data/cinnamon.png
 share/cinnamon-settings/data/icons/applets.svg
 share/cinnamon-settings/data/icons/backgrounds.svg
 share/cinnamon-settings/data/icons/bluetooth.svg
@@ -53,11 +69,13 @@ share/cinnamon-settings/data/icons/cat-hardware.svg
 share/cinnamon-settings/data/icons/cat-prefs.svg
 share/cinnamon-settings/data/icons/clock.svg
 share/cinnamon-settings/data/icons/color.svg
+share/cinnamon-settings/data/icons/default-applications.svg
 share/cinnamon-settings/data/icons/desklets.svg
 share/cinnamon-settings/data/icons/desktop-effects.svg
 share/cinnamon-settings/data/icons/desktop.svg
 share/cinnamon-settings/data/icons/details.svg
 share/cinnamon-settings/data/icons/display.svg
+share/cinnamon-settings/data/icons/drivers.svg
 share/cinnamon-settings/data/icons/extensions.svg
 share/cinnamon-settings/data/icons/firewall.svg
 share/cinnamon-settings/data/icons/fonts.svg
@@ -76,16 +94,25 @@ share/cinnamon-settings/data/icons/region.svg
 share/cinnamon-settings/data/icons/screen.svg
 share/cinnamon-settings/data/icons/screensaver.svg
 share/cinnamon-settings/data/icons/sound.svg
+share/cinnamon-settings/data/icons/sources.svg
+share/cinnamon-settings/data/icons/startup-programs.svg
 share/cinnamon-settings/data/icons/themes.svg
 share/cinnamon-settings/data/icons/universal-access.svg
 share/cinnamon-settings/data/icons/user-accounts.svg
 share/cinnamon-settings/data/icons/windows.svg
 share/cinnamon-settings/data/icons/workspaces.svg
+share/cinnamon-settings/data/inactive.png
+share/cinnamon-settings/data/installed.svg
+share/cinnamon-settings/data/running.svg
 share/cinnamon-settings/data/spices/applet-detail.html
 share/cinnamon-settings/data/spices/jquery.js
+share/cinnamon-settings/data/system.svg
+share/cinnamon-settings/data/update.svg
+share/cinnamon-settings/data/user.png
 share/cinnamon-settings/modules/cs_applets.py
 share/cinnamon-settings/modules/cs_backgrounds.py
 share/cinnamon-settings/modules/cs_calendar.py
+share/cinnamon-settings/modules/cs_default.py
 share/cinnamon-settings/modules/cs_desklets.py
 share/cinnamon-settings/modules/cs_desktop.py
 share/cinnamon-settings/modules/cs_effects.py
@@ -93,6 +120,7 @@ share/cinnamon-settings/modules/cs_extensions.py
 share/cinnamon-settings/modules/cs_fonts.py
 share/cinnamon-settings/modules/cs_general.py
 share/cinnamon-settings/modules/cs_hotcorner.py
+share/cinnamon-settings/modules/cs_info.py
 share/cinnamon-settings/modules/cs_keyboard.py
 share/cinnamon-settings/modules/cs_menu.py
 share/cinnamon-settings/modules/cs_mouse.py
@@ -101,6 +129,8 @@ share/cinnamon-settings/modules/cs_screensaver.py
 share/cinnamon-settings/modules/cs_themes.py
 share/cinnamon-settings/modules/cs_windows.py
 share/cinnamon-settings/modules/cs_workspaces.py
+share/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.glade
+share/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.py
 share/cinnamon/applets/a11y@cinnamon.org/applet.js
 share/cinnamon/applets/a11y@cinnamon.org/metadata.json
 share/cinnamon/applets/bluetooth@cinnamon.org/applet.js
@@ -395,12 +425,17 @@ share/cinnamon/applets/scale@cinnamon.org/cinnamon-scale-symbolic.svg
 share/cinnamon/applets/scale@cinnamon.org/icon.png
 share/cinnamon/applets/scale@cinnamon.org/metadata.json
 share/cinnamon/applets/separator@cinnamon.org/applet.js
-share/cinnamon/applets/separator@cinnamon.org/icon.png
 share/cinnamon/applets/separator@cinnamon.org/metadata.json
 share/cinnamon/applets/settings@cinnamon.org/applet.js
 share/cinnamon/applets/settings@cinnamon.org/metadata.json
+share/cinnamon/applets/settings-example@cinnamon.org/applet.js
+share/cinnamon/applets/settings-example@cinnamon.org/metadata.json
+share/cinnamon/applets/settings-example@cinnamon.org/settings-schema.json
 share/cinnamon/applets/show-desktop@cinnamon.org/applet.js
 share/cinnamon/applets/show-desktop@cinnamon.org/metadata.json
+share/cinnamon/applets/spacer@cinnamon.org/applet.js
+share/cinnamon/applets/spacer@cinnamon.org/metadata.json
+share/cinnamon/applets/spacer@cinnamon.org/settings-schema.json
 share/cinnamon/applets/sound@cinnamon.org/applet.js
 share/cinnamon/applets/sound@cinnamon.org/metadata.json
 share/cinnamon/applets/systray@cinnamon.org/applet.js
@@ -433,6 +468,7 @@ share/cinnamon/desklets/launcher@cinnamon.org/metadata.json
 share/cinnamon/desklets/photoframe@cinnamon.org/README
 share/cinnamon/desklets/photoframe@cinnamon.org/desklet.js
 share/cinnamon/desklets/photoframe@cinnamon.org/metadata.json
+share/cinnamon/desklets/photoframe@cinnamon.org/settings-schema.json
 share/cinnamon/desklets/photoframe@cinnamon.org/stylesheet.css
 share/cinnamon/icons/move-symbolic.svg
 share/cinnamon/js/misc/config.js
@@ -449,8 +485,12 @@ share/cinnamon/js/misc/screenSaver.js
 share/cinnamon/js/misc/util.js
 share/cinnamon/js/misc/windowUtils.js
 share/cinnamon/js/perf/core.js
-share/cinnamon/js/ui/altTab.js
 share/cinnamon/js/ui/appFavorites.js
+share/cinnamon/js/ui/appSwitcher/appSwitcher.js
+share/cinnamon/js/ui/appSwitcher/appSwitcher3D.js
+share/cinnamon/js/ui/appSwitcher/classicSwitcher.js
+share/cinnamon/js/ui/appSwitcher/coverflowSwitcher.js
+share/cinnamon/js/ui/appSwitcher/timelineSwitcher.js
 share/cinnamon/js/ui/applet.js
 share/cinnamon/js/ui/appletManager.js
 share/cinnamon/js/ui/automountManager.js
@@ -473,11 +513,13 @@ share/cinnamon/js/ui/extension.js
 share/cinnamon/js/ui/extensionSystem.js
 share/cinnamon/js/ui/flashspot.js
 share/cinnamon/js/ui/hotCorner.js
+share/cinnamon/js/ui/keybindings.js
 share/cinnamon/js/ui/keyboard.js
 share/cinnamon/js/ui/layout.js
 share/cinnamon/js/ui/lightbox.js
 share/cinnamon/js/ui/link.js
 share/cinnamon/js/ui/lookingGlass.js
+share/cinnamon/js/ui/lookingGlassDBus.js
 share/cinnamon/js/ui/magnifier.js
 share/cinnamon/js/ui/magnifierDBus.js
 share/cinnamon/js/ui/main.js
@@ -495,6 +537,7 @@ share/cinnamon/js/ui/radioButton.js
 share/cinnamon/js/ui/runDialog.js
 share/cinnamon/js/ui/scripting.js
 share/cinnamon/js/ui/search.js
+share/cinnamon/js/ui/settings.js
 share/cinnamon/js/ui/statusIconDispatcher.js
 share/cinnamon/js/ui/themeManager.js
 share/cinnamon/js/ui/tooltips.js
@@ -504,87 +547,94 @@ share/cinnamon/js/ui/windowManager.js
 share/cinnamon/js/ui/workspace.js
 share/cinnamon/js/ui/workspacesView.js
 share/cinnamon/js/ui/xdndHandler.js
-share/cinnamon/locale/af/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/am/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/ar/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/ast/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/be/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/bg/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/bn/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/bs/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/ca/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/cs/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/cy/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/da/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/de/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/el/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/en_AU/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/en_CA/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/en_GB/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/eo/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/es/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/et/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/eu/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/fa/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/fi/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/fil/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/fo/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/fr/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/fr_CA/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/gl/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/gu/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/he/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/hi/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/hr/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/hu/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/ia/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/id/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/is/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/it/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/ja/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/jv/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/km/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/kn/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/ko/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/la/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/lt/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/lv/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/mk/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/ml/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/mr/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/ms/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/nb/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/nds/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/ne/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/nl/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/nn/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/pl/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/pt/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/pt_BR/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/ro/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/ru/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/rue/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/si/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/sk/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/sl/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/so/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/sq/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/sr/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/sr@ijekavianlatin/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/sr@latin/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/sv/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/te/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/th/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/tr/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/ts/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/uk/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/ur/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/uz/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/vi/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/yi/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/zh_CN/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/zh_HK/LC_MESSAGES/cinnamon.mo
-share/cinnamon/locale/zh_TW/LC_MESSAGES/cinnamon.mo
+share/locale/af/LC_MESSAGES/cinnamon.mo
+share/locale/am/LC_MESSAGES/cinnamon.mo
+share/locale/ar/LC_MESSAGES/cinnamon.mo
+share/locale/ast/LC_MESSAGES/cinnamon.mo
+share/locale/be/LC_MESSAGES/cinnamon.mo
+share/locale/bg/LC_MESSAGES/cinnamon.mo
+share/locale/bn/LC_MESSAGES/cinnamon.mo
+share/locale/bs/LC_MESSAGES/cinnamon.mo
+share/locale/ca/LC_MESSAGES/cinnamon.mo
+share/locale/cs/LC_MESSAGES/cinnamon.mo
+share/locale/csb/LC_MESSAGES/cinnamon.mo
+share/locale/cy/LC_MESSAGES/cinnamon.mo
+share/locale/da/LC_MESSAGES/cinnamon.mo
+share/locale/de/LC_MESSAGES/cinnamon.mo
+share/locale/el/LC_MESSAGES/cinnamon.mo
+share/locale/en_AU/LC_MESSAGES/cinnamon.mo
+share/locale/en_CA/LC_MESSAGES/cinnamon.mo
+share/locale/en_GB/LC_MESSAGES/cinnamon.mo
+share/locale/eo/LC_MESSAGES/cinnamon.mo
+share/locale/es/LC_MESSAGES/cinnamon.mo
+share/locale/et/LC_MESSAGES/cinnamon.mo
+share/locale/eu/LC_MESSAGES/cinnamon.mo
+share/locale/fa/LC_MESSAGES/cinnamon.mo
+share/locale/fi/LC_MESSAGES/cinnamon.mo
+share/locale/fil/LC_MESSAGES/cinnamon.mo
+share/locale/fo/LC_MESSAGES/cinnamon.mo
+share/locale/fr/LC_MESSAGES/cinnamon.mo
+share/locale/fr_CA/LC_MESSAGES/cinnamon.mo
+share/locale/ga/LC_MESSAGES/cinnamon.mo
+share/locale/gd/LC_MESSAGES/cinnamon.mo
+share/locale/gl/LC_MESSAGES/cinnamon.mo
+share/locale/gu/LC_MESSAGES/cinnamon.mo
+share/locale/he/LC_MESSAGES/cinnamon.mo
+share/locale/hi/LC_MESSAGES/cinnamon.mo
+share/locale/hr/LC_MESSAGES/cinnamon.mo
+share/locale/hu/LC_MESSAGES/cinnamon.mo
+share/locale/ia/LC_MESSAGES/cinnamon.mo
+share/locale/id/LC_MESSAGES/cinnamon.mo
+share/locale/is/LC_MESSAGES/cinnamon.mo
+share/locale/it/LC_MESSAGES/cinnamon.mo
+share/locale/ja/LC_MESSAGES/cinnamon.mo
+share/locale/jv/LC_MESSAGES/cinnamon.mo
+share/locale/km/LC_MESSAGES/cinnamon.mo
+share/locale/kn/LC_MESSAGES/cinnamon.mo
+share/locale/ko/LC_MESSAGES/cinnamon.mo
+share/locale/ksw/LC_MESSAGES/cinnamon.mo
+share/locale/la/LC_MESSAGES/cinnamon.mo
+share/locale/lt/LC_MESSAGES/cinnamon.mo
+share/locale/lv/LC_MESSAGES/cinnamon.mo
+share/locale/mk/LC_MESSAGES/cinnamon.mo
+share/locale/ml/LC_MESSAGES/cinnamon.mo
+share/locale/mr/LC_MESSAGES/cinnamon.mo
+share/locale/ms/LC_MESSAGES/cinnamon.mo
+share/locale/nb/LC_MESSAGES/cinnamon.mo
+share/locale/nds/LC_MESSAGES/cinnamon.mo
+share/locale/ne/LC_MESSAGES/cinnamon.mo
+share/locale/nl/LC_MESSAGES/cinnamon.mo
+share/locale/nn/LC_MESSAGES/cinnamon.mo
+share/locale/pa/LC_MESSAGES/cinnamon.mo
+share/locale/pl/LC_MESSAGES/cinnamon.mo
+share/locale/pt/LC_MESSAGES/cinnamon.mo
+share/locale/pt_BR/LC_MESSAGES/cinnamon.mo
+share/locale/ro/LC_MESSAGES/cinnamon.mo
+share/locale/ru/LC_MESSAGES/cinnamon.mo
+share/locale/rue/LC_MESSAGES/cinnamon.mo
+share/locale/si/LC_MESSAGES/cinnamon.mo
+share/locale/sk/LC_MESSAGES/cinnamon.mo
+share/locale/sl/LC_MESSAGES/cinnamon.mo
+share/locale/so/LC_MESSAGES/cinnamon.mo
+share/locale/sq/LC_MESSAGES/cinnamon.mo
+share/locale/sr/LC_MESSAGES/cinnamon.mo
+share/locale/sr@ijekavianlatin/LC_MESSAGES/cinnamon.mo
+share/locale/sr@latin/LC_MESSAGES/cinnamon.mo
+share/locale/sv/LC_MESSAGES/cinnamon.mo
+share/locale/ta/LC_MESSAGES/cinnamon.mo
+share/locale/te/LC_MESSAGES/cinnamon.mo
+share/locale/th/LC_MESSAGES/cinnamon.mo
+share/locale/tlh/LC_MESSAGES/cinnamon.mo
+share/locale/tr/LC_MESSAGES/cinnamon.mo
+share/locale/ts/LC_MESSAGES/cinnamon.mo
+share/locale/uk/LC_MESSAGES/cinnamon.mo
+share/locale/ur/LC_MESSAGES/cinnamon.mo
+share/locale/uz/LC_MESSAGES/cinnamon.mo
+share/locale/vi/LC_MESSAGES/cinnamon.mo
+share/locale/yi/LC_MESSAGES/cinnamon.mo
+share/locale/zh_CN/LC_MESSAGES/cinnamon.mo
+share/locale/zh_HK/LC_MESSAGES/cinnamon.mo
+share/locale/zh_TW/LC_MESSAGES/cinnamon.mo
 share/cinnamon/search_providers/google.xml
 share/cinnamon/search_providers/wikipedia.xml
 share/cinnamon/shaders/dim-window.glsl
@@ -593,28 +643,25 @@ share/cinnamon/theme/add-workspace.png
 share/cinnamon/theme/calendar-arrow-left.svg
 share/cinnamon/theme/calendar-arrow-right.svg
 share/cinnamon/theme/calendar-today.svg
+share/cinnamon/theme/checkbox-focused.svg
+share/cinnamon/theme/checkbox-off-focused.svg
+share/cinnamon/theme/checkbox-off.svg
+share/cinnamon/theme/checkbox.svg
 share/cinnamon/theme/cinnamon.css
 share/cinnamon/theme/close-window.svg
 share/cinnamon/theme/close.svg
 share/cinnamon/theme/corner-ripple.png
-share/cinnamon/theme/dash-placeholder.svg
-share/cinnamon/theme/filter-selected-ltr.svg
-share/cinnamon/theme/filter-selected-rtl.svg
 share/cinnamon/theme/menu.png
 share/cinnamon/theme/overview-hover.png
 share/cinnamon/theme/overview.png
-share/cinnamon/theme/panel-border.svg
-share/cinnamon/theme/panel-button-border.svg
-share/cinnamon/theme/panel-button-highlight-narrow.svg
-share/cinnamon/theme/panel-button-highlight-wide.svg
 share/cinnamon/theme/player-paused.svg
 share/cinnamon/theme/player-playing.svg
 share/cinnamon/theme/player-stopped.svg
 share/cinnamon/theme/process-working.svg
-share/cinnamon/theme/running-indicator.svg
+share/cinnamon/theme/radiobutton-off.svg
+share/cinnamon/theme/radiobutton.svg
 share/cinnamon/theme/scroll-hhandle.svg
 share/cinnamon/theme/scroll-vhandle.svg
-share/cinnamon/theme/source-button-border.svg
 share/cinnamon/theme/thumbnail-generic.png
 share/cinnamon/theme/thumbnail.png
 share/cinnamon/theme/toggle-off-intl.svg
@@ -622,8 +669,6 @@ share/cinnamon/theme/toggle-off-us.svg
 share/cinnamon/theme/toggle-on-intl.svg
 share/cinnamon/theme/toggle-on-us.svg
 share/cinnamon/theme/trash-icon.png
-share/cinnamon/theme/ws-switch-arrow-down.svg
-share/cinnamon/theme/ws-switch-arrow-up.svg
 share/dbus-1/services/org.Cinnamon.HotplugSniffer.service
 share/desktop-directories/cinnamon-audio-video.directory
 share/desktop-directories/cinnamon-c.directory
@@ -656,169 +701,184 @@ share/xsessions/cinnamon2d.desktop
 @dirrm share/cinnamon/theme
 @dirrm share/cinnamon/shaders
 @dirrm share/cinnamon/search_providers
-@dirrm share/cinnamon/locale/zh_TW/LC_MESSAGES
-@dirrm share/cinnamon/locale/zh_TW
-@dirrm share/cinnamon/locale/zh_HK/LC_MESSAGES
-@dirrm share/cinnamon/locale/zh_HK
-@dirrm share/cinnamon/locale/zh_CN/LC_MESSAGES
-@dirrm share/cinnamon/locale/zh_CN
-@dirrm share/cinnamon/locale/yi/LC_MESSAGES
-@dirrm share/cinnamon/locale/yi
-@dirrm share/cinnamon/locale/vi/LC_MESSAGES
-@dirrm share/cinnamon/locale/vi
-@dirrm share/cinnamon/locale/uz/LC_MESSAGES
-@dirrm share/cinnamon/locale/uz
-@dirrm share/cinnamon/locale/ur/LC_MESSAGES
-@dirrm share/cinnamon/locale/ur
-@dirrm share/cinnamon/locale/uk/LC_MESSAGES
-@dirrm share/cinnamon/locale/uk
-@dirrm share/cinnamon/locale/ts/LC_MESSAGES
-@dirrm share/cinnamon/locale/ts
-@dirrm share/cinnamon/locale/tr/LC_MESSAGES
-@dirrm share/cinnamon/locale/tr
-@dirrm share/cinnamon/locale/th/LC_MESSAGES
-@dirrm share/cinnamon/locale/th
-@dirrm share/cinnamon/locale/te/LC_MESSAGES
-@dirrm share/cinnamon/locale/te
-@dirrm share/cinnamon/locale/sv/LC_MESSAGES
-@dirrm share/cinnamon/locale/sv
-@dirrm share/cinnamon/locale/sr@latin/LC_MESSAGES
-@dirrm share/cinnamon/locale/sr@latin
-@dirrm share/cinnamon/locale/sr@ijekavianlatin/LC_MESSAGES
-@dirrm share/cinnamon/locale/sr@ijekavianlatin
-@dirrm share/cinnamon/locale/sr/LC_MESSAGES
-@dirrm share/cinnamon/locale/sr
-@dirrm share/cinnamon/locale/sq/LC_MESSAGES
-@dirrm share/cinnamon/locale/sq
-@dirrm share/cinnamon/locale/so/LC_MESSAGES
-@dirrm share/cinnamon/locale/so
-@dirrm share/cinnamon/locale/sl/LC_MESSAGES
-@dirrm share/cinnamon/locale/sl
-@dirrm share/cinnamon/locale/sk/LC_MESSAGES
-@dirrm share/cinnamon/locale/sk
-@dirrm share/cinnamon/locale/si/LC_MESSAGES
-@dirrm share/cinnamon/locale/si
-@dirrm share/cinnamon/locale/rue/LC_MESSAGES
-@dirrm share/cinnamon/locale/rue
-@dirrm share/cinnamon/locale/ru/LC_MESSAGES
-@dirrm share/cinnamon/locale/ru
-@dirrm share/cinnamon/locale/ro/LC_MESSAGES
-@dirrm share/cinnamon/locale/ro
-@dirrm share/cinnamon/locale/pt_BR/LC_MESSAGES
-@dirrm share/cinnamon/locale/pt_BR
-@dirrm share/cinnamon/locale/pt/LC_MESSAGES
-@dirrm share/cinnamon/locale/pt
-@dirrm share/cinnamon/locale/pl/LC_MESSAGES
-@dirrm share/cinnamon/locale/pl
-@dirrm share/cinnamon/locale/nn/LC_MESSAGES
-@dirrm share/cinnamon/locale/nn
-@dirrm share/cinnamon/locale/nl/LC_MESSAGES
-@dirrm share/cinnamon/locale/nl
-@dirrm share/cinnamon/locale/ne/LC_MESSAGES
-@dirrm share/cinnamon/locale/ne
-@dirrm share/cinnamon/locale/nds/LC_MESSAGES
-@dirrm share/cinnamon/locale/nds
-@dirrm share/cinnamon/locale/nb/LC_MESSAGES
-@dirrm share/cinnamon/locale/nb
-@dirrm share/cinnamon/locale/ms/LC_MESSAGES
-@dirrm share/cinnamon/locale/ms
-@dirrm share/cinnamon/locale/mr/LC_MESSAGES
-@dirrm share/cinnamon/locale/mr
-@dirrm share/cinnamon/locale/ml/LC_MESSAGES
-@dirrm share/cinnamon/locale/ml
-@dirrm share/cinnamon/locale/mk/LC_MESSAGES
-@dirrm share/cinnamon/locale/mk
-@dirrm share/cinnamon/locale/lv/LC_MESSAGES
-@dirrm share/cinnamon/locale/lv
-@dirrm share/cinnamon/locale/lt/LC_MESSAGES
-@dirrm share/cinnamon/locale/lt
-@dirrm share/cinnamon/locale/la/LC_MESSAGES
-@dirrm share/cinnamon/locale/la
-@dirrm share/cinnamon/locale/ko/LC_MESSAGES
-@dirrm share/cinnamon/locale/ko
-@dirrm share/cinnamon/locale/kn/LC_MESSAGES
-@dirrm share/cinnamon/locale/kn
-@dirrm share/cinnamon/locale/km/LC_MESSAGES
-@dirrm share/cinnamon/locale/km
-@dirrm share/cinnamon/locale/jv/LC_MESSAGES
-@dirrm share/cinnamon/locale/jv
-@dirrm share/cinnamon/locale/ja/LC_MESSAGES
-@dirrm share/cinnamon/locale/ja
-@dirrm share/cinnamon/locale/it/LC_MESSAGES
-@dirrm share/cinnamon/locale/it
-@dirrm share/cinnamon/locale/is/LC_MESSAGES
-@dirrm share/cinnamon/locale/is
-@dirrm share/cinnamon/locale/id/LC_MESSAGES
-@dirrm share/cinnamon/locale/id
-@dirrm share/cinnamon/locale/ia/LC_MESSAGES
-@dirrm share/cinnamon/locale/ia
-@dirrm share/cinnamon/locale/hu/LC_MESSAGES
-@dirrm share/cinnamon/locale/hu
-@dirrm share/cinnamon/locale/hr/LC_MESSAGES
-@dirrm share/cinnamon/locale/hr
-@dirrm share/cinnamon/locale/hi/LC_MESSAGES
-@dirrm share/cinnamon/locale/hi
-@dirrm share/cinnamon/locale/he/LC_MESSAGES
-@dirrm share/cinnamon/locale/he
-@dirrm share/cinnamon/locale/gu/LC_MESSAGES
-@dirrm share/cinnamon/locale/gu
-@dirrm share/cinnamon/locale/gl/LC_MESSAGES
-@dirrm share/cinnamon/locale/gl
-@dirrm share/cinnamon/locale/fr_CA/LC_MESSAGES
-@dirrm share/cinnamon/locale/fr_CA
-@dirrm share/cinnamon/locale/fr/LC_MESSAGES
-@dirrm share/cinnamon/locale/fr
-@dirrm share/cinnamon/locale/fo/LC_MESSAGES
-@dirrm share/cinnamon/locale/fo
-@dirrm share/cinnamon/locale/fil/LC_MESSAGES
-@dirrm share/cinnamon/locale/fil
-@dirrm share/cinnamon/locale/fi/LC_MESSAGES
-@dirrm share/cinnamon/locale/fi
-@dirrm share/cinnamon/locale/fa/LC_MESSAGES
-@dirrm share/cinnamon/locale/fa
-@dirrm share/cinnamon/locale/eu/LC_MESSAGES
-@dirrm share/cinnamon/locale/eu
-@dirrm share/cinnamon/locale/et/LC_MESSAGES
-@dirrm share/cinnamon/locale/et
-@dirrm share/cinnamon/locale/es/LC_MESSAGES
-@dirrm share/cinnamon/locale/es
-@dirrm share/cinnamon/locale/eo/LC_MESSAGES
-@dirrm share/cinnamon/locale/eo
-@dirrm share/cinnamon/locale/en_GB/LC_MESSAGES
-@dirrm share/cinnamon/locale/en_GB
-@dirrm share/cinnamon/locale/en_CA/LC_MESSAGES
-@dirrm share/cinnamon/locale/en_CA
-@dirrm share/cinnamon/locale/en_AU/LC_MESSAGES
-@dirrm share/cinnamon/locale/en_AU
-@dirrm share/cinnamon/locale/el/LC_MESSAGES
-@dirrm share/cinnamon/locale/el
-@dirrm share/cinnamon/locale/de/LC_MESSAGES
-@dirrm share/cinnamon/locale/de
-@dirrm share/cinnamon/locale/da/LC_MESSAGES
-@dirrm share/cinnamon/locale/da
-@dirrm share/cinnamon/locale/cy/LC_MESSAGES
-@dirrm share/cinnamon/locale/cy
-@dirrm share/cinnamon/locale/cs/LC_MESSAGES
-@dirrm share/cinnamon/locale/cs
-@dirrm share/cinnamon/locale/ca/LC_MESSAGES
-@dirrm share/cinnamon/locale/ca
-@dirrm share/cinnamon/locale/bs/LC_MESSAGES
-@dirrm share/cinnamon/locale/bs
-@dirrm share/cinnamon/locale/bn/LC_MESSAGES
-@dirrm share/cinnamon/locale/bn
-@dirrm share/cinnamon/locale/bg/LC_MESSAGES
-@dirrm share/cinnamon/locale/bg
-@dirrm share/cinnamon/locale/be/LC_MESSAGES
-@dirrm share/cinnamon/locale/be
-@dirrm share/cinnamon/locale/ast/LC_MESSAGES
-@dirrm share/cinnamon/locale/ast
-@dirrm share/cinnamon/locale/ar/LC_MESSAGES
-@dirrm share/cinnamon/locale/ar
-@dirrm share/cinnamon/locale/am/LC_MESSAGES
-@dirrm share/cinnamon/locale/am
-@dirrm share/cinnamon/locale/af/LC_MESSAGES
-@dirrm share/cinnamon/locale/af
-@dirrm share/cinnamon/locale
+@dirrm share/locale/zh_TW/LC_MESSAGES
+@dirrm share/locale/zh_TW
+@dirrm share/locale/zh_HK/LC_MESSAGES
+@dirrm share/locale/zh_HK
+@dirrm share/locale/zh_CN/LC_MESSAGES
+@dirrm share/locale/zh_CN
+@dirrm share/locale/yi/LC_MESSAGES
+@dirrm share/locale/yi
+@dirrm share/locale/vi/LC_MESSAGES
+@dirrm share/locale/vi
+@dirrm share/locale/uz/LC_MESSAGES
+@dirrm share/locale/uz
+@dirrm share/locale/ur/LC_MESSAGES
+@dirrm share/locale/ur
+@dirrm share/locale/uk/LC_MESSAGES
+@dirrm share/locale/uk
+@dirrm share/locale/ts/LC_MESSAGES
+@dirrm share/locale/ts
+@dirrm share/locale/tr/LC_MESSAGES
+@dirrm share/locale/tr
+@dirrm share/locale/tlh/LC_MESSAGES
+@dirrm share/locale/tlh
+@dirrm share/locale/th/LC_MESSAGES
+@dirrm share/locale/th
+@dirrm share/locale/te/LC_MESSAGES
+@dirrm share/locale/te
+@dirrm share/locale/ta/LC_MESSAGES
+@dirrm share/locale/ta
+@dirrm share/locale/sv/LC_MESSAGES
+@dirrm share/locale/sv
+@dirrm share/locale/sr@latin/LC_MESSAGES
+@dirrm share/locale/sr@latin
+@dirrm share/locale/sr@ijekavianlatin/LC_MESSAGES
+@dirrm share/locale/sr@ijekavianlatin
+@dirrm share/locale/sr/LC_MESSAGES
+@dirrm share/locale/sr
+@dirrm share/locale/sq/LC_MESSAGES
+@dirrm share/locale/sq
+@dirrm share/locale/so/LC_MESSAGES
+@dirrm share/locale/so
+@dirrm share/locale/sl/LC_MESSAGES
+@dirrm share/locale/sl
+@dirrm share/locale/sk/LC_MESSAGES
+@dirrm share/locale/sk
+@dirrm share/locale/si/LC_MESSAGES
+@dirrm share/locale/si
+@dirrm share/locale/rue/LC_MESSAGES
+@dirrm share/locale/rue
+@dirrm share/locale/ru/LC_MESSAGES
+@dirrm share/locale/ru
+@dirrm share/locale/ro/LC_MESSAGES
+@dirrm share/locale/ro
+@dirrm share/locale/pt_BR/LC_MESSAGES
+@dirrm share/locale/pt_BR
+@dirrm share/locale/pt/LC_MESSAGES
+@dirrm share/locale/pt
+@dirrm share/locale/pl/LC_MESSAGES
+@dirrm share/locale/pl
+@dirrm share/locale/pa/LC_MESSAGES
+@dirrm share/locale/pa
+@dirrm share/locale/nn/LC_MESSAGES
+@dirrm share/locale/nn
+@dirrm share/locale/nl/LC_MESSAGES
+@dirrm share/locale/nl
+@dirrm share/locale/ne/LC_MESSAGES
+@dirrm share/locale/ne
+@dirrm share/locale/nds/LC_MESSAGES
+@dirrm share/locale/nds
+@dirrm share/locale/nb/LC_MESSAGES
+@dirrm share/locale/nb
+@dirrm share/locale/ms/LC_MESSAGES
+@dirrm share/locale/ms
+@dirrm share/locale/mr/LC_MESSAGES
+@dirrm share/locale/mr
+@dirrm share/locale/ml/LC_MESSAGES
+@dirrm share/locale/ml
+@dirrm share/locale/mk/LC_MESSAGES
+@dirrm share/locale/mk
+@dirrm share/locale/lv/LC_MESSAGES
+@dirrm share/locale/lv
+@dirrm share/locale/lt/LC_MESSAGES
+@dirrm share/locale/lt
+@dirrm share/locale/la/LC_MESSAGES
+@dirrm share/locale/la
+@dirrm share/locale/ksw/LC_MESSAGES
+@dirrm share/locale/ksw
+@dirrm share/locale/ko/LC_MESSAGES
+@dirrm share/locale/ko
+@dirrm share/locale/kn/LC_MESSAGES
+@dirrm share/locale/kn
+@dirrm share/locale/km/LC_MESSAGES
+@dirrm share/locale/km
+@dirrm share/locale/jv/LC_MESSAGES
+@dirrm share/locale/jv
+@dirrm share/locale/ja/LC_MESSAGES
+@dirrm share/locale/ja
+@dirrm share/locale/it/LC_MESSAGES
+@dirrm share/locale/it
+@dirrm share/locale/is/LC_MESSAGES
+@dirrm share/locale/is
+@dirrm share/locale/id/LC_MESSAGES
+@dirrm share/locale/id
+@dirrm share/locale/ia/LC_MESSAGES
+@dirrm share/locale/ia
+@dirrm share/locale/hu/LC_MESSAGES
+@dirrm share/locale/hu
+@dirrm share/locale/hr/LC_MESSAGES
+@dirrm share/locale/hr
+@dirrm share/locale/hi/LC_MESSAGES
+@dirrm share/locale/hi
+@dirrm share/locale/he/LC_MESSAGES
+@dirrm share/locale/he
+@dirrm share/locale/gu/LC_MESSAGES
+@dirrm share/locale/gu
+@dirrm share/locale/gl/LC_MESSAGES
+@dirrm share/locale/gl
+@dirrm share/locale/gd/LC_MESSAGES
+@dirrm share/locale/gd
+@dirrm share/locale/ga/LC_MESSAGES
+@dirrm share/locale/ga
+@dirrm share/locale/fr_CA/LC_MESSAGES
+@dirrm share/locale/fr_CA
+@dirrm share/locale/fr/LC_MESSAGES
+@dirrm share/locale/fr
+@dirrm share/locale/fo/LC_MESSAGES
+@dirrm share/locale/fo
+@dirrm share/locale/fil/LC_MESSAGES
+@dirrm share/locale/fil
+@dirrm share/locale/fi/LC_MESSAGES
+@dirrm share/locale/fi
+@dirrm share/locale/fa/LC_MESSAGES
+@dirrm share/locale/fa
+@dirrm share/locale/eu/LC_MESSAGES
+@dirrm share/locale/eu
+@dirrm share/locale/et/LC_MESSAGES
+@dirrm share/locale/et
+@dirrm share/locale/es/LC_MESSAGES
+@dirrm share/locale/es
+@dirrm share/locale/eo/LC_MESSAGES
+@dirrm share/locale/eo
+@dirrm share/locale/en_GB/LC_MESSAGES
+@dirrm share/locale/en_GB
+@dirrm share/locale/en_CA/LC_MESSAGES
+@dirrm share/locale/en_CA
+@dirrm share/locale/en_AU/LC_MESSAGES
+@dirrm share/locale/en_AU
+@dirrm share/locale/el/LC_MESSAGES
+@dirrm share/locale/el
+@dirrm share/locale/de/LC_MESSAGES
+@dirrm share/locale/de
+@dirrm share/locale/da/LC_MESSAGES
+@dirrm share/locale/da
+@dirrm share/locale/cy/LC_MESSAGES
+@dirrm share/locale/cy
+@dirrm share/locale/csb/LC_MESSAGES
+@dirrm share/locale/csb
+@dirrm share/locale/cs/LC_MESSAGES
+@dirrm share/locale/cs
+@dirrm share/locale/ca/LC_MESSAGES
+@dirrm share/locale/ca
+@dirrm share/locale/bs/LC_MESSAGES
+@dirrm share/locale/bs
+@dirrm share/locale/bn/LC_MESSAGES
+@dirrm share/locale/bn
+@dirrm share/locale/bg/LC_MESSAGES
+@dirrm share/locale/bg
+@dirrm share/locale/be/LC_MESSAGES
+@dirrm share/locale/be
+@dirrm share/locale/ast/LC_MESSAGES
+@dirrm share/locale/ast
+@dirrm share/locale/ar/LC_MESSAGES
+@dirrm share/locale/ar
+@dirrm share/locale/am/LC_MESSAGES
+@dirrm share/locale/am
+@dirrm share/locale/af/LC_MESSAGES
+@dirrm share/locale/af
+@dirrm share/locale
+@dirrm share/cinnamon/js/ui/appSwitcher
 @dirrm share/cinnamon/js/ui
 @dirrm share/cinnamon/js/perf
 @dirrm share/cinnamon/js/misc
@@ -835,9 +895,11 @@ share/xsessions/cinnamon2d.desktop
 @dirrm share/cinnamon/applets/window-list@cinnamon.org
 @dirrm share/cinnamon/applets/trash@cinnamon.org
 @dirrm share/cinnamon/applets/systray@cinnamon.org
+@dirrm share/cinnamon/applets/spacer@cinnamon.org
 @dirrm share/cinnamon/applets/sound@cinnamon.org
 @dirrm share/cinnamon/applets/show-desktop@cinnamon.org
 @dirrm share/cinnamon/applets/settings@cinnamon.org
+@dirrm share/cinnamon/applets/settings-example@cinnamon.org
 @dirrm share/cinnamon/applets/separator@cinnamon.org
 @dirrm share/cinnamon/applets/scale@cinnamon.org
 @dirrm share/cinnamon/applets/removable-drives@cinnamon.org
author	gusi <gusi@df743ca5-7f9a-e211-a948-0013205c9059>	2013-10-10 06:38:54 +0800
committer	gusi <gusi@df743ca5-7f9a-e211-a948-0013205c9059>	2013-10-10 06:38:54 +0800
commit	b27260bec4dec433d91f86459586a4c5e8c45e5a (patch)
tree	52412a380d2a3bc3dc456ac020d2ea5dfd3925c5
parent	fa32e601e6ae5eacda9dbdb05ce809f98be6af21 (diff)
download	marcuscom-ports-b27260bec4dec433d91f86459586a4c5e8c45e5a.tar marcuscom-ports-b27260bec4dec433d91f86459586a4c5e8c45e5a.tar.gz marcuscom-ports-b27260bec4dec433d91f86459586a4c5e8c45e5a.tar.bz2 marcuscom-ports-b27260bec4dec433d91f86459586a4c5e8c45e5a.tar.lz marcuscom-ports-b27260bec4dec433d91f86459586a4c5e8c45e5a.tar.xz marcuscom-ports-b27260bec4dec433d91f86459586a4c5e8c45e5a.tar.zst marcuscom-ports-b27260bec4dec433d91f86459586a4c5e8c45e5a.zip