[Xfce4-commits] [apps/xfce4-screensaver] 326/425: Bulk rename mate-screensaver -> xfce4-screensaver

noreply at xfce.org noreply at xfce.org
Mon Oct 15 01:52:53 CEST 2018


This is an automated email from the git hooks/post-receive script.

b   l   u   e   s   a   b   r   e       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository apps/xfce4-screensaver.

commit 2958215a243f2221121a2de00a7c96c38c31ea44
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Sun Sep 30 20:55:59 2018 -0400

    Bulk rename mate-screensaver -> xfce4-screensaver
---
 .gitignore                                         |  29 +++
 .tx/config                                         |   4 +-
 README                                             |   8 +-
 autogen.sh                                         |   2 +-
 configure.ac                                       |  26 +--
 data/Makefile.am                                   |  34 +--
 data/org.mate.ScreenSaver.service.in               |   2 +-
 data/{mate-screensaver => xfce4-screensaver}       |   0
 ...saver-command.1 => xfce4-screensaver-command.1} |  10 +-
 ...eferences.1 => xfce4-screensaver-preferences.1} |  16 +-
 ...in => xfce4-screensaver-preferences.desktop.in} |   4 +-
 ...erences.ui => xfce4-screensaver-preferences.ui} |   2 +-
 data/{mate-screensaver.1 => xfce4-screensaver.1}   |  20 +-
 ...directory.in => xfce4-screensaver.directory.in} |   0
 ...e-screensaver.pc.in => xfce4-screensaver.pc.in} |   2 +-
 ...ensavers.menu.in => xfce4-screensavers.menu.in} |   2 +-
 doc/Makefile.am                                    |  12 +-
 ...screensaver.xml.in => xfce4-screensaver.xml.in} |   0
 po/POTFILES.in                                     |  16 +-
 po/POTFILES.skip                                   |   2 +-
 po/am.po                                           | 174 +++++++--------
 po/ar.po                                           | 174 +++++++--------
 po/as.po                                           | 174 +++++++--------
 po/ast.po                                          | 174 +++++++--------
 po/be.po                                           | 174 +++++++--------
 po/bg.po                                           | 174 +++++++--------
 po/bn.po                                           | 174 +++++++--------
 po/bn_IN.po                                        | 174 +++++++--------
 po/br.po                                           | 174 +++++++--------
 po/bs.po                                           | 174 +++++++--------
 po/ca.po                                           | 174 +++++++--------
 po/ca at valencia.po                                  | 174 +++++++--------
 po/cmn.po                                          | 174 +++++++--------
 po/crh.po                                          | 174 +++++++--------
 po/cs.po                                           | 174 +++++++--------
 po/cy.po                                           | 174 +++++++--------
 po/da.po                                           | 174 +++++++--------
 po/de.po                                           | 174 +++++++--------
 po/dz.po                                           | 174 +++++++--------
 po/el.po                                           | 174 +++++++--------
 po/en_AU.po                                        | 174 +++++++--------
 po/en_CA.po                                        | 174 +++++++--------
 po/en_GB.po                                        | 174 +++++++--------
 po/es.po                                           | 174 +++++++--------
 po/es_AR.po                                        | 174 +++++++--------
 po/es_CO.po                                        | 174 +++++++--------
 po/et.po                                           | 174 +++++++--------
 po/eu.po                                           | 174 +++++++--------
 po/fa.po                                           | 174 +++++++--------
 po/fi.po                                           | 174 +++++++--------
 po/fr.po                                           | 174 +++++++--------
 po/fr_CA.po                                        | 174 +++++++--------
 po/frp.po                                          | 174 +++++++--------
 po/ga.po                                           | 174 +++++++--------
 po/gl.po                                           | 174 +++++++--------
 po/gnome-copyrights.txt                            | 238 ++++++++++-----------
 po/gu.po                                           | 174 +++++++--------
 po/he.po                                           | 174 +++++++--------
 po/hi.po                                           | 174 +++++++--------
 po/hr.po                                           | 174 +++++++--------
 po/hu.po                                           | 174 +++++++--------
 po/hy.po                                           | 174 +++++++--------
 po/id.po                                           | 174 +++++++--------
 po/is.po                                           | 174 +++++++--------
 po/it.po                                           | 174 +++++++--------
 po/ja.po                                           | 176 +++++++--------
 po/ka.po                                           | 174 +++++++--------
 po/kk.po                                           | 174 +++++++--------
 po/kn.po                                           | 174 +++++++--------
 po/ko.po                                           | 174 +++++++--------
 po/ku.po                                           | 174 +++++++--------
 po/ku_IQ.po                                        | 174 +++++++--------
 po/ky.po                                           | 174 +++++++--------
 po/lt.po                                           | 174 +++++++--------
 po/lv.po                                           | 174 +++++++--------
 po/mai.po                                          | 174 +++++++--------
 po/mg.po                                           | 174 +++++++--------
 po/mk.po                                           | 174 +++++++--------
 po/ml.po                                           | 174 +++++++--------
 po/mn.po                                           | 174 +++++++--------
 po/mr.po                                           | 174 +++++++--------
 po/ms.po                                           | 174 +++++++--------
 po/nb.po                                           | 174 +++++++--------
 po/nds.po                                          | 174 +++++++--------
 po/ne.po                                           | 174 +++++++--------
 po/nl.po                                           | 174 +++++++--------
 po/nn.po                                           | 174 +++++++--------
 po/oc.po                                           | 174 +++++++--------
 po/or.po                                           | 174 +++++++--------
 po/pa.po                                           | 174 +++++++--------
 po/pl.po                                           | 174 +++++++--------
 po/ps.po                                           | 174 +++++++--------
 po/pt.po                                           | 174 +++++++--------
 po/pt_BR.po                                        | 174 +++++++--------
 po/ro.po                                           | 174 +++++++--------
 po/ru.po                                           | 174 +++++++--------
 po/si.po                                           | 174 +++++++--------
 po/sk.po                                           | 174 +++++++--------
 po/sl.po                                           | 174 +++++++--------
 po/sq.po                                           | 174 +++++++--------
 po/sr.po                                           | 174 +++++++--------
 po/sr at latin.po                                     | 174 +++++++--------
 po/sv.po                                           | 174 +++++++--------
 po/ta.po                                           | 174 +++++++--------
 po/te.po                                           | 174 +++++++--------
 po/th.po                                           | 174 +++++++--------
 po/tr.po                                           | 174 +++++++--------
 po/uk.po                                           | 174 +++++++--------
 po/ur.po                                           | 174 +++++++--------
 po/uz.po                                           | 174 +++++++--------
 po/vi.po                                           | 174 +++++++--------
 po/zh_CN.po                                        | 174 +++++++--------
 po/zh_HK.po                                        | 174 +++++++--------
 po/zh_TW.po                                        | 174 +++++++--------
 savers/Makefile.am                                 |   2 +-
 src/Makefile.am                                    |  62 +++---
 src/debug-screensaver.sh                           |   8 +-
 src/gs-auth-bsdauth.c                              |   2 +-
 src/gs-auth-helper.c                               |   4 +-
 src/gs-debug.c                                     |   2 +-
 src/gs-listener-dbus.c                             |   2 +-
 src/gs-lock-plug.c                                 |   2 +-
 src/gs-monitor.c                                   |   4 +-
 src/gs-theme-manager.c                             |   4 +-
 src/gs-window-x11.c                                |   4 +-
 ...saver-command.c => xfce4-screensaver-command.c} |   0
 ...ensaver-dialog.c => xfce4-screensaver-dialog.c} |   2 +-
 ...r-gl-helper.c => xfce4-screensaver-gl-helper.c} |   0
 ...eferences.c => xfce4-screensaver-preferences.c} |   4 +-
 src/{mate-screensaver.c => xfce4-screensaver.c}    |   8 +-
 ...sktop.in.in => xfce4-screensaver.desktop.in.in} |   4 +-
 src/{mate-screensaver.h => xfce4-screensaver.h}    |   2 +-
 132 files changed, 8379 insertions(+), 8350 deletions(-)

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..db3120d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,29 @@
+*.o
+.vscode/
+INSTALL
+Makefile.in
+aclocal.m4
+autom4te.cache/
+compile
+config.guess
+config.h.in
+config.h.in~
+config.sub
+configure
+data/Makefile.in
+data/NONE/
+data/images/Makefile.in
+data/images/cosmos/Makefile.in
+depcomp
+doc/Makefile.in
+install-sh
+intltool-extract.in
+intltool-merge.in
+intltool-update.in
+ltmain.sh
+m4/
+missing
+po/Makefile.in.in
+savers/Makefile.in
+src/.deps/
+src/Makefile.in
diff --git a/.tx/config b/.tx/config
index 1779d57..1f6fc13 100644
--- a/.tx/config
+++ b/.tx/config
@@ -1,7 +1,7 @@
 [main]
 host = https://www.transifex.com
  
-[MATE.mate-screensaver]
+[MATE.xfce4-screensaver]
 file_filter = po/<lang>.po
-source_file = po/mate-screensaver.pot
+source_file = po/xfce4-screensaver.pot
 source_lang = en
diff --git a/README b/README
index 2ef8c14..6cfa944 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
-mate-screensaver
+xfce4-screensaver
 =================
 
-mate-screensaver is a screen saver and locker that aims to have
+xfce4-screensaver is a screen saver and locker that aims to have
 simple, sane, secure defaults and be well integrated with the desktop.
 It is designed to support:
 
@@ -29,7 +29,7 @@ How to report bugs
 
 Bugs should be reported to the MATE bug tracking
 system:
-    https://github.com/mate-desktop/mate-screensaver/issues
+    https://github.com/mate-desktop/xfce4-screensaver/issues
 
 You will need to create an account if you don't have one already.
 
@@ -39,6 +39,6 @@ In the bug report please include information about your system, if possible:
 
    - What version of mate-screenaver
 
-        The output of the "mate-screensaver-command --version" command.
+        The output of the "xfce4-screensaver-command --version" command.
 
  
diff --git a/autogen.sh b/autogen.sh
index 17680e0..5b6eca0 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,7 +4,7 @@
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
-PKG_NAME="mate-screensaver"
+PKG_NAME="xfce4-screensaver"
 
 (test -f $srcdir/configure.ac) || {
     echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
diff --git a/configure.ac b/configure.ac
index e342e58..0ed571f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,11 @@
 dnl -*- mode: m4 -*-
 
 AC_PREREQ(2.60)
-AC_INIT([mate-screensaver],
+AC_INIT([xfce4-screensaver],
         [1.20.0],
-        [http://www.mate-desktop.org/])
+        [http://www.xfce.org/])
 
-AC_CONFIG_SRCDIR(src/mate-screensaver.c)
+AC_CONFIG_SRCDIR(src/xfce4-screensaver.c)
 AC_CONFIG_MACRO_DIR([m4])
 
 AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-xz check-news])
@@ -29,7 +29,7 @@ AC_SUBST(VERSION)
 # Save flags to aclocal
 ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
 
-GETTEXT_PACKAGE=mate-screensaver
+GETTEXT_PACKAGE=xfce4-screensaver
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Name of default gettext domain])
 
@@ -148,9 +148,9 @@ AC_ARG_WITH(doc-dir,
               [AC_HELP_STRING([--with-doc-dir=<dir>],
               [directory to install documentation])])
 if ! test -z "$with_doc_dir"; then
-   DOCDIR="$with_doc_dir/mate-screensaver-$VERSION"
+   DOCDIR="$with_doc_dir/xfce4-screensaver-$VERSION"
 else
-   DOCDIR="$datadir/doc/mate-screensaver-$VERSION"
+   DOCDIR="$datadir/doc/xfce4-screensaver-$VERSION"
 fi
 AC_SUBST(DOCDIR)
 
@@ -1100,10 +1100,10 @@ AC_SUBST(MATE_SCREENSAVER_THEMES_DIR)
 # Special directories
 # Used for .pc.in file
 
-privlibexecdir='${libexecdir}'/mate-screensaver
+privlibexecdir='${libexecdir}'/xfce4-screensaver
 AC_SUBST(privlibexecdir)
 
-privdatadir='${datadir}'/mate-screensaver
+privdatadir='${datadir}'/xfce4-screensaver
 AC_SUBST(privdatadir)
 
 themesdir='${datadir}'/applications/screensavers
@@ -1116,21 +1116,21 @@ AC_OUTPUT([
 Makefile
 po/Makefile.in
 src/Makefile
-src/mate-screensaver.desktop.in
+src/xfce4-screensaver.desktop.in
 data/Makefile
-data/mate-screensavers.menu
-data/mate-screensaver.pc
+data/xfce4-screensavers.menu
+data/xfce4-screensaver.pc
 data/org.mate.ScreenSaver.service
 data/org.mate.screensaver.gschema.xml
 data/images/Makefile
 data/images/cosmos/Makefile
 savers/Makefile
 doc/Makefile
-doc/mate-screensaver.xml
+doc/xfce4-screensaver.xml
 ])
 
 echo "
-                    mate-screensaver $VERSION
+                    xfce4-screensaver $VERSION
                     ========================
 
         prefix:                   ${prefix}
diff --git a/data/Makefile.am b/data/Makefile.am
index 9d7316d..b9b423e 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -4,38 +4,38 @@ SUBDIRS =			\
 NULL =
 
 man_MANS = 				\
-	mate-screensaver.1		\
-	mate-screensaver-command.1	\
-	mate-screensaver-preferences.1	\
+	xfce4-screensaver.1		\
+	xfce4-screensaver-command.1	\
+	xfce4-screensaver-preferences.1	\
 	$(NULL)
 
 @INTLTOOL_DESKTOP_RULE@
 
 desktopdir = $(datadir)/applications
-desktop_in_files = mate-screensaver-preferences.desktop.in
+desktop_in_files = xfce4-screensaver-preferences.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 
 @INTLTOOL_DIRECTORY_RULE@
 
 directorydir = $(datadir)/desktop-directories
 directory_in_files =                            \
-	mate-screensaver.directory.in		\
+	xfce4-screensaver.directory.in		\
 	$(NULL)
 directory_DATA = $(directory_in_files:.directory.in=.directory)
 
 menudir = $(sysconfdir)/xdg/menus
 menu_DATA =					\
-	mate-screensavers.menu			\
+	xfce4-screensavers.menu			\
 	$(NULL)
 
 gtkbuilderdir = $(pkgdatadir)
 gtkbuilder_DATA = 					\
-	mate-screensaver-preferences.ui	\
+	xfce4-screensaver-preferences.ui	\
 	lock-dialog-default.ui		\
 	$(NULL)
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = mate-screensaver.pc
+pkgconfig_DATA = xfce4-screensaver.pc
 
 dbussessionservicedir = $(DBUS_SESSION_SERVICE_DIR)
 dbussessionservice_DATA = org.mate.ScreenSaver.service
@@ -52,8 +52,8 @@ EXTRA_DIST = 				\
 	$(directory_in_files)		\
 	$(gtkbuilder_DATA)		\
 	$(man_MANS)			\
-	mate-screensaver		\
-	mate-screensaver.pc.in		\
+	xfce4-screensaver		\
+	xfce4-screensaver.pc.in		\
 	org.mate.ScreenSaver.service.in\
 	xscreensaver-config.xsl		\
 	migrate-xscreensaver-config.sh	\
@@ -78,15 +78,15 @@ install-data-hook:
 		chmod 755 $(DESTDIR)$(PAM_PREFIX)/pam.d; \
 	   fi; \
 	   if test $$system = Linux; then \
-		if test '!' -f $(DESTDIR)$(PAM_PREFIX)/pam.d/mate-screensaver; then \
-		     $(INSTALL_DATA) mate-screensaver $(DESTDIR)$(PAM_PREFIX)/pam.d/mate-screensaver; \
+		if test '!' -f $(DESTDIR)$(PAM_PREFIX)/pam.d/xfce4-screensaver; then \
+		     $(INSTALL_DATA) xfce4-screensaver $(DESTDIR)$(PAM_PREFIX)/pam.d/xfce4-screensaver; \
 		fi; \
 		if test "x$(PAM_PREFIX)" != "x/etc/pam.d"; then \
 	             echo "***" ; \
-	             echo "***  Warning: mate-screensaver has been compiled with support for" ; \
+	             echo "***  Warning: xfce4-screensaver has been compiled with support for" ; \
 	             echo "***           Pluggable Authentication Modules (PAM).  However, you may need to" ; \
-	             echo "***           manually install $(PAM_PREFIX)/pam.d/mate-screensaver" ; \
-	             echo "***           to /etc/pam.d/mate-screensaver.  Otherwise, unlocking might" ; \
+	             echo "***           manually install $(PAM_PREFIX)/pam.d/xfce4-screensaver" ; \
+	             echo "***           to /etc/pam.d/xfce4-screensaver.  Otherwise, unlocking might" ; \
 	             echo "***           not work." ; \
 	             echo "***" ; \
 	             echo "***           Note: If you are using SuSE/Novell you may have to modify this file." ; \
@@ -95,9 +95,9 @@ install-data-hook:
 	   fi; \
 	   if test $$system = SunOS; then \
 	        echo "***" ; \
-	        echo "***  Warning: mate-screensaver has been compiled with support for" ; \
+	        echo "***  Warning: xfce4-screensaver has been compiled with support for" ; \
 	        echo "***           Pluggable Authentication Modules (PAM).  However, you" ; \
-	        echo "***           need to manually add authentication for mate-screensaver in" ; \
+	        echo "***           need to manually add authentication for xfce4-screensaver in" ; \
 	        echo "***           $(PAM_PREFIX)/pam.conf or /etc/pam.conf." ; \
 	        echo "***           Otherwise, unlocking might not work." ; \
 	        echo "***" ; \
diff --git a/data/org.mate.ScreenSaver.service.in b/data/org.mate.ScreenSaver.service.in
index 412ddfa..6928190 100644
--- a/data/org.mate.ScreenSaver.service.in
+++ b/data/org.mate.ScreenSaver.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.mate.ScreenSaver
-Exec=@EXPANDED_BINDIR@/mate-screensaver --no-daemon
+Exec=@EXPANDED_BINDIR@/xfce4-screensaver --no-daemon
diff --git a/data/mate-screensaver b/data/xfce4-screensaver
similarity index 100%
rename from data/mate-screensaver
rename to data/xfce4-screensaver
diff --git a/data/mate-screensaver-command.1 b/data/xfce4-screensaver-command.1
similarity index 87%
rename from data/mate-screensaver-command.1
rename to data/xfce4-screensaver-command.1
index f02c735..e7808b3 100644
--- a/data/mate-screensaver-command.1
+++ b/data/xfce4-screensaver-command.1
@@ -13,14 +13,14 @@
 .\"You should have received a copy of the GNU General Public License along
 .\"with this program; if not, write to the Free Software Foundation, Inc.,
 .\"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-.TH mate-screensaver-command 1 "2007\-09\-27" "MATE"
+.TH xfce4-screensaver-command 1 "2007\-09\-27" "MATE"
 .SH NAME
-mate-screensaver-command \- controls MATE screensaver
+xfce4-screensaver-command \- controls MATE screensaver
 .SH SYNOPSIS
-.B mate-screensaver-command
+.B xfce4-screensaver-command
 .RI [ OPTION... ]
 .SH DESCRIPTION
-mate-screensaver-command is a tool for controlling an already running instance of mate-screensaver.
+xfce4-screensaver-command is a tool for controlling an already running instance of xfce4-screensaver.
 .SH OPTIONS
 .TP
 .B \-\-exit
@@ -63,5 +63,5 @@ Version of this application
 .B
 This manual page was originally written by Sven Arvidsson <sa at whiz.se> for gnome-screensaver-command.
 .SH SEE ALSO
-.BR "mate-screensaver" (1)
+.BR "xfce4-screensaver" (1)
 
diff --git a/data/mate-screensaver-preferences.1 b/data/xfce4-screensaver-preferences.1
similarity index 80%
rename from data/mate-screensaver-preferences.1
rename to data/xfce4-screensaver-preferences.1
index e2864cd..c88be77 100644
--- a/data/mate-screensaver-preferences.1
+++ b/data/xfce4-screensaver-preferences.1
@@ -1,4 +1,4 @@
-.\" mate-screensaver-preferences manual page
+.\" xfce4-screensaver-preferences manual page
 .\"
 .\" This is free software; you may redistribute it and/or modify
 .\" it under the terms of the GNU General Public License as
@@ -18,18 +18,18 @@
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .SH NAME
-mate-screensaver-preferences \- Configure MATE Screensaver
+xfce4-screensaver-preferences \- Configure MATE Screensaver
 .SH SYNOPSIS
-.B mate-screensaver-preferences [ OPTIONS]
+.B xfce4-screensaver-preferences [ OPTIONS]
 .SH DESCRIPTION
 Manages preferences for the MATE Screensaver.
 .SH OPTIONS
 This program only accepts the standard GTK options.
 .SH "BUGS"
 .SS Should you encounter any bugs, they may be reported at: 
-http://github.com/mate-desktop/mate-screensaver/issues
+http://github.com/mate-desktop/xfce4-screensaver/issues
 .SH "AUTHORS"
-.SS mate-screensaver is maintained by:
+.SS xfce4-screensaver is maintained by:
 .nf
 Perberos <perberos at gmail.com>
 Steve Zesch <stevezesch2 at gmail.com>
@@ -43,8 +43,8 @@ Adam Erdman <hekel at archlinux.info> (2014)
 .SS gnome-screensaver was written by William Jon McCann <mccann at jhu.edu>
 .SH "SEE ALSO"
 .SS The documentation available through the program's menu.
-Further information may also be available at: http://wiki.mate-desktop.org/docs
+Further information may also be available at: http://wiki.xfce.org/docs
 .P
-.BR mate-screensaver (1),
-.BR mate-screensaver-command (1),
+.BR xfce4-screensaver (1),
+.BR xfce4-screensaver-command (1),
 .BR gtk-options (7)
diff --git a/data/mate-screensaver-preferences.desktop.in b/data/xfce4-screensaver-preferences.desktop.in
similarity index 78%
rename from data/mate-screensaver-preferences.desktop.in
rename to data/xfce4-screensaver-preferences.desktop.in
index 6f69648..671066e 100644
--- a/data/mate-screensaver-preferences.desktop.in
+++ b/data/xfce4-screensaver-preferences.desktop.in
@@ -2,12 +2,12 @@
 _Name=Screensaver
 _Comment=Set your screensaver preferences
 Icon=preferences-desktop-screensaver
-Exec=mate-screensaver-preferences
+Exec=xfce4-screensaver-preferences
 Terminal=false
 Type=Application
 Categories=GTK;Settings;DesktopSettings;
 OnlyShowIn=MATE;
 StartupNotify=true
 X-MATE-Bugzilla-Bugzilla=MATE
-X-MATE-Bugzilla-Product=mate-screensaver
+X-MATE-Bugzilla-Product=xfce4-screensaver
 X-MATE-Bugzilla-Component=general
diff --git a/data/mate-screensaver-preferences.ui b/data/xfce4-screensaver-preferences.ui
similarity index 99%
rename from data/mate-screensaver-preferences.ui
rename to data/xfce4-screensaver-preferences.ui
index cd3855b..0ee2423 100644
--- a/data/mate-screensaver-preferences.ui
+++ b/data/xfce4-screensaver-preferences.ui
@@ -3,7 +3,7 @@
 <interface>
   <requires lib="gtk+" version="3.14"/>
   <!-- interface-license-type gplv2 -->
-  <!-- interface-name mate-screensaver -->
+  <!-- interface-name xfce4-screensaver -->
   <!-- interface-description screensaver preferences -->
   <!-- interface-copyright MATE Developer -->
   <!-- interface-authors Wolfgang Ulbrich -->
diff --git a/data/mate-screensaver.1 b/data/xfce4-screensaver.1
similarity index 76%
rename from data/mate-screensaver.1
rename to data/xfce4-screensaver.1
index ed80668..809707a 100644
--- a/data/mate-screensaver.1
+++ b/data/xfce4-screensaver.1
@@ -1,4 +1,4 @@
-.\" mate-screensaver manual page
+.\" xfce4-screensaver manual page
 .\"
 .\" This is free software; you may redistribute it and/or modify
 .\" it under the terms of the GNU General Public License as
@@ -18,11 +18,11 @@
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .SH "NAME"
-mate-screensaver \- The MATE Desktop Screensaver and Locker
+xfce4-screensaver \- The MATE Desktop Screensaver and Locker
 .SH "SYNOPSIS"
-.B mate-screensaver [OPTIONS]
+.B xfce4-screensaver [OPTIONS]
 .SH "DESCRIPTION"
-MATE Screensaver is the default screen saver and locker for the MATE Desktop. It is designed with simplicity and security in mind. \fBmate-screensaver\fP integrates well with the MATE desktop, and it supports User Switching and the ability to lock down configuration settings.
+MATE Screensaver is the default screen saver and locker for the MATE Desktop. It is designed with simplicity and security in mind. \fBxfce4-screensaver\fP integrates well with the MATE desktop, and it supports User Switching and the ability to lock down configuration settings.
 .SH "OPTIONS"
 .TP
 \fB\-\-display=DISPLAY\fR
@@ -32,7 +32,7 @@ X display to use.
 Don't start as a daemon
 .TP
 \fB\-\-debug\fR
-Enable debugging messages for \fBmate-screensaver\fP
+Enable debugging messages for \fBxfce4-screensaver\fP
 .TP
 \fB\-\-version\fR
 Output version information and exit.
@@ -46,9 +46,9 @@ Print all command line options.
 This program also accepts the standard GTK options.
 .SH "BUGS"
 .SS Should you encounter any bugs, they may be reported at: 
-http://github.com/mate-desktop/mate-screensaver/issues
+http://github.com/mate-desktop/xfce4-screensaver/issues
 .SH "AUTHORS"
-.SS mate-screensaver is maintained by:
+.SS xfce4-screensaver is maintained by:
 .nf
 Perberos <perberos at gmail.com>
 Steve Zesch <stevezesch2 at gmail.com>
@@ -60,8 +60,8 @@ Adam Erdman <hekel at archlinux.info> (2014)
 .SS gnome-screensaver was written by William Jon McCann <mccann at jhu.edu>
 .SS This manual page was originally written by Sven Arvidsson <sa at whiz.se> (2007)
 .SH "SEE ALSO"
-.SS Further information may also be available at: http://wiki.mate-desktop.org/docs
+.SS Further information may also be available at: http://wiki.xfce.org/docs
 .P
-.BR mate-screensaver-command (1),
-.BR mate-screensaver-preferences (1),
+.BR xfce4-screensaver-command (1),
+.BR xfce4-screensaver-preferences (1),
 .BR gtk-options (7)
diff --git a/data/mate-screensaver.directory.in b/data/xfce4-screensaver.directory.in
similarity index 100%
rename from data/mate-screensaver.directory.in
rename to data/xfce4-screensaver.directory.in
diff --git a/data/mate-screensaver.pc.in b/data/xfce4-screensaver.pc.in
similarity index 92%
rename from data/mate-screensaver.pc.in
rename to data/xfce4-screensaver.pc.in
index 78e9f07..9fab7e6 100644
--- a/data/mate-screensaver.pc.in
+++ b/data/xfce4-screensaver.pc.in
@@ -10,7 +10,7 @@ privlibexecdir=@privlibexecdir@
 privdatadir=@privdatadir@
 themesdir=@themesdir@
 
-Name: mate-screensaver
+Name: xfce4-screensaver
 Description: MATE Screensaver
 Version: @VERSION@
 Requires:
diff --git a/data/mate-screensavers.menu.in b/data/xfce4-screensavers.menu.in
similarity index 89%
rename from data/mate-screensavers.menu.in
rename to data/xfce4-screensavers.menu.in
index 881a28a..ee2f1ce 100644
--- a/data/mate-screensavers.menu.in
+++ b/data/xfce4-screensavers.menu.in
@@ -4,7 +4,7 @@
 <Menu>
 
   <Name>Screensavers</Name>
-  <Directory>mate-screensaver.directory</Directory>
+  <Directory>xfce4-screensaver.directory</Directory>
 
   <!-- Read standard .directory and .desktop file locations -->
   <DefaultAppDirs/>
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 5a69bc8..d374246 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,22 +1,22 @@
 NULL =
 
 SPEC_XML_FILES =			\
-	mate-screensaver.xml		\
+	xfce4-screensaver.xml		\
 	dbus-interface.xml		\
 	$(NULL)
 
 if DOCBOOK_DOCS_ENABLED
 
 htmldocdir = $(DOCDIR)
-htmldoc_DATA = mate-screensaver.html
+htmldoc_DATA = xfce4-screensaver.html
 
-mate-screensaver.html : dbus-interface.xml
-	$(XMLTO) html-nochunks -m config.xsl mate-screensaver.xml
+xfce4-screensaver.html : dbus-interface.xml
+	$(XMLTO) html-nochunks -m config.xsl xfce4-screensaver.xml
 
 endif # DOCBOOK_DOCS_ENABLED
 
 EXTRA_DIST =				\
-	mate-screensaver.xml.in	\
+	xfce4-screensaver.xml.in	\
 	config.xsl			\
 	docbook.css			\
 	$(SPEC_XML_FILES)
@@ -24,4 +24,4 @@ EXTRA_DIST =				\
 
 clean-local:
 	rm -f *~
-	rm -f mate-screensaver.html
+	rm -f xfce4-screensaver.html
diff --git a/doc/mate-screensaver.xml.in b/doc/xfce4-screensaver.xml.in
similarity index 100%
rename from doc/mate-screensaver.xml.in
rename to doc/xfce4-screensaver.xml.in
diff --git a/po/POTFILES.in b/po/POTFILES.in
index ed32f78..7c90801 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,8 +1,8 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
-data/mate-screensaver-preferences.desktop.in
-[type: gettext/glade]data/mate-screensaver-preferences.ui
-data/mate-screensaver.directory.in
+data/xfce4-screensaver-preferences.desktop.in
+[type: gettext/glade]data/xfce4-screensaver-preferences.ui
+data/xfce4-screensaver.directory.in
 data/images/cosmos/cosmos.xml.in.in
 [type: gettext/glade]data/lock-dialog-default.ui
 [type: gettext/gsettings]data/org.mate.screensaver.gschema.xml.in
@@ -15,11 +15,11 @@ savers/popsquares.c
 savers/floaters.c
 savers/slideshow.c
 src/copy-theme-dialog.c
-src/mate-screensaver-command.c
-src/mate-screensaver-dialog.c
-src/mate-screensaver-preferences.c
-src/mate-screensaver.c
-src/mate-screensaver.desktop.in.in
+src/xfce4-screensaver-command.c
+src/xfce4-screensaver-dialog.c
+src/xfce4-screensaver-preferences.c
+src/xfce4-screensaver.c
+src/xfce4-screensaver.desktop.in.in
 src/gs-auth-pam.c
 src/gs-listener-dbus.c
 src/gs-lock-plug.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 2d37846..5461a91 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -4,4 +4,4 @@ savers/footlogo-floaters.desktop.in
 savers/gnomelogo-floaters.desktop.in
 savers/personal-slideshow.desktop.in
 savers/popsquares.desktop.in
-src/mate-screensaver.desktop.in
+src/xfce4-screensaver.desktop.in
diff --git a/po/am.po b/po/am.po
index 4d857cb..a1b8704 100644
--- a/po/am.po
+++ b/po/am.po
@@ -18,60 +18,60 @@ msgstr ""
 "Language: am\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "መመልከቻውን ማዳኛ "
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "የመመልከቻው ማዳኛ ምርጫዎች ማሰናጃ "
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "የመመልከቻው ማዳኛ ቅድመ እይታ "
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>የመመልከቻው ማዳኛ ቅድመ እይታ</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "የመመልከቻው ማዳኛ ምርጫዎች"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "የሐይል _አስተዳዳሪ "
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "_ቅድመ እይታ "
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "_የመመልከቻው ማዳኛ ገጽታዎች :"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "መመልከቻ ማዳኛ _ማስጀመሪያ ኮምፒዩተሩ በማይሰራ ጊዜ"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "መመልከቻ _መቆለፊያ መመልከቻ ማዳኛ በሚጀምር ጊዜ"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr ""
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "የመመልከቻው ማዳኛዎች "
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "የመመልከቻው ማዳኛ ገጽታዎች "
@@ -394,224 +394,224 @@ msgstr ""
 msgid "Copying file: %u of %u"
 msgstr "ፋይሉን ኮፒ በማድረግ ላይ : %u of %u"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "ንቁ "
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "የመውጫ ቁልፍ ማሳያ "
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "የተጠቃሚ መቀየሪያ ቁልፍ ማሳያ "
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr "መተው የሚፈልጉትን መልእክት ማሳያ "
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "መልእክት "
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr ""
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "የተጠቃሚ ስም :"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "የመግቢያ ቃል :"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "ምንም የ መግቢያ ቃል አልተሰጠም"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "የ መግቢያ ቃል አልተቀየረም "
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "የ ተጠቃሚ ስም አልተገኘም "
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "በ መመርመር ላይ..."
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "ማረጋገጫው ወድቋል"
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "ባዶ መመልከቻ"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "በነሲብ "
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d ሰአት "
 msgstr[1] "%d ሰአቶች"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d ደቂቃ "
 msgstr[1] "%d ደቂቆች"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -620,15 +620,15 @@ msgstr[1] "%d ሰከንዶች"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -636,35 +636,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "በፍጹም "
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "ዋናውን ገጽታ መጫን አልተቻለም"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr ""
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr ""
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr ""
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr ""
 
diff --git a/po/ar.po b/po/ar.po
index 2e7c882..c0afd25 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -22,60 +22,60 @@ msgstr ""
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "حافظة الشاشة"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "اضبط تفضيلات حافظة الشاشة"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "معاينة حافظة الشاشة"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>معاينة حافظة الشاشة</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "تفضيلات حافظة الشاشة"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "إ_دارة الطاقة"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "_معاينة"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "سِمة حافظة ال_شاشة:"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "اعتبر الحاسوب _ساكنًا بعد:"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "نشّط _حافظة الشاشة عند السكون"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "أو_صد الشاشة عند تفعيل حافظة الشاشة"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>تنبيه: لا تُوصد الشاشة للجذر.</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "حافظات الشاشة"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "سِمات حافظة الشاشة"
@@ -398,203 +398,203 @@ msgstr "يبدو أن الملف %s لا يمثل سِمة حافظة شاشة 
 msgid "Copying file: %u of %u"
 msgstr "ينسخ الملف: '%u من %u"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "يسبب خروج حافظة الشاشة بسلام"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "أظهر حالة حافظة الشاشة"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr "استعلم عن مدّة الزمن التي كانت فيها حافظة الشاشة نشطة"
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "تخبر عملية حافظة الشاشة التي تعمل بقفل الشاشة مباشرة "
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "انتقل إلى عرض رسومي آخر  إذا كانت حافظة الشاشة  نشِطة"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "شغّل حافظة الشاشة (أفرغ الشاشة)"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "أوقف حافظة الشاشة إذا كانت نشِطة (الغي إفراغ الشاشة)"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "وكز حافظة الشاشة المشتغل لمحاكاة نشاط من المستخدم"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr "امنع حافظة الشاشة من التفعيل. الأمر يتوقف عندما يكون المنع نشطًا."
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr "التطبيق المنادي الذي يمنع حافظة الشاشة"
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr "السبب وراء توقف حافظة الشاشة"
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "نسخة هذا التّطبيق"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "حافظة الشاشة هي %s\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "نشط"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "غير نشط"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr "حافظة الشاشة غير مُثبطة\n"
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr "حافظة الشاشة أثبطها:\n"
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr "حافظة الشاشة نشِطة منذ %Id ثواني.\n"
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr "حافظة الشاشة غير غير نشطة حاليًا\n"
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "أظهر مُخرجات التنقيح"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "أظهر زر الخروج"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "الأمر عند الضغط على زر الخروج"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "أظهر زر تبديل المستخدم"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr "الرسالة التي ستظهر في نافذة الحوار"
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "الرسالة"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr "غير مُستخدَمة"
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "اسم المستخدم:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "كلمة المرور:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr "يجب أن تغير كلمة مرورك حالًا (كلمة المرور قديمة)"
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "يجب أن تغير كلمة مرورك حالًا (فرض الجذر ذلك)"
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "انقضى حسابك، الرجاء الاتصال بمدير النظام"
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "لم تزود كلمة مرور جديدة"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "لم تغير كلمة المرور"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "لا يمكن تلقي اسم المستخدم"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "أعد كتابة كلمة مرور يونكس الجديدة:"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "أدخل كلمة مرور يونكس جديدة:"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "كلمة مرور يونكس (الحالية):"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "خطأ أثناء تغيير كلمة مرور NIS."
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "يجب أن تختار كلمة مرور أطول"
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "كلمة المرور مستخدمة. الرجاء اختيار كلمة مغايرة."
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "يجب أن تنتظر مدة أطول لتتمكن من تغيير كلمة مرورك"
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "عفوًا، كلمتا المرور لا تتطابقان"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "يفحص..."
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "فشل الاستيثاق."
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "شاشة فارغة"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "عشوائية"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -605,14 +605,14 @@ msgstr[3] "%Id ساعات"
 msgstr[4] "%Id ساعة"
 msgstr[5] "%Id ساعة"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -623,7 +623,7 @@ msgstr[3] "%Id دقائق"
 msgstr[4] "%Id دقيقة"
 msgstr[5] "%Id دقيقة"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -636,15 +636,15 @@ msgstr[5] "%Id ثانية"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -652,35 +652,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "أبدًا"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "تعذّر تحميل الواجهة الرئيسيّة"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "الرجاء التثبت من أن حافظة الشاشة مثبتة بنجاح"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "لا تصبح مُحثًا"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "فعّل التنقيح"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr ""
 
diff --git a/po/as.po b/po/as.po
index 9be5906..09d02b3 100644
--- a/po/as.po
+++ b/po/as.po
@@ -18,60 +18,60 @@ msgstr ""
 "Language: as\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "স্ক্ৰীনছেভাৰ"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "আপোনাৰ স্ক্ৰীনছেভাৰেৰ পছন্দসমূহ নিৰ্ধাৰণ কৰক"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "স্ক্ৰীনছেভাৰ Preview"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b> স্ক্ৰীনছেভাৰ</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "স্ক্ৰীনছেভাৰৰ পছন্দতালিকা"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "Power _Management"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "পূৰ্বৰূপ (_P)"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "স্ক্ৰীনছেভাৰ:"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "পিছত:"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "_Activate screensaver when computer is idle"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "লক কৰা হ'ব হলো সক্ৰিয়"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b> সতৰ্কবাণী উল্লিখিত সময় অবধি</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "স্ক্ৰীনছেভাৰ"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "স্ক্ৰীনছেভাৰ থিম"
@@ -394,224 +394,224 @@ msgstr "%s does not appear to be a valid screensaver theme."
 msgid "Copying file: %u of %u"
 msgstr "Copying file: %u of %u"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "Causes the screensaver to exit gracefully"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "স্ক্ৰিনছেভাৰেৰ অৱস্থা জানুন"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr "অনুসন্ধান সৰ্বমোট সক্ৰিয়"
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "চলমান"
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "হলো সক্ৰিয় ডেমো"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "চলি আছে"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "হলো সক্ৰিয়"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "চলমান"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr "Inhibit কমান্ড হলো সক্ৰিয়."
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr "হলো"
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr "উল্লিখিত সময় অবধি"
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "এই অ্যাপলিকেশনটিৰ সংস্কৰণ"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "স্ক্ৰিনছেভাৰটি হচ্ছে %s\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "সক্ৰিয়"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "নিষ্ক্ৰিয়"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr "স্ক্ৰিন-ছেভাৰ প্ৰতিৰোধ কৰা নহয়\n"
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr "স্ক্ৰিন-ছেভাৰ প্ৰতিৰোধকাৰী:\n"
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr "The screensaver has been active for %d seconds.\n"
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr "স্ক্ৰিন-ছেভাৰ বৰ্তমানে সক্ৰিয় নহয় ।\n"
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "ডিবাগিং আউটপুট প্ৰদৰ্শন কৰক"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "লগ আউট বাটন দেখাও"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "কমান্ড"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "Show the switch user button"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr "বাৰ্তা"
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "MESSAGE"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr "ব্যৱহৃত নহয়"
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "ব্যৱহাৰকাৰীৰ নাম:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "পাসওয়াৰ্ড:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr "এই মুহূৰ্তে পাসওয়াৰ্ড পৰিবৰ্তন কৰা আবশ্যক (পাসওয়াৰ্ডেৰ মেয়াদ পূৰণ হতে চলেছে)"
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "এই মুহূৰ্তে পাসওয়াৰ্ড পৰিবৰ্তন কৰা আবশ্যক (root ব্যৱহাৰকাৰীৰ নিৰ্দেশানুযায়ী)"
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "আপনাৰ অ্যাকাউন্টেৰ মেয়াদ উত্তীৰ্ণ হয়েছে; অনুগ্ৰহ কৰে সিস্টেম অ্যাডমিনস্ট্ৰেটৰেৰ সাথে যোগাযোগ কৰক ।"
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "পাসওয়াৰ্ড উল্লেখ কৰা নহয়"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "পাসওয়াৰ্ড অপৰিবৰ্তিত ৰয়েছে"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "ব্যৱহাৰকাৰীৰ নাম পাওয়া যায়নি"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "নতুন UNIX পাসওয়াৰ্ড পুনৰায় লিখুন:"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "নতুন UNIX পাসওয়াৰ্ড লিখুন:"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "(বৰ্তমান) UNIX পাসওয়াৰ্ড:"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "NIS পাসওয়াৰ্ড পৰিবৰ্তনে সমস্যা ।"
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "অত্যাধিক লম্বা পাসওয়াৰ্ড নিৰ্বাচন কৰা আবশ্যক"
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "উল্লিখিত পাসওয়াৰ্ডে পূৰ্বে ব্যৱহৃত হয়েছে । অনুগ্ৰহ কৰে একটি পৃথক পাসওয়াৰ্ড নিৰ্বাচন কৰক ।"
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "পাসওয়াৰ্ড পৰিবৰ্তনৰ জন্য কিছু সময় উপেক্ষা কৰতে হ'ব"
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "দুঃক্ষিত, পাসওয়াৰ্ডে গৰমিল"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "Checking..."
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "অনুমোদন ব্যৱস্থা."
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "পৰ্দা ফাঁকা"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "Random"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d ঘন্টা"
 msgstr[1] "%d ঘন্টা"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d মিনিট"
 msgstr[1] "%d মিনিট"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -620,15 +620,15 @@ msgstr[1] "%d সেকেন্ড"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -636,35 +636,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "কেতিয়াও নহয়"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "মূল ইন্টাৰফেস লোড কৰা নাযায়"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "অনুগ্ৰহ কৰি স্ক্ৰিন-ছেভাৰ সঠিক ৰূপে সংস্থাপন কৰা হৈছে নে নাই সেইটো নিশ্চিত কৰক"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "ডেমন সৃষ্টি কৰা ন'হ'ব"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "সক্ৰিয়"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr ""
 
diff --git a/po/ast.po b/po/ast.po
index 2b0a74c..88764c3 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -20,60 +20,60 @@ msgstr ""
 "Language: ast\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "Curiapantalles"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "Afite les sos preferencies pal curiapantalles"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "Previsualización del curiapantalles"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>Previsualización del curiapantalles</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "Preferencies del Curiapantalles"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "_Xestor Enerxía"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "Vista _previa"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "Tema del _curiapantalles:"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "Considerar l'equipu como _inactivu después de:"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "_Activar el curiapantalles cuando l'equipu tea inactivu"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "B_loquiar la pantalla cuando'l curiapantalles tea activu"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>Atención: la pantalla nun sedrá bloqueada pol usuariu root.</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "Curiapantalles"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "Temes del Curiapantalles"
@@ -396,224 +396,224 @@ msgstr "%s nun paez un tema de curiapantalles válidu."
 msgid "Copying file: %u of %u"
 msgstr "Copiando ficheru: %u de %u"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "Fai que'l curiapantalles zarre bien"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "Entrugar estáu del curiapantalles"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr "Entrugar la duración del tiempu dende que fue activáu'l curiapantalles"
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "Indica al procesu de curiapantalles n'execución que cande la pantalla nel intre"
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "Si'l curiapantalles ta activu entós camudar a otra demo gráfica"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "Prender el curiapantalles (apagar la pantalla)"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "Si'l curiapantalles ta activu entós desactivalu (prender la pantalla)"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "Unviar mensaxes al curiapantalles n'execución pa simular actividá del usuariu"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr "Inhibir l'activación del curiapantalles. El comandu blóquiase mentes la inhibición ta activa."
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr "La llamada de l'aplicación deshabilitó'l curiapantalles"
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr "El motivu pa inhibir el curiapantalles"
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "Versión d'esta aplicación"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "El curiapantalles ye %s\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "activu"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "inactivu"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr "El curiapantalles nun ta inhibíu\n"
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr "El curiapantalles ta siendo inhibíu por:\n"
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr "El curiapantalles foi activáu pa %d segundos.\n"
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr "El curiapantalles anguaño nun ta activáu.\n"
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "Amosar salida depuración"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "Amosar el botón de logout"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "Comandu invocáu dende'l botón logout"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "Amosar el botón de camudar usuariu"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr "Mensaxe a amosar nel diálogu"
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "MENSAXE"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr "Nun s'usa"
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "Nome d'usuariu:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "Contraseña:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr "Tienes que camudar la to contraseña nel intre (contraseña caducada)"
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "Fuiste requeríu pa camudar la clave inmediatamente (forzáu pol root)"
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "La to cuenta espiró; por favor, contauta col to alministrador del sistema"
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "Nun s'especificó contraseña dala"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "Clave non camudada"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "Nun pudo garrase nome d'usuariu"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "Reescribe la nueva clave UNIX"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "Introduz nueva clave UNIX"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "(actual) Clave UNIX:"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "Error al camudar la contraseñar NIS."
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "Tienes qu'escoyer una clave llarga"
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "Clave ta n'usu. Escueye otra."
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "Debes esperar pa camudar la to clave"
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "Sientolo, clave nun camudada"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "Comprobando..."
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "Falló l'autentificación."
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "Pantalla en blancu"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "Aleatoriu"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hores"
 msgstr[1] "%d hores"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minutos"
 msgstr[1] "%d minutos"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -622,15 +622,15 @@ msgstr[1] "%d segundos"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -638,35 +638,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "Enxamás"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "Nun fue a cargar la interfaz principal"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "Por favor, asegúrese de que'l curiapantalles tea bien instaláu"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "Nun convertise nun daemon"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "Activar códigu de depuración"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr ""
 
diff --git a/po/be.po b/po/be.po
index 03e28ea..4a89ef8 100644
--- a/po/be.po
+++ b/po/be.po
@@ -19,60 +19,60 @@ msgstr ""
 "Language: be\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "Ахоўнік экрану"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "Вызначэнне настáўленняў ахоўніка экрану"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "Дэманстрацыя ахоўніка"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>Дэманстрацыя ахоўніка</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "Настáўленні ахоўніка экрану"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "Кіраванне с_ілкаваннем"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "Д_эманстрацыя"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "_Тэма ахоўніка:"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "Лічыць, што камп'ютар бяздзейнічае, _пасля:"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "_Уключыць ахоўнік экрану, калі камп'ютар бяздзейнічае"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "За_мкнуць экран, калі ахоўнік экрану актыўны"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>Увага: для карыстальніка root экран не будзе заблакаваны.</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "Ахоўнікі экрану"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "Тэмы ахоўніка экрану"
@@ -395,203 +395,203 @@ msgstr "%s не з'яўляецца дзейснай тэмай ахоўніка
 msgid "Copying file: %u of %u"
 msgstr "Капіяванне файла: %u з %u"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "Прымушае ахоўнік экрану зграбна завяршыць працу"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "Апытвае стан ахоўніка экрану"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr "Запыт часу актыўнай працы ахоўніка экрану"
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "Паведамляе дзейнаму працэсу ахоўніка экрану неадкладна замкнуць экран"
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "Калі ахоўнік экрану актыўны, пераключыцца на інушю графічную дэманстрацыю"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "Уключыць ахоўнік экрану (пусты экран)"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "Калі ахоўнік экрану актыўны, адключыць яго (зрабіць экран не пустым)"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "Піхнуць дзейны ахоўнік экрану, каб імітаваць актыўнасць карыстальніка"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr "Стрымаць ахоўнік экрану ад працы.  Загад заблакаваны, пакуль актыўна стрымліванне."
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr "Названая праграма стрымлівае ахоўнік экрану"
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr "Прычына стрымлівання ахоўніка экрану"
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "Версія гэтай праграмы"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "Ахоўнік экрану %s\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "актыўны"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "неактыўны"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr "Актывацыя ахоўніка экрану не стрымана\n"
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr "Актывацыя ахоўніка экрану стрымана праграмай:\n"
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr "Ахоўнік экрану быў актыўны %d секунд.\n"
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr "Ахоўнік экрану цяпер неактыўны.\n"
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "Паказваць вывад наладкі"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "Паказваць кнопку выхаду"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "Загад, які выклікаецца падчас актывацыі кнопкі выхаду"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "Пакзаваць кнопку пераключэння карыстальнікаў"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr "Тэкст для паказу ў акенцы:"
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "MESSAGE"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr "Не выкарыстана"
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "Карыстальнік:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "Пароль:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr "Вы мусіце неадкладна змяніць ваш пароль (скончыўся час яго існавання)"
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "Вы мусіце неадкладна змяніць ваш пароль (прымушае root)"
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "Скончыўся час існавання конту; калі ласка, звяжыцеся з сістэмным адміністратарам"
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "Пароль не прадастаўлены"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "Пароль не зменены"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "Немагчыма вызначыць імя карыстальніка"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "Паўтарыце новы UNIX-пароль:"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "Увядзіце новы UNIX-пароль:"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "(дзейны) UNIX-пароль:"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "Памылка падчас змены паролю ў NIS."
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "Трэба задаць даўжэйшы пароль"
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "Пароль ужо выкарыстоўваўся раней. Абярыце іншы."
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "Вы мусіце чакаць крыху больш, калі змяняеце ваш пароль"
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "Нажаль, паролі не супадаюць"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "Праверка..."
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "Збой аўтэнтыфікацыі."
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "Чорны экран"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "Выпадковая тэма"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -600,14 +600,14 @@ msgstr[1] "%d гадзін"
 msgstr[2] "%d гадзін"
 msgstr[3] "%d гадзін"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -616,7 +616,7 @@ msgstr[1] "%d хвілін"
 msgstr[2] "%d хвілін"
 msgstr[3] "%d хвілін"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -627,15 +627,15 @@ msgstr[3] "%d секунд"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -643,35 +643,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "Ніколі"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "Не выйшла загрузіць асноўны інтэрфейс"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "Пераканайцеся, што ахоўнік экрану карэктна ўсталяваны"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "Не працаваць як дэман"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "Задзейнічаць код наладкі"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr "Запусціць ахоўнік экрану і блакавальнік"
 
diff --git a/po/bg.po b/po/bg.po
index 5d41eb1..d5e5037 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -22,60 +22,60 @@ msgstr ""
 "Language: bg\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "Предпазител на екрана"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "Настройване на предпазителя на екрана"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "Преглед на предпазителя на екрана"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>Преглед на темата</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "Настройки на предпазителя на екрана"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "_Управление на захранването"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "_Преглед"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "_Тема на предпазителя на екрана:"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "Сесията е _неактивна след:"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "В_ключване на предпазителя на екрана при неактивна сесия"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "_Заключване на екрана при задействане на предпазителя"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>Внимание: екранът няма да бъде заключен за администратора.</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "Предпазители на екрана"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "Теми за предпазителя"
@@ -398,224 +398,224 @@ msgstr "%s не изглежда да е валидна тема за екран
 msgid "Copying file: %u of %u"
 msgstr "Копиране на файл: %u от %u"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "Кара екранният предпазител да се затвори"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "Запитване за състоянието на екранния предпазител"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr "Запитване за времето на активност на екранния\n                             предпазител"
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "Съобщава на стартирания екранен предпазител\n                             веднага да заключи екрана"
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "Ако екранният предпазител е включен, да се\n                             превключи към друга визуализация"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "Включване на екранния предпазител (изчистване\n                             на екрана)"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "Ако екранният предпазител е активен — да се\n                             деактивира (включване на екрана)"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "Взаимодействане с работещия екранен предпазител за\n                             симулация на потребителска дейност"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr "Да не се допуска стартиране на предпазителя на\n                             екрана. Командата блокира докато забраната е\n                             активна."
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr "Викащата програма, която не допуска стартирането на\n                             предпазителя на екрана"
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr "Причината за недопускането на стартирането на\n                             предпазителя на екрана"
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "Версия на програмата"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "Екранният предпазител е %s\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "активен"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "неактивен"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr "Стартирането на екранният предпазител не се допуска\n"
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr "Стартирането на екранният предпазител не се допуска от:\n"
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr "Екранният предпазител се е задействал преди %d секунди.\n"
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr "В момента екранният предпазител не е включен.\n"
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "Показване на информацията за изчистване на грешки"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "Показване на бутона за изход"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "Команда стартирана от бутона за изход"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "Показване на бутона за смяна на потребителя"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr "Съобщение, което да се покаже в прозореца"
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "СЪОБЩЕНИЕ"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr "Не се използва"
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "Потребител:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "Парола:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr "Изисква се да смените паролата си незабавно (остаряла парола)"
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "Необходимо е незабавно да смените паролата (администраторът ви е задължил)"
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "Регистрацията ви е изтекла. Свържете се със системния администратор."
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "Не е предоставена парола"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "Паролата е непроменена"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "Не може да се получи потребителското име"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "Въведете отново новата парола за UNIX:"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "Въведете нова парола за UNIX:"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "(текуща) парола за UNIX:"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "Грешка при сменяне на паролата за NIS."
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "Трябва да изберете друга парола."
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "Паролата вече е използвана. Изберете друга."
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "Трябва да изчакате по-дълго, за да смените паролата си."
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "Паролите не съвпадат."
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "Проверка…"
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "Неуспех при удостоверяването."
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "Черен екран"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "Произволна"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d час"
 msgstr[1] "%d часа"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d минута"
 msgstr[1] "%d минути"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -624,15 +624,15 @@ msgstr[1] "%d секунди"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s и %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s, %s и %s"
@@ -640,35 +640,35 @@ msgstr "%s, %s и %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "Никога"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "Неуспех при зареждането на главния интерфейс"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "Уверете се, че предпазителя на екрана е инсталиран правилно."
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "Да не се преминава в режим на демон"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "Да се включи режим на изчистване на грешки"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr "Стартиране на предпазителя на екрана и заключване"
 
diff --git a/po/bn.po b/po/bn.po
index d149b4e..6489b32 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -22,60 +22,60 @@ msgstr ""
 "Language: bn\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "স্ক্রিন-সেভার"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "স্ক্রিন-সেভারের পছন্দসমূহ নির্ধারণ করুন"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "স্ক্রিন-সেভারের প্রাকদর্শন"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>স্ক্রিন-সেভারের প্রাকদর্শন</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "স্ক্রীনসেভারের পছন্দসমূহ"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "বিদ্যুৎ ব্যবস্থাপনা (_M)"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "প্রাকদর্শন (_P)"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "স্ক্রিন-সেভারের থীম: (_S)"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "কিছু সময় অতিবাহিত হলে কম্পিউটারে স্থগিত বিবেচনা করা হবে: (_i)"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "নিষ্ক্রিয় অবস্থায় কম্পিউটারে স্ক্রিন-সেভার সক্রিয় করা হবে (_A)"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "স্ক্রিন-সেভার সক্রিয় হলে পর্দা লক করা হবে (_L)"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>সতর্কবার্তা: root ব্যবহারকারীর জন্য পর্দা লক করা হবে না।</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "স্ক্রীন সেভার"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "স্ক্রীনসেভার থীম"
@@ -398,224 +398,224 @@ msgstr "%s সম্ভবত বৈধ স্ক্রিন-সেভারে
 msgid "Copying file: %u of %u"
 msgstr "ফাইল কপি করা হচ্ছে: %2$u এর %1$u"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "এর ফলে, স্ক্রিন-সেভার থেকে সঠিকরূপে প্রস্থান করবে"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "স্ক্রিনসেভারের অবস্থা জানুন"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr "স্ক্রিন-সেভার সক্রিয়তার সময়কাল অনুসন্ধান করুন"
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "এর ফলে, স্ক্রিন-সেভার প্রক্রিয়াকে অবিলম্বে পর্দা লক করার নির্দেশ দেওয়া হয়"
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "স্ক্রিন-সেভার সক্রিয় থাকলে ভিন্ন গ্রাফিক্স ডেমোতে পরিবর্তন করা হয়"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "স্ক্রিন-সেভার সক্রিয় করুন (পর্দা ফাঁকা থাকবে)"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "স্ক্রিন-সেভার সক্রিয় থাকলে তা নিষ্ক্রিয় করা হবে (পর্দা ফাঁকা থাকবে না)"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "ব্যবহারকারীর কাজের অনুকরণ করার জন্য চলমান স্ক্রিন-সেভার প্রবেশ করানো হয়"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr "স্ক্রিন-সেভার সক্রিয় করতে প্রতিরোধ করা হবে।  প্রতিরোধ ব্যবস্থা সক্রিয় থাকাকালীন কমান্ডের সক্রিয়তা সীমাবদ্ধতা।"
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr "স্ক্রিন-সেভার প্রতিরোধকারী কল করার অ্যাপ্লিকেশন"
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr "স্ক্রিন-সেভার প্রতিরোধের কারণ"
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "এই অ্যাপলিকেশনটির সংস্করণ"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "স্ক্রিনসেভারটি হচ্ছে %s\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "সক্রিয়"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "নিষ্ক্রিয়"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr "স্ক্রিন-সেভার প্রতিরোধ করা হয়নি\n"
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr "স্ক্রিন-সেভার প্রতিরোধকারী:\n"
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr "%d সেকেন্ড অবধি স্ক্রিন-সেভার সক্রিয় ছিল।\n"
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr "স্ক্রিন-সেভার বর্তমানে সক্রিয় নয়।\n"
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "ডিবাগিং আউটপুট প্রদর্শন করা হবে"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "লগ আউট বোতাম প্রদর্শন করা হবে"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "লগ-আউট বোতাম থেকে প্রাপ্ত কমান্ড"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "ব্যবহারকারী পরিবর্তনের বোতাম প্রদর্শন করা হবে"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr "ডায়ালগের মধ্যে প্রদর্শনের জন্য নির্ধারিত পাঠ্য"
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "MESSAGE"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr "ব্যবহৃত হয়নি"
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "ব্যবহারকারী নাম:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "পাসওয়ার্ড:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr "অবিলম্বে পাসওয়ার্ড পরিবর্তন করা আবশ্যক (পাসওয়ার্ডের মেয়াদ পূর্ণ হয়েছে)"
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "অবিলম্বে পাসওয়ার্ড পরিবর্তন করা আবশ্যক (root দ্বারা বাধ্যতামূলক)"
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "আপনার অ্যাকাউন্টের ব্যবহারকালের মেয়াদ উত্তীর্ণ হয়েছে; অনুগ্রহ করে সিস্টেম অ্যাডমিনিস্ট্রেটরের সাথে যোগাযোগ করুন"
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "পাসওয়ার্ড উল্লেখ করা হয়নি"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "পাসওয়ার্ড পরিবর্তন করা হয়নি"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "ব্যবহারকারীর নাম পাওয়া যায় না"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "নতুন UNIX পাসওয়ার্ড পুনরায় লিখুন:"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "নতুন UNIX পাসওয়ার্ড লিখুন:"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "(বর্তমান) UNIX পাসওয়ার্ড:"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "NIS পাসওয়ার্ড পরিবর্তন করতে ত্রুটি।"
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "দীর্ঘ পাসওয়ার্ড নির্বাচন করা আবশ্যক"
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "এই পাসওয়ার্ড ইতোমধ্যেই ব্যবহৃত হয়েছে। অনুগ্রহ করে একটি পৃথক পাসওয়ার্ড লিখুন।"
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "পাসওয়ার্ড পরিবর্তনের জন্য আরো কিছু সময় অপেক্ষা করা আবশ্যক"
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "দুঃখিত, পাসওয়ার্ডে মিলে না"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "পরীক্ষা করা হচ্ছে..."
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "প্রমানিকরণ ব্যর্থ।"
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "ফাঁকা পর্দা"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "যথেচ্ছ"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d ঘন্টা"
 msgstr[1] "%d ঘন্টা"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d মিনিট"
 msgstr[1] "%d মিনিট"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -624,15 +624,15 @@ msgstr[1] "%d সেকেন্ড"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -640,35 +640,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "কখনোই না"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "প্রধান ইন্টারফেস লোড করা যায়নি"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "অনুগ্রহ করে স্ক্রিন-সেভার সঠিক রূপে ইনস্টল করা হয়েছে কি না তা নিশ্চিত করুন"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "ডেমন তৈরি করা হবে না"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "কোড ডিবাগ সক্রিয় করা হবে"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr ""
 
diff --git a/po/bn_IN.po b/po/bn_IN.po
index adb8297..81bde59 100644
--- a/po/bn_IN.po
+++ b/po/bn_IN.po
@@ -20,60 +20,60 @@ msgstr ""
 "Language: bn_IN\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "স্ক্রিন-সেভার"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "স্ক্রিন-সেভার সংক্রান্ত পছন্দ নির্ধারণ করুন"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "স্ক্রিন-সেভারের পূর্বরূপ প্রদর্শন"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>স্ক্রিন-সেভারের পূর্বরূপ প্রদর্শন</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "স্ক্রীনসেভারের পছন্দতালিকা"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "বিদ্যৎ সরবরাহ পরিচালনা (_M)"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "পূর্বরূপ প্রদর্শন (_P)"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "স্ক্রিন-সেভারের থিম: (_S)"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "চিহ্নিত সময় অতিবাহিত হলে কম্পিউটারে কর্ম সঞ্চালন স্থগিত ধার্য করা হবে: (_i)"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "কর্মহীন অবস্থায় কম্পিউটারে স্ক্রিন-সেভার সক্রিয় করা হবে (_A)"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "স্ক্রিন-সেভার সক্রিয় হলে পর্দা লক করা হবে (_L)"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>সতর্কবার্তা: root ব্যবহারকারীর জন্য পর্দা লক করা হবে না।</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "স্ক্রীনসেভার"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "স্ক্রীনসেভার থিম"
@@ -396,224 +396,224 @@ msgstr "%s সম্ভবত বৈধ স্ক্রিন-সেভারে
 msgid "Copying file: %u of %u"
 msgstr "ফাইল কপি করা হচ্ছে: %u, সর্বমোট %u"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "এর ফলে, স্ক্রিন-সেভার সঠিকরূপে বন্ধ হবে"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "স্ক্রিনসেভারের অবস্থা জানুন"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr "স্ক্রিন-সেভার চালনার অবকাল অনুসন্ধান করুন"
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "এর ফলে, স্ক্রিন-সেভার পরিসেবাকে অবিলম্বে পর্দা লক করার নির্দেশ দেওয়া হয়"
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "স্ক্রিন-সেভার সক্রিয় থাকলে ভিন্ন গ্রাফিক্স ডেমোতে পরিবর্তন করা হয়"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "স্ক্রিন-সেভার সক্রিয় করুন (পর্দা ফাঁকা থাকবে)"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "স্ক্রিন-সেভার সক্রিয় থাকলে তা নিষ্ক্রিয় করা হবে (পর্দা ফাঁকা থাকবে না)"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "ব্যবহারকারী দ্বারা সঞ্চালিত কর্মের অনুকরণ করার জন্য স্ক্রিন-সেভার নাড়িয়ে দিন"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr "স্ক্রিন-সেভার আরম্ভ করতে প্রতিরোধ করা হবে।  প্রতিরোধ ব্যবস্থা সক্রিয় থাকাকালীন কমান্ডের সঞ্চালনের সীমাবদ্ধতা।"
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr "স্ক্রিন-সেভার প্রতিরোধকারী অ্যাপ্লিকেশন"
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr "স্ক্রিন-সেভার প্রতিরোধের কারণ"
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "এই অ্যাপলিকেশনটির সংস্করণ"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "স্ক্রিনসেভারটি হচ্ছে %s\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "সক্রিয়"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "নিষ্ক্রিয়"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr "স্ক্রিন-সেভার প্রতিরোধ করা হয়নি\n"
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr "স্ক্রিন-সেভার প্রতিরোধকারী:\n"
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr "%d সেকেন্ড অবধি স্ক্রিন-সেভার সক্রিয় ছিল।\n"
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr "স্ক্রিন-সেভার বর্তমানে সক্রিয় নয়।\n"
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "ডিবাগিং আউটপুট প্রদর্শন করুন"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "লগ আউট বাটন দেখাও"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "লগ-আউট বাটন দ্বারা সঞ্চালিত কমান্ড"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "ব্যবহারকারী পরিবর্তনের বাটন প্রদর্শন করা হবে"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr "ডায়লগের মধ্যে প্রদর্শনের জন্য নির্ধারিত টেক্সট"
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "MESSAGE"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr "ব্যবহৃত হয়নি"
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "ব্যবহারকারী:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "পাসওয়ার্ড:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr "অবিলম্বে পাসওয়ার্ড পরিবর্তন করা আবশ্যক (পাসওয়ার্ডের মেয়াদ পূর্ণ হয়েছে)"
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "অবিলম্বে পাসওয়ার্ড পরিবর্তন করা আবশ্যক (root দ্বারা বাধ্যতামূলক)"
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "আপনার অ্যাকাউন্টের ব্যবহারকালের মেয়াদ উত্তীর্ণ হয়েছে; অনুগ্রহ করে সিস্টেম অ্যাডমিনিস্ট্রেটরের সাথে যোগাযোগ করুন"
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "পাসওয়ার্ড উল্লেখ করা হয়নি"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "পাসওয়ার্ড পরিবর্তন করা হয়নি"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "ব্যবহারকারীর নাম"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "নতুন UNIX পাসওয়ার্ড পুনরায় লিখুন:"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "নতুন UNIX পাসওয়ার্ড লিখুন:"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "(বর্তমান) UNIX পাসওয়ার্ড:"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "NIS পাসওয়ার্ড পরিবর্তন করতে ত্রুটি।"
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "দীর্ঘ মাপের পাসওয়ার্ড নির্বাচন করা আবশ্যক"
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "এই পাসওয়ার্ড ব্যবহৃত হয়েছে। অনুগ্রহ করে একটি পৃথক পাসওয়ার্ড লিখুন।"
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "পাসওয়ার্ড পরিবর্তনের জন্য আরো কিছু কাল অপেক্ষা করা আবশ্যক"
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "দুঃখিত, পাসওয়ার্ডে গরমিল"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "পরীক্ষা করা হচ্ছে..."
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "অনুমোদন বিফল।"
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "ফাঁকা পর্দা"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "যথেচ্ছ"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d ঘন্টা"
 msgstr[1] "%d ঘন্টা"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d মিনিট"
 msgstr[1] "%d মিনিট"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -622,15 +622,15 @@ msgstr[1] "%d সেকেন্ড"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -638,35 +638,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "কখনোই না"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "প্রধান ইন্টারফেস লোড করা যায়নি"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "অনুগ্রহ করে স্ক্রিন-সেভা সঠিক রূপে ইনস্টল করা হয়েছে কি না তা নিশ্চিত করুন"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "ডেমন তৈরি করা হবে না"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "কোড ডিবাগের ব্যবস্থা সক্রিয় করা হবে"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr ""
 
diff --git a/po/br.po b/po/br.po
index b45dca2..3f9fc04 100644
--- a/po/br.po
+++ b/po/br.po
@@ -18,60 +18,60 @@ msgstr ""
 "Language: br\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "Damanter skramm"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "Arventenniñ gwellvezioù ho tamanter skramm"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "Alberz an damanter skramm"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "Gwellvezioù an damanter skramm"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "Merour _Energiezh"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "_Alberz"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "_Tem skramm kousk:"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "Sell pizh an urzhiataer ouzh dizoberiant goude:"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "_Gweredekaat an damanter skramm pa z'eo dizoberiant an urzhiataer"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "_Prennañ ar skramm p'emañ an damanter skramm war enaou"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>Diwallit: Ne vo ket prennet ar skramm evit an arveriad root.</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "Damanterioù skramm"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "Neuzioù an damanter skramm"
@@ -394,224 +394,224 @@ msgstr ""
 msgid "Copying file: %u of %u"
 msgstr "O kopiañ ar restr: %u eus %u"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "Handlev an arload"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "%s eo an damanter skramm\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "oberiat"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "dizoberiant"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "KEMENNADENN"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr ""
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "Anv an arveriad :"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "Ger-tremen :"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "Diamzeret eo ho kont ; kit e darempred gant hoc'h ardoer reizhiad"
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "N'eus ket ger-tremen"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "N'eo ket kemmet ar ger-tremen"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "N'eus ket tu da gaout un anv implijour"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "Roit ur ger-tremen UNIX nevez :"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "Ger-tremen UNIX (a-vremañ):"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "Digarez, ne glot ket ar ger-tremen"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "O wiriañ..."
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "Dilesadur sac'het."
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr ""
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "Dargouezhek"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d eurvezh"
 msgstr[1] "%d eurvezh"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d vunutenn"
 msgstr[1] "%d a vunutennoù"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -620,15 +620,15 @@ msgstr[1] "%d eilennoù"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -636,35 +636,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "Morse"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "N'eus ket tu da gargañ ar c'hetal pennañ"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr ""
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr ""
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "Gweredekaat ar boneg diveugañ"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr ""
 
diff --git a/po/bs.po b/po/bs.po
index a42ed8c..9008e21 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -18,60 +18,60 @@ msgstr ""
 "Language: bs\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "Screensaver"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "Postavi opcije za screensaver"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "Opcije za Screensaver"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr ""
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr ""
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr ""
@@ -394,203 +394,203 @@ msgstr ""
 msgid "Copying file: %u of %u"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr ""
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr ""
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr ""
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr ""
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -598,14 +598,14 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -613,7 +613,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -623,15 +623,15 @@ msgstr[2] ""
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr ""
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr ""
@@ -639,35 +639,35 @@ msgstr ""
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr ""
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr ""
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr ""
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr ""
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr ""
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr ""
 
diff --git a/po/ca.po b/po/ca.po
index 6a73969..ae16744 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -22,60 +22,60 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "Estalvi de pantalla"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "Establiu les preferències de l'estalvi de pantalla"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "Vista prèvia de l'estalvi de pantalla"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>Vista prèvia de l'estalvi de pantalla</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "Preferències de l'estalvi de pantalla"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "_Gestor d'energia"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "Vista _prèvia"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "Tema de l'e_stalvi de pantalla:"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "Considera l'ordinador com a _inactiu després de:"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "_Activa l'estalvi de pantalla quan l'ordinador estigui inactiu"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "_Bloqueja la pantalla quan l'estalvi de pantalla estigui actiu"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>Advertència: la pantalla no es bloquejarà per a l'usuari root.</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "Estalvis de pantalla"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "Temes de l'estalvi de pantalla"
@@ -398,224 +398,224 @@ msgstr "Sembla que el %s no sigui un tema d'estalvi de pantalla vàlid."
 msgid "Copying file: %u of %u"
 msgstr "S'està copiant el fitxer: %u de %u"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "Fa que l'estalvi de pantalla surti sense errors"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "Consulta l'estat de l'estalvi de pantalla"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr "Consulta la quantitat de temps que l'estalvi de pantalla ha estat actiu"
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "Diu al procés d'estalvi de pantalla en funcionament que bloquegi la pantalla immediatament"
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "Si l'estalvi de pantalla està actiu, llavors canvia a una altra demostració de gràfics"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "Activa l'estalvi de pantalla (enfosqueix la pantalla)"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "Si l'estalvi de pantalla està actiu, desactiva'l (restableix la pantalla)"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "Burxa l'estalvi de pantalla actiu per simular activitat de l'usuari"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr "Inhibeix l'activació de l'estalvi de pantalla. L'ordre bloqueja mentre la inhibició està activa."
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr "L'aplicació que està demanant d'inhibir l'estalvi de pantalla"
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr "El motiu per inhibir l'estalvi de pantalla"
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "Versió d'aquesta aplicació"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "L'estalvi de pantalla està %s\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "activat"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "desactivat"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr "L'estalvi de pantalla està inhibit\n"
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr "L'estalvi de pantalla l'inhibeix:\n"
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr "Fa %d segons que l'estalvi de pantalla s'ha activat.\n"
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr "L'estalvi de pantalla no és actiu.\n"
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "Mostra els missatges de depuració"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "Mostra el botó de tancar la sessió"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "Ordre per invocar des del botó de tancar la sessió"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "Mostra el botó de canvi d'usuari"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr "Missatge que es mostrarà en el diàleg"
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "MISSATGE"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr "No s'utilitza"
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "Nom d'usuari:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "Contrasenya:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr "Heu de canviar la contrasenya immediatament (la contrasenya s'ha fet vella)"
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "Heu de canviar la contrasenya immediatament (us hi obliga el superusuari)"
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "El vostre compte ha expirat, contacteu amb l'administrador d'aquest sistema"
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "No s'ha proporcionat cap contrasenya"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "No s'ha canviat la contrasenya"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "No s'ha pogut obtenir el nom d'usuari"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "Reescriviu la contrasenya nova UNIX:"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "Introduïu la contrasenya nova UNIX:"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "Contrasenya UNIX (actual):"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "S'ha produït un error en canviar la contrasenya NIS."
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "Heu de triar una contrasenya més llarga"
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "La contrasenya ja s'ha fet servir. Trieu-ne una altra."
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "Heu d'esperar més per canviar la contrasenya"
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "Les contrasenyes no coincideixen"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "S'està comprovant..."
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "Ha fallat l'autenticació."
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "Pantalla en negre"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "Aleatori"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d hores"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minut"
 msgstr[1] "%d minuts"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -624,15 +624,15 @@ msgstr[1] "%d segons"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -640,35 +640,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "Mai"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "No s'ha pogut carregar la interfície principal"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "Assegureu-vos que l'estalvi de pantalla estigui ben instal·lat"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "No esdevinguis un dimoni"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "Habilita el codi de depuració"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr "Llança l'estalvi de pantalla i el programa de bloqueig"
 
diff --git a/po/ca at valencia.po b/po/ca at valencia.po
index 7044ad9..c1ce717 100644
--- a/po/ca at valencia.po
+++ b/po/ca at valencia.po
@@ -21,60 +21,60 @@ msgstr ""
 "Language: ca at valencia\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "Estalvi de pantalla"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "Establiu les preferències de l'estalvi de pantalla"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "Previsualització de l'estalvi de pantalla"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>Previsualització de l'estalvi de pantalla</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "Preferències de l'estalvi de pantalla"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "_Gestor d'energia"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "_Previsualització"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "Tema de l'e_stalvi de pantalla:"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "Considera l'ordinador com a _inactiu després de:"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "_Activa l'estalvi de pantalla quan l'ordinador estiga inactiu"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "_Bloqueja la pantalla quan l'estalvi de pantalla estiga actiu"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>Avís: La pantalla no es bloquejarà per al superusuari (root).</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "Estalvis de pantalla"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "Temes de l'estalvi de pantalla"
@@ -397,224 +397,224 @@ msgstr "Pareix que el %s no siga un tema d'estalvi de pantalla vàlid."
 msgid "Copying file: %u of %u"
 msgstr "S'està copiant el fitxer: %u de %u"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "Fa que l'estalvi de pantalla isca sense errors"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "Consulta l'estat de l'estalvi de pantalla"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr "Consulta quan de temps fa que l'estalvi de pantalla s'ha activat"
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "Diu al procés d'estalvi de pantalla en funcionament que bloquege la pantalla immediatament"
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "Si l'estalvi de pantalla està actiu llavors canvia a una altra demostració de gràfics"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "Activa l'estalvi de pantalla (enfosqueix la pantalla)"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "Si l'estalvi de pantalla està actiu, desactiva'l (restableix la pantalla)"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "Burxa l'estalvi de pantalla actiu per a simular activitat de l'usuari"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr "Inhibeix l'activació de l'estalvi de pantalla. L'ordre bloqueja mentre la inhibició està activa."
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr "L'aplicació que demana inhibir l'estalvi de pantalla"
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr "El motiu per a inhibir l'estalvi de pantalla"
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "Versió d'aquesta aplicació"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "L'estalvi de pantalla està %s\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "activat"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "desactivat"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr "L'estalvi de pantalla està inhibit\n"
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr "L'estalvi de pantalla l'inhibeix:\n"
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr "Fa %d segons que l'estalvi de pantalla s'ha activat.\n"
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr "L'estalvi de pantalla no és actiu.\n"
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "Mostra els missatges de depuració"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "Mostra el botó d'eixida"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "Ordre per a invocar des del botó de tancar la sessió"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "Mostra el botó de canvi d'usuari"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr "Missatge que es mostrarà en el diàleg"
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "MISSATGE"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr "No s'utilitza"
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "Nom d'usuari:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "Contrasenya:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr "Heu de canviar la contrasenya immediatament (la contrasenya s'ha fet vella)"
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "Heu de canviar la contrasenya immediatament (us hi obliga el superusuari)"
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "El vostre compte ha expirat, contacteu amb l'administrador d'aquest sistema"
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "No s'ha proporcionat cap contrasenya"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "No s'ha canviat la contrasenya"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "No s'ha pogut obtindre el nom d'usuari"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "Reescriviu la nova contrasenya UNIX:"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "Introduïu la nova contrasenya UNIX:"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "Contrasenya UNIX (actual):"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "S'ha produït un error en canviar la contrasenya NIS."
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "Heu de triar una contrasenya més llarga"
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "La contrasenya ja s'ha fet servir. Trieu-ne una altra."
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "Heu d'esperar més per a canviar la contrasenya"
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "Les contrasenyes no coincideixen"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "S'està comprovant..."
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "Ha fallat l'autenticació."
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "Pantalla en negre"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "Aleatori"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d hores"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minut"
 msgstr[1] "%d minuts"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -623,15 +623,15 @@ msgstr[1] "%d segons"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -639,35 +639,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "Mai"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "No s'ha pogut carregar la interfície principal"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "Assegureu-vos que l'estalvi de pantalla estiga ben instal·lat"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "No esdevingues un dimoni"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "Habilita el codi de depuració"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr "Executa l'estalvi de pantalla i el programa de bloqueig"
 
diff --git a/po/cmn.po b/po/cmn.po
index 0f8dab1..9663660 100644
--- a/po/cmn.po
+++ b/po/cmn.po
@@ -22,60 +22,60 @@ msgstr ""
 "Language: cmn\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "螢幕保護程式"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "設定螢幕保護程式"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "螢幕保護程式預覽"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>螢幕保護程式預覽</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "螢幕保護程式偏好設定"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "電源管理(_M)"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "預覽(_P)"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "螢幕保護程式布景主題(_S):"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "在此時間之後將電腦設為閒置(_I)"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "當做業階段閒置時啟用螢幕保護程式(_A)"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "當螢幕保護程式作用時鎖定螢幕(_L)"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>警告:root 使用者的畫面不會鎖上。</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "螢幕保護程式"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "螢幕保護程式布景主題"
@@ -398,222 +398,222 @@ msgstr "%s 似乎不是有效的螢幕保護程式主題檔案。"
 msgid "Copying file: %u of %u"
 msgstr "拷貝檔案:%2$u 之 %1$u"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "令螢幕保護程式正常結束"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "查詢螢幕保護程式狀態"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr "查詢螢幕保護程式已啟動的時間"
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "要求螢幕保護程式立刻鎖定畫定"
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "如果螢幕保護程已經啟動,立刻切換直另一種畫面"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "啟動螢幕保護程式(畫面變黑)"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "如果螢幕保護程已經啟動,立刻回復狀態 (不變黑)"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "模擬用家使用電腦,令螢幕保護程式重設計時器"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr "禁止螢幕保護程式發生作用,這時螢幕保護程式會被封。"
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr "禁止螢幕保護程式發生作用的應用程式"
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr "禁止螢幕保護程式發生作用的理由"
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "本程式的版本"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "螢幕保護程式目前是 %s\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "啟動中"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "暫停運作"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr "螢幕保護程式並未被抑制\n"
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr "螢幕保護程式已被抑制:\n"
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr "螢幕保護程式己啟動了 %d 秒。\n"
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr "螢幕保護程式目前並未使用。\n"
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "顯示詳細偵錯訊息"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "顯示「登出」按鈕"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "「登出」按鈕呼叫的指令"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "顯示「切換使用者」按鈕"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr "要在對話視窗顯示的留言"
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "MESSAGE"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr "並未使用"
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "使用者名稱:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "密碼:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr "您必須立即變更密碼(密碼過期)"
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "您必須立即變更密碼(root 強制執行)"
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "您的帳戶已經過期,請聯絡系統管理員"
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "沒有提供密碼"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "密碼沒有變更"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "無法取得使用者名稱"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "再輸入新的 UNIX 密碼:"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "輸入新的 UNIX 密碼:"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "(目前的)UNIX 密碼:"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "變更 NIS 密碼時發生錯誤。"
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "您必須選用一個較長的密碼"
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "密碼已經使用,請選用另一個。"
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "變更密碼需要等候較長時間"
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "對不起,密碼不符"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "檢查中…"
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "認證失敗。"
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "空白畫面"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "隨機"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d 時"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d 分"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -621,15 +621,15 @@ msgstr[0] "%d 秒"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -637,35 +637,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "永不"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "無法載入主視窗介面"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "請確保螢幕保護程式已經正確安裝"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "不要成為守護程式"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "啟用除錯碼"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr ""
 
diff --git a/po/crh.po b/po/crh.po
index 14b7b36..8deead0 100644
--- a/po/crh.po
+++ b/po/crh.po
@@ -18,60 +18,60 @@ msgstr ""
 "Language: crh\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "Ekran qoruyıcısı"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "Ekran qoruyıcısı tercihleriñizni tesbit etiñiz"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "Ekran Qoruyıcısı Ög-baquvı"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>Ekran qoruyıcısı ög-baquvı</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "Ekran Qoruyıcısı Tercihleri"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "Quvet _İdaresi"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "_Ög-baquv"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "_Ekran qoruyıcısı teması:"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "Sonrasında bilgisayarı _boş duran olarak say:"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "Bilgis_ayar bekleme durumundayken ekran koruyucuyu etkinleştir"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "Ekran qoruyıcısı faal olğanda ekrannı ki_litle"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>İhtar: root (tamır) qullanıcısı içün ekran kilitlenmeycektir.</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "Ekran qoruyıcıları"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "Ekran qoruyıcısı temaları"
@@ -394,222 +394,222 @@ msgstr "%s geçerli bir ekran koruyucu teması gibi görünmüyor."
 msgid "Copying file: %u of %u"
 msgstr "Dosye kopiyalana: %u / %u"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "Ekran koruyucudan nazikçe çıkmasına sebep olur"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "Ekran qoruyıcısınıñ durumını sorğula"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr "Ekran koruyucusunun etkin olduğu zamanı sorgula"
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "Çapmaqta olğan ekran qoruyıcısı esnasına ekrannı deral kilitlemege söyler"
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "Eğer ekran koruyucu etkin ise başka bir grafik gösterimine geç"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "Ekran koruyucuyu aç (ekranı boş bırak)"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "Eğer ekran koruyucu etkin ise etkinliğini kaldır (ekranı boş bırakma)"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "Kullanıcı aktivitesini taklit etmek için çalışan ekran koruyucuyu dürt"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr "Ekran koruyucunun etkinleşmesini engelle. Engelleme etkin iken komut bloke edilir."
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr "Ekran koruyucuyu engelleyen çağrılan uygulama"
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr "Ekran koruyucuya engel olmak için sebep"
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "Bu uygulamanıñ sürümi"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "Ekran qoruyıcısı: %s\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "faal"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "ğayrı faal"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr "Ekran qoruyıcı manialı degil\n"
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr "Ekran koruyucuyu durduran:\n"
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr "Ekran koruyucu %d saniyedir etkin.\n"
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr "Ekran qoruyıcı al-azırda faal degildir.\n"
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "Arızasızlandıruv çıqtısını köster"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "Tışarı imzalanuv dögmesini köster"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "Oturumu kapat düğmesinden çağrılacak komut"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "Qullanıcı almaştıruv dögmesini köster"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr "Dialogta kösterilecek mesaj"
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "MESAJ"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr "Qullanılmay"
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "Qullanıcı adı:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "Sır-söz:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr "Hemen parolanızı değiştirmeniz gerekiyor (parolanız eskidi)"
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "Parolanızı hemen değiştirmeniz gerekiyor (root zorluyor)"
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "Esabıñız eskirgendir; lütfen sistem memurıñız ile temasqa keçiñiz"
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "Bir parola sağlanmadı"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "Parola değişmedi"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "Qullanıcı adı alınamay"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "Yañı UNIX sır-sözüñizni kene daktilo etiñiz:"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "Yañı UNIX sır-sözüñizni kirsetiñiz:"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "(cari) UNIX sır-sözüñiz:"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "NIS parolası değiştirilirken hata"
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "Daha uzun bir parola seçmelisiniz"
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "Parola kullanılmaktadır. Başka bir tane seçin."
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "Sır-sözüñizni deñiştirmek içün daa uzun beklemelisiñiz"
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "Üzgünüm, parolalar uyuşmuyor"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "Teşkerile..."
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "Sahihlenme muvafaqiyetsiz."
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "Boş ekran"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "Rastkele"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d saat"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d daqqa"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -617,15 +617,15 @@ msgstr[0] "%d saniye"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -633,35 +633,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "Asla"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "Ana arayüz yüklenamadı"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "Lütfen ekran koruyucusunun düzgün bir şekilde kurulmuş olduğundan emin olun"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "Bir cınğa dönüşme"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "Hata ayıklama kodunu etkinleştir"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr ""
 
diff --git a/po/cs.po b/po/cs.po
index dc7f6ab..6751c21 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -25,60 +25,60 @@ msgstr ""
 "Language: cs\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "Šetřič obrazovky"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "Nastaví šetřič obrazovky"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "Náhled šetřiče obrazovky"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>Náhled šetřiče obrazovky</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "Předvolby šetřiče obrazovky"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "Správa napá_jení"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "Ná_hled"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "_Motiv šetřiče obrazovky:"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "Doba, po které považovat počítač za neč_inný:"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "Spouštět šetřič obr_azovky při nečinnosti"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "Uzamykat o_brazovku po spuštění šetřiče"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>Varování: obrazovka nebude uzamčena pro superuživatele.</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "Šetřiče obrazovky"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "Motivy šetřiče obrazovky"
@@ -401,203 +401,203 @@ msgstr "%s zřejmě není platným motivem šetřiče obrazovky."
 msgid "Copying file: %u of %u"
 msgstr "Kopírování souboru: %u z %u"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "Způsobí běžné ukončení šetřiče obrazovky"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "Dotáže se na stav šetřiče obrazovky"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr "Dotáže se na dobu, po kterou byl šetřič obrazovky aktivní"
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "Oznámí běžícímu procesu šetřiče obrazovky, že má okamžitě uzamknout obrazovku"
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "Jestliže je šetřič obrazovky aktivní, přepnout na jiné grafické demo"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "Zapne šetřič obrazovky (ztmaví obrazovku)"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "Jestliže je šetřič obrazovky aktivní, deaktivuje jej (zruší ztmavení obrazovky)"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "Šťouchne běžící šetřič obrazovky jako simulaci aktivity uživatele"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr "Potlačí aktivaci šetřiče obrazovky. Příkaz blokuje během aktivity potlačení."
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr "Volající aplikace, která potlačuje šetřič obrazovky"
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr "Důvod potlačení šetřiče obrazovky"
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "Verze této aplikace"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "Šetřič obrazovky je %s\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "aktivní"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "neaktivní"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr "Šetřič obrazovky není zakázán\n"
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr "Šetřič obrazovky je zakázán aplikací:\n"
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr "Šetřič obrazovky byl aktivní po dobu %d sekund.\n"
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr "Šetřič obrazovky není právě aktivní.\n"
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "Zobrazovat ladicí výstup"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "Zobrazovat tlačítko odhlášení"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "Příkaz, který spustit tlačítkem odhlášení"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "Zobrazovat tlačítko přepnutí uživatele"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr "Zpráva, kterou zobrazit v dialogovém okně"
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "ZPRÁVA"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr "Nepoužito"
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "Uživatelské jméno:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "Heslo:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr "Je nutné si okamžitě změnit heslo (heslo je staré)"
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "Je nutné si okamžitě změnit heslo (vyžadováno superuživatelem)"
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "Váš účet vypršel; kontaktujte prosím správce systému"
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "Nebylo zadáno žádné heslo"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "Heslo nezměněno"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "Nelze získat uživatelské jméno"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "Zadejte znovu nové unixové heslo:"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "Zadejte nové unixové heslo:"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "(aktuální) unixové heslo:"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "Chyba při změně hesla NIS."
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "Je nutné si zvolit delší heslo"
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "Heslo již bylo použito. Zvolte prosím jiné."
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "Ke změně hesla je nutné vyčkat déle"
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "Hesla bohužel nesouhlasí"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "Probíhá kontrola..."
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "Ověření selhalo."
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "Prázdná obrazovka"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "Náhodný"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -605,14 +605,14 @@ msgstr[0] "%d hodina"
 msgstr[1] "%d hodiny"
 msgstr[2] "%d hodin"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -620,7 +620,7 @@ msgstr[0] "%d minuta"
 msgstr[1] "%d minuty"
 msgstr[2] "%d minut"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -630,15 +630,15 @@ msgstr[2] "%d sekund"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s:%s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s:%s:%s"
@@ -646,35 +646,35 @@ msgstr "%s:%s:%s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "Nikdy"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "Nelze načíst hlavní rozhraní"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "Přesvědčte se prosím, že šetřič obrazovky je správně nainstalován"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "Nestane se démonem"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "Povolí ladící kód"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr "Spustí šetřič obrazovky a program uzamknutí"
 
diff --git a/po/cy.po b/po/cy.po
index 025eab5..d06e804 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -19,60 +19,60 @@ msgstr ""
 "Language: cy\n"
 "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "Arbedwr sgrin"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "Gosod eich hoffterau arbedwr sgrin"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "Rhagolwg o'r Arbedwr Sgrin"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>Rhagolwg o'r arbedwr sgrin</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "Hoffterau'r Arbedwr Sgrin"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "_Rhagolwg"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "_Thema'r arbedwr sgrin:"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "_Cloi'r sgrin pan mae'r arbedwr sgrin ar waith"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr ""
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "Arbedwyr Sgrin"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "Themâu arbedwr sgrin"
@@ -395,203 +395,203 @@ msgstr ""
 msgid "Copying file: %u of %u"
 msgstr "Copïo ffeil: %u o %u"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "Achosi i'r arbedwr sgrin orffen yn daclus"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "Holi cyflwr yr arbedwr sgrin"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "Gorchymyn i'r broses arbedwr sgrin sy'n rhedeg i gloi'r sgrin yn syth"
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "Os yw'r arbedwr sgrin ar waith, newid i ddemo graffeg gwahanol"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "Troi'r arbedwr sgrin ymlaen (clirio'r sgrin)"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "Os yw'r arbedwr sgrin ar waith, ei ddi-ysgogi (dad-glirio'r sgrin)"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "Procio'r arbedwr sgrin sy'n rhedeg, i ddynwared gweithred defnyddiwr"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "Fersiwn y rhaglen hon"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "Yr arbedwr sgrin yw %s\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "ar waith"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "ddim ar waith"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "Dangos allbwn datnamu"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "Dangos y botwm allgofnodi"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "Y gorchymyn i'w redeg o'r botwm allgofnodi"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "Dangos y botwm i newid defnyddwyr"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr ""
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "Enw defnyddiwr:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "Cyfrinair:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr ""
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "Clirio'r sgrin"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "Ar hap"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -600,14 +600,14 @@ msgstr[1] "%d awr"
 msgstr[2] "%d awr"
 msgstr[3] "%d awr"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -616,7 +616,7 @@ msgstr[1] "%d funud"
 msgstr[2] "%d munud"
 msgstr[3] "%d munud"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -627,15 +627,15 @@ msgstr[3] "%d eiliad"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -643,35 +643,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "Byth"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "Methu llwytho'r prif ryngwyneb"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "Gwnewch yn siŵr fod yr arbedwr sgrin wedi'i osod yn gywir"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "Peidio â throi'n ellyll"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "Galluogi cod datnamu"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr ""
 
diff --git a/po/da.po b/po/da.po
index d9f8f2a..97a002a 100644
--- a/po/da.po
+++ b/po/da.po
@@ -20,60 +20,60 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "Pauseskærm"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "Sæt dine indstillinger for pauseskærm"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "Pauseskærms-forhåndsvisning"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>Forhåndsvisning af pauseskærm</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "Indstillinger for pauseskærm"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "Strø_mstyring"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "_Forhåndsvisning"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "Tema for pause_skærm:"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "Betragt computeren som værende _i tomgang efter:"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "_Aktiver pauseskærm når computeren er i tomgang"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "_Lås skærm mens pauseskærmen er aktiv"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>Advarsel: skærmen vil ikke være låst for administratoren.</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "Pauseskærme"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "Pauseskærm temaer"
@@ -396,224 +396,224 @@ msgstr "%s lader ikke til at være et gyldigt pauseskærmstema."
 msgid "Copying file: %u of %u"
 msgstr "Kopierer fil: %u af %u"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "For pauseskærmen til at afslutte med ynde"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "Forespørg pauseskærmens tilstand"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr "Forespørg til hvor lang tid pauseskærmen har været aktiv"
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "Beordre den kørende pauseskærmproces at låse skærmen øjeblikkeligt"
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "Hvis pauseskærmen er aktiv, skift da til en anden grafik demonstration"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "Slå pauseskærmen til (sorten skærmen)"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "Hvis pauseskærmen er aktiv, deaktiver den (genopret skærmen)"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "Prik den kørende pauseskærm for at simulere brugeraktivitet"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr "Forhindrer pauseskærmen i at aktiveres. Kommandoen blokerer så længe hindringen er aktiv."
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr "Programmet der undertrykker pauseskærmen"
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr "Grunden til at pauseskærmen undertrykkes"
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "Version af dette programmel"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "Denne pauseskærm er %s\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "aktiv"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "inaktiv"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr "Pauseskærm er ikke undertrykt\n"
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr "Pauseskærm bliver undertrykt af:\n"
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr "Pauseskærmen har været aktiv i %d sekunder.\n"
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr "Pauseskærmen er ikke aktiv i øjeblikket.\n"
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "Vis fejlfindingsuddata"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "Vis log ud-knappen"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "Kommando er skal køres fra log ud-knappen"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "Vis skift bruger-knappen"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr "Besked der skal vises i dialogen"
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "BESKED"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr "Bruges ikke"
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "Brugernavn:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "Adgangskode:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr "Det er påkrævet at du ændrer din adgangskode med det samme (adgangskode er for gammelt)"
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "Det er påkrævet at du ændrer din adgangskode med det samme (påtvunget af administrator)"
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "Din konto er udløbet; kontakt venligst din system-administrator"
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "Ingen adgangskode udleveret"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "Adgangskode er uændret"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "Kan ikke hente brugernavn"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "Skriv ny UNIX-adgangskode igen:"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "Skriv ny UNIX-adgangskode:"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "(nuværende) UNIX-adgangskode:"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "Fejl under ændring af NIS adgangskode."
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "Du skal vælge en længere adgangskode"
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "Adgangskoden har allerede været brugt. Vælg en anden."
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "Du skal vente længere før du kan ændre din adgangskode"
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "Beklager, adgangskoderne passer ikke sammen"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "Kontrollerer …"
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "Godkendelse fejlede."
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "Sort skærm"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "Tilfældig"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d time"
 msgstr[1] "%d timer"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minut"
 msgstr[1] "%d minutter"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -622,15 +622,15 @@ msgstr[1] "%d sekunder"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -638,35 +638,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "Aldrig"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "Kunne ikke indlæse hovedgrænsefladen"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "Kontroller venligst at pauseskærmen er installeret korrekt"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "Kør ikke som tjeneste"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "Slå fejlfindingskode til"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr "Start pauseskærm og skærmlåseprogram"
 
diff --git a/po/de.po b/po/de.po
index f82f90b..d94b301 100644
--- a/po/de.po
+++ b/po/de.po
@@ -27,60 +27,60 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "Bildschirmschoner"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "Einstellungen des Bildschirmschoners ändern"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "Vorschau des Bildschirmschoners"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>Vorschau des Bildschirmschoners</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "Einstellungen des Bildschirmschoners"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "_Energieverwaltung"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "_Vorschau"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "Bildschirmschoner_thema:"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "Sitzung auf _untätig stellen nach:"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "_Bildschirmschoner aktivieren, wenn der Benutzer untätig ist"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "Bildschirm _sperren, wenn der Bildschirmschoner aktiv ist"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>Achtung: Der Bildschirm wird für den Systemverwalter nicht gesperrt.</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "Bildschirmschoner"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "Bildschirmschonerthemen"
@@ -403,224 +403,224 @@ msgstr "%s scheint kein gültiger Bildschirmschoner zu sein."
 msgid "Copying file: %u of %u"
 msgstr "Datei wird kopiert: %u von %u"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "Den Bildschirmschoner beenden"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "Den Status des Bildschirmschoners abfragen"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr "Die Aktivitätsdauer des Bildschirmschoners abfragen"
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "Teilt dem laufenden Bildschirmschonerprozess mit, den Bildschirm sofort zu sperren"
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "Wenn der Bildschirmschoner aktiv ist, zu einer anderen Grafikdemo wechseln"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "Den Bildschirmschoner aktivieren (Bildschirm abdunkeln)"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "Wenn Bildschirmschoners aktiv ist, dann deaktivieren (Bildschirmabdunkelung aufheben)"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "Den laufenden Bildschirmschonerprozess anstoßen, um Benutzeraktivität zu simulieren"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr "Verhindern, dass der Bildschirmschoner aktiviert wird. Befehl wird bei aktiver Sperre blockiert."
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr "Die Anwendung, die den Bildschirmschoner unterdrückt"
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr "Der Grund für die Unterdrückung des Bildschirmschoners"
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "Version dieser Anwendung"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "Der Bildschirmschoner ist %s\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "aktiv"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "inaktiv"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr "Der Bildschirmschoner wird nicht unterdrückt\n"
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr "Der Bildschirmschoner wird unterdrückt von:\n"
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr "Der Bildschirmschoner war für %d Sekunden aktiv.\n"
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr "Der Bildschirmschoner ist derzeit nicht aktiv.\n"
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "Fehlerdiagnoseausgaben anzeigen"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "Den Knopf zum Abmelden anzeigen"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "Befehl, der vom Abmeldeknopf aufgerufen wird"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "Knopf für den Benutzerwechsel anzeigen"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr "Die im Dialog anzuzeigende Nachricht"
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "NACHRICHT"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr "Nicht verwendet"
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "Benutzername:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "Passwort:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr "Sie müssen Ihr Passwort sofort ändern (Passwort veraltet)"
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "Sie müssen Ihr Passwort sofort ändern (durch Systemadministrator erzwungen)"
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "Ihr Benutzerkonto ist abgelaufen. Bitte kontaktieren Sie Ihren Systemadministrator."
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "Kein Passwort angegeben"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "Passwort ist unverändert"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "Benutzername konnte nicht ermittelt werden"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "Neues UNIX-Passwort wiederholen:"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "Neues UNIX-Passwort:"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "Altes UNIX-Passwort:"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "Beim Ändern des NIS-Passworts ist ein Fehler aufgetreten."
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "Sie müssen ein längeres Passwort wählen"
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "Dieses Passwort wurde bereits verwendet. Bitte wählen Sie ein anderes."
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "Sie müssen länger warten, um Ihr Passwort zu ändern."
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "Entschuldigung, die Passwörter stimmen nicht überein"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "Überprüfung läuft …"
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "Legitimierung ist gescheitert."
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "Leerer Bildschirm"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "Zufällig"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d Stunde"
 msgstr[1] "%d Stunden"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d Minute"
 msgstr[1] "%d Minuten"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -629,15 +629,15 @@ msgstr[1] "%d Sekunden"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s:%s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s:%s:%s"
@@ -645,35 +645,35 @@ msgstr "%s:%s:%s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "Nie"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "Die Hauptschnittstelle konnte nicht geladen werden"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "Bitte stellen Sie sicher, dass der Bildschirmschoner richtig installiert ist"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "Kein Hintergrundprozess"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "Fehlerdiagnosefunktionen aktivieren"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr "Bildschirmschoner und Bildschirmsperrprogramm starten"
 
diff --git a/po/dz.po b/po/dz.po
index 6aefd43..8b9dc92 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -17,60 +17,60 @@ msgstr ""
 "Language: dz\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "གསལ་གཞི་ཉེན་སྲུང་།"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "ཁྱོད་རའི་གསལ་གཞི་ཉེནསྲུང་གི་དགའ་གདམ་ཚུ་ གཞི་སྒྲིག་འབད།"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "གསལ་གཞི་ཉེན་སྲུང་གི་སྔོན་ལྟ།"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "གསལ་གཞི་ཉེན་སྲུང་གི་སྔོན་ལྟ།"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "གསལ་གཞི་ཉེན་སྲུང་གི་དགའ་གདམ་ཚུ།"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "ནུས་ཤུགས་འཛིན་སྐྱོང་(_M)"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "སྔོན་ལྟ།(_P)"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "གསལ་གཞི་ཉེན་སྲུང་གི་བརྗོད་དོན་:(_S)"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "ཤུལ་ལས་གློག་རིག་ལས་མེད་སྦེ་ཆ་བཞག་:(_i)"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "གློག་རིག་ལས་མེད་ཨིན་པའི་སྐབས་ གསལ་གཞི་ཉེན་སྲུང་ཤུགས་ལྡན་བཟོ།(_A)"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "གསལ་གཞི་ཉེན་སྲུང་ཤུགས་ལྡན་སྐབས་ གསལ་གཞི་ལྡེ་མིག་རྐྱབས།(_L)"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>ཉེན་བརྡ་: རྩ་བའི་ལག་ལེན་པའི་དོན་ལུ་ གསལ་གཞི་ལྡེ་མིག་མི་བརྐྱབ།</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "གསལ་གཞི་ཉེན་སྲུང་ཚུ།"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "གསལ་གཞི་ཉེན་སྲུང་བརྗོད་དོན་ཚུ།"
@@ -393,222 +393,222 @@ msgstr "%s དེ་ ནུས་ཅན་གྱི་ གསལ་གཞིའ
 msgid "Copying file: %u of %u"
 msgstr "ཡིག་སྣོད་%uལས་%uའདྲ་བཤུས་རྐྱབ་དོ།"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "གསལ་གཞི་ཉེན་སྲུང་དེ་ སྤྲོ་ཉམས་ཐོག་ལས་ ཕྱིར་འཐོན་འབད་བཅུགཔ་ཨིན།"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "གསལ་གཞི་ཉེན་སྲུང་གི་གནས་ལུགས་དྲི་དཔྱད་འབད།"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr "གསལ་གཞི་ཉེན་སྲུང་འདི་ ཤུགས་ལྡན་སྦེ་སྡོད་པའི་ ཆུ་ཚོད་ཀྱི་རིང་ཚད་འདི་ འདྲི་དཔྱད་འབད་"
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "གསལ་གཞི་དེ་འཕྲལ་ལས་ལྡེ་མིག་བརྐྱབ་ནིའི་དོན་ལུ་ གཡོག་བཀོལ་བཞིན་ཡོད་མི་ གསལ་གཞི་ཉེན་སྲུང་གི་ལས་སྦྱོར་ལུ་སླབ་ཨིན།"
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "གསལ་གཞི་ཉེན་སྲུང་དེ་ ཤུགས་ལྡན་ཨིན་པ་ཅིན་ ཚད་རིས་ཌེ་མོ་གཞན་མི་ལུ་ སོར་བསྒྱུར་འབད།"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "གསལ་གཞི་ཉེན་སྲུང་ཨཱོན་འབད། (གསལ་གཞི་སྟོངམ་བཟོ)"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "གསལ་གཞི་ཉེན་སྲུང་དེ་ ཤུགས་ལྡན་ཨིན་པ་ཅིན་ ཤུགས་མེད་བཟོ།(གསལ་གཞི་སྟོངམ་བཟོ་ནི་བཤོལ)"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "ལག་ལེན་པའི་བྱ་བ་ མཚུངས་བཟོ་འབད་ནི་ལུ་ གཡོག་བཀོལ་བཞིན་ཡོད་མི་གསལ་གཞི་ཉེན་སྲུང་དེ་ལུ་གསོབ།"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr "གསལ་གཞི་ཉེན་སྲུང་ཤུགས་ལྡན་བཟོ་ནི་ལུ་ བར་ཆད་རྐྱབས། བར་ཆད་ཤུགས་ལྡན་ཨིན་པའི་སྐབས་ བརྡ་བཀོད་བཀག་ཆ་འབདཝ་ཨིན།"
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr "གསལ་གཞི་ཉེན་སྲུང་ལུ་ བར་ཆན་རྐྱབ་མི་ གློག་རིམ་དེ།"
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr "གསལ་གཞི་ཉེན་སྲུང་ལུ་ བར་ཆད་རྐྱབ་དགོ་པའི་རྒྱུ་མཚན།"
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "གློག་རིམ་འདི་གི་ཐོན་རིམ།"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "གསལ་གཞི་ཉེན་སྲུང་དེ་%sཨིན།\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "ཤུགས་ལྡན།"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "ཤུགས་མེད།"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr "གཞི་གཞི་ཉེན་སྲུང་འདི་  %d སྐར་ཆ་ཚུ་གི་དོན་ལུ་ ཤུགས་ལྡན་བཟོ་ཡོད།\n"
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "རྐྱེན་སེལ་གྱི་ཨའུཊི་པུཊི་སྟོན།"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "ཕྱིར་བསྐྱོད་ཨེབ་རྟ་སྟོན།"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "ཕྱིར་བསྐྱོད་ཨེབ་རྟའི་ནང་ལས་ ལས་བཀོལ་གྱི་བརྡ་བཀོད།"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "སོར་བསྒྱུར་ལག་ལེན་པའི་ཨེབ་རྟ་སྟོན།"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr "ཌའི་ལོག་ལྡེ་མིག་བརྐྱབ་ནི་ལུ་ལག་ལེན་འཐབ་མི་གི་འཕྲིན་དོན"
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "འཕྲིན་དོན"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr ""
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "ལག་ལེན་པའི་མིང་:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "ཆོག་ཡིག་:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr "ཁྱོད་ཀྱི་ཆོག་ཡིག་དེ་ དེ་འཕྲལ་ལས་སོར་དགོ་པས། (ཆོག་ཡིག་རྒས་སོ་ནུག)"
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "ཁྱོད་ཀྱི་ཆོག་ཡིག་དེ་ དེ་འཕྲལ་ལས་སོར་དགོ་པས། (རྩ་བ་ལག་ལེན་འཐབ་ནུག)"
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "ཁྱོད་ཀྱི་ཆོག་ཡིག་དེ་དུས་ཡོལ་ཐལ་སོ་ནུག། ཁྱོད་རའི་རིམ་ལུགས་བདག་སྐྱོང་པ་ལུ་ འབྲེལ་བ་འཐབ་གནང་།"
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "ཆོག་ཡིག་མ་བྱིན་པས།"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "ཆོག་ཡིག་མ་སོར་བས།"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "ལག་ལེན་པའི་མིང་ འཐོབ་མི་ཚུགས་པས།"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "ཡུ་ཨེན་ཨའི་ཨེགསི་ ཆོག་ཡིག་གསརཔ་ ལོག་ཡིག་དཔར་རྐྱབས།"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "ཡུ་ཨེན་ཨའི་ཨེགསི་ ཆོག་ཡིག་གསར་བཙུགས།"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "(ད་ལྟོའི་)ཡུ་ཨེན་ཨའི་ཨེགསི་ཆོག་ཡིག།"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "ཨེན་ཨའི་ཨེསི་ ཆོག་ཡིག་སོར་བའི་སྐབས་ལུ་འཛོལ་བ།"
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "ཁྱོད་ཀྱིས་ཆོག་ཡིག་ དེ་བ་རིང་སུ་ཅིག་ གདམ་ཁ་རྐྱབས།"
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "ཆོག་ཡིག་ཧེ་མ་ལས་རང་ ལག་ལེན་འཐབ་སྟེ་འདུག། གཞན་མི་ཅིག་ གདམ་ཁ་རྐྱབས།"
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "ཁྱོད་ཀྱི་ཆོག་ཡིག་དེ་ སོར་ནིའི་དོན་ལུ་ དུས་ཡུན་རིང་སུ་ཅིག་ བསྒུག་སྡོད་དགོ།"
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "དགོངསམ་མ་ཁྲེལ། ཆོག་ཡིག་མཐུན་སྒྲིག་མིན་འདུག།"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "ཞིབ་དཔྱད་འབད་དོ་..."
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "བདེན་བཤད་འབད་མཚུགས།"
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "གསལ་གཞི་སྟོངམ།"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "གང་འབྱུང་།"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -616,15 +616,15 @@ msgstr[0] ""
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -632,35 +632,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "ནམ་ཡང་།"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "ངོས་འདྲ་བ་གཙོ་བོ་ མངོན་གསལ་འབད་མ་ཚུགས།"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "གསལ་གཞི་ཉེན་སྲུང་དེ་ ཚུལ་ལྡན་སྦེ་ གཞི་བཙུགས་འབད་གནང་།"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "ཌེ་མཱོན་ཅིག་ལུ་མ་གྱུར།"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "རྐྱེན་སེལ་གྱི་ཀོཌི་ ལྕོགས་ཅན་བཟོ།"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr ""
 
diff --git a/po/el.po b/po/el.po
index b895a9b..c644e7f 100644
--- a/po/el.po
+++ b/po/el.po
@@ -25,60 +25,60 @@ msgstr ""
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "Προστασία οθόνης"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "Ρύθμιση των προτιμήσεων σας για την προστασία οθόνης"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "Προεπισκόπηση προστασίας οθόνης"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>Προεπισκόπηση προστασίας οθόνης</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "Προτιμήσεις προστασίας οθόνης"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "_Διαχείριση ενέργειας"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "_Προεπισκόπηση"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "Θέματα προ_στασίας οθόνης:"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "Ορισμός υπολογιστή ως _αδρανή μετά:"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "Ε_νεργοποίηση προστασίας οθόνης όταν ο υπολογιστής είναι αδρανής"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "_Κλείδωμα οθόνης όταν η προστασία οθόνης είναι ενεργή"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>Προειδοποίηση: η οθόνη δεν θα κλειδώνεται για το χρήστη root.</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "Θέματα"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "Θέματα προστασίας οθόνης"
@@ -401,224 +401,224 @@ msgstr "Το %s δεν φαίνεται να είναι ένα έγκυρο αρ
 msgid "Copying file: %u of %u"
 msgstr "Αντιγραφή αρχείου: %u από %u"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "Προκαλεί την έξοδο της προστασίας οθόνης"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "Ερώτηση της κατάστασης της προστασίας οθόνης"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr "Ερώτημα για το χρόνο που ήταν ενεργή η προστασία οθόνης"
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "Ειδοποιεί την προστασία οθόνης που εκτελείται για να κλειδώσει την οθόνη άμεσα."
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "Αν η προστασία οθόνης είναι ενεργή τότε να γίνει αλλαγή σε ένα άλλο graphics demo"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "Ενεργοποίηση της προστασίας οθόνης (κενή οθόνη)"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "Αν η προστασία οθόνης είναι ενεργή τότε να γίνει απενεργοποίηση"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "Η εκτελούμενη προστασία οθόνης να εξομοιώνει δρλασεις χρήστη"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr "Παρεμπόδιση της προστασίας οθόνης. Command blocks while inhibit is active."
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr "Η εφαρμογή που παρακωλύει την προστασία οθόνης"
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr "Ο λόγος για την παρακώλυση της προστασίας οθόνης."
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "Η Έκδοση αυτής της εφαρμογής"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "Η προστασία οθόνης είναι %s\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "ενεργή"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "ανενεργή"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr "Η προστασία οθόνης δεν παρεμποδίζεται\n"
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr "Η προστασία οθόνης παρεμποδίζεται από:\n"
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr "Η προστασία οθόνης ήταν ενεργή για %d δευτερόλεπτα.\n"
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr "Η προστασία οθόνης δεν είναι προς το παρόν ενεργή\n"
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "Προβολή επιλογών αποσφαλμάτωσης"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "Εμφάνιση του κουμπιού αποσύνδεσης"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "Εντολή για εκτέλεση από το κουμπί αποσύνδεσης"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "Προβολή του κουμπιού αλλαγής χρήστη"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr "Μήνυμα που θα εμφανίζεται στον διάλογο"
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "ΜΗΝΥΜΑ"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr "Δεν χρησιμοποιείται"
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "Όνομα χρήστη:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "Κωδικός:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr "Απαιτείται να αλλάξετε κωδικό άμεσα (ο κωδικός σας έχει ημερομηνία λήξης)"
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "Απαιτείται να αλλάξετε κωδικό άμεσα (εξαναγκασμός από το root)"
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "Ο λογαριασμός σας έχει λήξει. Παρακαλώ επικοινωνήστε με το διαχειριστή του συστήματος σας"
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "Δεν δόθηκε κωδικός"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "Αναλλοίωτος κωδικός"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "Αδυναμία λήψης ονόματος χρήστη"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "Επαπληκτρολόγηση νέου κωδικού UNIX:"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "Εισαγωγή νέου κωδικού UNIX:"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "(τρέχων) κωδικός UNIX:"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "Σφάλμα κατά την αλλαγή του κωδικού NIS"
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "Θα πρέπει να επιλέξετε ένα μεγαλύτερο κωδικό."
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "Ο Κωδικός χρησιμοποιείται ήδη. Διαλέξτε έναν άλλο."
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "Θα πρέπει να περιμένετε περισσότερο για να αλλάξετε το κωδικό σας"
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "Συγγνώμη, οι κωδικοί δεν ταιριάζουν"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "Έλεγχος..."
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "Αποτυχία πιστοποίησης."
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "Κενή οθόνη"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "Τυχαία"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d ώρα"
 msgstr[1] "%d ώρες"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d λεπτό"
 msgstr[1] "%d λεπτά"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -627,15 +627,15 @@ msgstr[1] "%d δευτερόλεπτα"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -643,35 +643,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "Ποτέ"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "Αδυναμία φόρτωση της κύριας επιφάνειας χρήσης"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "Βεβαιωθείτε ότι η προστασία οθόνης έχει εγκατασταθεί σωστά"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "Να μη γίνει daemon"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "Ενεργοποίηση κώδικα αποσφαλμάτωσης"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr "Έναρξη της προφύλαξης οθόνης και του προγράμματος κλειδώματος υπολογιστή"
 
diff --git a/po/en_AU.po b/po/en_AU.po
index b5f5c26..570f23e 100644
--- a/po/en_AU.po
+++ b/po/en_AU.po
@@ -19,60 +19,60 @@ msgstr ""
 "Language: en_AU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "Screensaver"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "Set your screensaver preferences"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "Screensaver Preview"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>Screensaver preview</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "Screensaver Preferences"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "Power _Management"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "_Preview"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "_Screensaver theme:"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "Regard the computer as _idle after:"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "_Activate screensaver when computer is idle"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "_Lock screen when screensaver is active"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>Warning: the screen will not be locked for the root user.</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "Screensavers"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "Screensaver themes"
@@ -395,224 +395,224 @@ msgstr "%s does not appear to be a valid screensaver theme."
 msgid "Copying file: %u of %u"
 msgstr "Copying file: %u of %u"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "Causes the screensaver to exit gracefully"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "Query the state of the screensaver"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr "Query the length of time the screensaver has been active"
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "Tells the running screensaver process to lock the screen immediately"
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "If the screensaver is active then switch to another graphics demo"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "Turn the screensaver on (blank the screen)"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "If the screensaver is active then deactivate it (un-blank the screen)"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "Poke the running screensaver to simulate user activity"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr "Inhibit the screensaver from activating.  Command blocks while inhibit is active."
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr "The calling application that is inhibiting the screensaver"
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr "The reason for inhibiting the screensaver"
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "Version of this application"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "The screensaver is %s\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "active"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "inactive"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr "The screensaver is not inhibited\n"
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr "The screensaver is being inhibited by:\n"
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr "The screensaver has been active for %d seconds.\n"
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr "The screensaver is not currently active.\n"
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "Show debugging output"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "Show the logout button"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "Command to invoke from the logout button"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "Show the switch user button"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr "Message to show in the dialogue"
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "MESSAGE"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr "Not used"
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "Username:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "Password:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr "You are required to change your password immediately (password aged)"
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "You are required to change your password immediately (root enforced)"
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "Your account has expired; please contact your system administrator"
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "No password supplied"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "Password unchanged"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "Cannot get username"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "Retype new UNIX password:"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "Enter new UNIX password:"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "(current) UNIX password:"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "Error while changing NIS password."
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "You must choose a longer password"
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "Password has been already used. Choose another."
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "You must wait longer to change your password"
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "Sorry, passwords do not match"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "Checking..."
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "Authentication failed."
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "Blank screen"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "Random"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hour"
 msgstr[1] "%d hours"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minute"
 msgstr[1] "%d minutes"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -621,15 +621,15 @@ msgstr[1] "%d seconds"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -637,35 +637,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "Never"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "Could not load the main interface"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "Please make sure that the screensaver is properly installed"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "Don't become a daemon"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "Enable debugging code"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr "Launch screensaver and locker program"
 
diff --git a/po/en_CA.po b/po/en_CA.po
index 9572ae1..a919f39 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -18,60 +18,60 @@ msgstr ""
 "Language: en_CA\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "Screensaver"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "Set your screensaver preferences"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "Screensaver Preferences"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "_Lock screen when screensaver is active"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr ""
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "Screensavers"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "Screensaver themes"
@@ -394,224 +394,224 @@ msgstr ""
 msgid "Copying file: %u of %u"
 msgstr "Copying file: %u of %u"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "Causes the screensaver to exit gracefully"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "Query the state of the screensaver"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "Tells the running screensaver process to lock the screen immediately"
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "If the screensaver is active then switch to another graphics demo"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "Turn the screensaver on (blank the screen)"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "If the screensaver is active then deactivate it (un-blank the screen)"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "Poke the running screensaver to simulate user activity"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "Version of this application"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "The screensaver is %s\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "active"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "inactive"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "Show debugging output"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "Show the \"logout\" button"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "Command to invoke from the logout button"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "Show the \"switch user\" button"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr ""
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr ""
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "Blank screen"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "Random"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hour"
 msgstr[1] "%d hours"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minute"
 msgstr[1] "%d minutes"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -620,15 +620,15 @@ msgstr[1] "%d seconds"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -636,35 +636,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "Never"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "Could not load the main interface"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "Please make sure that the screensaver is properly installed"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "Do not become a daemon"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "Enable debugging code"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr ""
 
diff --git a/po/en_GB.po b/po/en_GB.po
index 2bdb91a..ccbcfb3 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -21,60 +21,60 @@ msgstr ""
 "Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "Screensaver"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "Set your screensaver preferences"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "Screensaver Preview"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>Screensaver preview</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "Screensaver Preferences"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "Power _Management"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "_Preview"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "_Screensaver theme:"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "Regard the computer as _idle after:"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "_Activate screensaver when computer is idle"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "_Lock screen when screensaver is active"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>Warning: the screen will not be locked for the root user.</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "Screensavers"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "Screensaver themes"
@@ -397,224 +397,224 @@ msgstr "%s does not appear to be a valid screensaver theme."
 msgid "Copying file: %u of %u"
 msgstr "Copying file: %u of %u"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "Causes the screensaver to exit gracefully"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "Query the state of the screensaver"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr "Query the length of time the screensaver has been active"
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "Tells the running screensaver process to lock the screen immediately"
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "If the screensaver is active then switch to another graphics demo"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "Turn the screensaver on (blank the screen)"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "If the screensaver is active then deactivate it (un-blank the screen)"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "Poke the running screensaver to simulate user activity"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr "Inhibit the screensaver from activating.  Command blocks while inhibit is active."
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr "The calling application that is inhibiting the screensaver"
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr "The reason for inhibiting the screensaver"
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "Version of this application"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "The screensaver is %s\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "active"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "inactive"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr "The screensaver is not inhibited\n"
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr "The screensaver is being inhibited by:\n"
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr "The screensaver has been active for %d seconds.\n"
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr "The screensaver is not currently active.\n"
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "Show debugging output"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "Show the logout button"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "Command to invoke from the logout button"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "Show the switch user button"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr "Message to show in the dialogue"
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "MESSAGE"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr "Not used"
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "Username:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "Password:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr "You are required to change your password immediately (password aged)"
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "You are required to change your password immediately (root enforced)"
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "Your account has expired; please contact your system administrator"
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "No password supplied"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "Password unchanged"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "Cannot get username"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "Retype new Unix password:"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "Enter new Unix password:"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "(current) Unix password:"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "Error while changing NIS password."
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "You must choose a longer password"
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "Password has been already used. Choose another."
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "You must wait longer to change your password"
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "Sorry, passwords do not match"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "Checking…"
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "Authentication failed."
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "Blank screen"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "Random"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hour"
 msgstr[1] "%d hours"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minute"
 msgstr[1] "%d minutes"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -623,15 +623,15 @@ msgstr[1] "%d seconds"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -639,35 +639,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "Never"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "Could not load the main interface"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "Please make sure that the screensaver is properly installed"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "Don't become a daemon"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "Enable debugging code"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr "Launch screensaver and locker program"
 
diff --git a/po/es.po b/po/es.po
index 9603b5c..475b743 100644
--- a/po/es.po
+++ b/po/es.po
@@ -26,60 +26,60 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "Salvapantallas"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "Configure su salvapantallas"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "Vista previa del salvapantallas"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>Vista previa del salvapantallas</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "Preferencias del salvapantallas"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "Gestión de _energía"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "Vista _previa"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "Tema del _salvapantallas:"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "Considerar que el equipo está _inactivo después de:"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "_Activar el salvapantallas cuando el equipo esté inactivo"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "_Bloquear pantalla cuando el salvapantallas esté activo"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>Atención: la pantalla no se bloqueará para el usuario root.</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "Salvapantallas"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "Temas del salvapantallas"
@@ -402,224 +402,224 @@ msgstr "%s no parece ser un tema válido del salvapantallas."
 msgid "Copying file: %u of %u"
 msgstr "Copiando archivo: %u de %u"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "Hace que el salvapantallas termine de forma correcta"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "Consulta el estado del salvapantallas"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr "Consultar cuanto tiempo ha estado activo el salvapantallas"
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "Le dice al proceso del salvapantallas en ejecución que bloquee la pantalla inmediatamente"
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "Si el salvapantallas está activo, cambiar a otra demo gráfica"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "Activar el salvapantallas (ennegrecer la pantalla)"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "Si el salvapantallas está activo entonces lo desactiva (desenegrece la pantalla)"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "Similar el salvapantallas en ejecución para similar la actividad del usuario"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr "Inhibir la activación del salvapantallas. La orden se bloquea cuando se activa la inhibición."
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr "La aplicación llamante que está inhibiendo el salvapantallas"
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr "La razón para inhibir el salvapantallas"
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "Versión de esta aplicación"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "El salvapantallas es %s\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "activo"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "inactivo"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr "El salvapantallas no está inhibido\n"
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr "El salvapantallas está siendo inhibido por:\n"
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr "El salvapantallas ha estado activo durante %d segundos.\n\n"
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr "Actualmente el salvapantallas no está activo.\n"
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "Mostrar la salida de depuración"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "Mostrar el botón de cerrar sesión"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "Orden que invocar con el botón de cierre de sesión"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "Mostrar el botón de cambio de usuario"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr "Mensaje para mostrar en el diálogo"
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "MENSAJE"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr "No usado"
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "Usuario:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "Contraseña:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr "Tiene que cambiar la contraseña inmediatamente (la contraseña caducó)"
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "Tiene que cambiar la contraseña inmediatamente (forzado por el administrador)"
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "Su cuenta ha caducado. Contacte con su administrador de sistemas"
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "No introdujo ninguna contraseña"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "Contraseña no cambiada"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "No se puede obtener el nombre de usuario"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "Vuelva a teclear la contraseña de UNIX nueva:"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "Introduzca una contraseña UNIX nueva:"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "Contraseña UNIX (actual):"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "Error al cambiar la contraseña NIS."
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "Debe elegir una contraseña más larga"
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "La contraseña ya ha sido usada. Elija otra."
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "Debe esperar más para cambiar su contraseña"
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "Las contraseñas no coinciden"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "Comprobando…"
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "La autenticación ha fallado."
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "Oscurecer pantalla"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "Aleatorio"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -628,15 +628,15 @@ msgstr[1] "%d segundos"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -644,35 +644,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "Nunca"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "No se pudo cargar el interfaz principal"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "Asegúrese de que el salvapantallas está instalado apropiadamente"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "No convertirse en un demonio"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "Activar código de depuración"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr "Lanzar el salvapantallas y el programa de bloqueo"
 
diff --git a/po/es_AR.po b/po/es_AR.po
index 9fbf2d4..aaa9886 100644
--- a/po/es_AR.po
+++ b/po/es_AR.po
@@ -18,60 +18,60 @@ msgstr ""
 "Language: es_AR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "Protector de pantalla"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "Vista previa del protector de pantalla"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "Preferencias del protector de pantalla"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "_Administración de Energía"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "_Vista previa"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "Tema del _protector de pantalla:"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>Advertencia: la pantalla no se bloqueará para el usuario root.</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "Protectores de pantalla"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "Temas de protector de pantalla"
@@ -394,224 +394,224 @@ msgstr "%s no parece ser un tema de protector de pantalla válido."
 msgid "Copying file: %u of %u"
 msgstr "Copiando archivo: %u de %u"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "activo"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "inactivo"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr "No usado"
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "Nombre de usuario:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "Contraseña:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr ""
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr ""
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr ""
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -620,15 +620,15 @@ msgstr[1] "%d segundos"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -636,35 +636,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "Nunca"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "No se pudo cargar la interfase principal"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "Por favor, asegúrese de que el protector de pantalla está instalado apropiadamente"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr ""
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr ""
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr ""
 
diff --git a/po/es_CO.po b/po/es_CO.po
index b91d729..ae402c8 100644
--- a/po/es_CO.po
+++ b/po/es_CO.po
@@ -19,60 +19,60 @@ msgstr ""
 "Language: es_CO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "Protector de pantalla"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "Preferencias del protector de pantalla"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr ""
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr ""
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr ""
@@ -395,224 +395,224 @@ msgstr ""
 msgid "Copying file: %u of %u"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr "La aplicación de llamadas que está inhibiendo el protector de pantallas"
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "inactivo"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr ""
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr ""
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr ""
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr ""
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -621,15 +621,15 @@ msgstr[1] ""
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr ""
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr ""
@@ -637,35 +637,35 @@ msgstr ""
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr ""
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr ""
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr ""
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr ""
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr ""
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr ""
 
diff --git a/po/et.po b/po/et.po
index 1a702bc..a412245 100644
--- a/po/et.po
+++ b/po/et.po
@@ -19,60 +19,60 @@ msgstr ""
 "Language: et\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "Ekraanisäästja"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "Ekraanisäästja eelistuste seadmine"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "Ekraanisäästja eelvaade"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>Ekraanisäästja eelvaade</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "Ekraanisäästja eelistused"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "_Vooluhaldus"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "_Eelvaade"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "Ekraanisäästja _teema:"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "Seanss määratakse _jõudeolevaks pärast ajavahemikku:"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "Arvuti jõudeolekul aktiveeritakse e_kraanisäästja"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "Ekraanisäästja aktiveerimisel _lukustatakse ekraan"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>Hoiatus: ekraanilukustus ei toimi juurkasutaja (root) jaoks.</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "Ekraanisäästjad"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "Ekraanisäästja teemad"
@@ -395,224 +395,224 @@ msgstr "%s ei paista olevate korrektne ekraanisäästja teema."
 msgid "Copying file: %u of %u"
 msgstr "Faili kopeerimine: %u (%u'st)"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "Ekraanisäästjat töö lõpetamine (ilma veakoodita)"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "Ekraanisäästja oleku küsimine"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr "Ekraanisäästja aktiivse oleku kestuse küsimine"
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "Töötavale ekraanisäästja protsessile kohese ekraanilukustamise käsu saatmine"
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "Kui ekraanisäästja on aktiivne, siis graafilise demo vahetamine"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "Ekraanisäästja sisselülitamine (ekraani tühjendamine)"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "Kui ekraanisäästja on aktiivne, siis selle deaktiveerimine (ekraani taastamine)"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "Töötava ekraanisäästja torkimine kasutaja aktiivsuse jäljendamiseks"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr "Ekraanisäästja aktiveerimise keelamine. Käsk blokeerub kui aktiveerimine on juba keelatud."
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr "Ekraanisäästja aktiveerimist keelava rakenduse nimi"
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr "Ekraanisäästja aktiveerimise keelamise selgitus"
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "Selle rakenduse versioon"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "Ekraanisäästja on %s\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "aktiivne"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "aktiveerimata"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr "Ekraanisäästja on piiramata\n"
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr "Ekraanisäästja on piiratud. Piiraja:\n"
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr "Ekraanisäästja on olnud aktiivne %d sekundit.\n"
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr "Ekraanisäästja ei ole hetkel aktiivne.\n"
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "Silumisväljundi näitamine"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "Väljalogimisnupu näitamine"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "Väljalogimise nupule klõpsamisel käivitatav käsk"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "Kasutajate vahel lülitumise nupu näitamine"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr "Dialoogis näidatav sõnum"
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "SÕNUM"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr "Pole kasutusel"
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "Kasutajanimi:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "Parool:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr "Sa pead oma parooli koheselt ära vahetama (parool on aegunud)"
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "Sa pead oma parooli koheselt ära vahetama (juurkasutaja nõue)"
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "Sinu konto on aegunud, palun võta ühendust oma süsteemiülemaga"
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "Parooli pole antud"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "Parool on muutmata"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "Kasutajanime pole võimalik hankida"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "Sisesta UNIX-i parool uuesti:"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "Sisesta UNIX-i parool:"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "(praegune) UNIX-i parool:"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "Viga NIS-parooli muutmisel."
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "Sa pead valima pikema parooli"
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "Parool on juba kasutusel. Vali mõni muu parool."
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "Parooli muutmiseks pead sa kauem ootama"
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "Vabandust, paroolid ei klapi omavahel"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "Kontrollimine..."
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "Tõrge autentimisel."
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "Tühi ekraan"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "Juhuslik"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d tund"
 msgstr[1] "%d tundi"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minut"
 msgstr[1] "%d minutit"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -621,15 +621,15 @@ msgstr[1] "%d sekundit"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s:%s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s:%s:%s"
@@ -637,35 +637,35 @@ msgstr "%s:%s:%s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "Mitte kunagi"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "Põhiliidest pole võimalik laadida"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "Palun veendu, et ekraanisäästja on korrektselt paigaldatud"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "Deemoniks ei minda"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "Silumise lubamine"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr "Ekraanisäästja ja lukustusprogrammi käivitamine"
 
diff --git a/po/eu.po b/po/eu.po
index 0b48952..e8f345e 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -20,60 +20,60 @@ msgstr ""
 "Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "Pantaila-babeslea"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "Ezarri pantaila-babeslearen hobespenak"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "Pantaila-babeslearen aurrebista"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>Pantaila-babeslearen aurrebista</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "Pantaila-babeslearen hobespenak"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "Energia _kudeatzailea"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "_Aurrebista"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "_Pantaila-babeslearen gaia:"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "Jarri ordenagailua _inaktibo honen ondoren:"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "_Aktibatu pantaila-babeslea ordenagailua inaktibo dagoenean"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "_Blokeatu pantaila pantaila-babeslea aktibatzean"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>Abisua: pantaila ezin da 'root' erabiltzailearentzako blokeatu.</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "Pantaila-babeslea"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "Pantaila-babeslearen gaiak"
@@ -396,224 +396,224 @@ msgstr "%s badirudi ez dela pantaila-babeslearen baliozko gaia."
 msgid "Copying file: %u of %u"
 msgstr "Fitxategiak kopiatzen: %u / %u"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "Pantaila-babeslea ongi amaitzea eragiten du"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "Pantaila-babeslearen egoeraren kontsulta"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr "Kontsultatu zenbat denbora egon den pantaila-babeslea aktibo"
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "Exekutatzen ari den pantaila-babeslearen prozesuari pantaila berehala blokeatzeko esaten dio."
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "Pantaila-babeslea aktibo egonez gero, aldatu beste demo grafikora"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "Aktibatu pantaila-babeslea (belztu pantaila)"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "Pantaila-babeslea aktibo egonez gero, desaktibatu (kendu pantaila beltza)"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "Eskatu pantaila-babesleari erabiltzailearen aktibitatea simulatzeko"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr "Geldiarazi pantaila-babeslea aktibatzea. Komandoa blokeatu egiten da geldiaraztea aktibo dagoen heinean."
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr "Pantaila-babeslea geldiarazten duen aplikazioaren deia"
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr "Pantaila-babeslea geldiarazteko arrazoia"
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "Aplikazio honen bertsioa"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "Pantaila-babeslea %s da\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "aktibo"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "inaktibo"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr "Pantaila-babeslea ez dago geldituta\n"
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr "Pantaila-babeslea honek gelditu du:\n"
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr "Pantaila-babeslea %d segundo egon da aktibo.\n"
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr "Pantaila-babeslea ez dago unean aktibo.\n"
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "Erakutsi arazteko irteera"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "Erakutsi saioa amaitzeko botoia"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "Komandoa, saioa amaitzeko botoiari deitzeko"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "Erakutsi erabiltzailez aldatzeko botoia"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr "Mezua elkarrizketa-koadroan erakusteko"
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "MEZUA"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr "Erabili gabe"
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "Erabiltzaile-izena:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "Pasahitza:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr "Pasahitza berehala aldatu behar duzu (pasahitza zaharkituta)"
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "Pasahitza berehala aldatu behar duzu (erroak behartuta)"
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "Zure kontua iraungitu da; jarri harremanetan sistemako administratzailearekin"
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "Ez da pasahitzik eman"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "Pasahitza ez da aldatu"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "Ezin da erabiltzaile-izena lortu"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "Idatzi berriro UNIXeko pasahitz berria:"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "Idatzi UNIXeko pasahitz berria:"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "(uneko) UNIXeko pasahitza:"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "Errorea gertatu da NIS pasahitza aldatzean."
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "Pasahitz luzeagoa aukeratu behar duzu"
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "Pasahitz hori erabilita dago. Aukeratu beste bat."
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "Gehiago itxaron behar duzu pasahitza aldatzeko"
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "Pasahitzak ez datoz bat"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "Egiaztatzen..."
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "Autentifikazioak huts egin du."
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "Pantaila beltza"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "Ausazkoa"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "ordu %d"
 msgstr[1] "%d ordu"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "minutu %d"
 msgstr[1] "%d minutu"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -622,15 +622,15 @@ msgstr[1] "%d segundo"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s:%s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s:%s:%s"
@@ -638,35 +638,35 @@ msgstr "%s:%s:%s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "Inoiz ere ez"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "Ezin izan da interfaze nagusia kargatu"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "Ziurtatu pantaila-babeslea ongi instalatuta dagoela"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "Ez ezarri daemon gisa"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "Gaitu kode arazketa"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr ""
 
diff --git a/po/fa.po b/po/fa.po
index 6060cd2..3a6597e 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -20,60 +20,60 @@ msgstr ""
 "Language: fa\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "محافظ صفحهٔ نمایش"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "ترجیحات محافظ صفحهٔ نمایش خود را تنظیم کنید"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "پیش‌نمایش محافظ صفحهٔ نمایش"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>پیش‌نمایش محافظ صفحهٔ نمایش</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "ترجیحات محافظ صفحهٔ نمایش"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "ـمدیریت انرژی"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "_پیش‌نمایش"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "_تم محافظ صفحهٔ نمایش:"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "کامپیوتر پس از این مدت _بی‌کار فرض شود:"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "_فعال کردن محافظ صفحهٔ نمایش وقتی کامپیوتر بی‌کار است"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "_قفل کردن صفحهٔ‌ نمایش وقتی محافظ صفحهٔ نمایش فعال می‌شود"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>اخطار: صفحهٔ نمایش کاربر root قفل نخواهد شد.</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "محافظ‌های صفحهٔ نمایش"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "تم‌های محافظ صفحهٔ نمایش"
@@ -396,222 +396,222 @@ msgstr "به نظر نمی رسد %s تم محافظ صفحه نمایش معت
 msgid "Copying file: %u of %u"
 msgstr "در حال نسخه‌برداری پروندهٔ: %Iu از %Iu"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "باعث می‌شود محافظ صفحهٔ نمایش به آرامی خارج شود"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "پرس‌وجو از وضعیت محافظ صفحهٔ نمایش"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr "پرس و جوی مدت زمانی که محافظ صفحه نمایش فعال بوده"
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "به فراروند در حال اجرای محافظ صفحهٔ نمایش خبر می‌دهد که صفحهٔ نمایش را بلافاصله قفل کند"
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "اگر محافظ صفحهٔ نمایش فعال است گرافیک در حال نمایش تعویض شود"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "محافظ صفحهٔ نمایش روشن شود (صفحهٔ نمایش خالی شود)"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "اگر محافظ صفحهٔ نمایش فعال است، غیر فعال شود. (صفحهٔ نمایش از خالی بودن درآید)"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "انگولک کردن محافظ صفحه نمایش در حال اجرا برای شبیه سازی فعالیت کاربر"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr "از فعال شدن محافظ صفحهٔ نمایش ممانعت شود. هنگام ممانعت، فرمان مسدود می‌شود."
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr "برنامه‌ای که از فعالیت محافظ صفحهٔ نمایش ممانعت می‌کند"
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr "دلیل ممانعت از اجرای محافظ صفحهٔ نمایش"
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "نسخهٔ این برنامه"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "محافظ صفحهٔ نمایش %s است\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "فعال"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "غیرفعال"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr "محافظ صفحه نمایش مهار نشده است\n"
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr "محافظ صفحه نمایش مهار شده توسط:\n"
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr "مدت %d ثانیه است که محافظ صفحه نمایش فعال است.\n"
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr "محافظ صفحه نمایش در حال حاضر غیرفعال است.\n"
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "نمایش خروجی اشکال‌زدایی"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "نمایش دکمهٔ خروج از سیستم"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "فرمانی که از دکمهٔ خروج از سیستم فراخوانی می‌شود"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "نمایش دکمهٔ تعویض کاربر"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr "پیامی که در پنجره محاوره نمایش داده می شود"
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "MESSAGE"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr "بی استفاده"
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "نام کاربری:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "گذرواژه:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr "لازم است گذرواژه‌تان را بلافاصله تغییر دهید (گذرواژه قدیمی است)"
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "لازم است گذرواژه‌تان را بلافاصله تغییر دهید (اجبار مدیر)"
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "حساب شما منقضی شده است، لطفاً با مدیر سیستم تماس بگیرید"
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "گذرواژه‌ای داده نشد"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "گذرواژه تغییر نکرد"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "گرفتن نام کاربر ممکن نیست"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "گذرواژهٔ یونیکسی جدید را دوباره وارد کنید:"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "گذرواژهٔ یونیکس جدید را وارد کنید:"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "گذرواژهٔ یونیکس (فعلی):"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "خطا هنگام تغییر گذرواژهٔ NIS"
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "باید گذرواژهٔ بلندتری انتخاب کنید"
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "گذرواژه قبلاً استفاده شده است. از گذرواژهٔ دیگری استفاده کنید."
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "برای تغییر گذرواژه‌تان باید بیشتر صبر کنید"
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "ببخشید، گذرواژه‌ها مطابقت ندارند"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "در حال بررسی..."
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "تأیید هویت شکست خورد."
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "صفحهٔ نمایش خالی"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "تصادفی"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%Id ساعت"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%Id دقیقه"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -619,15 +619,15 @@ msgstr[0] "%Id ثانیه"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -635,35 +635,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "هرگز"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "نمی‌توان واسط اصلی را بار  کرد"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "لطفاً بررسی کنید که محافظ صفحهٔ نمایش درست نصب شده باشد"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "شبح نشود"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "اشکال‌زدایی کُد به کار انداخته شود"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr ""
 
diff --git a/po/fi.po b/po/fi.po
index ed3c89e..c5d9448 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -22,60 +22,60 @@ msgstr ""
 "Language: fi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "Näytönsäästäjä"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "Aseta näytönsäästäjän asetukset"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "Näytönsäästäjän esikatselu"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>Näytönsäästäjän esikatselu</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "Näytönsäästäjän asetukset"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "Virran_hallinta"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "_Esikatselu"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "_Näytönsäästäjän teema:"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "Näytönsäästäjän _käynnistysviive:"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "_Käynnistä näytönsäästäjä, kun tietokone on joutilas"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "_Lukitse näyttö, kun näytönsäästäjä on aktiivinen"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>Varoitus: näyttöä ei lukita pääkäyttäjälle (root).</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "Näytönsäästäjät"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "Näytönsäästäjän teemat"
@@ -398,224 +398,224 @@ msgstr "%s ei näytä olevan kelvollinen näytönsäästäjäteema."
 msgid "Copying file: %u of %u"
 msgstr "Kopioidaan tiedostoa: %u/%u"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "Sammuta näytönsäästäjäohjelma kokonaan"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "Näytä näytönsäästäjän tila"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr "Näytä, kuinka pitkään näytönsäästäjä on ollut päällä"
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "Lukitse näyttö heti käynnissä olevan näytönsäästäjäprosessin avulla"
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "Vaihtaa uuteen demoon, jos näytönsäästäjä on käynnissä"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "Laita näytönsäästäjä päälle (tyhjentää näytön)"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "Lopeta näytönsäästäjä, jos se on käynnissä (palauta näyttö)"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "Simuloi käyttäjän syötettä lähettämällä viesti näytönsäästäjälle"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr "Estä näytönsäästäjän käynnistyminen. Komento pysähtyy niin pitkäksi aikaa kun esto on päällä."
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr "Kutsuva ohjelma, joka estää näytönsäästäjän käynnistymisen"
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr "Syy näytönsäästäjän käynnistymisen ehkäisemiseen"
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "Tämän ohjelman versio"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "Näytönsäästäjä on %s\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "käytössä"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "pois käytöstä"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr "Näytönsäästäjä ei ole estetty\n"
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr "Näytönsäästäjän estää ohjelma:\n"
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr "Näytönsäästäjä on ollut päällä %d sekuntia.\n"
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr "Näytönsäästäjä ei ole tällä hetkellä aktiivinen.\n"
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "Näytä vianetsintätuloste"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "Näytä uloskirjautumispainike"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "Uloskirjautumispainikkeesta suoritettava komento"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "Näytä käyttäjän vaihtopainike"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr "Ikkunassa näytettävä viesti"
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "VIESTI"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr "Ei käytössä"
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "Käyttäjä:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "Salasana:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr "Salasana täytyy vaihtaa heti (salasana on vanhentunut)"
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "Salasana täytyy vaihtaa heti (ylläpitäjän pakottama salasanan vaihto)"
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "Käyttäjätunnuksesi on vanhentunut; ota yhteyttä ylläpitäjääsi"
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "Salasanaa ei annettu"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "Salasanaa ei vaihdettu"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "Käyttäjätunnusta ei löydy"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "Syötä toiseen kertaan uusi UNIX-salasana:"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "Syötä uusi UNIX-salasana:"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "Nykyinen UNIX-salasana:"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "Virhe vaihdettaessa NIS-salasanaa."
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "Salasanan täytyy olla pidempi"
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "Salasana on jo käytetty, valitse toinen salasana."
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "Et voi vaihtaa salasanaa näin usein"
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "Salasanat eivät vastaa toisiaan"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "Tarkistetaan..."
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "Tunnistautuminen epäonnistui."
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "Tyhjä näyttö"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "Satunnainen"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d tunti"
 msgstr[1] "%d tuntia"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuutti"
 msgstr[1] "%d minuuttia"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -624,15 +624,15 @@ msgstr[1] "%d sekuntia"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s, %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s, %s, %s"
@@ -640,35 +640,35 @@ msgstr "%s, %s, %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "Ei koskaan"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "Pääkäyttöliittymää ei voitu ladata"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "Varmista, että näytönsäästäjä on kunnolla asennettu"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "Älä käynnistä palvelinprosessina"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "Käytä vianetsintäkoodia"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr ""
 
diff --git a/po/fr.po b/po/fr.po
index 1604a7c..598a82b 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -27,60 +27,60 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "Économiseur d'écran"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "Définir vos préférences pour l'économiseur d'écran"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "Aperçu de l'économiseur d'écran"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>Aperçu de l'économiseur d'écran</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "Préférences de l'économiseur d'écran"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "_Gestion de l'énergie"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "A_perçu"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "_Thèmes de l'économiseur d'écran :"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "Considérer l'ordinateur _inactif après :"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "A_ctiver l'économiseur d'écran quand l'ordinateur est inactif"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "_Verrouiller l'écran quand l'économiseur d'écran est actif"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>Attention : l'écran ne sera pas verrouillé pour l'utilisateur root.</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "Économiseurs d'écran"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "Thèmes de l'économiseur d'écran"
@@ -403,224 +403,224 @@ msgstr "%s ne semble pas être un thème d'économiseur d'écran valide."
 msgid "Copying file: %u of %u"
 msgstr "Copie du fichier : %u sur %u"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "Demande à l'économiseur d'écran de quitter proprement"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "Indique l'état de l'économiseur d'écran"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr "Indique la durée pendant laquelle l'économiseur d'écran a été actif"
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "Demande à l'économiseur d'écran en cours de fonctionnement de verrouiller l'écran immédiatement"
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "Change de démonstration graphique si l'économiseur d'écran est actif"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "Démarre l'économiseur d'écran (efface l'écran)"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "Désactive l'économiseur d'écran s'il est actif (réaffiche l'écran)"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "Demande à l'économiseur d'écran en cours de fonctionnement de simuler l'activité d'un utilisateur"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr "Empêche l'activation de l'économiseur d'écran. La commande se bloque lorsque la désactivation est active."
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr "L'application demandant la désactivation de l'économiseur d'écran"
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr "La raison de la désactivation de l'économiseur d'écran"
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "Version de cette application"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "L'économiseur d'écran est %s\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "actif"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "inactif"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr "L'économiseur d'écran n'est pas inhibé\n"
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr "L'économiseur d'écran est inhibé par :\n"
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr "L'économiseur d'écran a été actif pendant %d secondes.\n"
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr "L'économiseur d'écran n'est actuellement pas actif.\n"
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "Affiche la sortie de débogage"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "Affiche le bouton de déconnexion"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "Commande à invoquer depuis le bouton de déconnexion"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "Affiche le bouton de changement d'utilisateur"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr "Message à afficher dans la boîte de dialogue"
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "MESSAGE"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr "Non utilisé"
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "Utilisateur :"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "Mot de passe :"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr "Vous devez modifier votre mot de passe immédiatement (mot de passe ancien)"
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "Vous devez modifier votre mot de passe immédiatement (à la demande de l'administrateur)"
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "Votre compte a expiré ; veuillez contacter votre administrateur système"
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "Aucun mot de passe fourni"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "Mot de passe non modifié"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "Impossible d'obtenir un nom d'utilisateur"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "Ressaisissez un nouveau mot de passe UNIX :"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "Saisissez un nouveau mot de passe UNIX :"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "Mot de passe UNIX (actuel) :"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "Erreur lors de la modification du mot de passe NIS."
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "Vous devez choisir un mot de passe plus long"
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "Le mot de passe a déjà été utilisé. Choisissez en un autre."
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "Vous devez attendre plus longtemps pour modifier votre mot de passe"
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "Désolé, les mots de passe ne correspondent pas"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "Vérification en cours..."
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "L'authentification a échoué."
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "Écran vide"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "Aléatoire"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d heure"
 msgstr[1] "%d heures"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minute"
 msgstr[1] "%d minutes"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -629,15 +629,15 @@ msgstr[1] "%d secondes"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -645,35 +645,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "Jamais"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "Impossible de charger l'interface principale"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "Assurez-vous que l'économiseur d'écran est correctement installé"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "Impossible de devenir un « daemon » (démon)"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "Activer le code de debogage"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr "Lancer l'économiseur d'écran et le programme de verrouillage"
 
diff --git a/po/fr_CA.po b/po/fr_CA.po
index 3e36b44..de27efc 100644
--- a/po/fr_CA.po
+++ b/po/fr_CA.po
@@ -18,60 +18,60 @@ msgstr ""
 "Language: fr_CA\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "Économiseur d'écran"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr ""
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr ""
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr ""
@@ -394,224 +394,224 @@ msgstr ""
 msgid "Copying file: %u of %u"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr ""
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr ""
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr ""
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr ""
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -620,15 +620,15 @@ msgstr[1] ""
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr ""
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr ""
@@ -636,35 +636,35 @@ msgstr ""
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr ""
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr ""
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr ""
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr ""
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr ""
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr ""
 
diff --git a/po/frp.po b/po/frp.po
index 2c1f13c..a995c9f 100644
--- a/po/frp.po
+++ b/po/frp.po
@@ -18,60 +18,60 @@ msgstr ""
 "Language: frp\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "Sârvor d’ècran"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "Ètablir lo sârvor d’ècran"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "Prèfèrences de sârvor d’ècran"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "Tèmo de sârvor d’ècran"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr ""
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "Sârvors d’ècran"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "Tèmos de sârvor d’ècran"
@@ -394,224 +394,224 @@ msgstr ""
 msgid "Copying file: %u of %u"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "Lo sârvor d’ècran est %s\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr ""
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "Nom d’usancér:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr ""
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr ""
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr ""
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -620,15 +620,15 @@ msgstr[1] ""
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr ""
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr ""
@@ -636,35 +636,35 @@ msgstr ""
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr ""
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr ""
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr ""
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr ""
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr ""
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr ""
 
diff --git a/po/ga.po b/po/ga.po
index c02d5ef..7ceebc5 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -18,60 +18,60 @@ msgstr ""
 "Language: ga\n"
 "Plural-Forms: nplurals=5; plural=(n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : 4);\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "Spárálaí Scáileáin"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "Socraigh do chuid sainroghanna spárálaí scáileáin"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "Réamhamharc Spárálaí Scáileáin"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>Réamhamharc spárálaí scáileáin</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "Sainroghanna Spárálaí Scáileáin"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "_Bainistíocht Cumhachta"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "_Réamhamharc"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "_Téama spárálaí scáileáin:"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "_Meas an ríomhaire ina staid dhíomhaoin i ndiaidh:"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "_Gníomhachtaigh an spárálaí scáileáin agus an ríomhaire díomhaoin"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "_Cuir an scáileán faoi ghlas agus an spárálaí scáileáin gníomhach"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>Rabhadh: ní bheidh an scáileán faoi ghlas don fhréamhúsáideoir.</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "Spárálaithe Scáileáin"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "Téamaí spárálaí scáileáin"
@@ -394,203 +394,203 @@ msgstr "Is cosúil nach téama spárálaí scáileáin bailí é %s."
 msgid "Copying file: %u of %u"
 msgstr "Comhad á chóipeáil: %u as %u"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "Leagan an fheidhmchláir seo"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "Tá an spárálaí scáileáin %s\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "gníomhach"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "neamhghníomhach"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "TEACHTAIREACHT"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr ""
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "Ainm úsáideora:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "Focal faire:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "Á sheiceáil..."
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "Theip ar fhíordheimhniú."
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "Scáileán bán"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "Fánach"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -600,14 +600,14 @@ msgstr[2] "%d uair"
 msgstr[3] "%d n-uair"
 msgstr[4] "%d uair"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -617,7 +617,7 @@ msgstr[2] "%d nóiméad"
 msgstr[3] "%d nóiméad"
 msgstr[4] "%d nóiméad"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -629,15 +629,15 @@ msgstr[4] "%d soicind"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -645,35 +645,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "Riamh"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr ""
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr ""
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "Ná téigh i ndeamhan"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "Cumasaigh cód dífhabhtaithe"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr ""
 
diff --git a/po/gl.po b/po/gl.po
index d9517c0..1341aa6 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -26,60 +26,60 @@ msgstr ""
 "Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "Protector de pantalla"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "Defina as súas preferencias para o protector de pantalla"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "Vista previa do protector de pantalla"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>Vista previa do protector de pantalla</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "Preferencias do protector de pantalla"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "_Xestión de enerxía"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "_Vista previa"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "Tema do _protector de pantalla:"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "Considerar que o computador está _inactivo despois de:"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "_Activar o protector de pantalla cando o computador estea inactivo"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "_Bloquear a pantalla cando o protector de pantalla estea activo"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>Aviso: non se bloqueará a pantalla para o superusuario.</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "Protectores de pantalla"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "Temas do protector de pantalla"
@@ -402,224 +402,224 @@ msgstr "Non parece que %s sexa un tema correcto para a pantalla."
 msgid "Copying file: %u of %u"
 msgstr "Copiando ficheiro: %u de %u"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "Fai que o protector de pantalla termine correctamente"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "Consultar o estado do protector de pantalla"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr "Consultar canto tempo estivo activo o protector de pantalla"
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "Dille ao proceso do protector de pantalla en execución que bloquee a pantalla inmediatamente"
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "Se o protector de pantalla está activo entón cambia a outra demostración gráfica"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "Activar o protector de pantalla (pór a pantalla en branco)"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "Se o protector de pantalla está activo entón desactívao (ilumina a pantalla)"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "Enviar mensaxes ao protector de pantalla en execución para simular a actividade do usuario"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr "Inhibir a activación do protector de pantalla. A orde bloquéase cando está activa a inhibición."
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr "A aplicativo que chama e que está inhibindo o protector de pantalla"
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr "A razón para inhibir o protector de pantalla"
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "Versión deste aplicativo"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "O protector de pantalla é %s\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "activo"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "inactivo"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr "O protector de pantalla non está inhibido\n"
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr "O protector de pantalla está sendo inhibido por:\n"
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr "O protector de pantalla estivo activo durante %d segundos.\n"
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr "O protector de pantalla non está activo actualmente\n"
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "Amosar a saída de depuración"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "Amosar o botón para saír da sesión"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "A orde que hai que invocar desde o botón para saír da sesión"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "Amosar o botón para cambiar de usuario"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr "Mensaxe para amosar no diálogo"
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "MENSAXE"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr "Non usada"
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "Nome de usuario:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "Contrasinal:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr "Debe cambiar o seu contrasinal inmediatamente (contrasinal caducado)"
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "Debe cambiar o seu contrasinal inmediatamente (obrigado polo superusuario)"
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "A súa conta caducou; contacte co administrador do sistema"
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "Non se indicou un contrasinal"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "Non se modificou o contrasinal"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "Non é posíbel obter o nome de usuario"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "Reescriba o contrasinal UNIX novo:"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "Introduza o contrasinal UNIX novo:"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "Contrasinal UNIX (actual):"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "Produciuse un erro ao modificar o contrasinal NIS."
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "Escolla un contrasinal máis longo"
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "O contrasinal xa foi usado. Escolla outro."
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "Ten que agardar máis tempo para cambiar o contrasinal"
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "Os contrasinais non coinciden"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "Comprobando..."
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "Non foi posíbel facer a autenticación."
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "Pór a pantalla a negro"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "Ao chou"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -628,15 +628,15 @@ msgstr[1] "%d segundos"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -644,35 +644,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "Nunca"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "Non foi posíbel cargar a interface principal"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "Asegúrese de que o protector de pantalla está instalado correctamente"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "Non converter nun daemon"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "Activar o código de depuración"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr ""
 
diff --git a/po/gnome-copyrights.txt b/po/gnome-copyrights.txt
index 40183ae..67e3b41 100644
--- a/po/gnome-copyrights.txt
+++ b/po/gnome-copyrights.txt
@@ -1,5 +1,5 @@
 ========== ar.po ==========
-# translation of mate-screensaver.HEAD.ar.po to Arabic
+# translation of xfce4-screensaver.HEAD.ar.po to Arabic
 # Djihed Afifi <djihed at gmail.com>, 2006.
 # Khaled Hosny <khaledhosny at eglug.org>, 2006, 2008, 2009.
 # Anas Husseini <linux.anas at gmail.com>, 2007.
@@ -18,10 +18,10 @@
 
 
 ========== ast.po ==========
-# translation of mate-screensaver.po to Asturian
-# Asturian translation for mate-screensaver
+# translation of xfce4-screensaver.po to Asturian
+# Asturian translation for xfce4-screensaver
 # Copyright (c) 2007 Rosetta Contributors and Canonical Ltd 2007
-# This file is distributed under the same license as the mate-screensaver package.
+# This file is distributed under the same license as the xfce4-screensaver package.
 #
 # FIRST AUTHOR <EMAIL at ADDRESS>, 2007.
 # Xose S. Puente <xspuente at gmail.com>, 2007.
@@ -30,9 +30,9 @@
 
 
 ========== be.po ==========
-# Belarusian translation for mate-screensaver
+# Belarusian translation for xfce4-screensaver
 # Copyright (c) (c) 2006 Canonical Ltd, and Rosetta Contributors 2006
-# This file is distributed under the same license as the mate-screensaver package.
+# This file is distributed under the same license as the xfce4-screensaver package.
 # FIRST AUTHOR <EMAIL at ADDRESS>, 2006.
 #
 
@@ -40,8 +40,8 @@
 
 
 ========== be at latin.po ==========
-# Biełaruski pierakład mate-screensaver.
-# Copyright (C) 2007 THE mate-screensaver'S COPYRIGHT HOLDER
+# Biełaruski pierakład xfce4-screensaver.
+# Copyright (C) 2007 THE xfce4-screensaver'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the marco.mate package.
 # Alaksandar Navicki <zolak at lacinka.org> & Łacinka.org 2007.
 #
@@ -50,9 +50,9 @@
 
 
 ========== bg.po ==========
-# Bulgarian translation of mate-screensaver po-file.
+# Bulgarian translation of xfce4-screensaver po-file.
 # Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
-# This file is distributed under the same license as the mate-screensaver package.
+# This file is distributed under the same license as the xfce4-screensaver package.
 # Rostislav "zbrox" Raykov <zbrox at i-space.org>, 2005, 2006.
 # Alexander Shopov <ash at contact.bg>, 2005, 2006, 2007, 2008, 2009.
 # Yavor Doganov <yavor at gnu.org>, 2008.
@@ -62,7 +62,7 @@
 
 
 ========== bn.po ==========
-# Bengali translation for mate-screensaver
+# Bengali translation for xfce4-screensaver
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
 #
@@ -89,9 +89,9 @@
 
 
 ========== br.po ==========
-# Breton translation for mate-screensaver
+# Breton translation for xfce4-screensaver
 # Copyright (c) (c) 2006 Canonical Ltd, and Rosetta Contributors 2006
-# This file is distributed under the same license as the mate-screensaver package.
+# This file is distributed under the same license as the xfce4-screensaver package.
 # Giulia Fraboulet <djoulia at gmail.com>, 2006.
 #
 #
@@ -100,10 +100,10 @@
 
 
 ========== ca.po ==========
-# Catalan translations for mate-screensaver package
-# Traduccions al català del paquet «mate-screensaver».
+# Catalan translations for xfce4-screensaver package
+# Traduccions al català del paquet «xfce4-screensaver».
 # Copyright (C) 2006 The Free Software Foundation, Inc.
-# This file is distributed under the same license as the mate-screensaver
+# This file is distributed under the same license as the xfce4-screensaver
 # package.
 # Josep Puigdemont i Casamajó <josep.puigdemont at gmail.com>, 2006.
 # Gil Forcada <gilforcada at guifi.net>, 2006, 2007, 2008, 2009.
@@ -114,10 +114,10 @@
 
 
 ========== ca at valencia.po ==========
-# Catalan translations for mate-screensaver package
-# Traduccions al català del paquet «mate-screensaver».
+# Catalan translations for xfce4-screensaver package
+# Traduccions al català del paquet «xfce4-screensaver».
 # Copyright (C) 2006 The Free Software Foundation, Inc.
-# This file is distributed under the same license as the mate-screensaver
+# This file is distributed under the same license as the xfce4-screensaver
 # package.
 # Josep Puigdemont i Casamajó <josep.puigdemont at gmail.com>, 2006.
 # Gil Forcada <gilforcada at guifi.net>, 2006, 2007, 2008, 2009.
@@ -128,8 +128,8 @@
 
 
 ========== crh.po ==========
-# Qırımtatarca mate-screensaver.
-# This file is distributed under the same license as the mate-screensaver package.
+# Qırımtatarca xfce4-screensaver.
+# This file is distributed under the same license as the xfce4-screensaver package.
 #
 #  Reşat SABIQ <tilde.birlik at gmail.com>, 2009.
 
@@ -137,11 +137,11 @@
 
 
 ========== cs.po ==========
-# Czech translation of mate-screensaver.
-# Copyright (C) 2005, 2007, 2008, 2009 the author(s) of mate-screensaver.
+# Czech translation of xfce4-screensaver.
+# Copyright (C) 2005, 2007, 2008, 2009 the author(s) of xfce4-screensaver.
 # Copyright (C) 2005 Miloslav Trmac <mitr at volny.cz>.
 # Copyright (C) 2006 Lukas Novotny <lukasnov at cvs.gnome.org>.
-# This file is distributed under the same license as the mate-screensaver package.
+# This file is distributed under the same license as the xfce4-screensaver package.
 # Miloslav Trmac <mitr at volny.cz>, 2005.
 # Lukas Novotny <lukasnov at cvs.gnome.org>, 2006.
 # Petr Tomeš <ptomes at gmail.com>, 2006.
@@ -161,9 +161,9 @@
 
 
 ========== da.po ==========
-# Danish translation of mate-screensaver.
+# Danish translation of xfce4-screensaver.
 # Copyright (C) 2006-2008
-# This file is distributed under the same license as the mate-screensaver package.
+# This file is distributed under the same license as the xfce4-screensaver package.
 # David Nielsen <david at lovesunix.net>, 2006.
 # Kenneth Nielsen <k.nielsen at gmail.com>, 2007-08.
 #
@@ -172,9 +172,9 @@
 
 
 ========== de.po ==========
-# German translation of mate-screensaver.
+# German translation of xfce4-screensaver.
 # Copyright (C) 2005 William Jon McCann <mccann at jhu.edu>
-# This file is distributed under the same license as the mate-screensaver
+# This file is distributed under the same license as the xfce4-screensaver
 # package.
 # Frank Arnold <frank at scirocco-5v-turbo.de>, 2005.
 # Hendrik Richter <hendrikr at gnome.org>, 2005, 2006, 2007, 2008.
@@ -192,7 +192,7 @@
 
 
 ========== dz.po ==========
-# Dzongkha translation of mate-screensaver.
+# Dzongkha translation of xfce4-screensaver.
 # Copyright @ 2006 Free Software Foundation, Inc.
 # Mindu Dorji
 #
@@ -214,7 +214,7 @@
 
 
 ========== en at shaw.po ==========
-# Shavian translation for mate-screensaver.
+# Shavian translation for xfce4-screensaver.
 # Copyright (C) 2009 The Mate Foundation.
 # Thomas Thurman <tthurman at gnome.org>, 2009.
 
@@ -222,9 +222,9 @@
 
 
 ========== en_CA.po ==========
-# Canadian English translation for mate-screensaver
+# Canadian English translation for xfce4-screensaver
 # Copyright (C) 2005-2006 Adam Weinberger and the MATE Foundation
-# This file is distributed under the same licence as the mate-screensaver package.
+# This file is distributed under the same licence as the xfce4-screensaver package.
 # Adam Weinberger <adamw at gnome.org>, 2005, 2006.
 #
 #
@@ -234,7 +234,7 @@
 
 ========== en_GB.po ==========
 # English (British) translation.
-# Copyright (C) 2005 THE mate-screensaver'S COPYRIGHT HOLDER
+# Copyright (C) 2005 THE xfce4-screensaver'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # Abigail Brady <morwen at evilmagic.org>, Bastien Nocera <hadess at hadess.net>, 2005.
 # Philip Withnall <philip at tecnocode.co.uk>, 2009.
@@ -244,9 +244,9 @@
 
 
 ========== es.po ==========
-# translation of mate-screensaver.HEAD.po to Español
-# translation of mate-screensaver to Spanish
-# This file is distributed under the same license as the mate-screensaver package.
+# translation of xfce4-screensaver.HEAD.po to Español
+# translation of xfce4-screensaver to Spanish
+# This file is distributed under the same license as the xfce4-screensaver package.
 # Copyright (C) 2005 The MATE Foundation, 2005.
 #
 # Francisco Javier F. Serrador <serrador at cvs.gnome.org>, 2005, 2006.
@@ -260,7 +260,7 @@
 # Estonian translation of MATE screensaver.
 #
 # Copyright (C) 2006-2008, The MATE Project.
-# This file is distributed under the same license as the mate-screensaver
+# This file is distributed under the same license as the xfce4-screensaver
 # package.
 #
 # Ivar Smolin <okul at linux.ee>, 2006-2008.
@@ -282,7 +282,7 @@
 
 
 ========== fa.po ==========
-# Persain translation of mate-screensaver
+# Persain translation of xfce4-screensaver
 # Copyright (C) 2006 Sharif FarsiWeb, Inc.
 # This file is distributed under the same license as the PACKAGE package.
 # Elnaz Sarbar <elnaz at farsiweb.info>, 2006.
@@ -292,9 +292,9 @@
 
 
 ========== fi.po ==========
-# Finnish messages for mate-screensaver package.
+# Finnish messages for xfce4-screensaver package.
 # Copyright (C) 2005-2009 Free Software Foundation, Inc.
-# This file is distributed under the same license as the mate-screensaver package.
+# This file is distributed under the same license as the xfce4-screensaver package.
 #
 # Tommi Vainikainen <Tommi.Vainikainen at iki.fi>, 2005, 2009.
 # Ilkka Tuohela <hile at iki.fi>, 2005-2009.
@@ -305,9 +305,9 @@
 
 
 ========== fr.po ==========
-# French translation of mate-screensaver.
+# French translation of xfce4-screensaver.
 # Copyright (C) 2005-2009 The Free Software Foundation, Inc.
-# This file is distributed under the same license as the mate-screensaver package.
+# This file is distributed under the same license as the xfce4-screensaver package.
 #
 # Eric Maeker <eric.maeker at free.fr>, 2005.
 # Davy Defaud <davy.defaud at posteasy.com>, 2005.
@@ -322,9 +322,9 @@
 
 
 ========== ga.po ==========
-# Irish translations for mate-screensaver package.
+# Irish translations for xfce4-screensaver package.
 # Copyright (C) 2007-2009 Free Software Foundation, Inc.
-# This file is distributed under the same license as the mate-screensaver package.
+# This file is distributed under the same license as the xfce4-screensaver package.
 # Seán de Búrca <leftmostcat at gmail.com>, 2007, 2008, 2009.
 #
 
@@ -332,8 +332,8 @@
 
 
 ========== gl.po ==========
-# translation of mate-screensaver.master.po to Galician
-# translation of mate-screensaver.gl.po to
+# translation of xfce4-screensaver.master.po to Galician
+# translation of xfce4-screensaver.gl.po to
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER, 2005.
 #
@@ -349,7 +349,7 @@
 
 
 ========== gu.po ==========
-# translation of mate-screensaver.mate-2-28.gu.po to Gujarati
+# translation of xfce4-screensaver.mate-2-28.gu.po to Gujarati
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
 #
@@ -371,7 +371,7 @@
 
 
 ========== hi.po ==========
-# translation of mate-screensaver.master.po to Hindi
+# translation of xfce4-screensaver.master.po to Hindi
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
 #
@@ -382,9 +382,9 @@
 
 
 ========== hr.po ==========
-# Croatian translation for mate-screensaver
+# Croatian translation for xfce4-screensaver
 # Copyright (c) (c) 2006 Canonical Ltd, and Rosetta Contributors 2006
-# This file is distributed under the same license as the mate-screensaver package.
+# This file is distributed under the same license as the xfce4-screensaver package.
 # FIRST AUTHOR <EMAIL at ADDRESS>, 2006.
 #
 
@@ -392,9 +392,9 @@
 
 
 ========== hu.po ==========
-# Hungarian translation for mate-screensaver
+# Hungarian translation for xfce4-screensaver
 # Copyright (c) (c) 2005 Canonical Ltd, and Rosetta Contributors 2005
-# This file is distributed under the same license as the mate-screensaver package.
+# This file is distributed under the same license as the xfce4-screensaver package.
 #
 # Szilveszter Farkas <szilveszter.farkas at gmail dot com>, 2005.
 # Gabor Kelemen <kelemeng at mate dot hu>, 2005, 2006, 2007, 2008, 2009, 2010.
@@ -404,9 +404,9 @@
 
 
 ========== id.po ==========
-# Indonesian translation of mate-screensaver.
-# Copyright (C) 2006 THE mate-screensaver'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the mate-screensaver package.
+# Indonesian translation of xfce4-screensaver.
+# Copyright (C) 2006 THE xfce4-screensaver'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the xfce4-screensaver package.
 # ahmad riza h nst <rizahnst at id.gnome.org>, 2006.
 # 
 # 
@@ -424,9 +424,9 @@
 
 
 ========== it.po ==========
-# Italian Translation of mate-screensaver
+# Italian Translation of xfce4-screensaver
 # Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation Inc.
-# This file is distributed under the same license as the mate-screensaver package.
+# This file is distributed under the same license as the xfce4-screensaver package.
 #
 #   idle -> inattivo/a
 #   activate --> avvia (per evitare attiva quando inattivo)
@@ -441,9 +441,9 @@
 
 
 ========== ja.po ==========
-# mate-screensaver ja.po.
+# xfce4-screensaver ja.po.
 # Copyright (C) 2004-2009 Free Software Foundation, Inc.
-# This file is distributed under the same license as the 'mate-screensaver' package.
+# This file is distributed under the same license as the 'xfce4-screensaver' package.
 # Takeshi AIHANA <takeshi.aihana at gmail.com>, 2004-2009.
 # Satoru SATOH <ss at gnome.gr.jp>, 2006.
 # Takayuki KUSANO <AE5T-KSN at asahi-net.or.jp>, 2009.
@@ -457,7 +457,7 @@
 # Vladimer Sichinava ვლადიმერ სიჭინავა <vsichi at gnome.org>, 2007.
 # Georgian translation for Mate Screensaver.
 # Copyright © 2006 Ubuntu Georgian Translators.
-# This file is distributed under the same license as the mate-screensaver package.
+# This file is distributed under the same license as the xfce4-screensaver package.
 # Malkhaz Barkalaya <malxaz at gmail.com>
 # Vladimer Sichinava  <vlsichinava at gmail.com>
 
@@ -465,7 +465,7 @@
 
 
 ========== kn.po ==========
-# translation of mate-screensaver.master.kn.po to Kannada
+# translation of xfce4-screensaver.master.kn.po to Kannada
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 #
@@ -475,8 +475,8 @@
 
 
 ========== ko.po ==========
-# mate-screensaver Korean message translation.
-# This file is distributed under the same license as the mate-screensaver package.
+# xfce4-screensaver Korean message translation.
+# This file is distributed under the same license as the xfce4-screensaver package.
 # Young-Ho Cha <ganadist at gmail.com>, 2006.
 # Changwoo Ryu <cwryu at debian.org>, 2006, 2007, 2008, 2009, 2010.
 #
@@ -486,9 +486,9 @@
 
 ========== ku.po ==========
 # translation of ku.po to
-# translation of mate-screensaver
-# Copyright (C) 2006 THE mate-screensaver'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the mate-screensaver package.
+# translation of xfce4-screensaver
+# Copyright (C) 2006 THE xfce4-screensaver'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the xfce4-screensaver package.
 # <>, 2006.
 # , 2006.
 # 
@@ -498,10 +498,10 @@
 
 
 ========== lt.po ==========
-# translation of mate-screensaver.HEAD.po to Lithuanian
-# Lithuanian translation for mate-screensaver.
+# translation of xfce4-screensaver.HEAD.po to Lithuanian
+# Lithuanian translation for xfce4-screensaver.
 # Copyright (C) 2005-2006, 2007, 2008 Free Software Foundation, Inc.
-# This file is distributed under the same license as the mate-screensaver package.
+# This file is distributed under the same license as the xfce4-screensaver package.
 #
 # Žygimantas Beručka <zygis at gnome.org>, 2005-2006.
 # Gintautas Miliauskas <gintas at akl.lt>, 2006, 2007, 2008.
@@ -522,7 +522,7 @@
 
 
 ========== mai.po ==========
-# translation of mate-screensaver.master.po to Maithili
+# translation of xfce4-screensaver.master.po to Maithili
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 #
@@ -554,9 +554,9 @@
 
 
 ========== ml.po ==========
-# translation of mate-screensaver.master.ml.po to
-# This file is distributed under the same license as the mate-screensaver package.
-# Copyright (C) 2006-2009 mate-screensaver'S COPYRIGHT HOLDER.
+# translation of xfce4-screensaver.master.ml.po to
+# This file is distributed under the same license as the xfce4-screensaver package.
+# Copyright (C) 2006-2009 xfce4-screensaver'S COPYRIGHT HOLDER.
 # Reviewed by Santhosh Thottingal <santhosh00 at gmail.com>
 # Ani Peter <apeter at redhat.com>, 2006.
 # Praveen|പ്രവീണ്‍ A|എ <pravi.a at gmail.com>, 2007, 2008‌.
@@ -590,7 +590,7 @@
 
 
 ========== nb.po ==========
-# Norwegian bokmål translation of mate-screensaver.
+# Norwegian bokmål translation of xfce4-screensaver.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # Kjartan Maraas  <kmaraas at gnome.org>, 2005-2009.
@@ -601,9 +601,9 @@
 
 
 ========== nds.po ==========
-# Low German translation for mate-screensaver.
-# Copyright (C) 2009 mate-screensaver's COPYRIGHT HOLDER
-# This file is distributed under the same license as the mate-screensaver package.
+# Low German translation for xfce4-screensaver.
+# Copyright (C) 2009 xfce4-screensaver's COPYRIGHT HOLDER
+# This file is distributed under the same license as the xfce4-screensaver package.
 # NILS-CHRISTOPH FIEDLER <LINUX at MEDIENKOMPANIE.DE>, 2009.
 #
 
@@ -611,7 +611,7 @@
 
 
 ========== ne.po ==========
-# translation of mate-screensaver.HEAD.ne.po to Nepali
+# translation of xfce4-screensaver.HEAD.ne.po to Nepali
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
 #
@@ -624,9 +624,9 @@
 
 
 ========== nl.po ==========
-# Dutch translation of mate-screensaver
+# Dutch translation of xfce4-screensaver
 #
-# This file is distributed under the same license as the mate-screensaver package.
+# This file is distributed under the same license as the xfce4-screensaver package.
 #
 # Tino Meinen <a.t.meinen at chello.nl>, 2005–2006
 # Wouter Bolsterlee <wbolster at gnome.org>, 2007–2010
@@ -643,9 +643,9 @@
 
 
 ========== nn.po ==========
-# Norwegian nynorsk translation of mate-screensaver.
+# Norwegian nynorsk translation of xfce4-screensaver.
 # Copyright (C) 2008 The Free Software Foundation Inc.
-# This file is distributed under the same license as the mate-screensaver package.
+# This file is distributed under the same license as the xfce4-screensaver package.
 # Kjartan Maraas  <kmaraas at gnome.org>, 2005-2006.
 # Eskild Hustvedt <i18n at zerodogg.org>, 2007, 2008
 
@@ -654,9 +654,9 @@
 
 ========== oc.po ==========
 # Translation of oc.po to Occitan
-# Occitan translation of mate-screensaver.
+# Occitan translation of xfce4-screensaver.
 # Copyright (C) 2005-2006, 2007 The Free Software Foundation, Inc.
-# This file is distributed under the same license as the mate-screensaver package.
+# This file is distributed under the same license as the xfce4-screensaver package.
 #
 # Yannig Marchegay (Kokoyaya) <yannig at marchegay.org>, 2006-2008
 
@@ -676,7 +676,7 @@
 
 
 ========== pa.po ==========
-# translation of mate-screensaver.HEAD.po to Punjabi
+# translation of xfce4-screensaver.HEAD.po to Punjabi
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
 #
@@ -712,9 +712,9 @@
 
 
 ========== pt.po ==========
-# mate-screensaver's Portuguese translation.
-# Copyright © 2006, 2007, 2008, 2009 mate-screensaver
-# This file is distributed under the same license as the mate-screensaver package.
+# xfce4-screensaver's Portuguese translation.
+# Copyright © 2006, 2007, 2008, 2009 xfce4-screensaver
+# This file is distributed under the same license as the xfce4-screensaver package.
 # Duarte Loreto <happyguy_pt at hotmail.com>, 2006, 2007, 2008, 2009.
 #
 
@@ -722,9 +722,9 @@
 
 
 ========== pt_BR.po ==========
-# Brazilian Portuguese translation of mate-screensaver.
+# Brazilian Portuguese translation of xfce4-screensaver.
 # Copyright (C) 2005-2006 Free Software Foundation, Inc.
-# This file is distributed under the same license as the mate-screensaver package.
+# This file is distributed under the same license as the xfce4-screensaver package.
 # Raphael Higino <raphaelh at uai.com.br>, 2005-2006.
 # Henrique Grolli Bassotto <henrique.grolli at gmail.com>, 2006.
 # Leonardo Ferreira Fontenelle <leo.fontenelle at gmail.com>, 2006.
@@ -738,9 +738,9 @@
 
 
 ========== ro.po ==========
-# Romanian translation of mate-screensaver.
+# Romanian translation of xfce4-screensaver.
 # Copyright (C) 2007 - 2008 Free Software Foundation
-# This file is distributed under the same license as the mate-screensaver package.
+# This file is distributed under the same license as the xfce4-screensaver package.
 # Alexandru Szasz <alexxed at gmail.com>, 2007.
 # Mișu Moldovan <dumol at mate.ro>, 2008.
 # Lucian Adrian Grijincu <lucian.grijincu at gmail.com>, 2009
@@ -749,9 +749,9 @@
 
 
 ========== ru.po ==========
-# Russian translation of mate-screensaver.
+# Russian translation of xfce4-screensaver.
 # Copyright (C) 2006 Free Software Foundation
-# This file is distributed under the same license as the mate-screensaver package.
+# This file is distributed under the same license as the xfce4-screensaver package.
 #
 # Sergio Kvantos <kvantos at plotinka.ru>, 2006.
 # Leonid Kanter <leon at asplinux.ru>, 2006.
@@ -771,9 +771,9 @@
 
 
 ========== sk.po ==========
-# Slovak translation for mate-screensaver.
+# Slovak translation for xfce4-screensaver.
 # Copyright (C) 2005, 2007, 2008, 2010 Free Software Foundation, Inc.
-# This file is distributed under the same license as the mate-screensaver package.
+# This file is distributed under the same license as the xfce4-screensaver package.
 # Peter Tuharsky <tuharsky at misbb.sk>, 2007.
 # Marcel Telka <marcel at telka.sk>, 2005, 2008, 2010.
 #
@@ -783,7 +783,7 @@
 
 ========== sl.po ==========
 # Copyright (C) 2006-2007 Free Software Foundation, Inc.
-# This file is distributed under the same license as the mate-screensaver package.
+# This file is distributed under the same license as the xfce4-screensaver package.
 #
 # Matic Žgur <mr.zgur at gmail.com>, 2006.
 # Matjaž Horvat <m at owca.info>, 2006.
@@ -794,9 +794,9 @@
 
 
 ========== sq.po ==========
-# Përkthimi i mesazheve të mate-screensaver në shqip
+# Përkthimi i mesazheve të xfce4-screensaver në shqip
 # Copyright (C) 2006 Free Software Foundation, Inc.
-# This file is distributed under the same license as the mate-screensaver package.
+# This file is distributed under the same license as the xfce4-screensaver package.
 #
 # Laurent Dhima <laurenti at alblinux.net>, 2006.
 
@@ -804,10 +804,10 @@
 
 
 ========== sr.po ==========
-# Serbian translation of mate-screensaver
+# Serbian translation of xfce4-screensaver
 # Courtesy of Prevod.org team (http://prevod.org/) -- 2006 -2009.
 #
-# This file is distributed under the same license as the mate-screensaver package.
+# This file is distributed under the same license as the xfce4-screensaver package.
 #
 # Maintainer: Слободан Д. Средојевић <ssl at uns.ns.ac.yu>
 #
@@ -816,10 +816,10 @@
 
 
 ========== sr at latin.po ==========
-# Serbian translation of mate-screensaver
+# Serbian translation of xfce4-screensaver
 # Courtesy of Prevod.org team (http://prevod.org/) -- 2006 -2009.
 #
-# This file is distributed under the same license as the mate-screensaver package.
+# This file is distributed under the same license as the xfce4-screensaver package.
 #
 # Maintainer: Slobodan D. Sredojević <ssl at uns.ns.ac.yu>
 #
@@ -828,7 +828,7 @@
 
 
 ========== sv.po ==========
-# Swedish messages for mate-screensaver.
+# Swedish messages for xfce4-screensaver.
 # Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 # Christian Rose <menthos at menthos.com>, 2005.
 # Daniel Nylander <po at danielnylander.se>, 2006, 2007, 2008, 2009.
@@ -838,7 +838,7 @@
 
 
 ========== ta.po ==========
-# translation of mate-screensaver.master.ta.po to Tamil
+# translation of xfce4-screensaver.master.ta.po to Tamil
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
 #
@@ -850,10 +850,10 @@
 
 
 ========== te.po ==========
-# translation of mate-screensaver.master.te.po to Telugu
-# Telugu translation of mate-screensaver.
+# translation of xfce4-screensaver.master.te.po to Telugu
+# Telugu translation of xfce4-screensaver.
 # Copyright (C) 2007 Swecha Telugu Localisation Team <localisation at swecha.org>
-# This file is distributed under the same license as the mate-screensaver package.
+# This file is distributed under the same license as the xfce4-screensaver package.
 #
 # Srinivas Chary <srinu.kolpur at gmail.com>, 2007.
 # Krishna Babu K <kkrothap at redhat.com>, 2008, 2009.
@@ -862,9 +862,9 @@
 
 
 ========== th.po ==========
-# Thai translation of mate-screensaver.
+# Thai translation of xfce4-screensaver.
 # Copyright (C) 2005-2009 Free Software Foundation, Inc.
-# This file is distributed under the same license as the mate-screensaver package.
+# This file is distributed under the same license as the xfce4-screensaver package.
 # Theppitak Karoonboonyanan <thep at linux.thai.net>, 2005-2009.
 #
 
@@ -872,9 +872,9 @@
 
 
 ========== tr.po ==========
-# Turkish translation of mate-screensaver.
+# Turkish translation of xfce4-screensaver.
 # Copyright (C) 2008
-# This file is distributed under the same license as the mate-screensaver package.
+# This file is distributed under the same license as the xfce4-screensaver package.
 #
 # Baris Cicek <baris at teamforce.name.tr>, 2008, 2009.
 
@@ -882,9 +882,9 @@
 
 
 ========== uk.po ==========
-# Ukrainian translation of mate-screensaver
+# Ukrainian translation of xfce4-screensaver
 # Copyright (C) 2005 Free Software Foundation
-# This file is distributed under the same license as the mate-screensaver package.
+# This file is distributed under the same license as the xfce4-screensaver package.
 # Maxim Dziumanenko <dziumanenko at gmail.com>, 2005-2008.
 #
 # wanderlust <wanderlust at ukr.net>, 2009.
@@ -902,9 +902,9 @@
 
 
 ========== zh_CN.po ==========
-# zh_CN translation of mate-screensaver.
-# Copyright (C) 2009 THE mate-screensaver'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the mate-screensaver package.
+# zh_CN translation of xfce4-screensaver.
+# Copyright (C) 2009 THE xfce4-screensaver'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the xfce4-screensaver package.
 # Funda Wang <fundawang at linux.net.cn>, 2005.
 # Yang Zhang <zyangmath at gmail.com>, 2009.
 #
@@ -914,7 +914,7 @@
 
 
 ========== zh_HK.po ==========
-# Chinese (Hong Kong) translation of mate-screensaver.
+# Chinese (Hong Kong) translation of xfce4-screensaver.
 # Copyright (C) 2005, 06, 07 Free Software Foundation, Inc.
 # Abel Cheung <abel at oaka.org>, 2005.
 # Chao-Hsiung Liao <j_h_liau at yahoo.com.tw>, 2006.
@@ -926,7 +926,7 @@
 
 
 ========== zh_TW.po ==========
-# Chinese (Taiwan) translation of mate-screensaver.
+# Chinese (Taiwan) translation of xfce4-screensaver.
 # Copyright (C) 2005, 06, 07 Free Software Foundation, Inc.
 # Abel Cheung <abel at oaka.org>, 2005.
 # Chao-Hsiung Liao <j_h_liau at yahoo.com.tw>, 2006.
diff --git a/po/gu.po b/po/gu.po
index 9de597d..d045f9e 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -20,60 +20,60 @@ msgstr ""
 "Language: gu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "સ્ક્રીનસેવર"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "તમારી સ્ક્રીનસેવર પસંદગીઓ સુયોજિત કરો"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "સ્ક્રીનસેવર પૂર્વદર્શન"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>સ્ક્રીનસેવર પૂર્વદર્શન</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "સ્ક્રીનસેવર પસંદગીઓ"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "પાવર વ્યવસ્થાપન (_M)"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "પૂર્વદર્શન (_P)"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "સ્ક્રીનસેવર થીમ (_S):"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "આના પછી કમ્પ્યૂટરને ફાજલ તરીકે સમજો (_i):"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "જ્યારે કમ્પ્યૂટર ફાજલ હોય ત્યારે સ્ક્રીનસેવર સક્રિય કરો (_A)"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "જ્યારે સ્ક્રીનસેવર સક્રિય હોય ત્યારે સ્ક્રીનને તાળું મારો (_L)"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>ચેતવણી: રુટ વપરાશકર્તા માટે સ્ક્રીનને તાળું મારવામાં આવશે નહિં.</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "સ્ક્રીનસેવરો"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "સ્ક્રીનસેવર થીમો"
@@ -396,224 +396,224 @@ msgstr "%s માન્ય સ્ક્રીનસેવર થીમ હોય
 msgid "Copying file: %u of %u"
 msgstr "ફાઈલની નકલ કરી રહ્યા છીએ: %u જેટલું %u માંથી"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "સ્ક્રીનસેવરને સારી રીતે બંધ કરવાનું કારણ બને છે"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "સ્ક્રીનસેવરની સ્થિતિને પ્રશ્ન પૂછે છે"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr "સ્ક્રીનસેવર જેટલા સમયથી સક્રિય છે તેટલા સમયની લંબાઈનો પ્રશ્ન"
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "ચાલી રહેલ સ્ક્રીનસેવર પ્રક્રિયાને સ્ક્રીન તુરંત જ તાળું મારવા માટે કહે છે"
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "જો સ્ક્રીનસેવર સક્રિય હોય તો પછી અન્ય ગ્રાફિક્સ ડેમોમાં બદલાવ"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "સ્ક્રીનસેવરને ચાલુ કરો (સ્ક્રીન કોરી કરો)"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "જો સ્ક્રીનસેવર સક્રિય હોય તો પછી તેને અસક્રિય કરો (સ્ક્રીનને કોરી-નહિં રાખો)"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "વપરાશકર્તા ક્રિયા સિમ્યુલેટ કરવા માટે ચાલી રહેલ સ્ક્રીનસેવરને ધક્કો મારો"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr "સ્ક્રીનસેવરને સક્રિય કરવાથી બચાવવું.  જ્યારે બચાવવાનું સક્રિય હોય ત્યારે આદેશો અટકાવે છે."
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr "બોલાવી રહેલ કાર્યક્રમ કે જે સ્ક્રીનસેવરને અટકાવી રહ્યો છે"
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr "સ્ક્રીનસેવરને બચાવવા માટેનું કારણ"
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "આ કાર્યક્રમની આવૃત્તિ"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "સ્ક્રીનસેવર એ %s છે\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "સક્રિય"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "અસક્રિય"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr "સ્ક્રીનસેવર એ અટકાવાયેલ છે\n"
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr "સ્ક્રીનસેવર એ અટકાવી દેવામાં આવ્યું છે:\n"
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr "સ્ક્રીનસેવર %d સેકન્ડોથી સક્રિય છે.\n"
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr "સ્ક્રીનસેવર એ હમણાં સક્રિય નથી.\n"
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "ડિબગીંગ આઉટપુટ બતાવો"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "બહાર નીકળો બટન બતાવો"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "બહાર નીકળો બટનમાંથી ચલાવવાનો આદેશ"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "વપરાશકર્તા બદલો બટન બતાવો"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr "સંવાદમાં બતાવવા માટેનો સંદેશો"
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "MESSAGE"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr "વપરાયેલ નથી"
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "વપરાશકર્તાનામ:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "પાસવર્ડ:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr "તમે તમારો પાસવર્ડ તુરંત બદલવા માટે આગ્રહ કરવામાં આવે છે (પાસવર્ડની આયુ)"
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "તમે તમારો પાસવર્ડ તુરંત બદલવા માટે આગ્રહ કરવામાં આવે છે (રુટ દ્વારા દબાણ)"
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "તમારા ખાતાની સમયમર્યાદા સમાપ્ત થઈ ગઈ; મહેરબાની કરીને તમારા સિસ્ટમ સંચાલકનો સંપર્ક કરો"
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "કોઈ પાસવર્ડો પૂરા પાડવામાં આવેલ નથી"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "પાસવર્ડ બદલાયેલ નથી"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "વપરાશકર્તાનામ મેળવી શકતા નથી"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "નવો UNIX પાસવર્ડ ફરી લખો:"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "નવો UNIX પાસવર્ડ દાખલ કરો:"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "(વર્તમાન) UNIX પાસવર્ડ:"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "NIS પાસવર્ડ બદલતી વખતે ભૂલ."
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "તમારે લાંબો પાસવર્ડ જ પસંદ કરવો જોઈએ"
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "પાસવર્ડ પહેલાથી જ વપરાઈ ગયેલ છે. અન્ય પસંદ કરો."
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "તમારે તમારો પાસવર્ડ બદલવા માટે લાંબે સુધી રાહ જોવી જ પડશે"
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "માફ કરજો, પાસવર્ડો બંધ બેસતા નથી"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "ચકાસી રહ્યા છીએ..."
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "સત્તાધિકરણ નિષ્ફળ."
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "ખાલી સ્ક્રીન"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "રેન્ડમ"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d કલાક"
 msgstr[1] "%d કલાકો"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d મિનિટો"
 msgstr[1] "%d મિનિટો"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -622,15 +622,15 @@ msgstr[1] "%d સેકન્ડો"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -638,35 +638,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "ક્યારેય નહિં"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "મુખ્ય ઈન્ટરફેસ લાવી શક્યા નહિં"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "મહેરબાની કરીને ખાતરી કરો કે સ્ક્રીનસેવર યોગ્ય રીતે સ્થાપિત થયેલ છે"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "ડિમન બનશો નહિં"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "ડિબગીંગ કોડ સક્રિય કરો"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr ""
 
diff --git a/po/he.po b/po/he.po
index a95ad55..4f4dc6d 100644
--- a/po/he.po
+++ b/po/he.po
@@ -18,60 +18,60 @@ msgstr ""
 "Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "שומר מסך"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "קבע את העדפות שומר המסך"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "תצוגה מקדימה של שומר המסך"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>תצוגה מקדימה של שומר המסך</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "העדפות שומר המסך"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "_ניהול צריכת חשמל"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "_תצוגה מקדימה"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "ערכת נושא _לשומר המסך:"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "התיחס למחשב כלא _פעיל לאחר:"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "הפעל _שומר מסך כאשר המחשב לא פעיל"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "_נעל מסך כששומר המסך פועל"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>אזהרה: המסך לא יינעל עבור מנהל המערכת.</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "שומרי מסך"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "ערכות נושא לשומר המסך"
@@ -394,224 +394,224 @@ msgstr "‏%s אינו ערכת נושא תקינה."
 msgid "Copying file: %u of %u"
 msgstr "מעתיק קובץ: %u מתוך %u"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "Causes the screensaver to exit gracefully"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "Query the state of the screensaver"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr "Query the length of time the screensaver has been active"
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "Tells the running screensaver process to lock the screen immediately"
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "If the screensaver is active then switch to another graphics demo"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "Turn the screensaver on (blank the screen)"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "If the screensaver is active then deactivate it (un-blank the screen)"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "Poke the running screensaver to simulate user activity"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr "Inhibit the screensaver from activating.  Command blocks while inhibit is active."
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr "The calling application that is inhibiting the screensaver"
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr "The reason for inhibiting the screensaver"
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "Version of this application"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "שומר המסך הוא %s\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "פעיל"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "לא פעיל"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr "שומר המסך אינו מנוע מלפעול\n"
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr "שומר המסך מנוע מלפעול על ידי:\n"
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr "שומר המסך היה פעיל במשך %d שניות.\n"
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr "שומר המסך אינו פעיל כעת.\n"
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "Show debugging output"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "Show the logout button"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "Command to invoke from the logout button"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "Show the switch user button"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr "Message to show in the dialog"
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "MESSAGE"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr "לא בשימוש"
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "שם משתמש:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "סיסמה:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr "הינך מחוייב לשנות את סיסמתך מיידית (הסיסמה התיישנה)"
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "הינך מחוייב לשנות את סיסמתך מיידית (דרישת מנהל המערכת)"
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "פג תוקף חשבונך; אנא צור קשר עם מנהל המערכת שלך"
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "לא סופקה סיסמה"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "סיסמה לא השתנתה"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "נכשל בהשגת שם משתמש"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "הקלד מחדש סיסמת UNIX חדשה:"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "הכנס סיסמת UNIX חדשה:"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "סיסמת UNIX (נוכחית):"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "שגיאה בזמן שינוי סיסמת NIS."
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "אתה חייב לבחור סיסמה ארוכה יותר"
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "הסיסמה הייתה כבר בשימוש. בחר אחרת."
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "אתה חייב לחכות יותר כדי לשנות את הסיסמה"
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "סליחה, הסיסמאות אינן מתאימות"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "בודק..."
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "האימות נכשל."
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "מסך ריק"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "אקראי"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "שעה %d"
 msgstr[1] "%d שעות"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "דקה %d"
 msgstr[1] "%d דקות"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -620,15 +620,15 @@ msgstr[1] "%d שניות"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -636,35 +636,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "אף פעם"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "לא ניתן להעלות את המנשק הראשי"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "אנא וודא ששומר המסך מותקן כיאות."
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "Don't become a daemon"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "Enable debugging code"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr ""
 
diff --git a/po/hi.po b/po/hi.po
index 7ee1339..0dc9787 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -20,60 +20,60 @@ msgstr ""
 "Language: hi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "स्क्रीनसेवर"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "अपना स्क्रीनसेवर पसंद सेट करें"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "स्क्रीनसेवर पूर्वावलोकन"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b> स्क्रीनसेवर पूर्वावलोकन</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "स्क्रीनसेवर पसंद"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "उर्जा प्रबंधन (_M)"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "पूर्वावलोकन (_P)"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "स्क्रीनसेवर थीम (_S):"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "कंप्यूटर को _idle के रूप में इसके बाद देखें:"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "स्क्रीनसेवर सक्रिय करें जब कंप्यूटर निष्क्रिय हो (_A)"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "जब सक्रीनसेवर सक्रिय हो तो स्क्रीन लॉक करें (_L)"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>चेतावनी: रूट उपयोक्ता के लिए स्क्रीन लॉक नहीं होगा.</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "स्क्रीनसेवरs"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "स्क्रीनसेवर थीम"
@@ -396,224 +396,224 @@ msgstr "%s एक वैध स्क्रीनसेवर थीम प्
 msgid "Copying file: %u of %u"
 msgstr "फाइल कॉपी कर रहा है: %u %u का"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "स्क्रीनसेवर के शांति से निकल जाने का कारण बना"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "स्क्रीनसेवर की स्थिति प्रश्नगत करें"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr "समय की लंबाई बताएं जबसे स्क्रीनसेवर के समय की लंबाई सक्रिय है"
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "स्क्रीन को तत्काल लॉक करने के लिए कार्यशील स्क्रीनसेवर प्रक्रिया कहता है"
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "यदि स्क्रीनसेवर सक्रिय है तब दूसरे आलेखीय डेमो पर जाएँ"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "स्क्रीनसेवर चालू करें (स्क्रीन खाली करें)"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "अगर स्क्रीनसेवर सक्रिय है तब इसे निष्क्रिय करें (स्क्रीन खाली करें)"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "उपयोक्ता क्रियाकलाप को सिमुलेट करने के लिये कार्यशील स्क्रीनसेवर आगे बढायें"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr "सक्रिय करने से स्क्रीनसेवर रोक रहा है.  बाधा सक्रिय रहने के दौरान कमांड खंड."
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr "स्क्रीनसेवर रोकने के लिये कॉलिंग अनुप्रयोग"
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr "स्क्रीनसेवर रोकने के लिये कारण"
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "इस अनुप्रयोग का संस्करण"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "%s स्क्रीनसेवर है\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "सक्रिय"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "निष्क्रिय"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr "The screensaver is not inhibited\n"
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr "The screensaver is being inhibited by:\n"
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr "स्क्रीनसेवर %d सेकेंड से सक्रिय रहा है.\n"
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr "यह स्क्रीन सेवर अभी सक्रिय नहीं है.\n"
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "डिबगिंग आउटपुट दिखायें"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "लॉगआउट बटन दिखायें"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "लॉगआउट बटन लाने के लिये कमांड"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "उपयोक्ता बदलें बटन दिखाएँ"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr "संवाद में दिखाने के लिए संदेश"
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "संदेश"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr "प्रयुक्त नहीं"
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "उपयोक्ता नाम:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "शब्दकूट: "
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr "आपको अपना पासवर्ड आवश्यक रूप से तत्काल बदलना होगा (पासवर्ड कालबाधित हो चुका है)."
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "आपको अपना पासवर्ड आवश्यक रूप से तत्काल बदलना होगा (रूट द्वारा बाध्य)"
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "आपका खाता खत्म हो गया है, कृपया अपने तंत्र प्रशासक से संपर्क करें"
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "कोई पासवर्ड नहीं दिया"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "पासवर्ड अपरिवर्तित"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "उपयोक्ता नाम नहीं मिला"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "नया यूनिक्स पासवर्ड दोबारा टाइप करें:"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "नया यूनिक्स पासवर्ड भरें:"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "(वर्तमान) यूनिक्स पासवर्ड:"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "एनआईएस पासवर्ड परिवर्तन के दौरान त्रुटि."
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "आपको अधिक लंबा पासवर्ड चुनना होगा"
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "पासवर्ड पहले ही उपयोग किया जा चुका है. अन्य चुनें."
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "अपने पासवर्ड को बदलने हेतु आपको अधिक इंतजार करना होगा"
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "क्षमा करें, पासवर्ड के जोड़ नहीं मिलते"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "जांच रहा है..."
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "सत्यापन असफल"
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "खाली स्क्रीन"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "बेतरतीब"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d घंटा"
 msgstr[1] "%d घंटा"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d मिनट"
 msgstr[1] "%d मिनट"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -622,15 +622,15 @@ msgstr[1] "%d सेकेंड"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -638,35 +638,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "कभी नहीं"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "मुख्य अंतरफलक लोड न कर सका"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "निश्चित करें कि स्क्रीनसेवर विधिवत अधिष्ठापित है"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "डेमॉन न होयें"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "डिबगिंग कोड सक्रिय करें"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr ""
 
diff --git a/po/hr.po b/po/hr.po
index d799951..f48389d 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -20,60 +20,60 @@ msgstr ""
 "Language: hr\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "Zaslonski čuvar"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "Postavi vlastite prilagodbe zaslonskog čuvara"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "Pregled zaslonskog čuvara"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>Pregled zaslonskog čuvara</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "Prilagodbe zaslonskog čuvara"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "Energetsko _upravljanje"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "_Pregled"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "_Tema zaslonskog čuvara:"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "Smatraj računalo u _mirovanju nakon:"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "_Pokreni zaslonskog čuvara kada je računalo u mirovanju"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "_Zaključaj zaslon kada je zaslonski čuvar djelatan"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>Upozorenje: zaslon neće biti zaključan za natkorisnika.</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "Zaslonski čuvari"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "Teme zaslonskog čuvara"
@@ -396,203 +396,203 @@ msgstr "%s se ne čini valjanom temom zaslonskog čuvara."
 msgid "Copying file: %u of %u"
 msgstr "Preslikavanje datoteke: %u od %u"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "Uzrokuje skladan izlaz zaslonskog čuvara"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "Provjeri stanje zaslonskog čuvara"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr "Provjeri koliko je dugo zaslonski čuvar bio djelatan"
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "Nalaže pokrenutom procesu zaslonskog čuvara da odmah zaključa zaslon"
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "Ako je čuvar zaslona djelatan, tada prebaci na drugu animaciju"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "Uključi zaslonskog čuvara (zatamni zaslon)"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "Ako je zaslonski čuvar djelatan, tada ga deaktiviraj (obnovi sliku na zaslonu)"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "Potakni djelatnog zaslonskog čuvara da oponaša korisničko djelovanje"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr "Onemogući pokretanje zaslonskog čuvara. Naredba sprječava dok je zabrana djelatna."
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr "Pozivna aplikacija koja onemogućuje zaslonskog čuvara"
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr "Razlog onemogućavanja zaslonskog čuvara"
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "Inačica ove aplikacije"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "Zaslonski čuvar je %s\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "djelatan"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "nedjelatan"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr "Zaslonski čuvar nije onemogućen\n"
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr "Zaslonski čuvar je onemogućen od strane:\n"
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr "Zaslonski čuvar je djelatan %d sekunda.\n"
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr "Zaslonski čuvar trenutno nije djelatan.\n"
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "Prikaži ispis uklanjanja grešaka"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "Prikaži odjavni gumb"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "Naredba koja se doziva odjavnim gumbom"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "Prikaži gumb za promjenu korisnika"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr "Poruka koju treba prikazati u dijaloškom okviru"
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "PORUKA"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr "Ne koristi se"
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "Korisničko ime:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "Zaporka:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr "Moraš odmah promijeniti svoju zaporku (zastarjela zaporka)"
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "Moraš odmah promijeniti svoju zaporku (zahtjev natkorisnika)"
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "Tvoj korisnički račun je istekao; molimo obrati se svome upravitelju sustava"
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "Zaporka nije dobavljena"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "Zaporka nepromijenjena"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "Nije moguće pribaviti korisničko ime"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "Ponovno utipkaj novu UNIX zaporku:"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "Unesi novu UNIX zaporku:"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "(trenutna) UNIX zaporka:"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "Greška pri promjeni NIS zaporke."
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "Moraš odabrati dužu zaporku"
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "Zaporka je već korištena. Odaberi drugu."
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "Moraš dulje pričekati za promjenu zaporke"
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "Nažalost, zaporke se ne podudaraju"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "Provjera..."
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "Ovjera nije uspjela."
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "Zatamnjeni zaslon"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "Nasumični izbor"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -600,14 +600,14 @@ msgstr[0] "%d sat"
 msgstr[1] "%d sata"
 msgstr[2] "%d sati"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -615,7 +615,7 @@ msgstr[0] "%d minuta"
 msgstr[1] "%d minute"
 msgstr[2] "%d minuta"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -625,15 +625,15 @@ msgstr[2] "%d sekunda"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -641,35 +641,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "Nikada"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "Nije bilo moguće učitati glavno sučelje"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "Molimo provjeri je li zaslonski čuvar pravilno instaliran"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "Nemoj postupati u pozadini"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "Omogući kod za uklanjanje grešaka"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr "Pokreni program zaslonskog čuvara i zaključavanja"
 
diff --git a/po/hu.po b/po/hu.po
index bd02b67..c3bcb4a 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -22,60 +22,60 @@ msgstr ""
 "Language: hu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "Képernyővédő"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "A képernyővédő tulajdonságainak beállítása"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "Képernyővédő előnézete"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>Képernyővédő előnézete</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "Képernyővédő tulajdonságai"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "_Energiakezelés"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "_Előnézet"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "Képernyő_védő-téma:"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "A számítógé_p üresjáratba kerül:"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "_Képernyővédő aktiválása üresjáratban"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "Képernyő _zárolása, ha a képernyővédő aktív"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>Figyelmeztetés: a képernyő nem kerül zárolásra a rendszergazda számára.</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "Képernyővédők"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "Képernyővédő-témák"
@@ -398,224 +398,224 @@ msgstr "A fájl (%s) nem tűnik érvényes képernyővédő témának."
 msgid "Copying file: %u of %u"
 msgstr "Fájl másolása: %u/%u"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "A képernyővédő „elegáns” bezárása"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "A képernyővédő állapotának lekérdezése"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr "Azon időtartam lekérdezése, amíg a képernyővédő aktív volt"
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "A futó képernyővédő-folyamatot kéri a képernyő azonnali zárolására"
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "Ha a képernyővédő aktív, akkor egy másik grafikus demóba váltson"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "Képernyővédő bekapcsolása (képernyő elsötétítése)"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "Ha a képernyővédő aktív, akkor deaktiválja (képernyő visszaállítása)"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "A futó képernyőkímélő szimuláljon felhasználói aktivitást"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr "A képernyővédő aktiválásának felfüggesztése. A parancs blokkolásra kerül, amíg a felfüggesztés aktív."
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr "A képernyővédőt felfüggesztő hívó alkalmazás"
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr "A képernyővédő felfüggesztésének oka"
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "Ezen alkalmazás verziója"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "A képernyővédő %s\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "aktív"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "inaktív"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr "A képernyővédő nincs korlátozva\n"
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr "A képernyővédőt korlátozza:\n"
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr "A képernyővédő %d másodpercig volt aktív.\n"
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr "A képernyővédő jelenleg nem aktív.\n"
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "Hibakeresési kimenet megjelenítése"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "Kijelentkezés gomb megjelenítése"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "A kijelentkezés gomb által meghívandó parancs"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "Felhasználóváltás gomb megjelenítése"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr "A párbeszédablakban megjelenítendő üzenet"
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "ÜZENET"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr "Nincs használatban"
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "Felhasználónév:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "Jelszó:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr "Azonnal meg kell változtatnia a jelszavát (a régi jelszó lejárt)"
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "Azonnal meg kell változtatnia a jelszavát (a rendszergazda kérése)"
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "Az Ön felhasználói fiókja lejárt; lépjen kapcsolatba a rendszergazdával"
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "Nincs jelszó megadva"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "A jelszó nem változott"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "A felhasználónév nem található"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "Adja meg ismét az új UNIX jelszót:"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "Adja meg az új UNIX jelszót:"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "(jelenlegi) UNIX jelszó:"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "Hiba a NIS jelszó módosítása közben."
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "Válasszon hosszabb jelszót"
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "A megadott jelszót már használta. Adjon meg egy másikat."
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "Még várnia kell a jelszó megváltoztatásával"
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "Sajnálom, a megadott jelszavak nem egyeznek meg"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "Ellenőrzés…"
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "A hitelesítés meghiúsult."
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "Üres képernyő"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "Véletlen"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d óra"
 msgstr[1] "%d óra"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d perc"
 msgstr[1] "%d perc"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -624,15 +624,15 @@ msgstr[1] "%d másodperc"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s.%s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s.%s.%s"
@@ -640,35 +640,35 @@ msgstr "%s.%s.%s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "Soha"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "A fő kezelőfelület nem tölthető be"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "Kérem győződjön meg arról, hogy a képernyővédő megfelelően telepítve van-e"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "Ne démonként fusson"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "Hibakeresési kód engedélyezése"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr "Képernyővédő és zároló program indítása"
 
diff --git a/po/hy.po b/po/hy.po
index c68eb59..abe7d1f 100644
--- a/po/hy.po
+++ b/po/hy.po
@@ -19,60 +19,60 @@ msgstr ""
 "Language: hy\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "Էկրանապահ"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "Սահմանել Ձեր Էկրանապահի նախընտրությունները"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "Էկրանապահի Նախադիտում"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>Էկրանապահի Նախադիտում</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "Էկրանապահի նախընտրություններ"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "Հզորության _Կառավարում"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "_Նախադիտել"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "_Էկրանապահ թեման։"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "Զննել համակարգիչը որպես  _պարապ հետո․"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "_Ակտիվացրեք Էկրանապահին, երբ համակարգիչը պարապ է"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "_Արգելափակել էկրանիը, երբ Էկրանապահ ակտիվ է"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>Զգուշացում․ էկրանը չի արգելափակվի արմատային օգտատիրոջ համար։</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "Էկրանապահ"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "Էկրանապահի թեմաներ"
@@ -395,224 +395,224 @@ msgstr "%s չի հայտնվում էկրանապահի վավեր թեմա լի
 msgid "Copying file: %u of %u"
 msgstr "Ֆայլի պատճենում : %u  %u"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "Հանգեցնում է Էկրանապահի նրբագեղորեն դուրս գալուն"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "Էկրանապահի վիճակի հարցում"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr "Էկրանապահի  ակտիվ եղած ժամանակի երկարության հարցում"
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "Հրամայում է գործարկել էկրանապահի գործընթացը անմիջապես արգելափակել էկրանը"
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "Եթե էկրանապահը ակտիվ է, ապա անցնել այլ գրաֆիկական ցուցադրության"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "Միացնել էկրանապահը (էկրանը դատարկ է)"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "Եթե էկրանապահը ակտիվ է, ապա ապաակտիվացնել այն (ոչ դատարկ էկրան)"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "Խառնել ընթացող էկրանապահը օգտագործողի գործունեության մոդելավորման համար"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr "Արգելակել Էկրանապահը ակտիվացնելու հետո։ Հրամանը փակվում է մինչ արգելակումը ակտիվ է։"
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr "Ծրագրի կանչ, որը արգելակում է էկրանապահը"
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr "էկրանապահի արգելափակման համար պատճառը"
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "Այս դիմումի տարբերակը"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr " Էկրանապահը %s է\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "Ակտիվ"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "Պասիվ"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr "Էկրանապահը չի խոչընդոտում\n"
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr "Էկրանապահը խոչընդոտվում է։\n"
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr "Էկրանապահը ակտիվ կլինի %d վարկյանից։\n"
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr "Էկրանապահը ներկայումս ակտիվ չէ։\n"
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "Ցույց տալ ելքը վրիպազերծելով"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "Ցույց տալ դուրս գալ կոճակը"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "Հրամանը գործարկել դուրս գալ համակարգից կոճակից հետո"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "Ցույց տալ օգտագործողին փոխանջատող կոճակը"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr "Հաղորդագրությունը ցույց տալ երկխոսությունում"
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "ՀԱՂՈՐԴԱԳՐՈՒԹՅՈՒՆ"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr "Չի օգտագործվել"
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "Օգտանուն։"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "Գաղտնաբառ։"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr "Ձեզնից պահանջվում է անմիջապես փոխել Ձեր գաղտնաբառը (գաղտնաբառը հնացած է)"
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "Ձեզնից պահանջվում է անմիջապես փոխել Ձեր գաղտնաբառը  (արմատը չիրագործվեց)"
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "Ձեր հաշիվը լրացել է. խնդրում ենք դիմել ձեր համակարգի ադմինիստրատորին"
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "Ոչ ապահովված գաղտնաբառ"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "Գաղտնաբառ անփոփոխ է"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "Հնարավոր չէ ստանալ օգտանունը"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "Հաստատեք նոր UNIX գաղտնաբառը։"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "Մուտքագրեք Նոր UNIX գաղտնաբառը։"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "(ընթացիկ) UNIX գաղտնաբառը:"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "Սխալ մինչ NIS գաղտնաբառի փոխարկումը։"
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "Դուք պետք է ընտրեք ավելի երկար գաղտնաբառ"
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "Գաղտնաբառ արդեն օգտագործված է։ Ընտրեք մեկ ուրիշը։"
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "Դուք պետք է ավելի երկար սպասեք Ձեր գաղտնաբառը փոխելու համար"
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "Ներեցեք, գաղտնաբառերը չեն համընկնում"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "Ստուգում..."
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "Նույնականացումը ձախողվեց."
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "Չգրառված էկրան"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "Պատահական"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d ժամ"
 msgstr[1] "%d ժամեր"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d րոպե"
 msgstr[1] "%d րոպեներ"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -621,15 +621,15 @@ msgstr[1] "%d վարկյաններ"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -637,35 +637,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "Երբեք"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "Չհաջողվեց բեռնել հիմնական ինտերֆեյսը"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "Խնդրում ենք համոզվեք, որ Էկրանապահը պատշաճ կերպով է տեղադրված"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "Չդարձնել օժանդակ ծրագիր"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "Ակտրվացնել ծածկագրի վրիպակազերծումը"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr "Գործարկել Էկրանապահը և արգելափակման ծրագիրը"
 
diff --git a/po/id.po b/po/id.po
index f93ba07..2c4c6b2 100644
--- a/po/id.po
+++ b/po/id.po
@@ -23,60 +23,60 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "Screensaver"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "Tentukan setingan screensaver Anda"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "Preview Screensaver"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>Preview screensaver</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "Setingan Screensaver"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "_Manajemen Daya"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "_Preview"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "Tema _screensaver:"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "Anggap komputer menganggur _setelah:"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "_Aktifkan screensaver ketika komputer menganggur"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "Kunci _layar ketika screensaver aktif"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>Peringatan: layar tidak akan terkunci untuk pengguna root.</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "Screensaver"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "Tema screensaver"
@@ -399,222 +399,222 @@ msgstr "%s sepertinya bukan merupakan tema screensaver yang valid."
 msgid "Copying file: %u of %u"
 msgstr "Menyalin berkas: %u dari %u"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "Menyebabkan screensaver keluar dengan baik"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "Query bagian dari screensaver"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr "Simpan lama aktif dari screensaver "
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "Meminta proses screensaver untuk mengunci layar dengan segera"
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "Screensaver aktif dan pindah ke demo grafis yang lain"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "Hidupkan screensaver (kosongkan layar)"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "Screensavernya aktif dan kemudian dinonaktifkan (tidak kosongkan layar)"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "Colek screensaver yang berjalan untuk menyimulasikan aktivitas pengguna"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr "Halangi screensaver dari pengaktifan. Perintah yang diblok ketika penghalangan aktif."
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr "Aplikasi yang menghalangi screensaver"
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr "Alasan penghalangan screensaver"
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "Versi dari aplikasi ini"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "Screensaver adalah %s\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "aktif"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "tidak aktif"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr "Screensaver tidak dihalangi ⏎\n"
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr "Screensaver dihalangi oleh :⏎\n"
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr "Screensaver sudah aktif selama %d detik.⏎\n"
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr "Screensaver sedang tidak aktif.\n"
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "Tampilkan hasil pencarian kesalahan"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "Tampilkan tombol keluar"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "Perintah untuk dilaksanakan dari tombol keluar"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "Tampilkan tombol pindah pengguna"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr "Pesan yang ditampilkan pada dialog"
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "PESAN"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr "Tidak digunakan"
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "Pengguna:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "Kata sandi:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr "Anda diharuskan mengganti kata sandi Anda sekarang (kata sandi sudah usang)"
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "Anda diharuskan mengganti kata sandi Anda segera (root·enforced)"
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "Account Anda sudah kadaluarsa, silahkan hubungi system administrator Anda"
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "Tidak ada kata sandi diberikan"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "Kata sandi tidak berubah"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "Tidak mendapatkan nama pengguna"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "Ketik ulang kata sandi UNIX baru:"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "Berikan kata sandi UNIX baru:"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "Kata sandi UNIX (saat ini):"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "Kesalahan ketika mengganti kata sandi NIS."
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "Anda harus memilih kata sandi lebih panjang"
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "Kata sandi sudah dipergunakan. Pilih yang lain."
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "Anda harus menunggu lebih lama untuk mengganti kata sandi"
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "Maaf, kata sandi tidak cocok"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "Memeriksa..."
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "Autentikasi gagal."
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "Layar kosong"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "Acak"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d jam"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d menit"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -622,15 +622,15 @@ msgstr[0] "%d detik"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -638,35 +638,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "Tidak pernah"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "Tidak dapat memuat antarmuka utama"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "Coba pastikan bahwa screensaver telah terpasang dengan benar"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "Jangan menjadi daemon"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "Aktifkan kode pencarian kesalahan"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr "Luncurkan program screensaver dan pengunci."
 
diff --git a/po/is.po b/po/is.po
index 7f3f024..0ffd94d 100644
--- a/po/is.po
+++ b/po/is.po
@@ -19,60 +19,60 @@ msgstr ""
 "Language: is\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "Skjáhvíla"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "Stilltu valmöguleika fyrir skjávhvíluna"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "Skjáhvíluforsýn"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>Skjáhvíluforsýn</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "Skjáhvíluvalmöguleikar"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "_Orkustjórnun"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "_Forsýning"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "_Skjáhvíluásýnd"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "Líta á tölvuna sem _iðjulausa eftir:"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "_Virkja skjáhvílu þegar tölva er iðjulaus"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "_Læsa skjá þegar skjáhvíla er í gangi"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>Varúð: Skjánum verður ekki læst fyrir rótarnotanda.</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "Skjáhvílur"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "Ásýnd skjáhvílu"
@@ -395,224 +395,224 @@ msgstr "%s virðist ekki vera gilt skjáhvíluþema."
 msgid "Copying file: %u of %u"
 msgstr "Afrita skrá: %u af %u"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "Veldur því að skjáhvílan hættir með sæmd"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "Senda fyrirspurn um stöðu skjáhvílu"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr "Senda fyrirspurn um tíma sem skjáhvílan hefur verið virk"
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "Skipa núverandi skjáhvílu að læsa skjánum strax"
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "Ef skjáhvílan er virk skipta þá yfir í aðra grafíska sýningu"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "Kveikja á skjáhvílu (tæma skjáinn)"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "Ef skjáhvíla er virk, afvirkja hann þá"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "Ýta í skjáhvíluna til að það virðist vera notenda virkni"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr "Hindra skjáhvíluna frá því að virkjast. Skipun rofin á meðan hindrun er virk."
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr "Kallandi forritið sem hindrar skjáhvíluna"
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr "Ástæðan fyrir hindrun skjáhvílunar"
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "Útgáfa þessa forrits"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "Skjáhvílan er %s\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "í notkun"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "ekki í notkun"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr "Skjáhvílan er ekki virkjuð\n"
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr "Skjáhvílan er virkjuð af:\n"
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr "Skjáhvílan hefur verið virk í %d sekúndur.\n"
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr "Skjáhvílan er ekki virk.\n"
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "Sýna aflúsunar útgang"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "Sýna útskráningarhnapp"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "Skipun sem á að keyra með útskráningarhnapp"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "Sýna notendaskiptahnapp"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr "Skilaboð til að sýna í svarglugga"
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "SKILABOÐ"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr "Ekki notað"
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "Notandanafn:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "Lykilorð:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr "Þú verður að breyta lykilorðinu þínu umsvifalaust (það er orðið of gamallt)"
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "Þú verður að breyta lykilorðinu þínu umsvifalaust (rótarskipun)"
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "Aðgangur þinn er útrunninn; vinsamlegast hafðu samband við kerfisstjóra"
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "Ekkert lykilorð gefið"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "Lykilorð óbreytt"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "Get ekki notað notandanafn"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "Sláðu aftur inn nýja UNIX lykilorðið:"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "Sláðu inn nýtt UNIX lykilorð:"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "(núverandi) UNIX lykilorð:"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "Villa kom upp við breytingu á NIS lykilorði."
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "Þú verður að velja lengra lykilorð"
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "Þú hefur notað þetta lykilorð áður. Vinsamlegast veldu annað."
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "Þú verður að bíða lengur til þess að breyta lykilorðinu þínu"
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "Afsakið, lykilorðin passa ekki saman"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "Skoða..."
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "Auðkenning tókst ekki."
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "Tómur skrár"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "Slembið"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d klukkutími"
 msgstr[1] "%d klukkutímar"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d mínúta"
 msgstr[1] "%d mínútur"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -621,15 +621,15 @@ msgstr[1] "%d sekúndur"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -637,35 +637,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "Aldrei"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "Gat ekki hlaðið aðalviðmót"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "Vinsamlegast gangið úr skugga um að skjáhvíla sé rétt uppsett"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "Ekki verða að þjónustu"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "Virkja aflúsunarham"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr "Ræsa skjáhvílu og læsingarforrit"
 
diff --git a/po/it.po b/po/it.po
index df2f89b..a4ffe7c 100644
--- a/po/it.po
+++ b/po/it.po
@@ -21,60 +21,60 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "Salvaschermo"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "Imposta le preferenze del salvaschermo"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "Anteprima del salvaschermo"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>Anteprima del salvaschermo</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "Preferenze del salvaschermo"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "_Gestione alimentazione"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "Ante_prima"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "Tema del _salvaschermo:"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "C_onsiderare il computer come inattivo dopo:"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "_Avviare il salvaschermo quando il computer è inattivo"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "_Bloccare lo schermo quando il salvaschermo viene avviato"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>Attenzione: lo schermo non verrà bloccato per l'utente root.</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "Salvaschermo"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "Temi del salvaschermo"
@@ -397,224 +397,224 @@ msgstr "Sembra che «%s» non sia un tema di salvaschermo valido."
 msgid "Copying file: %u of %u"
 msgstr "Copia del file: %u di %u"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "Causa l'uscita non forzosa del salvaschermo"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "Interroga lo stato del salvaschermo"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr "Interroga l'intervallo di tempo di esecuzione del salvaschermo"
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "Comunica al processo salvaschermo in esecuzione di bloccare immediatamente lo schermo"
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "Se il salvaschermo è in esecuzione passa ad altra demo grafica"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "Avvia il salvaschermo (blanking dello schermo)"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "Se il salvaschermo è in esecuzione lo arresta (unblanking dello schermo)"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "Simula al salvaschermo in esecuzione una segnalazione di attività utente"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr "Inibisce l'avvio del salvaschermo. I comandi sono bloccati mentre l'inibizione è attiva."
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr "L'applicazione chiamante che sta inibendo il salvaschermo"
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr "Il motivo dell'inibizione del salvaschermo"
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "Versione di questa applicazione"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "Il salvaschermo è %s\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "in esecuzione"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "arrestato"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr "Il salvaschermo non è inibito\n"
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr "Il salvaschermo sta per essere inibito da:\n"
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr "Il salvaschermo è stato in esecuzione per %d secondi.\n"
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr "l salvaschermo non è attivo al momento.\n"
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "Mostra l'outptut di debug"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "Mostra il pulsante per terminare la sessione"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "Comando da invocare col pulsante di termine sessione"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "Mostra il pulsante cambia utente"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr "Messaggio da mostrare nel dialogo"
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "MESSAGGIO"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr "Non usato"
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "Nome utente:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "Password:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr "È necessario cambiare immediatamente la propria password (password scaduta)"
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "È necessario cambiare immediatamente la propria password (imposto da root)"
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "Il proprio account è scaduto; contattare l'amministratore di sistema"
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "Nessuna password fornita"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "Password non cambiata"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "Impossibile ottenere il nome utente"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "Digitare di nuovo la nuova password UNIX:"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "Inserire la nuova password UNIX:"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "Password UNIX (attuale):"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "Errore durante il cambiamento della password NIS."
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "È necessario scegliere una password più lunga."
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "La password è stata già usata. Sceglierne un'altra."
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "È necessario attendere ancora prima di poter cambiare la propria password"
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "Le password non corrispondono"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "Controllo..."
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "Autenticazione non riuscita."
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "Schermo vuoto"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "Casuale"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d ora"
 msgstr[1] "%d ore"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minuti"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -623,15 +623,15 @@ msgstr[1] "%d secondi"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s e %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s, %s e %s"
@@ -639,35 +639,35 @@ msgstr "%s, %s e %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "Mai"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "Impossibile caricare l'interfaccia principale"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "Assicurarsi che il salvaschermo sia installato in modo corretto"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "Non diventare un demone"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "Abilitare il codice di debug"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr "Lancia il programma per salvaschermo e per blocco schermo"
 
diff --git a/po/ja.po b/po/ja.po
index 7b357db..10cfa0f 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -21,60 +21,60 @@ msgstr ""
 "Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "スクリーンセーバー"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "お使いのスクリーンセーバーを設定します"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "スクリーンセーバーのプレビュー"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>スクリーンセーバーのプレビュー</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "スクリーンセーバーの設定"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "電源管理(_M)"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "プレビュー(_P)"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "スクリーンセーバーのテーマ(_S):"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "アイドル状態になるまでの時間(_I):"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "アイドル状態になったらスクリーンセーバーを起動する(_A)"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "スクリーンセーバーを起動したら画面をロックする(_L):"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>注意: root ユーザの場合、スクリーンはロックされないので注意して下さい</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "いろいろなスクリーンセーバーを格納するフォルダ"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "スクリーンセーバーのテーマ"
@@ -397,222 +397,222 @@ msgstr "%s はスクリーンセーバーとして妥当なテーマではない
 msgid "Copying file: %u of %u"
 msgstr "ファイルのコピー中: %u / %u"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "スクリーンセーバーを強制終了する"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "スクリーンセーバーの状態を問い合わせる"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr "スクリーンセーバーが起動するしている時間を問い合わせる"
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "起動中のスクリーンセーバーに今すぐ画面をロックさせる"
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "スクリーンセーバーが起動されていたら別のグラフィックスデモに切り替える"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "スクリーンセーバーを有効にする (ブランクスクリーン)"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "有効になっているスクリーンセーバーを無効にする (ブランクスクリーン解除)"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "ユーザが設定できる機能を模擬するためにスクリーンセーバーをランダムに実行する"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr "スクリーンセーバーの起動を抑制する (これが有効な場合はコマンドが無視される)"
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr "スクリーンセーバーを抑止するアプリケーションを呼び出す"
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr "スクリーンセーバーを抑止するための理由を指定する"
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "このアプリケーションのバージョンを表示する"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "スクリーンセーバーは%s\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "起動されています"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "起動されていません"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr "スクリーンセーバーは無効になっていません\n"
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr "次のアプリがスクリーンセーバーを無効にしています:\n"
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr "スクリーンセーバーは %d 秒間起動されています\n"
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr "スクリーンセーバーは現在、有効になっていません。\n"
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "デバッグ出力を表示する"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "ログアウトボタンを表示する"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "ログアウトボタンから呼び出すコマンド"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "ログアウトボタンを表示する"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr "ダイアログに表示するメッセージ"
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "MESSAGE"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr "未使用"
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "ユーザ名:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "パスワード:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr "今すぐパスワードの変更が必要です (パスワードは期限切れです)"
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "今すぐパスワードの変更が必要です (管理者が強制しています)"
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "お使いのアカウントは期限切れです; システム管理者に問い合わせて下さい"
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "パスワードを指定していません"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "パスワードは変更されていません"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "ユーザ名を取得できません"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "(確認) 新しい UNIX パスワード:"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "新しい UNIX パスワード:"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "(現在の) UNIX パスワード:"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "NIS パスワードを変更する際にエラー"
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "もっと長いパスワードを選択して下さい"
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "既にパスワードは使用されているので別のものを選択して下さい"
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "パスワードを変更するまで待たなければなりません"
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "すみませんが、パスワードが一致しません"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "確認中..."
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "認証に失敗しました"
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "ブランクスクリーン"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "ランダム"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d時間"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d分"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -620,15 +620,15 @@ msgstr[0] "%d秒"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -636,35 +636,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "しない"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "Glade インタフェースを読み込めませんでした"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
-msgstr "mate-screensaver が正しくインストールされているか確認して下さい。"
+msgstr "xfce4-screensaver が正しくインストールされているか確認して下さい。"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "デーモン化しない"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "デバッグモードにする"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr "スクリーンセーバーとロックするプロラグラムを起動"
 
diff --git a/po/ka.po b/po/ka.po
index 6764b2d..ed8d0b8 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -18,60 +18,60 @@ msgstr ""
 "Language: ka\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "ეკრანმზოგი"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "ეკრანმზოგის პარამეტრების მითითება"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "ეკრანმზოგის გადახედვა"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>ეკრანმზოგის გადახედავ</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "ეკრანმზოგის პარამეტრები"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "დენის ?მართვა"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "გა_დახედვა"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "ეკრანმზოგი_ს გაფორმება:"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "_ეკრანმზოგის გააქტიურება, როცა სისტემა უქმ რეჟიმშია"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "_ეკრანის გამორთვა, როცა ეკრანმზოგი აქტიურია"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>ეკრანი არ დაიბლოკება root მომხმარებლისთვის.</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "ეკრანმზოგები"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "ეკრანმზოგის გაფორმების თემები"
@@ -394,222 +394,222 @@ msgstr ""
 msgid "Copying file: %u of %u"
 msgstr "ფაილის კოპირება: %u - %u"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "ეკრანმზოგის გრაციოზული დახურვა"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "ეკრანმზოგის მდგომარეობა"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "ეკრანმზოგის მიერ ეკრანის დაუყოვნებლივ ბლოკირება"
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "სხვა სურათზე გადასვლა, თუ ეკრანმზოგი ჩართულია"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "ეკრანმზოგის ჩართვა (ეკრანის გასუფთავება)"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "ეკრანმზოგის დახურვა (ეკრანის აღდგენა)"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "ეკრანმზოგის მიერ მომხმარებლის აქტივობის სიმულირება"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "პროგრამის ვერსია"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "ეკრანმზოგი: %s\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "აქტიური"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "არააქტიური"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "გამართვის გამონატანის ჩვენება"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "სესიის დახურვის ღილაკის ჩვენება"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "ბრძანება, რომელიც გაიშვება დახურვის ღილაკით"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "მომხმარებლის გადართვის ღილაკის ჩვენება"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr ""
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr ""
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "სუფთა ეკრანი"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "შემთხვევითი"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d საათი"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d წუთი"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -617,15 +617,15 @@ msgstr[0] "%d წამი"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -633,35 +633,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "არასოდეს"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "მთავარი ინტერფეისი არ იტვირთება"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "შეამოწმეთ, არის თუ არა ეკრანმზოგი სწორად დაყენებული"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "ნუ გაეშმაკდი მთლათ :)"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "გამართვის გამონატანი კოდის ჩართვა"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr ""
 
diff --git a/po/kk.po b/po/kk.po
index 80901b6..55e7f39 100644
--- a/po/kk.po
+++ b/po/kk.po
@@ -18,60 +18,60 @@ msgstr ""
 "Language: kk\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "Экран қорғауышы"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "Экран қорғауышы баптауларын орнатыңыз"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "Экран қорғауышын алдын-ала қарау"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>Экран қорғауышын алдын-ала қарау</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "Экран қорғауышы баптаулары"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "Эл. қореқті _басқару"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "А_лдын-ала қарау"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "_Экран қорғауышы темасы:"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr ""
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr ""
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr ""
@@ -394,222 +394,222 @@ msgstr ""
 msgid "Copying file: %u of %u"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "Осы бағдарламасының нұсқасы"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "Белсендi"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "Белсендi емес"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "ХАБАРЛАМА"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr "Қолданылмайды"
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "Пайдаланушы:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "Пароль:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "Пароль көрсетілмеген"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "Пароль өзгертілмеді"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "Пайдаланушы атын алу мүмкін емес"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "Жаңа UNIX паролін қайта теріңіз:"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "Жаңа UNIX паролін енгізіңіз:"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "(ағымдағы) UNIX паролі:"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "NIS паролін өзгерту кезіндегі қате."
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "Ұзағырақ парольді таңдауыңыз керек"
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "Пароль жақында қолданылған болып тұр. Басқасын таңдаңыз."
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "Пароліңізді ауыстыру үшін ұзағырақ күтуіңіз керек."
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "Кешіріңіз, парольдер өзара сәйкес келмейді"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "Тексеру..."
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "Аутентификация сәтсіз аяқталды."
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr ""
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "Кездейсоқ"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d сағат"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d минут"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -617,15 +617,15 @@ msgstr[0] "%d секунд"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -633,35 +633,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "Ешқашан"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr ""
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr ""
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr ""
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "Жөндеу кодын іске қосу"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr ""
 
diff --git a/po/kn.po b/po/kn.po
index 9104ae9..e023c9d 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -18,60 +18,60 @@ msgstr ""
 "Language: kn\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "ಸ್ಕ್ರೀನ್‌ಸೇವರ್"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "ನಿಮ್ಮ ಸ್ಕ್ರೀನ್‌ಸೇವರ್ ಆದ್ಯತೆಗಳನ್ನು ಅಣಿಗೊಳಿಸಿ"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "ಸ್ಕ್ರೀನ್‌ಸೇವರ್ ಮುನ್ನೋಟ"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>ಸ್ಕ್ರೀನ್‌ಸೇವರ್ ಮುನ್ನೋಟ</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "ಸ್ಕ್ರೀನ್‌ಸೇವರ್ ಆದ್ಯತೆಗಳು"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "ವಿದ್ಯುಚ್ಛಕ್ತಿ ನಿರ್ವಹಣೆ(_M)"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "ಮುನ್ನೋಟ(_P)"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "ಸ್ಕ್ರೀನ್‌ಸೇವರ್ ಥೀಮ್(_S):"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "ಈ ಸಮಯದ ನಂತರ ಗಣಕಕ್ಕೆ ಕೆಲಸವಿಲ್ಲ ಎಂದು ಪರಿಗಣಿಸು(_i):"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "ಗಣಕಕ್ಕೆ ಕೆಲಸವಿಲ್ಲದೆ ಇದ್ದಾಗ ಸ್ಕ್ರೀನ್‌ಸೇವರ್ ಅನ್ನು ಸಕ್ರಿಯಗೊಳಿಸು(_A)"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "ಸ್ಕ್ರೀನ್‌ಸೇವರ್ ಸಕ್ರಿಯವಾಗಿದ್ದಾಗ ತೆರೆಯನ್ನು ಲಾಕ್ ಮಾಡು(_L)"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>ಎಚ್ಚರಿಕೆ: ಮೂಲದ ಬಳಕೆದಾರರಿಗೆ ತೆರೆಯು ಲಾಕ್ ಮಾಡಲ್ಪಡುವುದಿಲ್ಲ.</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "ಸ್ಕ್ರೀನ್‌ಸೇವರುಗಳು"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "ಸ್ಕ್ರೀನ್‌ಸೇವರ್ ಥೀಮ್‌ಗಳು"
@@ -394,222 +394,222 @@ msgstr "%s ವು ಒಂದು ಮಾನ್ಯವಾದ ಸ್ಕ್ರೀನ್
 msgid "Copying file: %u of %u"
 msgstr "ಕಡತವನ್ನು ಕಾಪಿ ಮಾಡಲಾಗುತ್ತಿದೆ: %u, (%u ಯಲ್ಲಿ)"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "ಸ್ಕ್ರೀನ್‌ಸೇವರ್ ಅನ್ನು ಆಕರ್ಷಕವಾಗಿ ನಿರ್ಗಮಿಸುವಂತೆ ಮಾಡುತ್ತದೆ"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "ಸ್ಕ್ರೀನ್‌ಸೇವರಿನ ಸ್ಥಿತಿಗಾಗಿ ಮನವಿ ಸಲ್ಲಿಸಿ"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr "ಸ್ಕ್ರೀನ್‌ಸೇವರ್ ಸಕ್ರಿಯವಾಗಿರಬೇಕಿರುವ ಸಮಯಕ್ಕಾಗಿ ಮನವಿಸಲ್ಲಿಸಿ"
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "ಚಾಲನೆಯಲ್ಲಿರುವ ಸ್ಕ್ರೀನ್‌ಸೇವರ್ ಪ್ರಕ್ರಿಯೆಗೆ ತಕ್ಷಣವೆ ತೆರೆಯನ್ನು ಲಾಕ್ ಮಾಡುವಂತೆ ತಿಳಿಸುತ್ತದೆ"
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "ಸ್ಕ್ರೀನ್‌ಸೇವರ್ ಸಕ್ರಿಯವಾಗಿದ್ದರೆ ಬೇರೊಂದು ಗ್ರಾಫಿಕ್ಸ್‍ ಡೆಮೋಗೆ ಬದಲಾಯಿಸು"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "ಸ್ಕ್ರೀನ್‌ಸೇವರ್ ಅನ್ನು ಆನ್ ಮಾಡು (ತೆರೆಯನ್ನು ಖಾಲಿಯಾಗಿ ಇರಿಸು)"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "ಸ್ಕ್ರೀನ್‌ಸೇವರ್ ಸಕ್ರಿಯವಾಗಿದ್ದರೆ ಅದನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸು (ತೆರೆಯನ್ನು ಖಾಲಿಯಾಗಿ ಇರಿಸಬೇಡ)"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "ಚಲಾಯಿತಗೊಳ್ಳುತ್ತಿರುವ ಸ್ಕ್ರೀನ್‌ಸೇವರ್ ಅನ್ನು ಬಳಕೆದಾರರ ಕಾರ್ಯದಲ್ಲಿ ಹೊಂದಿಕೊಂಡಿರುವಂತೆ ಮಾಡು"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr "ಸ್ಕ್ರೀನ್‌ಸೇವರ್ ಅನ್ನು ಸಕ್ರಿಯಗೊಳ್ಳದಂತೆ ತಡೆಹಿಡಿ.  ತಡೆಯೊಡ್ಡುವಿಕೆಯು ಸಕ್ರಿಯಗೊಂಡಿದ್ದಾಗ ಆಜ್ಞೆಯು ನಿರ್ಬಂಧಿಸುತ್ತದೆ."
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr "ಸ್ಕ್ರೀನ್‌ಸೇವರ್ ಅನ್ನು ತಡೆಯತ್ತಿರುವ ಕರೆ ಮಾಡುವ ಅನ್ವಯ"
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr "ಸ್ಕ್ರೀನ್‌ಸೇವರ್ ಅನ್ನು ತಡೆಯಲು ಕಾರಣ"
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "ಈ ಅನ್ವಯದ ಆವೃತ್ತಿ"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "ಸ್ಕ್ರೀನ್‌ಸೇವರ್ %s ಆಗಿದೆ\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "ಸಕ್ರಿಯ"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "ನಿಷ್ಕ್ರಿಯ"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr "ಸ್ಕ್ರೀನ್‌ಸೇವರ್ ಅನ್ನು ತಡೆಯಲಾಗುತ್ತಿಲ್ಲ\n"
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr "ಸ್ಕ್ರೀನ್‌ಸೇವರ್ ಅನ್ನು ಇದು ತಡೆಯುತ್ತಿದೆ:\n"
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr "ಸ್ಕ್ರೀನ್‌ಸೇವರ್ %d ಸೆಕೆಂಡುಗಳ ಕಾಲ ಸಕ್ರಿಯವಾಗಿತ್ತು.\n"
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr "ಸ್ಕ್ರೀನ್‌ಸೇವರ್ ಪ್ರಸಕ್ತ ಸಕ್ರಿಯವಾಗಿಲ್ಲ.\n"
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "ದೋಷನಿವಾರಣಾ ಔಟ್‌ಪುಟ್ ಅನ್ನು ತೋರಿಸು"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "ನಿರ್ಗಮಿಸುವ ಗುಂಡಿಯನ್ನು ತೋರಿಸು"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "ನಿರ್ಗಮಿಸುವ ಗುಂಡಿಯಿಂದ ಕೋರಿಕೆ ಸಲ್ಲಿಸಬೇಕಿರುವ ಆಜ್ಞೆ"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "ಬಳಕೆದಾರರನ್ನು ಬದಲಾಯಿಸುವ ಗುಂಡಿಯನ್ನು ತೋರಿಸು"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr "ಸಂವಾದದಲ್ಲಿ ತೋರಿಸಬೇಕಿರುವ ಸಂದೇಶ"
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "MESSAGE"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr "ಬಳಸದೆ ಇರುವ"
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "ಬಳಕೆದಾರ ಹೆಸರು:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "ಗುಪ್ತಪದ:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr "ನೀವು ಈ ಕೂಡಲೆ ನಿಮ್ಮ ಗುಪ್ತಪದವನ್ನು ಬದಲಾಯಿಸುವ ಅಗತ್ಯವಿದೆ (ಗುಪ್ತಪದ ಹಳತಾಗಿದೆ)"
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "ನೀವು ಈ ಕೂಡಲೆ ನಿಮ್ಮ ಗುಪ್ತಪದವನ್ನು ಬದಲಾಯಿಸುವ ಅಗತ್ಯವಿದೆ (ಮೂಲದಿಂದ ಒತ್ತಾಯಿತಗೊಂಡ)"
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "ನಿಮ್ಮ ಖಾತೆಯು ವಾಯಿದೆಯು ಮುಗಿದಿದೆ; ದಯವಿಟ್ಟು ನಿಮ್ಮ ಗಣಕ ವ್ಯವಸ್ಥಾಪಕರನ್ನು ಸಂಪರ್ಕಿಸಿ"
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "ಯಾವುದೆ ಗುಪ್ತಪದವನ್ನು ಒದಗಿಸಲಾಗಿಲ್ಲ"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "ಗುಪ್ತಪದವನ್ನು ಬದಲಾಯಿಸಲಾಗಿಲ್ಲ"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "ಬಳಕೆದಾರ ಹೆಸರನ್ನು ಪಡೆಯಲಾಗಿಲ್ಲ"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "ಹೊಸ UNIX ಗುಪ್ತಪದವನ್ನು ಇನ್ನೊಮ್ಮೆ ನಮೂದಿಸಿ:"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "ಹೊಸ UNIX ಗುಪ್ತಪದವನ್ನು ನಮೂದಿಸಿ:"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "(ಪ್ರಸಕ್ತ) UNIX ಗುಪ್ತಪದ:"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "NIS ಗುಪ್ತಪದವನ್ನು ಬದಲಾಯಿಸುವಾಗ ದೋಷ ಉಂಟಾಗಿದೆ."
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "ನೀವು ದೊಡ್ಡದಾದ ಗುಪ್ತಪದವನ್ನು ಬಳಸಬೇಕು"
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "ಗುಪ್ತಪದವು ಈಗಾಗಲೆ ಬಳಸಲಾಗಿದೆ. ಬೇರೊಂದನ್ನು ಆರಿಸಿ."
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "ಗುಪ್ತಪದವನ್ನು ಬದಲಾಯಿಸಲು ನೀವು ಇನ್ನಷ್ಟು ಹೊತ್ತು ಕಾಯಬೇಕು"
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "ಕ್ಷಮಿಸಿ, ಗುಪ್ತಪದಗಳು ತಾಳೆಯಾಗುವುದಿಲ್ಲ"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "ಪರಿಶೀಲಿಸಲಾಗುತ್ತಿದೆ..."
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "ದೃಢಿಕರಣವು ವಿಫಲಗೊಂಡಿದೆ."
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "ಖಾಲಿ ತೆರೆ"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "ಮನಸ್ಸಿಗೆ ಬಂದಂತೆ"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -617,15 +617,15 @@ msgstr[0] ""
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -633,35 +633,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "ಎಂದೂ ಬೇಡ"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "ಮುಖ್ಯ ಸಂಪರ್ಕ ಸಾಧನವನ್ನು ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "ಸ್ಕ್ರೀನ್‌ಸೇವರ್ ಸರಿಯಾಗಿ ಅನುಸ್ಥಾಪಿತಗೊಂಡಿದೆ ಎಂದು ದಯವಿಟ್ಟು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "ಒಂದು ಡೆಮನ್ ಆಗಬೇಡ"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "ದೋಷನಿವಾರಣಾ ಸಂಜ್ಞೆಯನ್ನು ಶಕ್ತಗೊಳಿಸು"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr ""
 
diff --git a/po/ko.po b/po/ko.po
index 8858107..0907389 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -24,60 +24,60 @@ msgstr ""
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "화면 보호기"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "화면 보호기를 설정합니다"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "화면 보호기 미리 보기"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>화면 보호기 미리 보기</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "화면 보호기 기본 설정"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "전원 관리(_M)"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "미리 보기(_P)"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "화면 보호기 테마(_S):"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "다음 시간이 지나면 입력 없는 상태로 취급(_I):"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "입력이 없는 상태일 때 화면 보호기 켜기(_A)"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "화면 보호기가 켜지면 화면 잠그기(_L)"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>경고: 루트 사용자의 경우에는 화면을 잠그지 않습니다.</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "화면 보호기"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "화면 보호기 테마"
@@ -400,222 +400,222 @@ msgstr "%s 파일은 올바른 화면 보호기 테마가 아닌 것 같습니
 msgid "Copying file: %u of %u"
 msgstr "파일 복사 중: %2$u개 중 %1$u개"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "화면 보호기를 정상적으로 끝냅니다"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "화면 보호기의 상태를 알아봅니다"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr "화면 보호기가 얼마나 오랜 시간동안 동작하고 있었는지 알아봅니다"
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "실행 중인 화면 보호기 프로세스에게 바로 화면을 잠그도록 합니다"
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "화면 보호기가 실행중이면, 다른 화면이 시작하도록 합니다"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "화면 보호기를 켭니다(빈 화면)"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "화면 보호기가 실행중이면 화면보호기를 끕니다"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "실행 중인 화면 보호기를 건드려 사용자가 동작을 흉내냅니다"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr "화면 보호기 동작을 막습니다.  해당 명령이 동작하는 동안 활성화되지 않습니다."
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr "화면 보호기 동작을 막는 프로그램 지정"
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr "화면 보호기를 막는 이유"
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "이 프로그램의 버전"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "화면 보호기는 %s 입니다\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "활성화"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "비활성화"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr "화면 보호기 동작을 막지 않았습니다\n"
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr "화면 보호기 동작을 다음 요소가 막고 있습니다:\n"
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr "화면 보호기가 %d초 동안 동작하고 있었습니다.\n"
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr "화면 보호기를 사용하지 않고 있습니다.\n"
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "디버깅 출력 보기"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "로그아웃 단추 보이기"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "로그아웃 단추를 누를 때 실행할 명령"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "사용자 전환 단추 보이기"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr "대화 상자에 보여줄 메시지"
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "<메시지>"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr "사용하지 않음"
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "사용자 이름:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "암호:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr "즉시 암호를 바꿔야 합니다(암호가 오래됨)"
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "즉시 암호를 바꿔야 합니다(루트가 강제로 지정)"
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "암호가 만료되었습니다. 시스템 관리자에게 연락하십시오"
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "암호를 입력하지 않았습니다"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "암호를 바꾸지 않았습니다"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "사용자 이름을 얻을 수 없습니다"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "새 유닉스 암호를 다시 입력하십시오:"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "새 유닉스 암호를 입력하십시오:"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "(현재) 유닉스 암호:"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "NIS 암호를 바꾸는 데 오류가 발생했습니다."
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "더 긴 암호를 사용해야 합니다"
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "암호를 이미 사용했습니다. 다른 암호를 사용하십시오."
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "암호를 바꾸려면 좀 더 기다려야 합니다"
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "암호가 일치하지 않습니다"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "확인하는 중..."
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "인증이 실패했습니다."
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "빈 화면"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "아무거나"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d시간"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d분"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -623,15 +623,15 @@ msgstr[0] "%d초"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -639,35 +639,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "사용 안함"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "주 인터페이스를 불러올 수 없습니다"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "화면 보호기를 올바로 설치하십시오"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "데몬이 되지 않았습니다"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "디버깅 코드 사용"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr "화면 보호기 및 잠금 프로그램 실행"
 
diff --git a/po/ku.po b/po/ku.po
index d4bbded..ebaa4ab 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -19,60 +19,60 @@ msgstr ""
 "Language: ku\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "Dîmenderparêz"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "Vebijêrkên dîmenderparezê mîheng bike"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "Vebijêrkên Dîmenderparêzê"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>Dirbên dîmenderparêzê</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "Vebijêrkên Dîmenderparêzê"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "_Pêşdîtin"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "Dirba _dîmenderparêzê:"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "Piştî vê wextê_ weke di moda rawestîne de mîheng bike:"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "Dema danişîn di moda rawestînê de be dîmenderparêzê bi_xebitîne"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "Dema dîmenderparêz dixebite dîmenê _kilît bike"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr ""
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "Parêzvanên ekranê"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "Dirbên dîmenderparêzê"
@@ -395,224 +395,224 @@ msgstr ""
 msgid "Copying file: %u of %u"
 msgstr "Jibergirtina dosya : %u ji %u"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "Hişt ku dîmenderparêz bi nazikî derkeve"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "Lêkolîna dîmenderparêz bike"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "Ji dîmenderparêzê xebatkar bixwaze ku bi carekê re dîmender bigire."
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "Heke dîmenderparêz çalak be here demo ya girafîkeke din"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "Dîmenderparêz çalak bike"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "Heke dîmenderparêz çalak be wî ne çalak bike"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "Dîmenparêza herikandî bizivrîne da tu bikî wek çalakiya bikarhinêr"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "Guhertoya vê sepanê"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "Dîmenparêz eve %s\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "çalak"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "ne çalak e"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "Çewtiya derketanê nîşan bide"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "Bişkoka derketinê nîşan bide"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "Ji vexwendina ji bişkoka derketinê ferman bide"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "Bişkoka çalakirina bikarhiner nîşan bide"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr ""
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "Navê bikarhêner:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "Şîfre:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "Tê kontrolkirin..."
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr ""
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "Dîmenê reş bike"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "Çawalêhato"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d saet"
 msgstr[1] "%d saet"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d xulek"
 msgstr[1] "%d xulek"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -621,15 +621,15 @@ msgstr[1] "% de çirke"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -637,35 +637,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "Tu car"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "Dirûvê navberê yê mak nehate barkirin."
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "Ji kerema xwe re teqez bike ku dîmenderparêz hatiye daxistin"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "Nebe zordest"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "Koda neqandina çewtiyan çalak bike"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr ""
 
diff --git a/po/ku_IQ.po b/po/ku_IQ.po
index 0e74915..46d8836 100644
--- a/po/ku_IQ.po
+++ b/po/ku_IQ.po
@@ -18,60 +18,60 @@ msgstr ""
 "Language: ku_IQ\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "پەردەپارێز"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "دانانی هەڵبژاردەکانی خۆت بۆ پەردەپارێز"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "پێشدیتنی پەردەپارێز"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>پێشدیتنی پەردەپارێز</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "هەڵبژاردەکانی پەردەپارێز"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "بەڕێوەبردنی _وزە"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "_پێشدیتن"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr ""
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "پەردەپارێزەکان"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr ""
@@ -394,224 +394,224 @@ msgstr ""
 msgid "Copying file: %u of %u"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr "بەکارنەهێنراو"
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "ناوی بەکارهێنەر:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr ""
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr ""
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr ""
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -620,15 +620,15 @@ msgstr[1] ""
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr ""
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr ""
@@ -636,35 +636,35 @@ msgstr ""
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr ""
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr ""
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr ""
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr ""
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr ""
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr ""
 
diff --git a/po/ky.po b/po/ky.po
index 33ea20e..288a0e5 100644
--- a/po/ky.po
+++ b/po/ky.po
@@ -18,60 +18,60 @@ msgstr ""
 "Language: ky\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "Экран сактагыч"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "Экран сактагычты көрүү"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>Экран сактагычты көрүү</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "Экран сактагычтын параметрлери"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "_Көрүү"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "_Экран сактачтын темасы:"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr ""
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "Экран сактагычтар"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "Экран сактагыч темалары"
@@ -394,222 +394,222 @@ msgstr ""
 msgid "Copying file: %u of %u"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "Бул тиркеменин версиясы"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "активдүү"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr ""
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr ""
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr ""
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr ""
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -617,15 +617,15 @@ msgstr[0] ""
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr ""
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr ""
@@ -633,35 +633,35 @@ msgstr ""
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr ""
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr ""
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr ""
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr ""
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr ""
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr ""
 
diff --git a/po/lt.po b/po/lt.po
index 6c95e46..49771de 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -21,60 +21,60 @@ msgstr ""
 "Language: lt\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "Ekrano užsklanda"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "Nurodykite ekrano užsklandos nustatymus"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "Ekrano užsklandos peržiūra"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>Ekrano užsklandos peržiūra</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "Ekrano užsklandos nustatymai"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "Energijos _valdymas"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "_Peržiūra"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "_Ekrano užsklandos tema:"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "La_ikyti kompiuterį neveikliu po:"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "_Aktyvuoti ekrano užsklandą, kai kompiuteris neveiklus"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "_Užrakinti ekraną, kai aktyvuota ekrano užsklanda"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>Dėmesio: ekranas root naudotojui nebus užrakintas.</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "Ekrano užsklandos"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "Ekrano užsklandos temos"
@@ -397,203 +397,203 @@ msgstr "%s nėra tinkama ekrano užsklandos tema."
 msgid "Copying file: %u of %u"
 msgstr "Kopijuojamas failas: %u iš %u"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "Paprasčiausiai užveria ekrano užsklandą"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "Užklausti ekrano užsklandos būklės"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr "Užklausti, kiek laiko ekrano užsklanda buvo aktyvi"
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "Nurodo ekrano užsklandos procesui tuojau pat užrakinti ekraną"
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "Jei ekrano užsklanda aktyvi, perjungti į kitą grafinę demonstraciją"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "Įjungti ekrano užsklandą (užtemdyti ekraną)"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "Jei ekrano užsklanda aktyvi, ją deaktyvuoti (išjungti ekrano užtemdymą)"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "Simuliuoti naudotojo aktyvumą, kad nebūtų aktyvuota ekrano užsklanda"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr "Sulaikyti ekrano užskalandą nuo aktyvavimo. Komanda blokuoja, kol kliudymas aktyvus."
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr "Iškviečianti programa slopinanti ekrano užsklandą"
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr "Ekrano užsklandos iškvietimo priežastis"
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "Šios programos versija"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "Ekrano užsklanda yra %s\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "aktyvi"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "neaktyvi"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr "Ekrano užsklanda neblokuojama\n"
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr "Ekrano užsklanda blokuojama šios programos:\n"
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr "Ekrano užsklanda buvo aktyvi %d sekundžių.\n"
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr "Ekrano užsklanda neaktyvi\n"
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "Rodyti derinimo išvestį"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "Rodyti atsijungimo mygtuką"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "Komanda vykdoma paspaudus atsijungimo mygtuką"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "Rodyti naudotojo perjungimo mygtuką"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr "Pranešimas, rodomas dialoge"
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "PRANEŠIMAS"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr "Nenaudojama"
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "Naudotojo vardas:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "Slaptažodis:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr "Turite tuojau pat pasikeisti slaptažodį (slaptažodis paseno)"
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "Turite tuojau pat pasikeisti slaptažodį (root nurodymu)"
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "Jūsų slaptažodis nustojo galiojęs; susisiekite su sistemos administratoriumi"
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "Slaptažodis nenurodytas"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "Slaptažodis nepakeistas"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "Nepavyko gauti naudotojo vardo"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "Pakartokite naują UNIX slaptažodį:"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "Įveskite naują UNIX slaptažodį:"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "(esamas) UNIX slaptažodis:"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "Klaida keičiant NIS slaptažodį."
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "Turite pasirinkti ilgesnį slaptažodį"
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "Slaptažodis jau buvo naudojamas. Pasirinkite kitą."
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "Turite palaukti ilgiau norėdami pakeisti slaptažodį"
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "Slaptažodžiai nevienodi"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "Tikrinama..."
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "Tapatybė nepatvirtinta."
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "Tuščias ekranas"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "Atsitiktinė"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -601,14 +601,14 @@ msgstr[0] "%d valanda"
 msgstr[1] "%d valandos"
 msgstr[2] "%d valandų"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -616,7 +616,7 @@ msgstr[0] "%d minutė"
 msgstr[1] "%d minutės"
 msgstr[2] "%d minučių"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -626,15 +626,15 @@ msgstr[2] "%d sekundžių"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -642,35 +642,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "Niekada"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "Nepavyko įkelti pagrindinės sąsajos"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "Įsitikinkite, kad ekrano užsklanda yra tinkamai įdiegta"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "Netapti tarnyba"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "Įjungti derinimo kodą"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr "Paleisti ekrano užsklandą ir užraktą"
 
diff --git a/po/lv.po b/po/lv.po
index c3e0f83..52ac16d 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -20,60 +20,60 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "Ekrānsaudzētājs"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "Iestatīt sava ekrānsaudzētāja iestatījumus"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "Ekrānsaudzētāja priekšskatījums"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>Ekrānsaudzētāja priekšskatījums</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "Ekrānsaudzētāja iestatījumi"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "Barošanas _pārvaldība"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "_Priekšskatījums"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "Ekrān_saudzētāja tēma:"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "Uzskatīt datoru kā _neaktīvu pēc:"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "_Aktivizēt ekrānsaudzētāju, kad dators ir neaktīvs"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "Nozs_lēgt ekrānu, kad ekrānsaudzētājs ir aktīvs"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>Uzmanību: root lietotājam šis ekrāns netiks noslēgts.</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "Ekrānsaudzētāji"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "Ekrānsaudzētāja tēmas"
@@ -396,203 +396,203 @@ msgstr "Izskatās, ka %s nav derīga ekrānsaudzētāja tēma."
 msgid "Copying file: %u of %u"
 msgstr "Kopē failu:%u no %u"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "Liek ekrānsaudzētājam saudzīgi iziet"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "Vaicā ekrānsaudzētāja stāvokli"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr "Vaicājums par laiku, kurā ekrānsaudzētāja ir bijis aktīvs"
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "Liek strādājošam ekrānsaudzētāja procesam nekavējoties noslēgt ekrānu"
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "Ja ekrānsaudzētājs ir aktīvs, tad pārslēgties uz citu grafikas demonstrāciju"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "Ieslēgt ekrānsaudzētāju (notīrīt ekrānu)"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "Ja ekrānsaudzētājs ir aktīvs, tad deaktivizēt to (at-notīrīt ekrānu)"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "Pabikstīt darbojošos ekrānsaudzētāju, lai simulētu lietotāja aktivitāti"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr "Atturēt ekrānsaudzētāju no aktivizēšanās. Komanda bloķē, kamēr atturēšana ir aktīva."
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr "Izsaucošā lietotne, kas nomāc ekrānsaudzētāju"
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr "Ekrānsaudzētāja nomākšanas iemesls"
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "Šīs lietotnes versija"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "Ekrānsaudzētājs ir %s\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "aktīvs"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "neaktīvs"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr "Ekrānsaudzētājs nav nomākts\n"
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr "Ekrānsaudzētāju nomāc:\n"
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr "Ekrānsaudzētājs ir bijis aktīvs %d sekundes.\n"
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr "Ekrānsaudzētājs pašlaik nav aktīvs.\n"
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "Rādīt atkļūdošanas izvadu"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "Rādīt atteikšanās pogu"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "Komanda, kuru izsaukt, nospiežot atteikšanās pogu"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "Rādīt lietotāju pārslēgšanas pogu"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr "Logā rādāmais ziņojums"
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "ZIŅOJUMS"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr "Nav izmantots"
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "Lietotājvārds:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "Parole:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr "Jums nekavējoties jānomaina parole (parole novecojusi)"
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "Jums nekavējoties jānomaina parole (administratora prasība)"
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "Jūsu konta derīgums ir beidzies. Lūdzu, sazinieties ar sistēmas administratoru"
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "Nav ievadīta parole"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "Parole nav mainīta"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "Nevar noteikt lietotājvārdu"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "Ievadiet jauno UNIX paroli vēlreiz:"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "Ievadiet jauno UNIX paroli:"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "(pašreizējā) UNIX parole:"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "Kļūda, mainot NIS paroli."
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "Jums jāizvēlas garāka parole"
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "Šāda parole jau ir tikusi izmantota. Izvēlieties citu."
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "Jums jāuzgaida ilgāk, lai nomainītu savu paroli"
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "Atvainojiet, paroles nesakrīt"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "Notiek pārbaude..."
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "Autentifikācija nav izdevusies."
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "Tukšs ekrāns"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "Nejaušs"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -600,14 +600,14 @@ msgstr[0] "%d stunda"
 msgstr[1] "%d stundas"
 msgstr[2] "%d stundu"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -615,7 +615,7 @@ msgstr[0] "%d minūte"
 msgstr[1] "%d minūtes"
 msgstr[2] "%d minūšu"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -625,15 +625,15 @@ msgstr[2] "%d sekunžu"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -641,35 +641,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "Nekad"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "Nevar ielādēt galveno saskarni"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "Lūdzu, pārliecinieties, ka ekrānsaudzētājs ir pareizi uzinstalēts"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "Nekļūst par dēmonu"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "Ieslēgt atkļūdošans kodu"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr ""
 
diff --git a/po/mai.po b/po/mai.po
index 2cad96f..bab8a85 100644
--- a/po/mai.po
+++ b/po/mai.po
@@ -18,60 +18,60 @@ msgstr ""
 "Language: mai\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "स्क्रीनसेवर"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "अपन स्क्रीनसेवर वरीयता सेट करू"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "स्क्रीनसेवर पूर्वावलोकन"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b> स्क्रीनसेवर पूर्वावलोकन</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "स्क्रीनसेवर वरीयता"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "उर्जा प्रबंधन (_M)"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "पूर्वावलोकन (_P)"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "स्क्रीनसेवर थीम (_S):"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "कंप्यूटरकेँ निष्क्रिय क' रूपमे एकर बाद देखू (_i):"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "स्क्रीनसेवर सक्रिय करू जखन कंप्यूटर निष्क्रिय हुए (_A)"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "जखन सक्रीनसेवर सक्रिय हुए तँ स्क्रीन लाक करू (_L)"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>चेतावनी: रूट प्रयोक्ता क' लेल स्क्रीन लाक नहि हाएत.</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "स्क्रीनसेवर"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "स्क्रीनसेवर थीम"
@@ -394,224 +394,224 @@ msgstr ""
 msgid "Copying file: %u of %u"
 msgstr "फाइल कॉपी कए रहल अछि %u %u क'"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "स्क्रीनसेवर क' शांति सँ निकलि जाए क' कारण बनल"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "स्क्रीनसेवर क' स्थिति प्रश्नगत करू"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr "समय क' नमाइ बताउ जखनसँ स्क्रीनसेवर सक्रिय अछि"
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "स्क्रीनकेँ तत्काल लाक करबाक लेल काज करत स्क्रीनसेवर प्रक्रिया बतबैत अछि"
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "जँ स्क्रीनसेवर सक्रिय अछि तब दोसर आलेखीय डेमो पर जाउ"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "स्क्रीनसेवर चालू करू (स्क्रीन खाली करू)"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "जँ स्क्रीनसेवर सक्रिय अछि तब एकरा निष्क्रिय करू (स्क्रीन खाली करू)"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "प्रयोक्ता क्रियाकलापकेँ सिमुलेट करब क'लेल कार्यशील स्क्रीनसेवर आगाँ बढाबू"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr "सक्रिय करब सँ स्क्रीनसेवर रोकि रहल अछि बाधा सक्रिय रहबाक दौरान कमांड खंड."
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr "स्क्रीनसेवर रोकबाक लेल कालिंग अनुप्रयोग"
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr "स्क्रीनसेवर रोकबाक लेल कारण"
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "एहि अनुप्रयोग क' संस्करण"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "%s स्क्रीनसेवर अछि\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "क्रियाशील"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "निष्क्रिय"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr "स्क्रीनसेवर %d सकेंड सँ सक्रिय रहल अछि.\n"
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "डिबगिंग आउटपुट देखाबू"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "लागआउट बटन देखाबू"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "लागआउट बटन लाबै क'लेल कमांड"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "प्रयोक्ता बदलू बटन देखाबू"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr ""
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "प्रयोक्ताक नाम:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "कूटशब्द: "
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr "अहाँक अपन कूटशब्द आवश्यक रूप सँ तत्काल बदलना हाएत (कूटशब्द कालबाधित भ' चुकल अछि)."
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "अहाँक अपन कूटशब्द आवश्यक रूप सँ तत्काल बदलना हाएत (रूट द्वारा बाध्य)"
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "अहाँक खाता खत्म भ' गेल अछि कृप्या अपन सिस्टम प्रशासक सँ संपर्क करू"
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "कोनो कूटशब्द नहि देलक"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "कूटशब्द अपरिवर्तित"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "प्रयोक्ता नाम नहि भेटल"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "नवीन यूनिक्स कूटशब्द दोबारा टाइप करू:"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "नवीन यूनिक्स कूटशब्द भरू:"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "(वर्तमान) यूनिक्स कूटशब्द:"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "एनआईएस कूटशब्द परिवर्तन क' दौरान त्रुटि."
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "अहाँक बेसी नमहर कूटशब्द चुनै हाएत"
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "कूटशब्द पहिले उपयोग कएल जाए चुकल अछि आन चुनू."
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "अपन कूटशब्दकेँ बदलब लेल अहाँक बेसी इंतजार कएनाइ हाएत"
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "क्षमा करू, कूटशब्द क' जोड़ नहि मिलैत अछि"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "जाँचि रहल अछि..."
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "सत्यापन असफल"
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "खाली स्क्रीन"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "क्रमहीन"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d घंटा"
 msgstr[1] "%d घंटा"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d मिनट"
 msgstr[1] "%d मिनट"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -620,15 +620,15 @@ msgstr[1] "%d सकेंड"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -636,35 +636,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "कहियो नहि"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "मुख्य अंतरफलक लोड नहि कए सकल"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "निश्चित करू जे स्क्रीनसेवर विधिवत संस्थापित अछि"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "डेमोन नहि होउ"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "डिबगिंग कोड सक्रिय करू"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr ""
 
diff --git a/po/mg.po b/po/mg.po
index 9cbe084..6bd6fbc 100644
--- a/po/mg.po
+++ b/po/mg.po
@@ -18,60 +18,60 @@ msgstr ""
 "Language: mg\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "Sary mitsitsy"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "Mamaritra ny safidy manokan'ny sary mitsitsy"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "Topimason'ny sary mitsitsy"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>Topimason'ny sary mitsitsy</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "Safidy manokan'ny sary mitsitsy"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "_Topimaso"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "Endri-t_sary mitsitsy:"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "Hevero ho _tsy miasa ilay solosaina avy eo:"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "_Alefaso ny sary mitsitsy rehefa tsy miasa ny solosaina"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "_Gejao ny efijery rehefa mandeha ny sary mitsitsy"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>Fampilazana: tsy ho voageja ny efijery iasan'ny mpampiasa faka.</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "Sary mitsitsy"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "Endri-tsary mitsitsy"
@@ -394,224 +394,224 @@ msgstr ""
 msgid "Copying file: %u of %u"
 msgstr "Mandika rakitra: %u amin'ny %u"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "Mahatonga ilay sary mitsitsy hijanona moramora fotsiny"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "Manontany ny toetran'ilay sary mitsitsy"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "Milaza ny asan'ny sary mitsitsy mandeha mba hangeja ny efijery avy hatrany"
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "Raha mandeha ny sary mitsitsy, dia miovà démon-tsary hafa"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "Mandefa ny sary mitsitsy (manafoana ny efijery)"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "Atsaharo ny sary mitsitsy raha mandeha (mamerina ny efijery)"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "Manosika ny sary mitsitsy mandeha haka tahaka ny fihetsiketsehan'ny mpampiasa"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr "Misakana ny sary mitsitsy handeha. Voasakana ny baiko rehefa mandeha ny fisakanana."
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr "Ny rindranasa mpiantso misakana ilay sary mitsitsy"
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr "Ny antony isakanana ilay sary mihetsika"
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "Ny kinovan'io rindranasa io"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "%s ilay sary mitsitsy\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "miasa"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "tsy miasa"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "Mampiseho ny lazan'ny debugging"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "Mampiseho ny tsindrin'ny fivoahana"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "Ny baiko antsoin'ny tsindrin'ny fivoahana"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "Mampiseho ny tsindrin'ny fiovana mpampiasa"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr ""
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "Anaran'ny mpampiasa:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "Teny fanalahidy:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr "Mila manova ny teny fanalahidinao izao dieny izao ianao (tonta ny teny fanalahidy)"
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "Mila manova ny teny fanalahidinao izao dieny izao ianao (teren'ny faka)"
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "Tapi-potoana ny kaontinao. "
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "Tsy misy teny fanalahidy nomena"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "Tsy niova ilay teny fanalahidy"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "Tsy mety azo ny anaran'ny mpampiasa"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "Avereno soratana ny teny fanalahidy UNIX vaovao:"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "Soraty ny teny fanalahidy UNIX vaovao:"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "Ny teny fanalahidy UNIX (izao):"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "Nisy olana teo am-panovana ny teny fanalahidy NIS."
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "Tsy maintsy mitady teny fanalahidy lavalava ianao"
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "Efa nampiasaina io teny fanalahidy io. Manomeza hafa."
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "Tsy maintsy miandry elaela ianao vao afaka manova ny teny fanalahidinao"
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "Miala tsiny. Tsy mitovy ilay teny fanalahidy"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "Tsy nety ny fanamarinana."
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "Efijery foana"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "An-tsapaka"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d ora"
 msgstr[1] "%d ora"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minitra"
 msgstr[1] "%d minitra"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -620,15 +620,15 @@ msgstr[1] "%d segaondra"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -636,35 +636,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "Na oviana na oviana"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "Tsy afaka naka ny mpanera fototra"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "Amarino tsara hoe voapetraka araka ny tokony ho izy ny sary mitsitsy"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "Aza mivadika daemon"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "Mandefa ny fangon'ny debugging"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr ""
 
diff --git a/po/mk.po b/po/mk.po
index c7de716..7405045 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -21,60 +21,60 @@ msgstr ""
 "Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "Чувар на екранот"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "Поставете ги преференциите за чуварот на екранот"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "Преглед на чуварот"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>Преглед</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "Преференции за чуварот"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "Менаџмент на _енергија"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "_Преглед"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "Тема за _чуварот на екранот:"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "Постави ја сесијата како _неактивна по:"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "_Активирај чувар на екранот кога сесијата е неактивна"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "_Заклучи екран кога чуварот на екранот е активен"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>Внимание: екранот ќе биде заклучен за корисникот „root“.</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "Чувари на екранот"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "Теми за чуварот на екранот"
@@ -397,224 +397,224 @@ msgstr "%s не изгледа дека е валидна тема за чува
 msgid "Copying file: %u of %u"
 msgstr "Копирам датотека %u од %u"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "Предизвикува излез од чуварот на екранот постепено"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "Побарај ја состојбата на чуварот на екранот"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr "Побарај ја должината на времето колку што е активен чуварот на екранот"
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "Му кажува на чуварот на екранот да го заклучи екранот веднаш"
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "Ако чуварот на екранот е активен тогаш промени друго графичко демо"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "Вклучи го чуварот на екранот (бланко екран)"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "Ако чуварот на екранот е активен тогаш деактивирај го (покажи екран)"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "Поттикни го чуварот на екранот што работи да симулира активност на корисникот"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr "Спречи го чуварот на екранот да се активира.  Командата го блокира додека чуварот на екранот се активира."
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr "Повикувачката апликација која го блокира чуварот на екранот"
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr "Причина за блокирање на чуварот на екранот"
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "Верзија на оваа апликација"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "Чуварот на екранот е %s\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "активно"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "неактивно"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr "Чуварот на екранот не е забранет\n"
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr "Чуварот на екранот е забранет од:\n"
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr "Чуварот на екранот е активен %d секунди.\n"
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "Прикажи дебагирачкиот излез"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "Прикажи го одјавното копче"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "Команда за повик од одјавното копче"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "Прикажи го копчето за промена на кориснокот"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr "Порака која ќе се прикаже во дијалогот"
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "MESSAGE"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr ""
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "Корисничко име:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "Лозинка:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr "Треба да ја смените лозинката веднаш (лозинката остаре)"
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "Треба да ја смените лозинката веднаш (root присили)"
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "Вашиот акаунт истече; Ве молам контактирајте го Вашиот администратор на системот"
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "Не е обезбедена лозинка"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "Лозинката е непроменета"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "Не можам да добијам корисничко име"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "Повторно внесете ја новата UNIX лозинка:"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "Внесете ја новата UNIX лозинка:"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "(тековна) UNIX лозинка:"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "Грешка при промената на лозинката за NIS."
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "Мора да одберите подолга лозинка"
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "Лозинката е веќе употребена. Одберете друга."
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "Мора да чекате подолго за да ја промените Вашата лозинка"
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "Жалам, лозинките не се совпаѓаат"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "Проверувам..."
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "Проверката на автентичност не успеа."
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "Црн екран"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "Рандом"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -623,15 +623,15 @@ msgstr[1] ""
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -639,35 +639,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "Никогаш"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "Не можам да го вчитам главниот интерфејс"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "Ве молам осигурајте се дека чуварот на екранот е правилно инсталиран"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "Не станувај Демон"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "Овозможи дебагирачки код"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr ""
 
diff --git a/po/ml.po b/po/ml.po
index c623c3e..b2d2378 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -19,60 +19,60 @@ msgstr ""
 "Language: ml\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "സ്ക്രീന്‍സേവര്‍"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "നിങ്ങളുടെ സ്ക്രീന്‍സേവറിന്റെ മുന്‍ഗണനകള്‍ സജ്ജീകരിയ്ക്കുക"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "സ്ക്രീന്‍സേവര്‍ കണ്ടു നോക്കുക"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>സ്ക്രീന്‍സേവര്‍ കണ്ടു നോക്കുക</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "സ്ക്രീന്‍സേവറിന്റെ മുന്‍ഗണനകള്‍"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "വൈദ്യുതി _നടത്തിപ്പ്"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "_കണ്ടു നോക്കുക"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "_സ്ക്രീന്‍സേവറിന്റെ പ്രമേയം:"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "കമ്പ്യൂട്ടര്‍ _ആലസ്യത്തിലാണെന്ന് കരുതേണ്ടത് എത്ര സമയത്തിന് ശേഷം:"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "കമ്പ്യൂട്ടര്‍ ആലസ്യത്തിലാകുമ്പോള്‍ സ്ക്രീന്‍സേവര്‍ _സജീവമാക്കുക"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "സ്ക്രീന്‍സേവര്‍ സജീവമാകുമ്പോള്‍ സ്ക്രീന്‍ _പൂട്ടുക"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>മുന്നറിയിപ്പ്: റൂട്ട് ഉപയോക്താവിന് സ്ക്രീന്‍ പൂട്ടുവാന്‍ സാധിക്കില്ല.</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "സ്ക്രീന്‍സേവറുകള്‍"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "സ്ക്രീന്‍സേവറിന്റെ പ്രമേയങ്ങള്‍"
@@ -395,224 +395,224 @@ msgstr "%s സാധുവായ ഒരു സ്ക്രീന്‍സേവ
 msgid "Copying file: %u of %u"
 msgstr "%2$uയിലെ %1$u: ഫയല്‍ പകര്‍ത്തുന്നു"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "സ്ക്രീന്‍സേവറില്‍ നിന്നും നല്ലനിലയില്‍ പുറത്ത് കടക്കുന്നുതിനു കാരണമാകുന്നു"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "സ്ക്രീന്‍സേവറിന്റെ അവസ്ഥ അന്വേഷിയ്ക്കുക"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr "സ്ക്രീന്‍സേവര്‍ എത്ര സമയമായി സജീവമാണെന്ന് അന്വേഷിയ്ക്കുക"
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "ഉടന്‍ തന്നെ സ്ക്രീന്‍ പൂട്ടുന്നതിനായി പ്രവര്‍ത്തിച്ചുകൊണ്ടിരിക്കുന്ന സ്ക്രീന്‍സേവര്‍ പ്രക്രിയയോട് പറയുന്നു"
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "സ്ക്രീന്‍സേവര്‍ സജീവമാണെങ്കില്‍ മറ്റൊരു ഗ്രാഫിക്സ് പ്രവര്‍ത്തനമാതൃകയിലേയ്ക്ക് മാറ്റുക"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "സ്ക്രീന്‍സേവര്‍ ഓണ്‍ ചെയ്യുക (സ്ക്രീന്‍ ശൂന്യമാക്കുക)"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "സ്ക്രീന്‍സേവര്‍ സജീവമാണെങ്കില്‍ അതിനെ നിഷ്ക്രിയമാക്കുക (സ്ക്രീന്‍ ശൂന്യമല്ലാതാക്കുക)"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "ഉപയോക്താക്കളുടെ പ്രവര്‍ത്തനം അനുകരിയ്ക്കാനായി പ്രവര്‍ത്തിച്ചുകൊണ്ടിരിയ്ക്കുന്ന സ്ക്രീന്‍സേവറിനെ തോണ്ടുക"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr "സ്ക്രീന്‍സേവര്‍ സജീവമാകുന്നത് തടയുക. തടയല്‍ സജീവമാകുമ്പോള്‍ ആജ്ഞ തടസ്സപ്പെടുന്നു."
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr "സ്ക്രീന്‍സേവറിനെ തടയാന്‍ വിളിയ്ക്കുന്ന പ്രയോഗം"
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr "സ്ക്രീന്‍സേവറിനെ തടയുന്നതിനുള്ള കാരണം"
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "ഈ പ്രയോഗത്തിന്റെ ലക്കം"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "%s എന്നതാണ് സ്ക്രീന്‍സേവര്‍\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "സജീവമാകുക"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "നിഷ്ക്രിയമാകുക"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr "സ്ക്രീന്‍സേവര്‍ തടഞ്ഞിട്ടില്ല\n"
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr "സ്ക്രീന്‍സേവര്‍ തടയപ്പെട്ടിരിയ്ക്കുന്നതു്:\n"
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr "സ്ക്രീന്‍സേവര്‍ %d സെക്കന്റുകള്‍ സജീവമായിരുന്നു.\n"
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr "സ്ക്രീന്‍സേവര്‍ നിലവില്‍ സജീവമല്ല.\n"
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "പിഴവ് തിരുത്തുന്നതിന് സഹായകമായ ഔട്ട്പുട്ട് കാണിയ്ക്കുക"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "പുറത്തിറങ്ങുന്നതിനുള്ള ബട്ടണ്‍ കാണിയ്ക്കുക"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "പുറത്തിറങ്ങുന്നതിനുള്ള ബട്ടണില്‍ നിന്നും പ്രവര്‍ത്തിപ്പിയ്ക്കുന്നതിനായുളള ആജ്ഞ"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "മറ്റൊരു ഉപയോക്താവായി മാറുന്നതിനുളള ബട്ടണ്‍ കാണിയ്ക്കുക"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr "ജാലകത്തില്‍ കാണിയ്ക്കേണ്ട സന്ദേശം"
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "സന്ദേശം"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr "ഉപയോഗിച്ചിട്ടില്ല"
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "ഉപയോക്താവിന്റെ പേര്:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "അടയാളവാക്ക്:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr "നിങ്ങളുടെ അടയാളവാക്ക് ഉടന്‍ തന്നെ മാറ്റേണ്ടതാകുന്നു (അടയാളവാക്ക് പഴയതായിരിക്കുന്നു)"
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "നിങ്ങളുടെ അടയാളവാക്ക് ഉടന്‍ തന്നെ മാറ്റേണ്ടതാകുന്നു (റൂട്ട് നിര്‍ബന്ധിതമാക്കിയത്)"
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "നിങ്ങളുടെ അക്കൌണ്ടിന്റെ കാലാവധി കഴിഞ്ഞിരിക്കുന്നു; ദയവായി നിങ്ങളുടെ സിസ്റ്റം നടത്തിപ്പുകാരനുമായി ബന്ധപ്പെടുക"
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "അടയാളവാക്കൊന്നും നല്‍കിയിട്ടില്ല"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "അടയാളവാക്ക് മാറിയിട്ടില്ല"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "ഉപയോക്താവിന്റെ പേര് ലഭിച്ചില്ല"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "പുതിയ യുണിക്സ് അടയാളവാക്ക് വീണ്ടും നല്‍കുക:"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "പുതിയ യുണിക്സ് അടയാളവാക്ക് നല്‍കുക:"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "(നിലവിലുളള) യുണിക്സ് അടയാളവാക്ക്:"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "എന്‍ഐഎസ് അടയാളവാക്ക് മാറ്റുന്നതിനിടയില്‍ തെറ്റ്."
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "ഇതിലും വലിയൊരു അടയാളവാക്ക് തിരഞ്ഞെടുക്കേണ്ടതാണ്"
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "അടയാളവാക്ക് നേരത്തെ ഉപയോഗിച്ചതാണ്. മറ്റൊന്ന് തിരഞ്ഞെടുക്കുക."
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "നിങ്ങളുടെ അടയാളവാക്ക് മാറ്റുന്നതിനായി ഇനിയും കാത്തിരിയ്ക്കേണ്ടതാണ്"
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "ക്ഷമിക്കണം, അടയാളവാക്കുകള്‍ തമ്മില്‍ പൊരുത്തമില്ല"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "പരിശോധനയില്‍..."
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "തിരിച്ചറിയല്‍ പരാജയപ്പെട്ടു."
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "ശൂന്യമായ സ്ക്രീന്‍"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "ഏതെങ്കിലുമൊന്ന്"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d മണിക്കൂര്‍"
 msgstr[1] "%d മണിക്കൂറുകള്‍"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d നിമിഷം"
 msgstr[1] "%d നിമിഷങ്ങള്‍"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -621,15 +621,15 @@ msgstr[1] "%d സെക്കന്‍ഡുകള്‍"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -637,35 +637,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "ഒരിക്കലുമില്ല"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "പ്രധാന വിനിമയതലം ചേര്‍ക്കുവാന്‍ സാധിച്ചില്ല"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "സ്ക്രീന്‍സേവര്‍ ശരിയായിട്ടാണ് ഇന്‍സ്റ്റാള്‍ ചെയ്തിട്ടുളളത് എന്നുറപ്പ് വരുത്തുക"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "ഒരു നിരന്തരപ്രക്രിയയാകേണ്ടതില്ല"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "പിഴവ് തിരുത്തുന്നതിന് സഹായകമായ കോഡ് പ്രവര്‍ത്തികമാക്കുക"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr ""
 
diff --git a/po/mn.po b/po/mn.po
index a5c7304..13dc997 100644
--- a/po/mn.po
+++ b/po/mn.po
@@ -19,60 +19,60 @@ msgstr ""
 "Language: mn\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "Дэлгэц гамнагч"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "Дэлгэц гамнагчийн тохиргоонуудыг байрлуул."
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "Дэлгэц гамнагч урьдчилан харах"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>Дэлгэц гамнагчийг урьдчилан харах</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "Дэлгэц гамнагчийн Tохиргоонууд"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "_Урьдчилан харах"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "_Дэлгэц гамнагчийн сэдэв"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "Дараа нь компютерийг чөлөөтэй гэж үз."
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "Комьпютер дээр ямар нэг үйлдэл хийлгүй тодорхой хугацаа өнгөрөхөд скринсевер _идэвхиждэг."
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "_Дэлгэц гамнагч идэвхитэй байх үед дэлгэц түгжигддэг"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>Анхааруулга: Дэлгэц эзэн (root) хэрэглэгчээр түгжигдэхгүй.</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "_Дэлгэц гамнагчүүд"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "_Дэлгэц гамнагчийн загварууд"
@@ -395,224 +395,224 @@ msgstr ""
 msgid "Copying file: %u of %u"
 msgstr "Файлыг хуулж байна:%u, %u"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "Скринсэвэрийг хаах шалтгаан"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "Дэлгэц гамнагчийн байдлыг асууна уу"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "Ажиллаж байгаа скринсевер дэлгэцийг хурдан түгжихийг сануулж байна."
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "Хэрвээ скринсевер идэвхитэй бол өөр график демо-д холбох."
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "сринсеверийг асаах (хар дэлгэц)"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "Хэрвээ скринсевер идэвхитэй бол түүнийг идэвхигүйжүүлэх (дэлгэцийг харлуулахгүй)"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "Хэрэглэгчийн үйл ажиллагааг ажилллаж байгаа скринсеверээр идэхижүүл."
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr "Дэпгэц гамнагч барих програм дуудалт"
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr "Дэлгэц гамнагчийн барих шалтгаан"
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "Энэ програмын хувилбар"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "Дэлгэц гамнагч %s байна\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "идэвхтэй"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "идэвхгүй"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "Шалгах гарцыг харуулах"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "Гарах товчлуурыг харуулах"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "Гарах товчлуурыг дуудах комманд"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "Хэрэглэгч шилжүүлэгч товчлуурыг харуулах"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr ""
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "Хэрэглэгч:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "Нууц үг:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr "Та нууц үгээ дариу солих шаардлагатай (нууц үг хуучирсан)"
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "Та нууц үгээ дариу солих шаардлагатай (root шаардсан)"
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "Таны дансны хугацаа дууссан; Системийн админ руу хандана уу"
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "Нууц үг нийлүүлэгдсэнгүй"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "Нууц үг өөрчилөгдсөнгүй"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "Хэрэглэгчийн нэрийг авах боломжгүй"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "Шинэ UNIX нууц үгээ давтана уу:"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "Шинэ UNIX нууц үг оруул:"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "(идэвхтэй) UNIX нууц үг:"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "NIS нууц үг сольж байхад алдаа."
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "Та илүү урт нууц үг сонгох ёстой"
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "Нууц үг хэдийнэ хэрэглэгдсэн. Өөрийг сонгоно уу."
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "Та нууц үгээ солихдоо удаан хүлээх ёстой"
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "Уучилаарай, нууц үг таарахгүй байна"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "Шалгаж байна..."
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "Баталгаажуулалт амжилтгүй."
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "Хар  дэлгэц"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "Тохиолдлын"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d цаг"
 msgstr[1] "%d цаг"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d минут"
 msgstr[1] "%d минут"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -621,15 +621,15 @@ msgstr[1] "%d секунд"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -637,35 +637,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "Хэзээ ч үгүй"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "Гол интерфейс ачаалагдсангүй."
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "Дэлгэц гамнагч зөв суусан эсэхийг шалгана уу."
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "Сервер программ болохгүй байна."
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "Шалгах код идэвхижүүлэх."
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr ""
 
diff --git a/po/mr.po b/po/mr.po
index 6ad974a..f9e2bae 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -19,60 +19,60 @@ msgstr ""
 "Language: mr\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "स्क्रीनसेवर"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "तुमची स्क्रीनसेवर प्राधान्यता निश्चित करा"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "स्क्रीनसेवर पूर्वदृश्य"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>स्क्रीनसेवर पूर्वदृश्य</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "स्क्रीनसेवर प्राधान्यता"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "पॉवर व्यवस्थापन (_M)"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "पूर्वदृश्य (_P)"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "स्क्रीनसेवर सुत्रयोजना (_S):"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "संगणकास ठराविक वेळे नंतर निकामी असे गृहीत धरा (_i):"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "संगणक निष्क्रीय असल्यावर स्क्रीनसेवर सक्रीय करा (_A)"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "स्क्रीनसेवर स्क्रीय असल्यावर पडदा कुलूपबंद करा (_L)"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>सावधान: पडदा रूट वापरकर्त्यास कुलूपबंद केले जाणार नाही.</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "स्क्रीनसेवर"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "स्क्रीनसेवर सुत्रयोजना"
@@ -395,224 +395,224 @@ msgstr "%s वैध स्क्रीनसेवर सुत्रयोज
 msgid "Copying file: %u of %u"
 msgstr "फाइल प्रतिलिपी होतेय: %u पैकी %u"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "स्क्रीनसेवर पासून बाहेर पडण्यास कारणीभूत ठरते"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "स्क्रीनसेवरच्या स्थितीची चौकशी करा"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr "स्क्रीनसेवर कितीवेळ पासून सक्रीय आहे त्याची चौकशी करा"
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "कार्यरत स्क्रीनसेवर पध्दतीला पडदा त्वरीत कुलूपबंद करण्यास सांगतो"
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "सक्रीनसेवर सक्रीय असल्यावर इतर चित्रलेखीय प्रदर्शनावर जा"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "स्क्रीनसेवर कार्यान्वीत करा (पडदा रिकामा करा)"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "सक्रीनसेवेर सक्रीय असल्यावर त्यास असक्रीय करा (पडदा सक्रीय करा)"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "वापरकर्ता कार्य दर्शविण्याकरीता कार्यरत स्क्रीनसेवरला सतर्क करा"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr "स्क्रीनसेवरला सक्रीय होण्यापासून थांबवा.  प्रतिबंध सक्रीय असल्यावर आदेश बंधीत राहते."
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr "स्क्रीनसेवर दर्शविण्यापासून थांबविण्यापासून कारणीभूत अनुप्रयोग"
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr "स्क्रीनसेवर अकार्यान्वीत करण्यामागचे कारण"
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "या अनुप्रयोगाची आवृत्ती"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "%s सक्रीनसेवर आहे\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "सक्रीय"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "निषक्रीय्रीय"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr "सक्रीनसेवर प्रतिबंद नाही\n"
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr "सक्रीनसेवर यानुरूप प्रतिबंदीत केले गेले\n"
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr "%d सेकंद करीता सक्रीनसेवर सक्रीय आहे.\n"
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr "सक्रीनसेवर सध्या सक्रीय नाही.\n"
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "डीबगींग आउटपुट दर्शवा"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "लॉगआउट बटण दर्शवा"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "लॉगआउट बटण पासून प्रारंभ करण्यासाठीचे आदेश"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "वापरकर्ता बटण बदलवा दर्शवा"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr "संवाद मध्ये दर्शवायचे ते संदेश"
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "MESSAGE"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr "वारले नाही"
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "वापरकर्त्याचे नाव:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "गुप्तशब्द:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr "तुमचा गुप्तशब्द तत्काळ बदलण्याची आवश्यकता आहे (गुप्तशब्द जुना आहे)"
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "तुमचा गुप्तशब्द तत्काळ बदलण्याची आवश्यकता आहे (रूट वापरा)"
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "तुमचे खाते बंद झाले आहे, कृपया तुमच्या संगणक व्यवस्थापकाकडे जा"
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "गुप्तशब्द दिलेला नाही"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "गुप्तशब्द बदललेला नाही"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "वापरकर्त्याचे नाव मिळत नाही"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "नवा UNIX गुप्तशब्द पुन्हा टाईप करा:"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "नवा UNIX गुप्तशब्द प्रविष्ट करा:"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "(सद्याचा) UNIX गुप्तशब्द:"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "NIS चा गुप्तशब्द बदलताना चुक झाली."
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "तुम्ही मोठा गुप्तशब्द निवडला पाहीजे"
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "ह्या गुप्तशब्दचा आधीच वापर झाला आहे. दुसरा निवडा."
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "तुमचा गुप्तशब्द बदलण्यासाठी तुम्हाला बराच वेळ वाट पहावी लागेल"
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "क्षमा करा, गुप्तशब्द जुळत नाहीत"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "तपास करीत आहे..."
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "अधिप्रमाणन असफल."
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "रिकामी पडदा"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "विस्कळीत"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d तास"
 msgstr[1] "%d तास"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d मिनिट"
 msgstr[1] "%d मिनिट"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -621,15 +621,15 @@ msgstr[1] "%d सेकंद"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -637,35 +637,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "कधीच नाही"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "मुख्य इंटरफेस भारित करता आला नाही"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "कृपया स्क्रीनसेवर योग्यरित्या प्रतिष्ठापीत आहे याची खात्री करा"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "डीमन बनू नका"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "डीबगींग कोड कार्यान्वीत करा"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr ""
 
diff --git a/po/ms.po b/po/ms.po
index 0ceab61..b06306a 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -19,60 +19,60 @@ msgstr ""
 "Language: ms\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "Penyelamat skrin"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "Tetapkan keutamaan penyelamat skrin anda"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "Pratonton Penyelamat Skrin"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>Pratonton penyelamat skrin</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "Keutamaan Penyelamat Skrin"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "Pengurusan _Kuasa"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "_Pratonton"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "Tema penyelamat _skrin:"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "Anggap komputer sebaga_i melahu selepas:"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "_Aktifkan penyelamat skrin bila komputer melahu"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "Kunci skrin bi_la penyelamat skrin aktif"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>Amaran: skrin tidak akan dikunci untuk pengguna root.</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "Penyelamat skrin"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "Tema penyelamat skrin"
@@ -395,222 +395,222 @@ msgstr "%s nampaknya bukan tema penyelamat skrin yang sah."
 msgid "Copying file: %u of %u"
 msgstr "Menyalin fail: %u dari %u"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "Menyebabkan penyelamat skrin keluar secara lemah lembut"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "Tanya keadaan penyelamat skrin"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr "Tanya panjang masa penyelamat skrin telah aktif"
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "Memberitahu proses penyelamat skrin sedang berjalan untuk mengunci skrin serta-merta"
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "Jika penyelamat skrin sedang aktif, maka tukar ke demo grafik lain"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "Hidupkan penyelamat skrin (kosongkan skrin)"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "Jika penyelamat skrin sedang aktif, nyah-aktifkan (skrin tidak kosong lagi)"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "Cuit penyelamat skrin yang sedang berjalan untuk meniru aktiviti pengguna"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr "Halang penyelamat skrin dari mengaktif.  Perintah menghalang semasa penghalang sedang aktif."
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr "Aplikasi pemanggil yang menghalang penyelamat skrin"
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr "Alasan menghalang penyelamat skrin"
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "Versi aplikasi ini"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "Penyelamat skrin adalah %s\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "aktif"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "tidak aktif"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr "Penyelamat skrin tidak dihalang\n"
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr "Penyelamat skrin sedang dihalang oleh:\n"
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr "Penyelamat skrin telah diaktifkan selama %d saat.\n"
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr "Penyelamat skrin tidak aktif buat masa ini.\n"
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "Tunjukkan output penyahpepijatan"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "Tunjukkan butang daftar keluar"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "Perintah untuk dibangkitkan dari butang daftar keluar"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "Tunjukkan butang tukar pengguna"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr "Mesej untuk ditunjukkan di dalam dialog"
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "MESSAGE"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr "Tidak digunakan"
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "Nama pengguna:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "Kata laluan:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr "Anda perlu menukar kata laluan anda serta merta (kata laluan terlalu lama)"
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "Anda perlu menukar kata laluan anda serta merta (dikuatkuasa oleh root)"
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "Akaun anda telah luput, sila hubungi pentadbir sistem anda"
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "Tiada kata laluan dibekalkan"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "Kata laluan tidak berubah"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "Tidak boleh mendapatkan nama pengguna"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "Taip semula kata laluan baharu UNIX:"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "Masukkan katalaluan baharu UNIX:"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "Kata laluan UNIX (semasa):"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "Ralat ketika menukar kata laluan NIS."
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "Anda mesti pilih kata laluan yang lebih panjang"
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "Kata laluan telah digunakan. Pilih yang lain."
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "Anda mesti tunggu lebih lama untuk menukar kata laluan anda"
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "Maaf, kata laluan tidak sepadan"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "Memeriksa..."
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "Pengesahihan gagal."
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "Skrin kosong"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "Rawak"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d jam"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minit"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -618,15 +618,15 @@ msgstr[0] "%d saat"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -634,35 +634,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "Tidak sesekali"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "Tidak dapat memuatkan antaramuka utama"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "Sila pastikan penyelamat skrin dipasang dengan betul"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "Jangan jadi daemon"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "Benarkan kod penyahpepijatan"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr "Lancar penyelamat skrin dan program pengunci"
 
diff --git a/po/nb.po b/po/nb.po
index f2dde5d..8b32c7f 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -20,60 +20,60 @@ msgstr ""
 "Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "Skjermsparer"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "Sett brukervalg for skjermspareren"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "Forhåndsvisning av skjermsparer"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>Forhåndsvisning av skjermsparer</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "Brukervalg for skjermsparer"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "Strø_mstyring"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "_Forhåndsvis"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "Draktvalg for _skjermsparer:"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "Se på datamaskinen som _inaktiv etter:"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "_Aktiver skjermsparer når datamaskinen er inaktiv"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "_Lås skjermen når aktiv"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>Advarsel: skjermen vil ikke bli låst for root.</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "Skjermsparere"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "Drakt for skjermsparer"
@@ -396,224 +396,224 @@ msgstr "%s ser ikke ut til å være en gyldig drakt for skjermspareren."
 msgid "Copying file: %u of %u"
 msgstr "Kopierer fil: %u av %u"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "Sørger for sikker avslutning av skjermspareren"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "Spør etter skjermsparerstatus"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr "Spør hvor lenge skjermspareren har vært aktiv"
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "Tvinger kjørende skjermsparer til å låse skjermen omgående"
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "Skift til et annet tema om skjermspareren er aktiv"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "Slå på skjermspareren (blank ut skjermen)"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "Deaktiver skjermspareren om den er aktiv"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "Kommuniser med kjørende skjermsparer for å simulere brukeraktivitet"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr "Hindre skjermspareren fra å aktiveres. Kommandoen blokkerer så lenge hindringen er aktiv."
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr "Programmet som hindrer skjermspareren"
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr "Årsak for hinding av skjermsparer."
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "Skjermsparerversjon"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "Skjermsparer er %s\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "aktiv"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "inaktiv"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr "Skjermsparer er ikke hindret\n"
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr "Skjermsparer hindres av:\n"
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr "Skjermspareren har vært aktiv i %d sekunder.\n"
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr "Skjermsparer er ikke aktiv.\n"
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "Vis avlusingsinformasjon"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "Vis knapp for å logge ut"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "Kommando som skal kjøres ved klikk på utloggingsknappen"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "Vis knapp for å bytte bruker"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr "Melding som skal vises i dialogen"
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "MELDING"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr "Ikke brukt"
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "Brukernavn:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "Passord:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr "Du må endre ditt passord nå (passordet er utløpt)"
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "Du må endre ditt passord nå (bestemt av administrator)"
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "Din konto har utgått; kontakt systemadministrator"
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "Ingen passord oppgitt"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "Passordet er ikke endret"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "Kan ikke finne brukernavn"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "Skriv inn nytt UNIX-passord på nytt:"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "Oppgi nytt UNIX-passord:"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "(aktivt) UNIX-passord:"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "Feil under endring av NIS-passord."
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "Du må velge et lenger passord"
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "Passordet er allerede brukt. Velg et annet."
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "Du må vente lenger før du endrer ditt passord"
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "Beklager, passordene er ikke like"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "Sjekker …"
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "Autentisering mislyktes."
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "Blank skjerm"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "Tilfeldig"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d time"
 msgstr[1] "%d timer"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minutt"
 msgstr[1] "%d minutter"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -622,15 +622,15 @@ msgstr[1] "%d sekunder"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -638,35 +638,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "Aldri"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "Kunne ikke laste hovedbrukergrensesnittet"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "Se til at skjermspareren er skikkelig installert"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "Ikke kjør som tjeneste"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "Aktiver avlusingskode"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr "Start skjermsparer og låseprogram"
 
diff --git a/po/nds.po b/po/nds.po
index 028485b..552d69c 100644
--- a/po/nds.po
+++ b/po/nds.po
@@ -18,60 +18,60 @@ msgstr ""
 "Language: nds\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "Billschirmschoner"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "Billschirmschonerinstellens setten"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "Billschirmschonerutblick"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>Billschirmschonerutblick</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "Billschirmschonerinstellens"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "Strom _Oppasser"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "_Utblick"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "_Billschirmschonerthema:"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "In Leerloop nah'm Räkner kieken nah:"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "_Billschirmschoner in Leerloopmodus aktiveren"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "_Billschirm avsluten, wenn de Billschirmschoner an is"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>Oppassen: De Billschirm warrt open laten för de root-Bruker.</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "Billschirmschoners"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "Billschirmschonerthemen"
@@ -394,224 +394,224 @@ msgstr "%s is vermoudlich keen valides Billschirmschonerthema."
 msgid "Copying file: %u of %u"
 msgstr "Kopiere Datei: %u vun %u"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "Billschirmschoner scheun sluten"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "Op'n Tostand vun Billschirmschoner oppassen"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr "De Tiet rutfinnen, de de Billschirmschoner nu schon an is"
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "Vertellt de lööpenden Billschirmschoner, dat de Billschirm avslut werrn schall"
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "Wenn de Billschirmschoner an is, schall to eene annere Grafikdemonstratschoon wesselt werrn"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "Billschirmschoner anmaken (Blanker Billschirm)"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "Wenn de Billschirmschoner an is, denn schall dat utmakt werrn. (Denn is de Billschirm nich blank)"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "De Räkner schall so doon, as ob he aktiv is, dormit de Billschirmschoner nich angeiht."
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr "De Billschirmschoner stoppen, ehe de losgeiht. "
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr "Dat Programm, dat bi'n Utföhren vun Billschirmschoner datwüschen funkt"
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr "De Grund, warum de Billschirmschoner stoppt werrn künn"
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "Verschoon vun düssem Programm"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "De Billschirmschoner is %s\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "Aktiv"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "Nich aktiv"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr "De Billschirmschoner is nich stoppt worrn\n"
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr "De Billschirmschoner is stoppt worrn bi:\n"
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr "De Billschirmschoner is nu aktiv siet %d Sekunnen.\n"
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr "De Billschirmschoner is grade nich aktiv.\n"
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "Debugging-Utgav opwiesen"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "Avmellensknopp opwiesen"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "Order, de döör de Avmellensknopp in Gang kümmt"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "Knopp to'm Brukerwessel opwiesen"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr "Nahricht, de in'n Dialogfinster opwiest warrn schall"
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "NAHRICHT"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr "nich gebrukt"
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "Brukernaam:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "Passwoord:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr "Bidde Passwoord ännern! (to ol)"
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "Bidde Passwoord ännern (root nödig)"
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "Düsses Brukerkonto is avloopen; bidde mit de Systemoppasser Kontakt opnehmen"
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "Keen Passwoord angeven"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "Passwoord nich ännert"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "Kunn de Brukernaam nich rutkregen"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "Nejes UNIX Passwoord to'm tweiten Mol ingeven:"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "Nejes UNIX Passwoord ingeven:"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "(Aktuelles) UNIX Passwoord:"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "Fehler bi'm Ännern vu'm NIS Passwoord."
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "Dat Passwoord is to kort"
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "Düsses Passwoord givt dat schon. Bidde anneres utsöken."
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "Dat düert noch'n beten, bit dat Passwoord ännert weern künn"
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "Dat Passwoord passt nich."
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "Döörkieken..."
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "Authentifikatschoon fehlslagen"
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "Blanker Billschirm"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "Liek"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -620,15 +620,15 @@ msgstr[1] ""
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -636,35 +636,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "Nie nich"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "Kunn de Hööftböverflach nich laden"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "Bidde rutfinnen, ob de Billschirmschoner akerat installeert is"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "Keen daemon to kregen"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "Debugging code möglich maken"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr ""
 
diff --git a/po/ne.po b/po/ne.po
index d16fa18..90727e1 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -21,60 +21,60 @@ msgstr ""
 "Language: ne\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "स्क्रिनसेभर"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "स्क्रिनसेभर प्राथमिकता सेट गर्नुहोस्"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "स्क्रिनसेभर पूर्वावलोकन"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>स्क्रिनसेभर पूर्वावलोकन</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "स्क्रिनसेभर प्राथमिकता"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "पावर प्रबन्ध"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "पूर्वावलोकन"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "स्क्रिनसेभर विषयवस्तु:"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "निस्क्रियता पछिको कम्प्युटर सम्बन्धी:"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "कम्प्युटर निस्क्रिय हुदा स्क्रिनसेभर सक्रिय पार्नुहोस्"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "स्क्रिनसेभर सक्रिय भएपछि पर्दामा ताल्चा लगाउनुहोस्"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>चेतावनी: मूल प्रयोगकर्ताका लागि पर्दामा ताल्चा लगाइने छैन ।</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "स्क्रिनसेभर"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "स्क्रिनसेभर विषयवस्तु"
@@ -397,224 +397,224 @@ msgstr ""
 msgid "Copying file: %u of %u"
 msgstr "फाइल प्रतिलिपि गरिदैँछ: %u को %u"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "स्क्रिनसेभरको कारणले गर्दा उचित रुपले बाहिरियो"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "स्क्रिनसेभरको स्थितिलाई क्वेरी गर्नुहोस्"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr "स्क्रिनसेभर सक्रिय भएको समय अवधि क्वेरी गर्नुहोस्"
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "पर्दामा तत्काल ताल्चा लगाउनका लागि चलिरहेको स्क्रिनसेभरलाई सुझाव दिन्छ"
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "स्क्रिनसेभर सक्रिय भएमा अर्को ग्राफिक्स डेमोमा स्विच गर्नुहोस्"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "स्क्रिनसेभर खोल्नुहोस् (पर्दा खाली बनाउनुहोस्)"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "स्क्रिनसेभर सक्रिय भएमा यसलाई निस्क्रिय बनाउनुहोस् (पर्दा खाली नबनाउनुहोस्)"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "प्रयोगकर्ताको क्रियाकलापलाई नक्कल गर्न चलिरहेको स्क्रिनसेभरलाई पोक गर्नुहोस्"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr "स्क्रिनसेभर सक्रिय बनाउन निषेध गर्नुहोस् ।  निषेध सक्रिय भएमा आदेशले केही समय रोक्दछ ।"
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr "स्क्रिनसेभर निषेध गरिरहेको कलिङ अनुप्रयोग"
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr "स्क्रिनसेभर निषेध गर्नुको कारण"
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "यस अनुप्रयोगको संस्करण"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "स्क्रिनसेभर %s हो\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "सक्रिय"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "निस्क्रिय"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr "स्क्रिनसेभरलाई %d सेकेन्डका लागि सक्रिय पारिएको छ ।\n"
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "डिवगिङ प्रतिफल देखाउनुहोस्"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "लगआउट बटन देखाउनुहोस्"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "लग आउट वटनबाट आह्वान गरिने आदेश"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "स्विच प्रयोगकर्ता वटन देखाउनुहोस्"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr "संवादमा देखाइने सन्देश"
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "सन्देश"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr ""
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "प्रयोगकर्तानाम:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "पासवर्ड:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr "तपाईँले तत्काल आफ्नो पासवर्ड परिवर्तन गर्नु आवश्यक हुन्छ (पासवर्ड अवधि)"
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "तपाईँले तत्काल आफ्नो पासवर्ड परिवर्तन गर्नु आवश्यक हुन्छ (मूल दवाब)"
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "तपाईँको खाताको म्याद समाप्त भएको छ; कृपया तपाईँको प्रणाली प्रसासकलाई सम्पर्क गर्नुहोस्"
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "पासवर्ड दिइएको छैन"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "पासवर्ड परिवर्तन गरिएको छैन"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "प्रयोगकर्ता नाम प्राप्त गर्न सकिदैँन "
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "नयाँ युनिक्स पासवर्ड पुन: टाइप गर्नुहोस्:"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "नयाँ युनिक्स पासवर्ड प्रविष्टि गर्नुहोस्:"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "(हाल) युनिक्स पासवर्ड:"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "एनआईएस(NIS) पासवर्ड परिवर्तन गर्दा त्रुटि ।"
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "तपाईँले लामो पासवर्ड रोज्नुपर्दछ"
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "पासवर्ड पहिला नै प्रयोग गरिएको छ । अन्य पासवर्ड रोज्नुहोस् ।"
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "पासवर्ड परिवर्तन गर्न तपाईँले लामो समय प्रतिक्षा गर्नुपर्दछ"
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "माफ गर्नुहोस्। पासवर्ड मिलेको छैन"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "जाँच गरिदैँछ..."
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "प्रमाणीकरण असफल ।"
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "खाली पर्दा"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "अनियमित"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d घन्टा"
 msgstr[1] "%d घन्टा"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d मिनेट"
 msgstr[1] "%d मिनेट"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -623,15 +623,15 @@ msgstr[1] "%d सेकेन्ड"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -639,35 +639,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "कहिले पनि"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "मुख्य इन्टरफेस लोड गर्न सकेन"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "कृपया स्क्रिनसेभर ठीकरूपमा स्थापित भएको निश्चित गर्नुहोस्"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "डेइमोन नहुनुहोस्"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "त्रुटि सच्याउने कोड सक्षम पार्नुहोस्"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr ""
 
diff --git a/po/nl.po b/po/nl.po
index 8405c4a..5d41828 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -22,60 +22,60 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "Schermbeveiliging"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "Voorkeuren voor de schermbeveiliging instellen"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "Voorbeeldweergave schermbeveiliging"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>Voorbeeldweergave schermbeveiliging</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "Voorkeuren schermbeveiliging"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "_Energiebeheer"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "_Voorbeeldweergave"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "_Schermbeveiligingsthema:"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "Computer als i_nactief beschouwen na:"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "Schermbeveiliging inschakelen wanneer de computer inactief is"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "_Scherm vergrendelen wanneer schermbeveiliging is geactiveerd"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>Waarschuwing: het scherm zal niet vergrendeld worden voor de gebruiker root.</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "Schermbeveiligingen"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "Schermbeveiligingsthema's"
@@ -398,224 +398,224 @@ msgstr "‘%s’ lijkt niet een geldig schermbeveiligingsthema te zijn."
 msgid "Copying file: %u of %u"
 msgstr "Bestand kopiëren: %u van %u"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "Zorgt dat de schermbeveiliging netjes afsluit"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "De toestand van de schermbeveiliging opvragen"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr "Opvragen hoe lang de schermbeveiliging actief is geweest"
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "Geeft de actieve schermbeveiliging opdracht om het scherm onmiddellijk te vergrendelen"
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "Indien de schermbeveiliging actief is, wisselen naar een andere grafische demo"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "De schermbeveiliging activeren (het scherm zwart maken)"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "Indien de schermbeveiliging actief is, deze deactiveren (het scherm zichtbaar maken)"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "De actieve schermbeveiliging laten denken dat er gebruikersactiviteit is"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr "Verhinderen dat de schermbeveiliging ingeschakeld wordt. Deze opdracht blokkeert zo lang als de verhindering actief is."
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr "De aanroepende toepassing die de schermbeveiliging verhindert te starten"
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr "De reden voor de verhindering van de schermbeveiliging"
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "Versie van deze toepassing"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "De schermbeveiliging is %s\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "actief"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "inactief"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr "De schermbeveiliging wordt niet verhinderd\n"
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr "De schermbeveiliging wordt verhinderd door:\n"
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr "De schermbeveiliging is geactiveerd geweest gedurende %d seconden.\n"
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr "De schermbeveiliging is momenteel niet actief.\n"
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "Foutopsporingsuitvoer tonen"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "Een afmeldknop tonen"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "Opdracht die wordt uitgevoerd met de afmeldknop"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "Een knop tonen met 'Gebruiker wisselen'"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr "Te tonen bericht in het dialoogvenster"
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "BERICHT"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr "Niet gebruikt"
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "Gebruikersnaam:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "Wachtwoord:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr "U dient uw wachtwoord direct te veranderen (wachtwoord verlopen)"
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "U dient uw wachtwoord direct te veranderen (op last van de systeembeheerder)"
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "Uw account is verlopen; neem a.u.b. contact op met de systeembeheerder"
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "Geen wachtwoord opgegeven"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "Wachtwoord ongewijzigd"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "Kan gebruikersnaam niet opvragen"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "Tik nieuw wachtwoord opnieuw in:"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "Voer nieuw wachtwoord in:"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "Huidig wachtwoord:"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "Fout bij veranderen NIS-wachtwoord."
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "U dient een langer wachtwoord te kiezen"
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "Dit wachtwoord is al eens gebruikt. Kies een ander wachtwoord."
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "U dient langer te wachten om uw wachtwoord te veranderen"
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "Helaas, de wachtwoorden komen niet overeen"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "Controle…"
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "Authenticatie mislukt."
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "Zwart scherm"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "Willekeurig"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d uur"
 msgstr[1] "%d uur"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuut"
 msgstr[1] "%d minuten"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -624,15 +624,15 @@ msgstr[1] "%d seconden"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -640,35 +640,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "Nooit"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "Kon de hoofd-bedieningsschil niet laden"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "Controleer a.u.b. of de schermbeveiliging correct is geïnstalleerd"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "Niet als achtergronddienst uitvoeren"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "Foutopsporing code inschakelen"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr "Programma opstarten voor schermbeveiling en -vergrendeling"
 
diff --git a/po/nn.po b/po/nn.po
index 363d235..abfc301 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -19,60 +19,60 @@ msgstr ""
 "Language: nn\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "Skjermsparar"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "Set brukarval for skjermspararen"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "Førehandsvising av skjermsparar"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>Førehandsvising av skjermsparar</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "Brukarval for skjermsparar"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "Strø_mstyring"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "_Førehandsvis"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "Tema for _skjermsparar:"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "Sjå på datamaskinen som _inaktiv etter:"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "_Aktiver skjermsparar når datamaskina er inaktiv"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "_Lås skjermen når aktiv"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>Advarsel: skjermen vil ikkje verta låst for root.</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "Skjermsparare"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "Tema for skjermsparar"
@@ -395,224 +395,224 @@ msgstr "%s ser ikkje ut til å vera ein gyldig skjermsparardrakt."
 msgid "Copying file: %u of %u"
 msgstr "Kopierer fil: %u av %u"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "Sørger for sikker avslutning av skjermspararen"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "Spør etter skjermspararstatus"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr "Spør kor lenge skjermspararen har vore aktiv"
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "Tvingar køyrande skjermsparar til å låse skjermen omgåande"
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "Skift til eit anna drakt om skjermspararen er aktiv"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "Slå på skjermspararen (blank ut skjermen)"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "Deaktiver skjermspararen om den er aktiv"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "Kommuniser med køyrande skjermsparar for å simulere brukaraktivitet"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr "Hindre skjermspararen frå å aktiverast. Kommandoen blokkerer så lenge hindringa er aktiv."
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr "Programmet som hindrar skjermspararen"
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr "Årsak for hinding av skjermsparar."
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "Skjermspararversjon"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "Skjermsparar er %s\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "aktiv"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "inaktiv"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr "Skjermspararen har vore aktiv i %d sekund.\n"
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "Vis avlusingsinformasjon"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "Vis knapp for å logge ut"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "Kommando som skal køyrast ved klikk på utloggingsknappen"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "Vis knapp for å byte brukar"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr "Melding som skal vert viste i dialogen"
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "MELDING"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr ""
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "Brukarnamn:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "Passord:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr "Du må endra ditt passord no (passordet er utløpt)"
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "Du må endra ditt passord no (bestemt av administrator)"
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "Din konto har utgått; vennligst kontakt systemadministrator"
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "Inga passord oppgjeven"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "Passordet er ikkje endra"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "Kan ikkje finna brukarnamn"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "Skriv inn nytt UNIX-passord på nytt:"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "Oppgje nytt UNIX-passord:"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "(aktivt) UNIX-passord:"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "Feil under endring av NIS-passord."
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "Du må velja eit lenger passord"
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "Passordet er allereie brukt. Vel eit anna."
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "Du må vente lenger før du endrar ditt passord"
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "Beklager, passorda er ikkje like"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "Sjekkar..."
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "Autentisering feilet."
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "Blank skjerm"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "Tilfeldig"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d time"
 msgstr[1] "%d timar"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minutt"
 msgstr[1] "%d minutt"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -621,15 +621,15 @@ msgstr[1] "%d sekund"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -637,35 +637,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "Aldri"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "Kunne ikkje lasta hovudbrukargrensesnittet"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "Vennligst sjå til at skjermspararen er skikkeleg installert"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "Ikkje køyr som teneste"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "Aktiver avlusingskode"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr ""
 
diff --git a/po/oc.po b/po/oc.po
index 7e2a0c1..ba9b56c 100644
--- a/po/oc.po
+++ b/po/oc.po
@@ -18,60 +18,60 @@ msgstr ""
 "Language: oc\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "Estalviador d'ecran"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "Definir vòstras preferéncias per l'estalviador d'ecran"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "Preferéncias de l'estalviiador d'ecran"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "_Gestion de l'energia"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "_Previsualizacion"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "Tèma de l'estalviador d'_ecran :"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr ""
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "Estalviadors d'ecran"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "Tèmas d'estalviador d'ecran"
@@ -394,224 +394,224 @@ msgstr ""
 msgid "Copying file: %u of %u"
 msgstr "Còpia del fichièr : %u sus %u"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "Version de l'aplicacion"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "actiu"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "inactiu"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "MESSATGE"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr "Pas utilizat"
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "Nom d'utilizaire :"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "Senhal :"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "Cap de senhal pas provesit"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "Senhal pas modificat"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "Impossible d'obténer un nom d'utilizaire"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "Senhal UNIX (actual) :"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "Verificacion en cors..."
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "L'autentificacion a fracassat."
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "Ecran void"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "Aleatòri"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d ora"
 msgstr[1] "%d oras"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuta"
 msgstr[1] "%d minutas"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -620,15 +620,15 @@ msgstr[1] "%d segonda"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -636,35 +636,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "Jamai"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "Impossible de cargar l'interfàcia principala"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr ""
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr ""
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "Activa lo còdi de desbugatge"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr ""
 
diff --git a/po/or.po b/po/or.po
index 80019e9..79a5178 100644
--- a/po/or.po
+++ b/po/or.po
@@ -20,60 +20,60 @@ msgstr ""
 "Language: or\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "ପରଦା ସଂରକ୍ଷକ"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "ଆପଣଙ୍କର ପରଦା ସଂରକ୍ଷକ ପସନ୍ଦଗୁଡିକୁ ସ୍ଥିର କରନ୍ତୁ"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "ପରଦା ସଂରକ୍ଷକ ପୂର୍ବଦୃଶ୍ଯ"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>ପରଦା ସଂରକ୍ଷକ ପୂର୍ବଦୃଶ୍ଯ</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "ପରଦା ସଂରକ୍ଷକ ପସନ୍ଦଗୁଡିକ"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "ବିଦ୍ଯୁତ ପ୍ରବନ୍ଧନ (_M)"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "ପୂର୍ବାଲୋକନ (_P)"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "ପରଦା ସଂରକ୍ଷକ ପ୍ରସଙ୍ଗ (_S):"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "ପରେ କମ୍ପ୍ଯୁଟରକୁ ନିଷ୍କ୍ରିଯ ପରି ବିଚାର କରନ୍ତୁ (_i):"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "ୟେବେ କମ୍ପ୍ଯୁଟର ନିଷ୍କ୍ରିଯ ହୁଏ ପରଦା ସଂରକ୍ଷକକୁ ସକ୍ରିଯ କର (_A)"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "ୟେବେ ପରଦା ସଂରକ୍ଷକ ସକ୍ରିଯ ହୁଏ ସ୍କ୍ରିନକୁ ତାଲାବନ୍ଦ କର (_L)"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>ଚେତାବନୀ: ମୂଳ ଉପୟୋଗକର୍ତ୍ତା ପାଇଁ ସ୍କ୍ରିନ ତାଲାବନ୍ଦ ହେବ ନାହିଁ </b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "ପରଦା ସଂରକ୍ଷକ"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "ପରଦା ସଂରକ୍ଷକ ପ୍ରସଙ୍ଗ"
@@ -396,224 +396,224 @@ msgstr "%s ଟି ଗୋଟିଏ ବୈଧ ପରଦା ସଂରକ୍ଷକ 
 msgid "Copying file: %u of %u"
 msgstr "ଫାଇଲ ନକଲ କରନ୍ତୁ: %u of %u"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "ମର୍ୟ୍ଯାଦାର ସହିତ ପରଦା ସଂରକ୍ଷକକୁ ପ୍ରାସ୍ଥାନ କରିବାର କାରଣଉତ୍ପନ୍ନ କରେ।"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "ପରଦା ସଂରକ୍ଷକର ସ୍ଥିତିର ପ୍ରଶ୍ନ କରେ"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr "ପରଦା ସଂରକ୍ଷକ ସକ୍ରିଯ ରହିଥିବା ସମଯର ଦୀର୍ଘତା ପ୍ରଶ୍ନ କର"
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "ଚାଲୁଥିବା ପରଦା ସଂରକ୍ଷକ ପ୍ରକ୍ରିଯାକୁ ଅତିଶୀଘ୍ର ସ୍କ୍ରିନକୁ ତାଲାବନ୍ଦ କରିବା ପାଇଁ କହେ"
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "ୟଦି ପରଦା ସଂରକ୍ଷକ ସକ୍ରିଯ ଅଟେ, ତେବେ ଅନ୍ଯ ଗୋଟିଏ ଗ୍ରାଫିକ୍ସ ଡେମୋକୁ ବଦଳାଅ"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "ପରଦା ସଂରକ୍ଷକକୁ ଆରମ୍ଭ କର(ଖାଲି ସ୍କ୍ରିନ)"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "ୟଦି ପରଦା ସଂରକ୍ଷକ ସକ୍ରିଯ ଅଟେ ଏହାକୁ ନିଷ୍କ୍ରିଯ କର( ସ୍କ୍ରିନକୁ ପୁରଣ କର)"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "ଚାଲୁଥିବା ସ୍କ୍ରିନସ୍ଭରକୁ ଉପୟୋଗକର୍ତ୍ତା କାର୍ୟ୍ଯକଳାପକୁ ବାହାନା କରିବା ପାଇଁ ଆଲୋଡିତ କର"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr "ସକ୍ରିଯ ହେବାରୁ ସ୍କ୍ରିନ ସେଭରକୁ ନିଷେଧ କର। ନିଷେଧ ସକ୍ରିଯ ଥିବା ବେଳେ ଆଦେଶ ଅବରୋଧିତ ହୁଏ"
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr "ଡାକୁଥିବା ପ୍ରଯୋଗ ୟାହାକି ପରଦା ସଂରକ୍ଷକକୁ ନିଷେଧ କରୁଛି"
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr "ପରଦା ସଂରକ୍ଷକକୁ ନିଷେଧ କରିବା ନିମନ୍ତେ କାରଣ"
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "ଏହି ପ୍ରୟୋଗର ସଂସ୍କରଣ"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "ପରଦା ସଂରକ୍ଷକ ହେଉଛି %s\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "ସକ୍ରିୟ"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "ନିଷ୍କ୍ରିୟ"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr "ପରଦା ସଂରକ୍ଷକକୁ ବାରଣ କରାଯାଇନାହିଁ\n"
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr "ଦ୍ୱାରା ପରଦା ସଂରକ୍ଷକଟି ବାରଣ କରାଯାଇଥାଏ:\n"
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr "ପରଦା ସଂରକ୍ଷକ %d ସେକେଣ୍ଡ ପାଇଁ ସକ୍ରିଯ ହୋଇଛି।\n"
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr "ପରଦା ସଂରକ୍ଷକଟି ବର୍ତ୍ତମାନ ସକ୍ରିୟ ନାହିଁ।\n"
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "ଡିବଗ୍ କରିବା ଆଉଟପୁଟ ଦେଖାଅ"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "ଲଗଆଉଟ ବଟନ ଦେଖାଅ"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "ଲଗଆଉଟ ବଟନରୁ ଆହ୍ବାନ କରିବା ପାଇଁ ଆଦେଶ"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "ଉପୟୋଗକର୍ତ୍ତା ବଦଳ ବଟନ ଦେଖାଅ"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr "ସଂଳାପରେ ଦର୍ଶାଇବା ପାଇଁ ସନ୍ଦେଶ"
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "MESSAGE"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr "ବ୍ୟବହାର ହୋଇନାହିଁ"
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "ଚାଳକ ନାମ:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "ପ୍ରବେଶ ସଙ୍କେତ:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr "ଆପଣ ଆପଣଙ୍କର ପ୍ରବେଶ ସଙ୍କେତକୁ ଯଥାଶୀଘ୍ର ବଦଳାଇବା ଆବଶ୍ଯକ (ପ୍ରବେଶ ସଙ୍କେତ କାଲବାଧିତ ହୋଇସାରିଛି)"
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "ଆପଣ ଆପଣଙ୍କର ପ୍ରବେଶ ସଙ୍କେତକୁ ଯଥାଶୀଘ୍ର ବଦଳାଇବା ଆବଶ୍ଯକ (ରୁଟ ଦ୍ବାରା ବାଧ୍ଯ)"
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "ଆପଣଙ୍କର ଖାତାଟି ଅଚଳ ବନ୍ଦ ହୋଇଯାଇଛି; ଦୟାକରି ଆପଣଙ୍କ ତନ୍ତ୍ର ପ୍ରଶାସକଙ୍କ ସହିତ ଯୋଗାଯୋଗ କରନ୍ତୁ"
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "କୌଣସି ପ୍ରବେଶ ସଙ୍କେତ ଦିଆଯାଇ ନାହିଁ"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "ପ୍ରବେଶ ସଙ୍କେତ ଟି ଅପରିବର୍ତ୍ତିତ ଅଛି"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "ଚାଳକ ନାମକୁ ପାଇ ପାରିବ ନାହିଁ"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "ନୂତନ UNIX ପ୍ରବେଶ ସଙ୍କେତକୁ ପୁନର୍ବାର ଟାଇପ କରନ୍ତୁ:"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "ନୂତନ UNIX ପ୍ରବେଶ ସଙ୍କେତକୁ ଭରଣ କରନ୍ତୁ:"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "(ପ୍ରଚଳିତ) UNIX ପ୍ରବେଶ ସଙ୍କେତ:"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "NIS ପ୍ରବେଶ ସଙ୍କେତକୁ ବଦଳାଇବା ସମୟରେ ତ୍ରୁଟି।"
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "ଆପଣ ଗୋଟିଏ ଲମ୍ବା ପ୍ରବେଶ ସଙ୍କେତ ଚୟନ କରିବା ଉଚିତ"
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "ପ୍ରବେଶ ସଙ୍କେତକୁ ପୂର୍ବରୁ ବଦଳା ଯାଇଛି। ଆଉ ଗୋଟିଏ ପ୍ରବେଶ ସଙ୍କେତ ଚୟନ କରନ୍ତୁ।"
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "ପ୍ରବେଶ ସଙ୍କେତକୁ ବଦଳାଇବା ପାଇଁ ଆପଣଙ୍କୁ ଅଧିକ ଅପେକ୍ଷା କରିବା ପାଇଁ ପଡିବ"
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "କ୍ଷମା କରିବେ, ପ୍ରବେଶ ସଙ୍କେତଟି ମିଶୁ ହେଉନାହିଁ"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "ଯାଞ୍ଚ କରୁଅଛି..."
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "ବୈଧିକରଣ ବିଫଳ।"
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "କଳା ପରଦା"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "କ୍ରମମୁକ୍ତ"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d ଘଣ୍ଟା"
 msgstr[1] "%d ଘଣ୍ଟା"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d ମିନିଟ"
 msgstr[1] "%d ମିନିଟ"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -622,15 +622,15 @@ msgstr[1] "%d ସେକେଣ୍ଡ"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -638,35 +638,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "କେବେ ନୁହେଁ"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "ମୁଖ୍ୟ ଅନ୍ତରାପୃଷ୍ଠ ଧାରଣ କରିବାରେ ଅସମର୍ଥ"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "ଦଯାକରି ନିଶ୍ଚିତ କରନ୍ତୁ ୟେ ସ୍କ୍ରିନ ସେଭର ସଠିକ ଭାବରେ ପ୍ରତିଷ୍ଠାପିତ ହୋଇଛି"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "ଗୋଟିଏ ଡିମୋନ ହୁଅ ନାହିଁ"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "ତ୍ରୁଟି ନିବାରଣ ସଂକେତକୁ ସକ୍ରିୟ କରନ୍ତୁ"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr ""
 
diff --git a/po/pa.po b/po/pa.po
index d9337ba..853629c 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -20,60 +20,60 @@ msgstr ""
 "Language: pa\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "ਸਕਰੀਨ-ਸੇਵਰ"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "ਸਕਰੀਨ-ਸੇਵਰ ਲਈ ਆਪਣੀ ਪਸੰਦ ਦਿਓ"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "ਸਕਰੀਨ-ਸੇਵਰ ਝਲਕ"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>ਸਕਰੀਨ-ਸੇਵਰ ਝਲਕ</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "ਸਕਰੀਨ-ਸੇਵਰ ਪਸੰਦ"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "ਊਰਜਾ ਪਰਬੰਧ(_M)"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "ਝਲਕ(_P)"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "ਸਕਰੀਨ-ਸੇਵਰ ਥੀਮ(_S):"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "ਕੰਪਿਊਟਰ ਨੂੰ ਇੰਨੇ ਸਮੇਂ ਬਾਅਦ ਵੇਹਲਾ ਮੰਨੋ(_i):"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "ਜਦੋਂ ਕੰਪਿਊਟਰ ਵੇਹਲਾ ਹੋਵੇ ਤਾਂ ਸਕਰੀਨ-ਸੇਵਰ ਸਰਗਰਮ ਕਰੋ(_A)"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "ਜਦੋਂ ਸਕਰੀਨ-ਸੇਵਰ ਸਰਗਰਮ ਹੋਵੇ ਤਾਂ ਸਕਰੀਨ ਲਾਕ ਕਰੋ(_L)"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>ਚੇਤਾਵਨੀ: ਸਕਰੀਨ root ਯੂਜ਼ਰ ਲਈ ਤਾਲਾਬੰਦ ਨਹੀਂ ਹੋਵੇਗੀ।</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "ਸਕਰੀਨ-ਸੇਵਰ"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "ਸਕਰੀਨ-ਸੇਵਰ ਥੀਮ"
@@ -396,224 +396,224 @@ msgstr "%s ਫਾਇਲ ਇੱਕ ਠੀਕ ਸਕਰੀਨ-ਸੇਵਰ ਥੀ
 msgid "Copying file: %u of %u"
 msgstr "ਫਾਇਲ ਕਾਪੀ ਜਾਰੀ: %2$u ਵਿੱਚੋਂ %1$u"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "ਸਕਰੀਨ-ਸੇਵਰ ਨੂੰ ਮਾਣ ਨਾਲ ਬੰਦ ਕਰਨ ਦਾ ਕਾਰਨ ਬਣਦਾ ਹੈ"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "ਸਕਰੀਨ-ਸੇਵਰ ਦੀ ਹਾਲਤ ਬਾਰੇ ਸਵਾਲ"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr "ਸਕਰੀਨ-ਸੇਵਰ ਸਰਗਰਮ ਹੋਣ ਦੇ ਸਮੇਂ ਦੀ ਲੰਬਾਈ ਬਾਰੇ ਸਵਾਲ"
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "ਚੱਲਦੇ ਸਕਰੀਨ-ਸੇਵਰ ਕਾਰਵਾਈ ਨੂੰ ਸਕਰੀਨ ਨੂੰ ਤੁਰੰਤ ਲਾਕ ਕਰਨ ਦਾ ਸੰਕੇਤ ਦਿਓ"
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "ਜੇਕਰ ਸਕਰੀਨ-ਸੇਵਰ ਸਰਗਰਮ ਹੋਵੇ ਤਾਂ ਹੋਰ ਗਰਾਫਿਕਸ ਡੈਮੋ ਲਈ ਤਬਦੀਲ ਕਰੋ"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "ਸਕਰੀਨ-ਸੇਵਰ ਚਾਲੂ ਕਰੋ (ਖਾਲੀ ਸਕਰੀਨ ਹੀ)"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "ਜੇਕਰ ਸਕਰੀਨ-ਸੇਵਰ ਸਰਗਰਮ ਹੋਵੇ ਤਾਂ ਉਸ ਨੂੰ ਨਾ-ਸਰਗਰਮ ਕਰੋ (ਨਾ-ਖਾਲੀ ਸਕਰੀਨ)"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "ਸਕਰੀਨ-ਸੇਵਰ ਨੂੰ ਯੂਜ਼ਰ ਕਾਰਵਾਈਆਂ ਮੁਤਾਬਕ ਨਕਲ ਕਰਨ ਲਈ ਤਿਆਰ ਕਰੋ"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr "ਸਕਰੀਨ-ਸੇਵਰ ਨੂੰ ਸਰਗਰਮ ਹੋਣ ਤੋਂ ਰੋਕਿਆ ਗਿਆ।  ਕਮਾਂਡਾਂ ਉੱਤੇ ਰੋਕ ਹੈ, ਜਦੋਂ ਕਿ ਰੋਕਣਾ ਸਰਗਰਮ ਹੈ।"
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr "ਸਕਰੀਨ-ਸੇਵਰ ਨੂੰ ਰੋਕਣ ਵਾਲੇ ਕਾਰਜ ਬਾਰੇ ਜਾਣਕਾਰੀ ਲਈ ਜਾ ਰਹੀ ਹੈ"
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr "ਸਕਰੀਨ-ਸੇਵਰ ਰੋਕਣ ਲਈ ਕਾਰਨ"
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "ਇਹ ਐਪਲੀਕੇਸ਼ਨ ਦਾ ਵਰਜਨ"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "ਸਕਰੀਨ-ਸੇਵਰ %s ਹੈ।\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "ਸਰਗਰਮ"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "ਨਾ-ਸਰਗਰਮ"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr "ਸਕਰੀਨ-ਸੇਵਰ ਇੰਹੈਬਿਟ ਨਹੀਂ ਹੈ\n"
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr "ਸਕਰੀਨ-ਸੇਵਰ ਇੰਹੈਬਿਟ ਕੀਤਾ ਹੈ:\n"
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr "ਸਕਰੀਨ-ਸੇਵਰ %d ਸਕਿੰਟਾਂ ਤੋਂ ਸਰਗਰਮ ਹੈ।\n"
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr "ਸਕਰੀਨ-ਸੇਵਰ ਹਾਲੇ ਐਕਟਿਵ ਨਹੀਂ ਹੈ।\n"
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "ਡੀਬੱਗ ਆਉਟਪੁੱਟ ਵੇਖਾਓ"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "ਲਾਗਆਉਟ ਬਟਨ ਵੇਖਾਓ"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "ਲਾਗਆਉਟ ਬਟਨ ਲਈ ਕੰਮ ਕਰਨ ਵਾਲੀ ਕਮਾਂਡ"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "ਯੂਜ਼ਰ ਬਦਲਣ ਵਾਲਾ ਬਟਨ ਵੇਖਾਓ"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr "ਡਾਈਲਾਗ ਵਿੱਚ ਸੁਨੇਹਾ ਵੇਖਾਓ"
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "ਸੁਨੇਹਾ"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr "ਨਹੀਂ ਵਰਤਿਆ"
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "ਯੂਜ਼ਰ-ਨਾਂ:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "ਪਾਸਵਰਡ:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr "ਤੁਹਾਨੂੰ ਆਪਣਾ ਪਾਸਵਰਡ ਹੁਣੇ ਬਦਲਣਾ ਪਵੇਗਾ (ਪਾਸਵਰਡ ਦੀ ਮਿਆਦ ਪੁੱਗੀ)"
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "ਤੁਹਾਨੂੰ ਆਪਣਾ ਪਾਸਵਰਡ ਹੁਣੇ ਬਦਲਣਾ ਪਵੇਗਾ (root ਵਲੋਂ ਮਜਬੂਰ ਕੀਤਾ ਗਿਆ ਹੈ)"
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "ਤੁਹਾਡੇ ਅਕਾਊਂਟ ਦੀ ਮਿਆਦ ਖਤਮ ਹੋ ਗਈ ਹੈ; ਆਪਣੇ ਸਿਸਟਮ ਪਰਸ਼ਾਸ਼ਕ ਨਾਲ ਸੰਪਰਕ ਕਰੋ ਜੀ।"
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "ਕੋਈ ਪਾਸਵਰਡ ਨਹੀਂ ਦਿੱਤਾ ਗਿਆ"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "ਪਾਸਵਰਡ ਬਦਲਿਆ ਗਿਆ"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "ਯੂਜ਼ਰ ਨਾਂ ਲਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "ਨਵਾਂ UNIX ਪਾਸਵਰਡ ਮੁੜ-ਲਿਖੋ:"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "ਨਵਾਂ UNIX ਪਾਸਵਰਡ ਦਿਓ:"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "(ਮੌਜੂਦਾ) UNIX ਪਾਸਵਰਡ:"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "NIS ਪਾਸਵਰਡ ਬਦਲਣ ਦੌਰਾਨ ਗਲਤੀ ਆਈ ਹੈ।"
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "ਤੁਹਾਨੂੰ ਇੱਕ ਲੰਮਾ ਪਾਸਵਰਡ ਚੁਣਨਾ ਚਾਹੀਦਾ ਹੈ"
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "ਪਾਸਵਰਡ ਪਹਿਲਾਂ ਹੀ ਬਦਲਿਆ ਗਿਆ ਹੈ। ਹੋਰ ਚੁਣੋ ਜੀ।"
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "ਤੁਹਾਨੂੰ ਆਪਣਾ ਪਾਸਵਰਡ ਬਦਲਣ ਲਈ ਹੋਰ ਵੱਧ ਉਡੀਕ ਕਰਨੀ ਪਵੇਗੀ।"
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "ਅਫ਼ਸੋਸ ਹੈ ਕਿ ਪਾਸਵਰਡ ਮਿਲਦਾ ਨਹੀਂ ਹੈ"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "ਚੈੱਕ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "ਪਰਮਾਣਕਿਤਾ ਫ਼ੇਲ੍ਹ ਹੋ ਗਈ ਹੈ।"
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "ਖਾਲੀ ਸਕਰੀਨ"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "ਰਲਵੇਂ"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d ਘੰਟਾ"
 msgstr[1] "%d ਘੰਟੇ"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d ਮਿੰਟ"
 msgstr[1] "%d ਮਿੰਟ"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -622,15 +622,15 @@ msgstr[1] "%d ਸਕਿੰਟ"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -638,35 +638,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "ਕਦੇ ਨਹੀਂ"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "ਮੁੱਖ ਇੰਟਰਫੇਸ ਲੋਡ ਨਹੀਂ ਹੋ ਸਕਿਆ ਹੈ।"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "ਜਾਂਚ ਕਰੋ ਕਿ ਸਕਰੀਨ-ਸੇਵਰ ਠੀਕ ਤਰ੍ਹਾਂ ਇੰਸਟਾਲ ਹੈ ਜੀ"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "ਇੱਕ ਡੈਮਨ ਨਾ ਬਣਾਓ"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "ਡੀਬੱਗ ਕੋਡ ਨੂੰ ਯੋਗ"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr ""
 
diff --git a/po/pl.po b/po/pl.po
index 3c3463e..c73136d 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -21,60 +21,60 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "Wygaszacz ekranu"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "Preferencje wygaszacza ekranu"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "Podgląd wygaszacza ekranu"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>Podgląd wygaszacza ekranu</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "Preferencje wygaszacza ekranu"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "_Zarządzanie zasilaniem"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "_Podgląd"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "Moty_w wygaszacza ekranu:"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "Przejście w stan _bezczynności po:"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "_Uruchomienie wygaszacza ekranu, gdy komputer jest w stanie bezczynności"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "Blokowani_e ekranu, gdy wygaszacz jest aktywny"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>Uwaga: ekran nie będzie blokowany dla użytkownika root.</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "Wygaszacze ekranu"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "Motywy wygaszacza ekranu"
@@ -397,203 +397,203 @@ msgstr "%s nie jest prawidłowym motywem wygaszacza ekranu."
 msgid "Copying file: %u of %u"
 msgstr "Kopiowanie pliku %u z %u"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "Wyłącza wygaszacz ekranu"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "Wypisuje stan wygaszacza ekranu"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr "Wypisuje czas aktywności wygaszacza ekranu"
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "Powoduje natychmiastowe zablokowanie ekranu w uruchomionym wygaszaczu"
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "Jeżeli wygaszacz ekranu jest aktywny, przełącza do następnego motywu graficznego"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "Aktywuje wygaszacz ekranu"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "Jeżeli wygaszacz jest aktywny, przełącza w stan nieaktywny"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "Generuje zdarzenie symulujące aktywność użytkownika"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr "Wstrzymuje aktywację wygaszacza ekranu. Polecenia są blokowane, gdy wstrzymanie jest włączone."
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr "Program, który wstrzymuje aktywację wygaszacza ekranu"
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr "Powód wstrzymania wygaszacza ekranu"
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "Wersja tego programu"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "Wygaszaczem ekranu jest %s\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "aktywny"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "nieaktywny"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr "Wygaszacz ekranu nie został wstrzymany\n"
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr "Wygaszacz ekranu jest wstrzymany przez:\n"
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr "Wygaszacz ekranu jest aktywny od %d sekund.\n"
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr "Wygaszacz ekranu nie jest obecnie aktywny.\n"
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "Wypisuje komunikaty debugowania"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "Wyświetla przycisk wylogowania"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "Polecenie wykonywane po naciśnięciu przycisku wylogowania"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "Wyświetlanie przycisku przełączania użytkowników"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr "Wiadomość do wyświetlenia w oknie dialogowym"
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "WIADOMOŚĆ"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr "Nieużywane"
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "Użytkownik:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "Hasło:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr "Wymagana jest natychmiastowa zmiana hasła (minął okres ważności hasła)"
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "Wymagana jest natychmiastowa zmiana hasła (zmiana wymuszona przez administratora)"
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "Minął okres ważności konta. Proszę skontaktować się z administratorem systemu"
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "Nie wprowadzono hasła"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "Hasło niezmienione"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "Nie można uzyskać nazwy użytkownika"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "Powtórzenie hasła UNIX:"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "Nowe hasło UNIX:"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "Hasło UNIX (bieżące):"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "Błąd podczas zmieniania hasła NIS."
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "Należy wybrać dłuższe hasło"
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "To hasło było już używane. Należy wybrać inne."
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "Podczas zmiany hasła należy poczekać dłużej"
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "Hasła nie są zgodne"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "Sprawdzanie..."
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "Uwierzytelnienie się nie powiodło."
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "Wygaszenie ekranu"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "Losowo"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -602,14 +602,14 @@ msgstr[1] "%d godzinach"
 msgstr[2] "%d godzinach"
 msgstr[3] "%d godzinach"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -618,7 +618,7 @@ msgstr[1] "%d minutach"
 msgstr[2] "%d minutach"
 msgstr[3] "%d minutach"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -629,15 +629,15 @@ msgstr[3] "%d sekundach"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -645,35 +645,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "Nigdy"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "Nie można wczytać głównego interfejsu"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "Proszę upewnić się, że wygaszacz ekranu jest poprawnie zainstalowany"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "Uruchamia program bez przełączania do pracy w tle"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "Włącza kod debugowania"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr "Uruchamia wygaszacz ekranu i program blokujący"
 
diff --git a/po/ps.po b/po/ps.po
index d50a2b7..32131af 100644
--- a/po/ps.po
+++ b/po/ps.po
@@ -17,60 +17,60 @@ msgstr ""
 "Language: ps\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "پرده ساتونکی"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "د خپل پرده ساتونکي غوراوي وټاکئ"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "د پرده ساتونکي مخليد"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>د پرده ساتونکي مخليد</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "د پرده ساتونکي غوراوي"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "برېښنا سمبالښت"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "مخليد_"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr ":د پرده ساتونکي کوندې_"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr ":سولګر لکه _وزګار شمېرل وروسته له"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "د سولګر د وزګارېدو پر مهال پرده ساتونکی چارندول_"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "د سولګر د چارندېدو پر مهال پرده کولپول_"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>.خبرتيا: پرده به د ولي کارن لپاره نه کولپيږي</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "پرده ساتونکي"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "د پرده ساتونکي کوندې"
@@ -393,224 +393,224 @@ msgstr ".سم پرده ساتونکي کونده نه ښکاري %s"
 msgid "Copying file: %u of %u"
 msgstr "%u له %u :دوتنه لمېسل کيږي"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "په سمه توګه پرده ساتونکی بندوي"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "د پرده ساتونکي انکړ پوښتل"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "د دې کاريال نسخه"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "دی %s پرده ساتونکی\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "چارنده"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "ناچارنده"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr ".سېکېنډو لپاره چارند وو %d پرده ساتونکی د\n"
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "د کړاوتمبونې وتنی ښودل"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "وتون تڼۍ ښودل"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "کارن ونجول تڼۍ ښودل"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr "هغه استوزه چې په کړکۍ کښې وښودل شي"
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "استوزه"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr ""
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr ":کارننوم"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "تېرنويې"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "ستاسو د ګڼون مهال بشپړ شوی؛ مهرباني وکړﺉ خپل غونډال پازوال سره اړيکه ونيسئ"
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "تېرنويې نه ده ټاکل شوې"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "تېرنويې نه ده بدله شوې"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "کارننوم نه شي اخېستلی"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr ":تېرنويې بيا ليکل UNIX نوې"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr ":تېرنويې ليکل UNIX نوې"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr ":تېرنويې UNIX (اوسنۍ)"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr ".تېرنويې بدلولو پر مهال تېروتنهNISد"
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "تاسو بايد يوه اوږده تېرنويې وټاکئ"
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr ".تېرنويې له مخکښې نه کارول شوې ده. له وټاکئ"
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "خپلې تېرنويې بدلولو لپاره بايد تاسو ډېره تمه وکړئ"
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "بښنه غواړو، تېرنويې سره نه لګيږي"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "...کتل کيږي"
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr ".کرونه پاتې راغله"
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "توره پرده"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "ناټاکلي"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -619,15 +619,15 @@ msgstr[1] ""
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -635,35 +635,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "هېڅکله"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "ار برسېر نه شي لېښلی"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "مهرباني وکړﺉ ځان ډاډمن کړﺉ چې پرده ساتونکی په سمه توګه لګول شوی"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "ډاېمون مه جوړېږه"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "کړاتمبونې کوډ وړول"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr ""
 
diff --git a/po/pt.po b/po/pt.po
index 33b5b81..fb74416 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -23,60 +23,60 @@ msgstr ""
 "Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "Proteção de Ecrã"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "Defina as suas preferências de proteção de ecrã"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "Antevisão da Proteção de Ecrã"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>Antevisão do Protetor de Ecrã</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "Preferências da Proteção de Ecrã"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "Gestão de _Energia"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "_Antevisão"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "Tema do _protetor de ecrã:"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "Considerar o computador como _inativo após:"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "_Ativar o protetor de ecrã quando o computador estiver inativo"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "_Trancar o ecrã quando o protetor de ecrã está ativo"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>Aviso: o ecrã não ficará trancado para o utilizador root.</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "Protetores de Ecrã"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "Temas do Protetor de Ecrã"
@@ -399,224 +399,224 @@ msgstr "%s não aparenta ser um tema de proteção de ecrã válido."
 msgid "Copying file: %u of %u"
 msgstr "A copiar o ficheiro: %u de %u"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "Força o protetor de ecrã a terminar graciosamente"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "Consulta o estado do protetor de ecrã"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr "Consultar há quanto tempo o protetor de ecrã está ativo"
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "Indica ao processo de proteção de ecrã em execução para trancar o ecrã imediatamente"
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "Se a proteção de ecrã estiver ativa, então alterna para outra demonstração gráfica"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "Ligar o protetor de ecrã (ecrã preto)"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "Se a protecção de ecrã estiver ativa, desativá-la (ecrã deixa de estar preto)"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "Estimular o protetor de ecrã em execução para simular a actividade de utilizador"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr "Impedir a proteção de ecrã de se iniciar. Comando bloqueia enquanto a inibição estiver ativa."
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr "A aplicação chamadora que está a inibir a proteção de ecrã"
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr "O motivo para inibir o protetor de ecrã"
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "Versão desta aplicação"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "O protetor de ecrã está %s\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "ativo"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "inativo"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr "O protetor de ecrã não está inibido\n"
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr "O protetor de ecrã está a ser inibido por:\n"
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr "O protetor de ecrã está ativo à %d segundos.\n"
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr "O protetor de ecrã não está de momento ativo.\n"
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "Apresentar resultados da depuração"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "Apresentar o botão de terminar sessão"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "Comando a invocar pelo botão de terminar sessão"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "Mostrar o botão de alternar utilizador"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr "Mensagem a apresentar no diálogo"
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "MENSAGEM"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr "Não usado"
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "Utilizador:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "Senha:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr "É obrigatório alterar a sua senha imediatamente (senha antiga)"
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "É obrigatório alterar a sua senha imediatamente (forçado pelo root)"
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "A sua conta expirou; contacte o administrador do seu sistema"
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "Nenhuma senha especificada"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "Senha inalterada"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "Incapaz de obter o nome de utilizador"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "Reintroduza a nova senha UNIX:"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "Introduza a nova senha UNIX:"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "Senha UNIX (atual):"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "Erro ao alterar a senha NIS."
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "Tem de escolher uma senha maior"
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "A senha já foi utilizada anteriormente. Escolha outra."
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "Tem de aguardar mais tempo antes de poder alterar a sua senha"
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "As senhas não coincidem"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "A Verificar..."
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "Autenticação falhada."
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "Ecrã Preto"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "Aleatório"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -625,15 +625,15 @@ msgstr[1] "%d segundos"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -641,35 +641,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "Nunca"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "Incapaz de ler a interface principal"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "Certifique-se de que o protetor de ecrã está devidamente instalado"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "Não tornar-se um servidor"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "Ativar o código de depuração"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr "Iniciar protetor de ecrã e aplicação de bloquear"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 2a08e85..51583b9 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -32,60 +32,60 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "Proteção de tela"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "Defina suas preferências de proteção de tela"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "Visualização de proteção de tela"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>Visualização da proteção de tela</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "Preferências de Proteção de Tela"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "Gerencia_mento de energia"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "_Visualizar"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "_Tema de proteção de tela:"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "_Considerar o computador ocioso após:"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "_Ativar proteção de tela quando o computador estiver ocioso"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "B_loquear a tela quando a proteção de tela estiver ativa"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>Aviso: a tela não será bloqueada para o usuário root.</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "Proteções de tela"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "Temas de proteção de tela"
@@ -408,224 +408,224 @@ msgstr "%s não parece ser um tema de proteção de tela válido."
 msgid "Copying file: %u of %u"
 msgstr "Copiando arquivo: %u de %u"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "Encerra a proteção de tela sem erros"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "Consulta o estado da proteção de tela"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr "Consultar há quanto tempo a proteção de tela está em execução"
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "Solicita ao processo da proteção de tela que bloqueie a tela imediatamente"
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "Se a proteção de tela estiver ativa, então muda para uma outra demonstração gráfica"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "Ativa a proteção de tela"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "Se a proteção de tela estiver ativa, desativa-a"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "Envia eventos para a proteção de tela em execução simulando atividade do usuário"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr "Inibir a ativação da proteção de tela. O comando fica bloqueado enquanto a inibição estiver ativa."
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr "O aplicativo que está inibindo a proteção de tela"
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr "O motivo para inibir a proteção de tela"
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "Versão deste aplicativo"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "A proteção de tela está %s\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "ativa"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "inativa"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr "A proteção de tela não está inibida\n"
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr "A proteção de tela está sendo inibida por:\n"
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr "A proteção de tela está ativa há %d segundos.\n"
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr "A proteção de tela não está ativa atualmente.\n"
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "Mostrar saída de depuração"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "Mostrar o botão de encerramento de sessão"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "Comando que o botão de encerramento de sessão deve executar"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "Mostrar o botão de troca de usuário"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr "Mensagem a mostrar na janela de bloqueio"
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "MENSAGEM"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr "Não utilizado"
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "Nome de usuário:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "Senha:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr "Você precisa alterar sua senha imediatamente (a senha expirou)"
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "Você precisa alterar sua senha imediatamente (determinação do root)"
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "Sua conta expirou; contate o administrador do sistema"
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "Senha não fornecida"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "Senha não alterada"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "Não foi possível obter o nome de usuário"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "Redigite a nova senha UNIX:"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "Digite a nova senha UNIX:"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "Senha UNIX (atual):"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "Erro ao alterar a senha NIS."
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "Você precisa escolher uma senha mais longa"
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "Senha já utilizada anteriormente. Escolha outra."
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "Você precisa aguardar um pouco mais para alterar a sua senha"
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "Desculpe, suas senhas não conferem"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "Verificando..."
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "Falha na autenticação."
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "Tela vazia"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "Aleatória"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -634,15 +634,15 @@ msgstr[1] "%d segundos"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -650,35 +650,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "Nunca"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "Não foi possível carregar a interface principal"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "Certifique-se de que a proteção de tela foi instalada corretamente"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "Não executar como daemon"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "Habilitar depuração de código"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr "Executar protetor de tela e programa de bloqueio"
 
diff --git a/po/ro.po b/po/ro.po
index 0e2e82b..0dc7a9b 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -21,60 +21,60 @@ msgstr ""
 "Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "Protector ecran"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "Alegeți preferințele pentru protector ecran"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "Previzualizare protector ecran"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>Previzualizare protector ecran</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "Preferințe pentru economizorul de ecran"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "Gestionare ali_mentare"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "_Previzualizare"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "Temă _protector ecran:"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "Calculatorul este considerat _inactiv după:"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "_Activează protector ecran când calculatorul este inactiv"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "B_lochează ecranul când protectorul ecran este activ"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>Avertisment: ecranul nu va fi blocat pentru utilizatorul root.</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "Protectoare ecran"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "Teme protectoare ecran"
@@ -397,203 +397,203 @@ msgstr "%s nu pare a fi o temă validă de protector ecran."
 msgid "Copying file: %u of %u"
 msgstr "Se copiază fișierul: %u din %u"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "Determină protectorul ecran să se încheie normal"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "Interoghează starea protectorului ecran"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr "Obține timpul de activitate al protectorului ecran"
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "Transmite procesului protector ecran pornit o comandă de blocare imediată a ecranului"
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "Dacă protectorul ecran este activ, atunci schimbă la alt demo grafic"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "Pornește protectorul ecran (înnegrește ecranul)"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "Dacă protectorul ecran este activ, atunci deactivează-l"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "Păcălește protectorul ecran simulând activitate de utilizator"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr "Inhibă activarea protectorul ecran. Comanda blochează când inhibarea este activă."
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr "Aplicația care va inhiba protectorul ecran"
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr "Motivul pentru inhibarea protectorul ecran"
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "Versiunea acestei aplicații"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "Protectorul ecran este %s\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "activ"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "inactiv"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr "Protectorul ecran nu este întrerupt de nimic\n"
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr "Protectorul ecran este întrerupt de:\n"
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr "Protectorul ecran a fost activ pentru %d secunde.\n"
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr "Protectorul ecran nu este activ în acest moment.\n"
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "Arată informații de depanare"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "Arată butonul de deconectare din sesiune"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "Comandă de invocat pentru butonul de deconectare din sesiune"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "Afișează butonul de schimbare a utilizatorului"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr "Mesajul de afișat în dialog"
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "MESAJ"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr "Nefolosit"
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "Utilizator:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "Parolă:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr "Este necesar să vă schimbați parola imediat (parola este prea veche)"
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "Este necesar să vă schimbați parola imediat (vă obligă administratorul)"
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "Contul dumneavoastră a expirat, contactați administratorul de sistem"
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "Nu ați introdus o parolă"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "Parolă neschimbată"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "Nu se poate obține utilizatorul"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "Tastați încă o dată noua parolă UNIX:"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "Introduceți noua parolă UNIX:"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "Parola (actuală) UNIX:"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "Eroare la schimbarea parolei NIS."
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "Trebuie să alegeți o parolă mai lungă"
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "Parola a fost deja folosită. Alegeți alta."
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "Trebuie să așteptați mai mult pentru a vă schimba parola"
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "Ne pare rău, parolele nu se potrivesc"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "Se verifică..."
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "Autentificarea a eșuat."
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "Ecran gol"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "Aleator"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -601,14 +601,14 @@ msgstr[0] "%d oră"
 msgstr[1] "%d ore"
 msgstr[2] "%d de ore"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -616,7 +616,7 @@ msgstr[0] "%d minut"
 msgstr[1] "%d minute"
 msgstr[2] "%d de minute"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -626,15 +626,15 @@ msgstr[2] "%d de secunde"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -642,35 +642,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "Niciodată"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "Nu se poate încărca interfața principală"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "Asigurați-vă că protectorul ecran este instalat corespunzător"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "Nu deveni un serviciu"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "Activează codul de depanare"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr "Lansați programul de protecție și blocare a ecranului"
 
diff --git a/po/ru.po b/po/ru.po
index 03036d9..fb6e6a7 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -24,60 +24,60 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "Хранитель экрана"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "Параметры хранителя экрана"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "Просмотр хранителя экрана"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>Просмотр хранителя экрана</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "Параметры хранителя экрана"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "Управление _питанием"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "_Просмотр"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "_Тема хранителя экрана:"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "Считать компьютер _простаивающим через:"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "_Запускать хранитель экрана, когда компьютер простаивает"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "_Блокировать экран, когда запущен хранитель экрана"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>Внимание: экран не будет блокироваться для пользователя root.</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "Хранители экрана"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "Темы хранителя экрана"
@@ -400,203 +400,203 @@ msgstr "Файл %s не похож на файл темы хранителя э
 msgid "Copying file: %u of %u"
 msgstr "Копируется файл: %u из %u"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "Приводит к корректному завершению работы хранителя экрана"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "Запрашивает состояние хранителя экрана"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr "Запрашивает промежуток времени, в течение которого работал хранитель экрана"
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "Указывает запущенному процессу хранителя экрана заблокировать экран немедленно"
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "Если хранитель экрана активен, переключиться к другой графической демонстрации"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "Включить хранитель экрана (чёрный экран)"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "Если хранитель экрана активен, деактивировать его (восстановить экран)"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "Имитировать активность пользователя"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr "Запретить активирование хранителя экрана.  Команда блокируется, пока запрет активен."
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr "Вызывающее приложение, которое блокирует хранитель экрана"
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr "Причина блокирования хранителя экрана"
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "Версия этого приложения"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "Хранитель экрана: %s\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "активно"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "неактивно"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr "Активация хранителя экрана не заблокирована\n"
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr "Активация хранителя экрана заблокирована приложением:\n"
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr "Хранитель экрана работал %d секунд.\n"
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr "Хранитель экрана сейчас неактивен.\n"
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "Отображать отладочный вывод"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "Отображать кнопку выхода из сеанса"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "Команда, вызываемая при нажатии кнопки выхода"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "Отображать кнопку переключения пользователя"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr "Сообщение в диалоге"
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "СООБЩЕНИЕ"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr "Не использовано"
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "Имя пользователя:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "Пароль:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr "Вам необходимо сменить ваш пароль немедленно (срок действия пароля истёк)"
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "Вам необходимо сменить пароль немедленно (требование администратора)"
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "Срок действия вашей учетной записи истёк, свяжитесь со своим системным администратором"
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "Пароль не введен"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "Пароль оставлен без изменения"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "Не удаётся получить имя пользователя"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "Повторите новый пароль UNIX:"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "Введите новый пароль UNIX:"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "(текущий) пароль UNIX:"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "Ошибка при изменении пароля NIS."
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "Вы должны выбрать более длинный пароль"
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "Этот пароль уже был использован. Выберите другой пароль."
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "Вы должны подождать дольше, чтобы сменить ваш пароль"
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "Пароли не совпадают"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "Проверка..."
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "Сбой аутентификации."
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "Пустой экран"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "Случайным образом"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -605,14 +605,14 @@ msgstr[1] "%d часа"
 msgstr[2] "%d часов"
 msgstr[3] "%d часов"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -621,7 +621,7 @@ msgstr[1] "%d минуты"
 msgstr[2] "%d минут"
 msgstr[3] "%d минут"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -632,15 +632,15 @@ msgstr[3] "%d секунд"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -648,35 +648,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "Никогда"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "Не удалось загрузить основной интерфейс"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "Убедитесь, что хранитель экрана установлен должным образом"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "Не становиться демоном"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "Включить режим отладки"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr "Запустить хранитель экрана и программу блокировки"
 
diff --git a/po/si.po b/po/si.po
index 879d4c2..31eb26f 100644
--- a/po/si.po
+++ b/po/si.po
@@ -18,60 +18,60 @@ msgstr ""
 "Language: si\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "තිරආවරකය"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "ඔබගේ තිරආවරක අභිප්‍රේත සකසන්න"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "තිරආවරකය පෙන්වන්න"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>තිරආවරකය පෙන්වන්න</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "තිරආවරක අභිප්‍රේතයන්"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "ශක්ති කළමණාකරනය (_M)"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "පෙන්වන්න (_P)"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "තිරආවරකයේ තේමාව: (_S)"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "පරිගණකය අභාවිත වනවිට තිරආවරකය සක්‍රිය කරන්න (_A)"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "තිරආවරකය සක්‍රිය වන විට තිරය අගුලු දමන්න (_L)"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>අවවාදය: තිරය පද්ධති පරිපාලක (root පරිශිලක) සඳහා අගුලැමට නොහැකිය.</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "තිරආවරක"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "තිරආවරකයේ තේමා"
@@ -394,224 +394,224 @@ msgstr ""
 msgid "Copying file: %u of %u"
 msgstr "ගොනු පිටපත් කරමින් සිටී: %u of %u"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "තිරආවරකය ක්‍රියාකරි නම් වෙනත් චිත්‍රක ප්‍රදර්ශකයක් වෙතට මාරු වන්න"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "තිරආවරකය ක්‍රියාත්මක කරන්න (තිරය හිස් කරන්න)"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "තිරආවරකය සක්‍රිය නම් එය අක්‍රිය කරන්න (තිරය හිස් නොකරන්න)"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "මෙම යෙදුමෙ වෙළුම"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "තිරආවරකය වන්නේ %s\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "සක්‍රිය"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "අක්‍රිය"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "දෝෂහරිණ ප්‍රථිධානය පෙන්වන්න"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "ඉවත් වීමේ බොත්තම පෙන් වන්න"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "ඉවත් වීමෙ බොත්තමෙන් ඉල්ලා සිටින විධානය"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "පරිශිලක හුවමාරු බොත්තම පෙන්වන්න"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr "සංවාද කොටුවේ පෙන් විය යුතු පණිවිඩවේ"
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "පණිවිවිඩය"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr ""
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "පරිශිලක නම:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "රහස්පදය:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr "ඔබ හැකි ඉක්මනින් රහස් පදය වෙනස් කළයුතුවේ (රහස්පදය පරණයි)"
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "ඔබ හැකි ඉක්මනින් රහස්පදය වෙනස් කළයුතුවේ (root බලකරයි)"
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "ඔබගේ ගිණුම අවලංගු වී ඇත; කරුණාකර ඔබගේ පද්ධති පරිපාලක හමුවන්න"
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "රහස්පදයක් සපයා නැත"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "රහස්පදය වෙනස් නොවුනී"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "පරිශීලක නාමය ගත නොහැක"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "නව UNIX රහස්පදයක් නැවත යොදන්න:"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "නව UNIX රහස්පදයක් ඇතුලත් කරන්න:"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "(දැනට ඇති) UNIX රහස්පදය:"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "NIS රහස්පදය වෙනස් කිරීමේදි දෝෂයක්."
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "ඔබ විසින් වඩා දිගු රහස්පදයක් තෝරාගත යුතුමවේ"
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "රහස්පදය මීට පෙර භාවිතා කර ඇත. වෙත් එකක් තොරන්න."
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "රහස්පදය වෙනස් කිරිමට ඔබ බොහෝ වේලාවක් රැදී සිටිය යුතුමයි"
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "සමාවන්න, රහස්පද නොගැලපේ"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "පරික්‍ෂාකරමින්..."
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "තහවුරු කර ගැනීම අසමත්විය."
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "හිස් තිරය"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "අහබු"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "පැය %d යි"
 msgstr[1] "පැය %d යි"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "විනාඩි %d යි"
 msgstr[1] "විනාඩි %d යි"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -620,15 +620,15 @@ msgstr[1] "තත්පර %d යි"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -636,35 +636,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr ""
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "ප්‍රධාන මුහුණත පුරණය කළ නොහැක"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "කරුණාකර තිරආවරකය නිසි ලෙස ස්ථාපනය කළ ඇති දැයි තහවුරු කරගන්න."
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "විබුද්ධකයකු නොවන්න"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "දෝෂහරිණ කේත සක්‍රිය කරන්න"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr ""
 
diff --git a/po/sk.po b/po/sk.po
index c30334a..b8098ea 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -22,60 +22,60 @@ msgstr ""
 "Language: sk\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "Šetrič obrazovky"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "Nastaviť váš šetrič obrazovky"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "Ukážka šetriča obrazovky"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>Ukážka šetriča obrazovky</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "Nastavenia šetriča obrazovky"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "Správa _napájania"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "_Ukážka"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "_Téma šetriča obrazovky:"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "Považovať počítač za neč_inný po:"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "_Aktivovať šetrič obrazovky keď je počítač nečinný"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "_Uzamknúť obrazovku keď je aktívny šetrič obrazovky"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>Upozornenie: obrazovka sa nezamkne pre používateľa root.</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "Šetriče obrazovky"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "Témy šetriča obrazovky"
@@ -398,203 +398,203 @@ msgstr "%s nevyzerá ako platná téma šetriča obrazovky."
 msgid "Copying file: %u of %u"
 msgstr "Kopíruje sa súbor: %u z %u"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "Spôsobí korektné ukončenie šetriča obrazovky"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "Zistiť stav šetriča obrazovky"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr "Zistiť dobu aktivity šetriča obrazovky"
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "Požiada bežiaci šetrič obrazovky, aby okamžite uzamkol obrazovku"
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "Ak je šetrič obrazovky aktívny, tak prepnúť na inú grafickú ukážku"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "Zapnúť šetrič obrazovky (vyprázdniť obrazovku)"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "Ak je šetrič obrazovky aktívny, tak ho deaktivovať (opustiť režim prázdnej obrazovky)"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "Šťuchnúť do bežiaceho šetriča obrazovky tak, aby sa napodobnila aktivita používateľa"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr "Potlačiť aktiváciu šetriča obrazovky. Príkaz blokuje, kým je aktívne potlačenie."
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr "Volajúci program, ktorá potláča šetrič obrazovky"
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr "Dôvod potlačenia šetriča obrazovky"
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "Verzia tohto programu"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "Šetrič obrazovky je %s\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "aktívny"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "neaktívny"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr "Šetrič obrazovky nie je potlačený\n"
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr "Šetrič obrazovky je potlačovaný:\n"
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr "Doterajšia aktivita šetriča obrazovky trvala %d sekúnd.\n"
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr "Šetrič obrazovky momentálne nie je aktívny.\n"
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "Zobraziť ladiaci výstup"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "Zobraziť tlačidlo odhlásenia"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "Príkaz, ktorý sa má spustiť tlačidlom pre odhlásenie"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "Zobraziť tlačidlo prepnutia používateľa"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr "Správa, ktorá sa má zobraziť v dialógovom okne"
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "SPRÁVA"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr "Nepoužité"
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "Meno používateľa:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "Heslo:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr "Musíte si ihneď zmeniť heslo (je príliš staré)"
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "Musíte si ihneď zmeniť heslo (zmenu vyžiadal správca)"
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "Platnosť vášho účtu vypršala. Prosím, kontaktujte správcu vášho systému"
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "Nebolo zadané heslo"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "Heslo nezmenené"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "Nie je možné zistiť meno používateľa"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "Znovu zadajte UNIXové heslo:"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "Zadajte nové UNIXové heslo:"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "(aktuálne) UNIXové heslo:"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "Chyba pri zmene hesla NIS."
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "Musíte vybrať dlhšie heslo"
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "Toto heslo ste už použili. Vyberte iné."
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "Pred zmenou hesla musíte počkať dlhšie"
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "Prepáčte, heslá sa nezhodujú"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "Kontrola..."
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "Overenie totožnosti zlyhalo."
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "Prázdna obrazovka"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "Náhodné"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -602,14 +602,14 @@ msgstr[0] "%d hodina"
 msgstr[1] "%d hodiny"
 msgstr[2] "%d hodín"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -617,7 +617,7 @@ msgstr[0] "%d minúta"
 msgstr[1] "%d minúty"
 msgstr[2] "%d minút"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -627,15 +627,15 @@ msgstr[2] "%d sekúnd"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -643,35 +643,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "Nikdy"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "Nepodarilo sa načítať hlavné rozhranie"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "Prosím, uistite sa, či je šetrič obrazovky správne nainštalovaný"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "Nestať sa démonom"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "Povoliť ladiaci kód"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr "Spustí šetrič obrazovky a uzamykací program"
 
diff --git a/po/sl.po b/po/sl.po
index f971da6..3f3a0df 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -21,60 +21,60 @@ msgstr ""
 "Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "Ohranjevalnik zaslona"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "Nastavitve ohranjevalnika zaslona"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "Predogled ohranjevalnika zaslona"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>Predogled ohranjevalnika zaslona</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "Nastavitve ohranjevalnika zaslona"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "Upravljanje porabe energije"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "_Predogled"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "_Tema ohranjevalnika zaslona:"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "Računaln_ik je nedejaven po:"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "Vključi ohr_anjevalnik zaslona, ko je računalnik nedejaven"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "Zak_leni zaslon, ko je ohranjevalnik zaslona dejaven"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>Opozorilo: zaslon za skrbniško upravljanje ne bo zaklenjen.</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "Ohranjevalniki zaslona"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "Teme ohranjevalnika zaslona"
@@ -397,203 +397,203 @@ msgstr "%s ni veljavna tema ohranjevalnika zaslona."
 msgid "Copying file: %u of %u"
 msgstr "Kopiranje datoteke: %u od %u"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "Omogoča nežen izhod ohranjevalnika zaslona"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "Poizvedba stanja ohranjevalnika zaslona"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr "Poizvedba o trajanju ohranjevalnika zaslona"
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "Procesu ohranjevalnika zaslona v teku pove, da nemudoma zaklene zaslon"
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "V primeru, da je ohranjevalnik zaslona dejaven, preklopi na prikaz druge grafike"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "Vključi ohranjevalnik zaslona (sprazni zaslon)"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "V primeru, da je ohranjevalnik zaslona dejaven, ga izključi (napolni zaslon)"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "Zatresi ohranjevalnik zaslona za vtis navidezene dejavnosti uporabnika"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr "Onemogoči vključitev ohranjevalnika zaslona. Ukaz zavira, ko je ohranjevalnik dejaven."
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr "Klicni program, ki onemogoča delovanje ohranjevalnika zaslona"
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr "Razlog za onemogočanje ohranjevalnika zaslona"
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "Različica tega programa"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "Ohranjevalnik zaslona je %s\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "dejaven"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "nedejaven"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr "Ohranjevalnik zaslona ni onemogočen\n"
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr "Ohranjevalnik zaslona onemogoča program:\n"
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr "Ohranjevalnik zaslona je bil dejaven %d sekund.\n"
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr "Ohranjevalnik zaslona trenutno ni dejaven.\n"
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "Pokaži izpis razhroščevanja"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "Pokaži gumb za odjavo"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "Ukaz, ki ga sproži gumb za odjavo"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "Pokaži gumb za preklop uporabnika"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr "Sporočilo v pogovornem oknu"
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "SPOROČILO"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr "Ni uporabljeno"
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "Uporabniško ime:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "Geslo:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr "Svoje geslo morate takoj spremeniti (zaradi zastaranja)"
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "Svoje geslo morate takoj spremeniti (zahteva skrbnika)"
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "Vaš uporabniški račun je pretekel; obrnite se na vašega sistemskega skrbnika"
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "Geslo ni bilo vpisano"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "Geslo je nespremenjeno"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "Ni mogoče dobiti uporabniškega imena"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "Ponovno vnesite novo geslo za UNIX:"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "Vnesite novo geslo za UNIX:"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "(trenutno) geslo za UNIX:"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "Napaka ob spreminjanju gesla NIS."
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "Izbrati morate daljše geslo"
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "Geslo je bilo že uporabljeno. Izberite drugo."
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "Za spremembo gesla morate počakati dlje"
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "Gesli se ne ujemata"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "Preverjanje ..."
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "Overitev je spodletela"
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "Prazen zaslon"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "Naključno"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -602,14 +602,14 @@ msgstr[1] "%d uri"
 msgstr[2] "%d ur"
 msgstr[3] "%d ure"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -618,7 +618,7 @@ msgstr[1] "%d minuti"
 msgstr[2] "%d minut"
 msgstr[3] "%d minute"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -629,15 +629,15 @@ msgstr[3] "%d sekunde"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -645,35 +645,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "Nikoli"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "Ni mogoče naložiti glavnega vmesnika"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "Prepričajte se, da je ohranjevalnik zaslona pravilno nameščen"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "Ne zaženi kot ozadnji program"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "Omogoči kodo za razhroščevanje"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr "Zaženi ohranjevalnik zaslona in program za zaklepanje"
 
diff --git a/po/sq.po b/po/sq.po
index f61eba9..d4c8ba3 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -18,60 +18,60 @@ msgstr ""
 "Language: sq\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "Ruajtës ekrani"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "Përcakto preferimet e ruajtësit tuaj të ekranit"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "Preferimet e ruajtësit të ekranit"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "B_Lloko ekranin kur ruajtësi i ekranit është aktiv"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr ""
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "Ruajtës ekrani"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "Temat e ruajtësit të ekranit"
@@ -394,224 +394,224 @@ msgstr ""
 msgid "Copying file: %u of %u"
 msgstr "Duke kopjuar file: %u në %u"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "Shkakton daljen e plotë të ruajtësit të ekranit"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "Kontrollon gjendjen e ruajtësit të ekranit"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "I thotë proçesit në zbatim të ruajtësit të bllokojë menjëherë ekranin"
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "Nëse reuajtësi është aktiv atëhere kalon tek një grafik tjetër demostrativ"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "Aktivon ruajtësin e ekranit (ekrani bosh)"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "Nëse reujatësi është akitv atëhere e çaktivon (ekrani jo bosh)"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "Ngacmo ruajtësin e ekranit në ekzekutim për të simuluar aktivitet përdoruesi"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "Versioni i këtij programi"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "Ruajtësi i ekranit është %s\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "aktiv"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "jo aktiv"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "Shfaq rezultatet e debug"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "Shfaq pulsantin e daljes"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "Komanda që duhet zbatuar nga pulsanti i daljes"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "Shfaq pulsantin e ndryshimit të përdoruesit"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr ""
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr ""
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "Ekran bosh"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "Pa renditje"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d orë"
 msgstr[1] "%d orë"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minutë"
 msgstr[1] "%d minuta"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -620,15 +620,15 @@ msgstr[1] "%d sekonda"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -636,35 +636,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "Asnjëherë"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "I pamundur ngarkimi i interfaqes kryesore"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "Sigurohu që ruajtësi i ekranit të jetë instaluar si duhet"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "Mos u kthe në deamon"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "Aktivo kodin e debug"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr ""
 
diff --git a/po/sr.po b/po/sr.po
index b9c6bb7..397e3af 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -18,60 +18,60 @@ msgstr ""
 "Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "Чувар екрана"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "Подесите поставке чувара екрана"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "Преглед чувара екрана"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>Преглед чувара екрана</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "Поставке чувара екрана"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "_Управник напајањем"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "_Преглед"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "_Тема чувара екрана:"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "Сматрај рачунар _неактивним након:"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "_Покрени чувара екрана када се ништа не ради"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "_Закључај екран када чувар екрана ради"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>Упозорење: екран неће бити закључан за администратора.</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "Чувари екрана"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "Теме чувара екрана"
@@ -394,203 +394,203 @@ msgstr "Изгледа да „%s“ није исправна тема чува
 msgid "Copying file: %u of %u"
 msgstr "Умножавам датотеку: %u од %u"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "Чини да чувар екрана буде заустављен природно"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "Пропитује стање чувара екрана"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr "Пропитује време за које је чувар екрана био активан"
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "Говори покренутом процесу чувара екрана да одмах закључа екран"
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "Ако је чувар екрана покренут прелази на други графички пример"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "Укључује чувара екрана (чисти екран)"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "Ако је чувар екрана покренут зауставља га (враћа пређашњу слику на екрану)"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "Говори покренутом чувару екрана да опонаша рад корисника"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr "Спречава покретање чувара екрана. Наредба блокира чувара екрана док год је радна."
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr "Програм који спречава чувара екрана"
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr "Разлог спречавања чувара екрана"
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "Издање овог програма"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "Чувар екрана је %s\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "покренут"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "угашен"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr "Чувар екрана је није спречен\n"
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr "Чувара екрана је спречио:\n"
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr "Чувар екрана је био покренут %d секунде.\n"
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr "Чувар екрана тренутно није покренут.\n"
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "Приказује излаз прочишћавања"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "Приказује дугме за одјаву"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "Наредба која се позива притиском на дугме за одјаву"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "Приказује дугме за промену корисника"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr "Порука за приказивање у прозорчету"
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "ПОРУКА"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr "Не користи се"
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "Корисник:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "Лозинка:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr "Потребно је да одмах промените вашу лозинку (лозинка је стара)"
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "Потребно је да одмах промените вашу лозинку (администратор то тражи)"
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "Ваш налог је истекао; обратите се администратору система"
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "Лозинка није достављена"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "Лозинка није промењена"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "Не могу да добавим корисничко име"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "Поново унесите нову Јуникс лозинку:"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "Унесите нову Јуникс лозинку:"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "(тренутна) Јуникс лозинка:"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "Грешка приликом промене НИС лозинке."
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "Морате да изаберете дужу лозинку"
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "Лозинка је већ у употреби. Изаберите другу."
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "Морате да сачекате дуже за промену ваше лозинке"
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "Лозинке се не поклапају"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "Проверавам..."
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "Потврђивање идентитета није успело."
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "Празан екран"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "Случајно"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -598,14 +598,14 @@ msgstr[0] "%d сат"
 msgstr[1] "%d сата"
 msgstr[2] "%d сати"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -613,7 +613,7 @@ msgstr[0] "%d минут"
 msgstr[1] "%d минута"
 msgstr[2] "%d минута"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -623,15 +623,15 @@ msgstr[2] "%d секунди"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -639,35 +639,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "Никада"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "Не могу да учитам главно сучеље"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "Проверите да ли је чувар екрана правилно инсталиран"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "Не постаје позадински процес"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "Укључује режим прочишћавања"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr "Покрените чувара екрана и програм за закључавање"
 
diff --git a/po/sr at latin.po b/po/sr at latin.po
index 13055d5..5282aac 100644
--- a/po/sr at latin.po
+++ b/po/sr at latin.po
@@ -17,60 +17,60 @@ msgstr ""
 "Language: sr at latin\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "Čuvar ekrana"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "Sopstvene postavke čuvara ekrana"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "Pregled čuvara ekrana"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>Pregled čuvara ekrana</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "Postavke čuvara ekrana"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "_Upravnik potrošnje"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "_Pregled"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "_Teme čuvara ekrana:"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "Posmatraj računar kao neaktivan nakon:"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "_Pokreni čuvara ekrana kada se ništa ne radi"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "_Zaključaj ekran kada čuvar ekrana radi"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>Upozorenje: čuvar ekrana neće biti zaključan za administratora.</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "Čuvari ekrana"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "Teme čuvara ekrana"
@@ -393,203 +393,203 @@ msgstr "Čini se da „%s“ nije ispravna tema čuvara ekrana."
 msgid "Copying file: %u of %u"
 msgstr "Umnožavam datoteku: %u od %u"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "Čini da čuvar ekrana bude zaustavljen prirodno"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "Ispitaj stanje čuvara ekrana"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr "Ispituj vreme za koje je čuvar ekrana bio aktivan"
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "Govori pokrenutom procesu čuvara ekrana da odmah zaključa ekran"
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "Ako je čuvar ekrana pokrenut tada pređi na drugi grafički demo"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "Uključi čuvara ekrana (očisti ekran)"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "Ako je čuvar ekrana prisutan, prekini ga (vrati pređašnju sliku na ekranu)"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "Pozovi pokrenuti čuvar ekrana radi isprobavanja aktivnosti korisnika"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr "Zabrani pokretanje čuvara ekrana. Komanda blokira čuvar ekrana dok god jeaktivna."
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr "Program koji zabranjuje čuvar ekrana"
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr "Razlog zabrane čuvara ekrana"
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "Verzija ovog programa"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "Čuvar ekrana je %s\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "prisutan"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "ugašen"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr "Čuvar ekrana je nije zaustavljen\n"
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr "Čuvar ekrana je onemogućen od strane:\n"
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr "Čuvar ekrana je aktivan %d sekundi.\n"
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr "Čuvar ekrana je trenutno zaustavljen.\n"
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "Prikaži ispis za traženje grešaka"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "Prikaži dugme za odjavu"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "Naredba koja se poziva pritiskom na dugme za odjavu"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "Prikaži dugme za promenu korisnika"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr "Poruka za prikaz u prozorčetu"
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "PORUKA"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr "Nije korišćeno"
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "Korisničko ime:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "Lozinka:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr "Potrebno je da odmah promenite Vašu lozinku (lozinka je stara)"
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "Potrebno je da odmah promenite Vašu lozinku (primoran je administrator)"
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "Vaš nalog je istekao; potražite Vašeg administratora sistema"
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "Nije dostavljena šifra"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "Šifra je nepromenjena"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "Ne mogu da dobijem korisničko ime"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "Ponovo unesi novu Juniks lozinku:"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "Unesi novu Juniks lozinku:"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "(trenutna) Juniks lozinka:"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "Greška pri promeni NIS lozinke."
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "Morate sa odaberete dužu lozinku"
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "Lozinka je već u upotrebi. Izaberite drugu."
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "Morate da čekate duže za promenu Vaše šifre"
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "Lozinke se ne poklapaju"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "Provera..."
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "Identifikacija neuspela."
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "Očisti ekran"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "Slučajan"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -597,14 +597,14 @@ msgstr[0] "%d sat"
 msgstr[1] "%d sata"
 msgstr[2] "%d sati"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -612,7 +612,7 @@ msgstr[0] "%d minut"
 msgstr[1] "%d minuta"
 msgstr[2] "%d minuta"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -622,15 +622,15 @@ msgstr[2] "%d sekundi"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -638,35 +638,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "Nikada"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "Ne mogu da učitam glavno sučelje"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "Molim proverite da li je čuvar ekrana pravilno instaliran"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "Nemoj biti pozadinski proces"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "Omogući ispis za traženje grešaka"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr ""
 
diff --git a/po/sv.po b/po/sv.po
index 846c595..00a5368 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -25,60 +25,60 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "Skärmsläckare"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "Ställ in dina skärmsläckarinställningar"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "Förhandsgranska skärmsläckare"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>Förhandsgranska skärmsläckare</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "Skärmsläckarinställningar"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "Ström_hantering"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "_Förhandsgranska"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "_Skärmsläckartema:"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "Anse datorn som _inaktiv efter:"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "_Aktivera skärmsläckaren när datorn är inaktiv"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "_Lås skärmen när skärmsläckaren är aktiv"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>Varning: skärmen kommer inte att låsas för root-användaren.</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "Skärmsläckare"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "Skärmsläckarteman"
@@ -401,224 +401,224 @@ msgstr "%s verkar inte vara ett giltigt skärmsläckartema."
 msgid "Copying file: %u of %u"
 msgstr "Kopierar fil: %u av %u"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "Gör så att skärmsläckaren avslutas snällt"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "Fråga om status för skärmsläckaren"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr "Fråga om tidsperioden som skärmsläckaren har varit aktiv"
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "Berättar för den körande skärmsläckarprocessen att skärmen ska låsas omedelbart"
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "Om skärmsläckaren är aktiv, byt till en annan grafikdemonstration"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "Slå på skärmsläckaren (töm skärmen)"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "Om skärmsläckaren är aktiv, inaktivera den (väck upp skärmen)"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "Peta på den körande skärmsläckaren för att simulera användaraktivitet"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr "Förhindra skärmsläckaren från att aktiveras. Kommandot blockeras när hindrandet är aktiv."
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr "Det anropande programmet som hindrar skärmsläckaren"
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr "Anledning till att hindra skärmsläckaren"
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "Detta programs versionsnummer"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "Skärmsläckaren är %s\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "aktiv"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "inaktiv"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr "Skärmsläckaren förhindras inte\n"
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr "Skärmsläckaren förhindras av:\n"
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr "Skärmsläckaren har varit aktiv i %d sekunder.\n"
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr "Skärmsläckaren är för närvarande inte aktiv.\n"
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "Visa utdata för felsökning"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "Visa utloggningsknappen"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "Kommando att starta från utloggningsknappen"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "Visa knapp för byte av användare"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr "Meddelande att visa i dialogrutan"
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "MEDDELANDE"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr "Används inte"
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "Användarnamn:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "Lösenord:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr "Du måste ändra ditt lösenord omedelbart (lösenord för gammalt)"
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "Du måste ändra ditt lösenord omedelbart (root kräver det)"
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "Ditt konto har gått ut; kontakta din systemadministratör"
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "Inget lösenord angivet"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "Lösenordet inte ändrat"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "Kan inte få tag på användarnamn"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "Skriv in nytt UNIX-lösenord igen:"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "Ange nytt UNIX-lösenord:"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "(nuvarande) UNIX-lösenord:"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "Fel vid ändring av NIS-lösenord."
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "Du måste välja ett längre lösenord"
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "Lösenordet har redan använts tidigare. Välj ett annat."
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "Du måste vänta längre för att ändra ditt lösenord"
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "Tyvärr, lösenorden stämmer inte överens"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "Kontrollerar..."
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "Autentisering misslyckades."
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "Blank skärm"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "Slumpmässigt"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d timme"
 msgstr[1] "%d timmar"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minut"
 msgstr[1] "%d minuter"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -627,15 +627,15 @@ msgstr[1] "%d sekunder"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -643,35 +643,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "Aldrig"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "Kunde inte läsa in huvudgränssnittet"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "Försäkra dig om att skärmsläckaren är korrekt installerad"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "Bli inte en demon"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "Aktivera felsökningskod"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr "Kör skärmsläckar och låsprogram"
 
diff --git a/po/ta.po b/po/ta.po
index 4320c83..0ac6c8e 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -20,60 +20,60 @@ msgstr ""
 "Language: ta\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "திரை சேமிப்பி"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "உங்கள் திரை சேமிப்பி முன்னுரிமைகளை அமைக்கவும்"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "திரைசேமிப்பி முன்பார்வை"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>திரை சேமிப்பி முன்பார்வை</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "திரைசேமிப்பி முன்னுரிமைகள்"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "சக்தி நிர்வாகம்"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "முன்பார்வை (_P)"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "திரைசேமிப்பி சூழல்: (_S)"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "இந்த நேரத்துக்குப்பின் கணினி சும்மாயிருப்பதாக கொள்ளவும்:"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "கணினி சும்மாயிருப்பின் திரை சேமிப்பியை செயல்படுத்துக"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "திரை சேமிப்பி செயலில் இருப்பின் திரையை பூட்டவும்."
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>எச்சரிக்கை: திரை ரூட் பயனருக்கு பூட்டப்பட மாட்டாது. </b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "திரைசேமிப்பிகள்"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "திரைசேமிப்பி சூழல்கள்"
@@ -396,224 +396,224 @@ msgstr "%s சரியான திரைசேமிப்பி சூழல
 msgid "Copying file: %u of %u"
 msgstr "கோப்பினை நகலெடுக்கிறது: %u ல் %uஐ"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "திரை சேமிப்பினை வெளியேற்றுகிறது"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "திரை சேமிப்பியின் நிலையை கேட்கிறது"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr "திரை சேமிப்பி செயல்பட்ட நேரத்தை கேள்"
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "இயங்கும் திரை சேமிப்பி செயலை உடனே திரையை பூட்டச் சொல்லுகிறது."
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "திரைசேமிப்பி இயங்கினால் வேறு ஒரு வரைகலை காட்சிக்கு மாறுக."
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "திரை சேமிப்பினை செயல்படுத்தவும் (திரையை வெறுமையாக்கவும்)"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "திரைசேமிப்பி இயங்கினால் அதை செயல் நீக்குக. (திரையை வெற்றாக ஆக்காதே)"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "பயனர் செயலை போல் செய்ய இயங்கும் திரை சேமிப்பியை சீண்டுக"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr "திரை சேமிப்பி இயங்குவதை தடுக்கவும்.  தடுப்பு செயல்படும்போது கட்டளை தடுக்கும்"
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr "திரை சேமிப்பியை தடுக்க காரணமான பயன்பாடு"
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr "திரை சேமிப்பியை தடுக்க காரணம்"
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "இந்த பயன்பாட்டின் பதிப்பு"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "திரைசேமிப்பி %s ஆகும்\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "செயலில்"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "செயலற்ற"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr "திரைசேமிப்பி தடை செய்யப்பட்டதில்லை\n"
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr "திரைசேமிப்பி பின்வருவதால் தடைசெய்யப்படுகிறது:\n"
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr "திரை சேமிப்பி %d வினாடிகளுக்கு செயல் பட்டு உள்ளது.\n"
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr "திரைசேமிப்பி தற்போது செயலிலுள்ளது.\n"
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "பிழைத்திருத்த வெளியீட்டை காட்டு"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "வெளிச்செல் பொத்தானை காட்டு"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "வெளியேறு பொத்தானிலிருந்து கடைபிடிக்க வேண்டிய கட்டளை"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "பயனர் மாற்றி பொத்தானை காட்டவும்"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr "உரையாடலில் காட்டப்படும் செய்தி"
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "MESSAGE"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr "பயன்படுத்தவில்லை"
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "பயனர் பெயர்:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "கடவுச்சொல்:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr "நீங்கள் உங்கள் கடவுச்சொல்லை மாற்ற வேண்டும் (கடவுச்சொல் பழையதானதால்)"
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "நீங்கள் உங்கள் கடவுச்சொல்லை மாற்ற வேண்டும் (ரூட் வலியுறுத்துகிறது)"
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "உங்கள் கணக்கு முடிவடைந்தது; உங்கள் கணினி நிர்வாகியை அணுகவும்"
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "கடவுச்சொல் கொடுக்கப்படவில்லை"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "கடவுச்சொல் மாற்றப்படவில்லை"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "பயனர் பெயர் இல்லை"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "புதிய UNIX கடவுச்சொல்லை மீண்டும் தட்டச்சு செய்யவும்:"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "புதிய UNIX கடவுச்சொல்லை உள்ளிடவும்:"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "(நடப்பு) UNIX கடவுச்சொல்:"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "NIS கடவுச்சொல்லை மாற்றும் போது பிழை."
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "பெரிய கடவுச்சொல்லை தேர்ந்தெடுக்கவும்"
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "கடவுச்சொல் ஏற்கனவே பயன்படுத்தப்பட்டுள்ளது. வேறொன்றை தேர்வு செய்யவும்."
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "கடவுச்சொல்லை மாற்ற நீங்கள் காத்திருக்க வேண்டும்"
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "கடவுச்சொல் பொருத்தமானதாக இல்லை"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "சோதிக்கிறது..."
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "அங்கீகாரம் இல்லை."
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "வெற்று திரை"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "குறிப்பில்லாத"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d மணி நேரம்"
 msgstr[1] "%d மணி நேரங்கள்"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d நிமிடம்"
 msgstr[1] "%d நிமிடங்கள்"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -622,15 +622,15 @@ msgstr[1] "%d விநாடிகள்"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -638,35 +638,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "ஒருபோதும்"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "முக்கியமான இடைமுகத்தை ஏற்ற முடியவில்லை"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "திரைச்சேமிப்பி சரியாக நிறுவப்பட்டுள்ளதா என உறுதிப்படுத்தவும்"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "ஒரு டீமானாக ஆக வேண்டாம்"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "பிழைத்திருத்த குறியீட்டை செயல்படுத்து"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr ""
 
diff --git a/po/te.po b/po/te.po
index 6f02509..5d7885f 100644
--- a/po/te.po
+++ b/po/te.po
@@ -19,60 +19,60 @@ msgstr ""
 "Language: te\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "తెరకాపరి"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "మీ  తెరకాపరి యొక్క అభీష్టాలు అమర్చుకొను"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "తెరకాపరి యొక్క ఉపదర్శనం"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>తెరకాపరి యొక్క ఉపదర్శనము</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "తెరకాపరి యొక్క అభీష్టాలు "
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "విద్యుత్ నిర్వహణ(_M)"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "ఉపదర్శనం(_P)"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "తెరకాపరి వైవిద్యాంశం(_S):"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "జడముగా ఉన్న తర్వాత కంప్యూటర్ గురించి(_i):"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "కంప్యూటర్ తీరికగా ఉన్నప్పుడు తెరకాపరిని ప్రేరేపించు(_A)"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "తెరకాపరి చురుకుగా ఉన్నప్పుడు తెరకు తాళం వేయు(_L)"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>హెచ్చరిక : మూల వినియోగదారునికి తెర తాళము వేయబడదు </b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "తెరకాపరులు"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "తెరకాపరి వైవిద్యాంశాలు"
@@ -395,224 +395,224 @@ msgstr "%s విలువైన తెరకాపరి థీమ్‌లా
 msgid "Copying file: %u of %u"
 msgstr "దస్త్రాన్ని నకలు చేస్తోంది :%u లో %u"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "తెరకాపరిని అందంగా వెళ్లిపోయేట్టు చేస్తుంది"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "తెరకాపరి యొక్క స్థితిని ప్రశ్నించు"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr "తెరకాపరి ఎంత సమయం వరకు  చురుకుగా ఉందో ప్రశ్నించు"
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "నడిచే తెరకాపరి కార్యాన్ని వెంటనే తెరకు తాళం వేయమని చెబుతుంది"
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "ఒక వేళ తెరకాపరి చురుకుగా ఉంటే వేరే గ్రాఫిక్స్    డెమోకి మరలు "
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "తెరకాపరిని చురుకుగా చేయు "
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "తెరకాపరి చురుకుగా ఉంటే దానిని "
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "నడుస్తున్న తెరకాపరిని వినియోగదారి క్రియాశీలతను అనుకరించుటకు పెట్టుము"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr "తెరకాపరిని చురుకుగా ఉండకుండా నిషేధించు.ఆటంకము చురుకుగా ఉన్నప్పుడు ఆదేశం నిషేధిస్తుంది."
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr "తెరకాపరిని ఆపడానికి పిలుస్తున్న కార్యక్షేత్రం"
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr "తెరకాపరి ఆటంకానికి కారణం"
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "ఈ కార్యక్షేత్ర వివరణం"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "తెరకాపరి %s\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "చురుకుగా ఉంది"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "చురుకుగాలేదు"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr "తెరకాపరి ఆక్షేపితమైనది కాదు\n"
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr "తెరకాపరి దీనిచేత అక్షేపించబడుచున్నది:\n"
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr "తెరకాపరి %d క్షణాలు చురుకుగా ఉంది.\n"
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr "తెరకాపరి ప్రస్తుతం క్రియాశీలముగా లేదు.\n"
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "లోపనిర్మూలన దిగుబడిని చూపించు"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "నిష్ర్కమణద్వార బొత్తాన్ని చూపించు"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "నిష్ర్కమణద్వార బొత్తం నుంచి పిలుచుటకు ఆదేశం"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "వినియోగదారున్ని మార్చే బొత్తాన్ని చూపించు"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr "వివరణలో చూపటానికి సందేశం"
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "సందేశం"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr "ఉపయోగించబడలేదు"
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "వినియోగదారుని పేరు:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "రహస్యపదం:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr "మీరు వెంటనే రహస్యపదాన్ని మార్చమని కోరడమైనది (రహస్యపదం పాతదైనది)"
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "మీ రహస్యపదాన్ని మార్చుకోమని కోరడమైనది (మూలం బలవంతంగా )"
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "మీ అకౌంట్ ముగిసినది; దయచేసి మీ వ్యవస్థ నిర్వాహకుడిని సంప్రదించండి"
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "రహస్యపదం ఇవబడలేదు"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "రహస్యపదం మార్చబడలేదు"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "వినియోగదారుని పేరు దొరకలేదు"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "మరల కొత్త యూనిక్స్  రహస్యపదాన్ని వ్రాయండి:"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "కొత్త యూనిక్స్  రహస్యపదాన్ని వ్రాయండి:"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "(ప్రస్తుత) యూనిక్స్  రహస్యపదం:"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "NIS రహస్యపదాన్ని మార్చేటప్పుడు తప్పు జరిగినది."
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "మీరు పెద్ద రహస్యపదాన్ని ఎంచుకోవాలి"
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "రహస్యపదం మునుపే వాడుకలో ఉంది. వేరేదాన్ని ఎంచుకోండి."
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "మీ రహస్యపదాన్ని మార్చుకోవటానికి చాలా సమయం ఆగాల్సివుంటుంది"
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "క్షమించాలి , రహస్యపదాలు జతకూడట్లేదు"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "తనిఖీ చేస్తోంది..."
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "ప్రామాణీకరణ తప్పినది"
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "వట్టి తెర"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "విభిన్న"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d గంట"
 msgstr[1] "%d గంటలు"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d నిమిషము"
 msgstr[1] "%d నిమిషాలు"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -621,15 +621,15 @@ msgstr[1] "%d క్షణాలు"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -637,35 +637,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "ఎప్పుడును లేదు"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "ప్రధాన సంవిధాన్ని భారం చేయలేకపోయింది"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "దయచేసి తెరకాపరి సరిగ్గా నెలకొల్పండిందో లేదో చూసుకోండి"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "సూత్రదారి అవ్వకు"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "లోపనిర్మూలన సంకేతాన్ని ఉపయోగించు"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr ""
 
diff --git a/po/th.po b/po/th.po
index 91a9c35..1a628dd 100644
--- a/po/th.po
+++ b/po/th.po
@@ -18,60 +18,60 @@ msgstr ""
 "Language: th\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "โปรแกรมรักษาหน้าจอ"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "ปรับแต่งโปรแกรมรักษาหน้าจอของคุณ"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "ภาพตัวอย่างโปรแกรมรักษาหน้าจอ"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>ภาพตัวอย่างโปรแกรมรักษาหน้าจอ</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "ปรับแต่งโปรแกรมรักษาหน้าจอ"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "การจัดการ_พลังงาน"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "ภาพ_ตัวอย่าง"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "_ชุดโปรแกรมรักษาหน้าจอ:"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "ถือว่าเครื่องไ_ม่ถูกใช้งานหลังจาก:"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "แ_สดงโปรแกรมรักษาหน้าจอเมื่อเครื่องไม่ถูกใช้งาน"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "_ล็อคหน้าจอเมื่อโปรแกรมรักษาหน้าจอทำงาน"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>คำเตือน: จะไม่ล็อคหน้าจอถ้าเข้าระบบด้วยบัญชี root</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "โปรแกรมรักษาหน้าจอ"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "ชุดโปรแกรมรักษาหน้าจอ"
@@ -394,222 +394,222 @@ msgstr "%s ดูเหมือนไม่ใช่ชุดโปรแกร
 msgid "Copying file: %u of %u"
 msgstr "กำลังคัดลอกแฟ้ม: %u จาก %u"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "ทำให้โปรแกรมรักษาหน้าจอจบอย่างนุ่มนวล"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "สอบถามสถานะของโปรแกรมรักษาหน้าจอ"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr "สอบถามระยะเวลาที่โปรแกรมรักษาหน้าจอได้ทำงานมา"
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "บอกโพรเซสโปรแกรมรักษาหน้าจอที่กำลังทำงานอยู่ให้ล็อคหน้าจอทันที"
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "ถ้าโปรแกรมรักษาหน้าจอกำลังวาดอยู่ ก็ให้สลับไปใช้ชุดโปรแกรมอื่นวาด"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "ให้โปรแกรมรักษาหน้าจอเริ่มทำงาน (ล้างหน้าจอ)"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "ถ้าโปรแกรมรักษาหน้าจอกำลังวาดอยู่ ก็ให้หยุดวาด (เลิกล้างหน้าจอ)"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "รบเร้าโปรแกรมรักษาหน้าจอที่กำลังทำงานอยู่ เพื่อจำลองการเคลื่อนไหวของผู้ใช้"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr "ระงับไม่ให้เรียกโปรแกรมรักษาหน้าจอ คำสั่งจะหยุดรอในระหว่างที่มีการระงับ"
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr "ชื่อโปรแกรมผู้เรียก ซึ่งระงับโปรแกรมรักษาหน้าจอ"
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr "สาเหตุของการระงับโปรแกรมรักษาหน้าจอ"
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "รุ่นของโปรแกรมนี้"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "โปรแกรมรักษาหน้าจอกำลัง%s\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "ทำงาน"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "หลับ"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr "โปรแกรมรักษาหน้าจอไม่ได้ถูกระงับ\n"
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr "โปรแกรมรักษาหน้าจอกำลังถูกระงับโดย:\n"
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr "โปรแกรมรักษาหน้าจอทำงานมาแล้ว %d วินาที\n"
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr "โปรแกรมรักษาหน้าจอไม่ได้ทำงานอยู่\n"
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "แสดงข้อความดีบั๊ก"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "แสดงปุ่มออกจากระบบ"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "คำสั่งที่จะเรียกจากปุ่มออกจากระบบ"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "แสดงปุ่มสลับผู้ใช้"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr "ข้อความที่จะแสดงในกล่องโต้ตอบ"
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "MESSAGE"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr "ไม่ใช้"
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "ชื่อผู้ใช้:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "รหัสผ่าน:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr "คุณต้องเปลี่ยนรหัสผ่านเดี๋ยวนี้ (รหัสผ่านหมดอายุแล้ว)"
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "คุณต้องเปลี่ยนรหัสผ่านเดี๋ยวนี้ (ผู้ดูแลระบบบังคับให้เปลี่ยน)"
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "บัญชีของคุณหมดอายุแล้ว กรุณาติดต่อผู้ดูแลระบบ"
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "ไม่ได้ป้อนรหัสผ่าน"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "รหัสผ่านไม่เปลี่ยน"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "หาชื่อผู้ใช้ไม่พบ"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "ป้อนรหัสผ่านยูนิกซ์อีกครั้ง:"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "ตั้งรหัสผ่านยูนิกซ์:"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "รหัสผ่านยูนิกซ์ปัจจุบัน:"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "เกิดข้อผิดพลาดขณะเปลี่ยนรหัสผ่าน NIS"
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "คุณต้องตั้งรหัสผ่านยาวกว่านี้"
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "รหัสผ่านนี้ถูกใช้อยู่ กรุณาตั้งรหัสผ่านอื่น"
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "คุณต้องหยุดคอยก่อนเปลี่ยนรหัสผ่าน"
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "ขออภัย รหัสผ่านไม่ตรงกัน"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "กำลังตรวจสอบ..."
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "การยืนยันตัวบุคคลไม่ผ่าน"
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "จอเปล่า"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "สุ่ม"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d ชั่วโมง"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d นาที"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -617,15 +617,15 @@ msgstr[0] "%d วินาที"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -633,35 +633,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "ไม่ทำงาน"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "ไม่สามารถโหลดส่วนติดต่อผู้ใช้หลักได้"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "กรุณาตรวจสอบการติดตั้งโปรแกรมรักษาหน้าจอว่าครบถ้วนหรือไม่"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "ไม่ต้องเป็นดีมอน"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "เปิดใช้โค้ดส่วนดีบั๊ก"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr "เรียกใช้โปรแกรมรักษาหน้าจอและโปรแกรมล็อกเกอร์"
 
diff --git a/po/tr.po b/po/tr.po
index 0493613..0f127ca 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -24,60 +24,60 @@ msgstr ""
 "Language: tr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "Ekran koruyucu"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "Ekran koruyucunuzun tercihlerini belirtin"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "Ekran koruyucu Önizleme"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>Ekran koruyucu önizleme</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "Ekran koruyucusu Tercihleri"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "Güç Yöneti_mi"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "Ö_nizleme"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "_Ekran koruyucu teması:"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "Sonrasında bilgisayarı _boş duran olarak say:"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "Bilgis_ayar bekleme durumundayken ekran koruyucuyu etkinleştir"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "Ekran koruyucu etkinken ekranı ki_litle"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>Uyarı: root kullanıcısı için ekran kilitlenmeyecektir.</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "Ekran koruyucular"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "Ekran koruyucu temaları"
@@ -400,224 +400,224 @@ msgstr "%s geçerli bir ekran koruyucu teması gibi görünmüyor."
 msgid "Copying file: %u of %u"
 msgstr "Dosya kopyalanıyor: %u / %u"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "Ekran koruyucudan nazikçe çıkmasına sebep olur"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "Ekran koruyucunun durumunu sorgula"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr "Ekran koruyucusunun etkin olduğu zamanı sorgula"
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "Çalışan ekran koruyucu sürecine ekranı hemen kilitlemesini söyle"
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "Eğer ekran koruyucu etkin ise başka bir grafik gösterimine geç"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "Ekran koruyucuyu aç (ekranı boş bırak)"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "Eğer ekran koruyucu etkin ise etkinliğini kaldır (ekranı boş bırakma)"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "Kullanıcı aktivitesini taklit etmek için çalışan ekran koruyucuyu dürt"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr "Ekran koruyucunun etkinleşmesini engelle. Engelleme etkin iken komut bloke edilir."
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr "Ekran koruyucuyu engelleyen çağrılan uygulama"
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr "Ekran koruyucuya engel olmak için sebep"
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "Bu uygulamanın sürümü"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "Ekran koruyucu %s\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "etkin"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "etkin değil"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr "Ekran koruyucu durdurulmamış\n"
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr "Ekran koruyucuyu durduran:\n"
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr "Ekran koruyucu %d saniyedir etkin.\n"
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr "Ekran koruyucu şu anda etkin değil.\n"
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "Hata ayıklama çıktısını göster"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "Çıkış düğmesini göster"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "Oturumu kapat düğmesinden çağrılacak komut"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "Kullanıcı değiştir düğmesini göster"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr "Pencerede gösterilecek mesaj"
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "MESAJ"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr "Kullanılmıyor"
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "Kullanıcı adı:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "Parola:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr "Hemen parolanızı değiştirmeniz gerekiyor (parolanız eskidi)"
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "Parolanızı hemen değiştirmeniz gerekiyor (root zorluyor)"
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "Hesabınızın süresi dolmuş; lütfen sistem yöneticiniz ile temasa geçin"
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "Bir parola sağlanmadı"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "Parola değişmedi"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "Kullanıcı adı alınamıyor"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "Yeni UNIX parolanızı yeniden girin:"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "Yeni UNIX parolanızı girin:"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "(şimdiki) UNIX parolanız:"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "NIS parolası değiştirilirken hata."
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "Daha uzun bir parola seçmelisiniz"
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "Parola kullanılmaktadır. Başka bir tane seçin."
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "Parolanızı değiştirmek için daha uzun beklemelisiniz"
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "Üzgünüm, parolalar uyuşmuyor"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "Kontrol ediliyor..."
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "Kimlik kontrolü başarısız."
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "Boş ekran"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "Rastgele"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d saat"
 msgstr[1] "%d saat"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d dakika"
 msgstr[1] "%d dakika"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -626,15 +626,15 @@ msgstr[1] "%d saniye"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -642,35 +642,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "Asla"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "Ana arayüz yüklenemedi"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "Lütfen ekran koruyucusunun düzgün bir şekilde kurulmuş olduğundan emin olun"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "Bir servis haline gelme"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "Hata ayıklama kodunu etkinleştir"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr "Ekran koruyucu ve kilitleyici programı başlat"
 
diff --git a/po/uk.po b/po/uk.po
index 80397ab..b726fd4 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -21,60 +21,60 @@ msgstr ""
 "Language: uk\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "Зберігач екрану"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "Встановити параметри зберігача екрану"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "Попередній перегляд зберігача екрану"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>Попередній перегляд зберігача екрану</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "Параметри зберігача екрану"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "Керування _живленням"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "_Попередній перегляд"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "_Тема зберігача екрану:"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "Вважати сеанс _неактивним через:"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "_Активувати зберігач екрану, коли комп'ютер простоює"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "_Блокувати екран, коли зберігач екрану активний"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>Попередження: екран буде заблокований, розблокувати зможе користувач root.</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "Зберігачі екрану"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "Теми зберігача екрану"
@@ -397,203 +397,203 @@ msgstr "Файл %s не схожий на файл теми зберігача
 msgid "Copying file: %u of %u"
 msgstr "Копіюється файл: %u of %u"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "Призводить до виходу із зберігача екрану"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "Запитує стан зберігача екрану"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr "Запитати інтервал часу, протягом якого був активним зберігач екрану"
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "Вказує запущеному процесу зберігача екрану негайно заблокувати екран"
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "Якщо зберігач екрану активний, змінити заставку"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "Увімкнути зберігач екрану (погасити екран)"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "Якщо зберігач екрану активний, деактивувати його (відновити екран)"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "Штовхнути запущений зберігач екрану для імітації активности користувача"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr "Затримувати активацію зберігача екрану. Команда блокується поки заборона активна."
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr "Виклик проґрами, яка затримує зберігач екрану"
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr "Причина для затримки зберігача екрану"
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "Версія проґрами"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "Зберігач екрану: %s\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "активне"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "неактивне"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr "Зберігач екрану не стримується\n"
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr "Зберігач екрану стримується:\n"
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr "Зберігач екрану був активний протягом %d секунд.\n"
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr "Зберігач екрану наразі не активований\n"
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "Показувати вивід зневадження"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "Показувати кнопку виходу"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "Команда, що виконується при натисканні кнопки виходу"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "Показувати кнопку зміни користувача"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr "Повідомлення, що виводиться у діялоґовому вікні"
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "ПОВІДОМЛЕННЯ"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr "Не використовується"
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "Користувач:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "Пароль:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr "Варто негайно змінити Ваш пароль (пароль старий)"
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "Варто негайно змінити Ваш пароль (за вимогою адміністратора)"
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "Ваш обліковий запис застарів, зконтактуйтеся з системним адміністратором"
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "Не вказано пароль"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "Пароль не змінено"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "Не вдається отримати ім'я користувача"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "Повторіть новий пароль UNIX:"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "Уведіть новий пароль UNIX:"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "(поточний) пароль UNIX:"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "Помилка при зміні паролю NIS."
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "Потрібно вибрати довший пароль"
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "Пароль вже використовувався. Виберіть иньший пароль."
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "Слід довше почекати щоб змінити Ваш пароль"
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "Паролі не збігаються"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "Перевірка..."
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "Помилка розпізнання."
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "Порожній екран"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "Випадкова"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -601,14 +601,14 @@ msgstr[0] "%d година"
 msgstr[1] "%d години"
 msgstr[2] "%d годин"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -616,7 +616,7 @@ msgstr[0] "%d хвилина"
 msgstr[1] "%d хвилини"
 msgstr[2] "%d хвилин"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -626,15 +626,15 @@ msgstr[2] "%d секунд"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s·%s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s·%s·%s"
@@ -642,35 +642,35 @@ msgstr "%s·%s·%s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "Ніколи"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "Не вдається завантажити головний інтерфейс"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "Переконайтеся, що зберігач екрану встановлено правильно"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "Не ставати службою"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "Увімкнути режим зневадження"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr "Запустити зберігач екрану і проґраму блокування"
 
diff --git a/po/ur.po b/po/ur.po
index d87171c..d0919c4 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -17,60 +17,60 @@ msgstr ""
 "Language: ur\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "سکرین سیور"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "اپنے سکرین سیور کی ترجیحات مُتعین کریں"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "سکرین سیور کا معائنہ"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>سکرین سیور معائنہ</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "سکرین سیور کی ترجیحات"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "توانائی کی _ادارت"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "_معائنہ"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "_سکرین سیور کی تھیم:"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "کمپیوٹر کو اس کے بعد _ساکن تصور کریں:"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "جب کمپیوٹر ساکن ہو سکرین سیور _فعال کریں"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "جب سکرین سیور فعال ہو سکرین _مقفل کریں"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>انتباہ: روٹ صارف کے لیے سکرین مقفل نہیں کی جائے گی.</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "سکرین سیور"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "سکرین سیور کی تھیم"
@@ -393,224 +393,224 @@ msgstr "%s موزوں سکرین سیور تھیم معلوم نہیں ہوتی.
 msgid "Copying file: %u of %u"
 msgstr "فائل کاپی کی جارہی ہے: %u برائے %u"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "سلیقے سے سکرین سیور کو برخاست کرنے کا موجب بنتا ہے"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "سکرین سیور کو چلائیں (سکرین خالی کریں)"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "اس اطلاقیے کا نسخہ"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "سکرین سیور ہے %s\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "فعال"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "غیر فعال"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr "سکرین سیور %d سیکنڈوں سے فعال ہے.\n"
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr "سکرین سیور اس وقت فعال نہیں ہے.\n"
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "لاگ آؤٹ کا بٹن دکھائیں"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "صارف کو بدلنے کا بٹن دکھائیں"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr "مکالمے میں دکھانے کا پیغام"
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "پیغام"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr "غیر استعمال شدہ"
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "اسمِ صارف:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "پاس ورڈ:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr "آپ کو اپنا پاس ورڈ فوری طور پر بدلنے کی ضرورت ہے (پاس ورڈ پرانا ہوگیا ہے)"
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "آپ کو اپنا پاس ورڈ فوری طور پر بدلنے کی ضرورت ہے (روٹ کی طرف سے نافذ کردہ)"
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "آپ کا کھاتہ ایکسپائر ہوگیا ہے; اپنے نظام کے مدیر سے رابطہ کریں"
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "کوئی پاس ورڈ فراہم نہیں کیا گیا"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "پاس ورڈ غیر تبدیل شُدہ"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "اسم صارف حاصل نہیں کیا جاسکتا"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "نیا یونکس پاس ورڈ دوبارہ لکھیں:"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "نیا یونکس پاس ورڈ درج کریں:"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "(حالیہ) یونکس پاس ورڈ:"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "نس NIS پاس ورڈ بدلتے ہوئے غلطی."
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "پاس ورڈ کا طویل ہونا لازمی ہے"
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "پاس ورڈ پہلے ہی استعمال میں ہے. دوسرا منتخب کریں."
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "اپنا پاس ورڈ بدلنے کے لیے آپ کو طویل انتظار کرنا ہوگا"
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "معذرت، پاس ورڈ مطابقت نہیں رکھتے"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "پڑتال کی جارہی ہے..."
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "توثیق ناکام ہوئی."
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "خالی سکرین"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "اتفاقی"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d گھنٹہ"
 msgstr[1] "%d گھنٹے"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d منٹ"
 msgstr[1] "%d منٹ"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -619,15 +619,15 @@ msgstr[1] "%d سیکنڈ"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -635,35 +635,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "کبھی نہیں"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "تھیم کا مواجہ نہیں لادا جاسکتا"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "ازراہِ کرم تصدیق کر لیں کہ تھیم درست طور پر نصب ہے"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "ڈیمن مت بنیں"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "ڈی بگنگ کوڈ فعال کریں"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr ""
 
diff --git a/po/uz.po b/po/uz.po
index 27f31c2..e54ecb6 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -18,60 +18,60 @@ msgstr ""
 "Language: uz\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "Ekran Saqlovchi"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "Ekran Saqlovchi Xususiyatlarini belgilang"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "Oldindan koʻrish"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>Oldindan ko'rish</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "Ekran Saqlovchi Xususiyatlari"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "Quvvat _Boshqaruvi"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "_Oldindan ko'rish"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "_Ekran Saqlovchi mavzusi:"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr ""
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "Ekran saqlovchi faol bo'lsa ekranni qulflash"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>Ogohlantirish: ekran ildiz foydalanuvchi uchun qulflanmaydi.</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "Ekran Saqlovchilar"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "Ekran Saqlovchi mavzulari"
@@ -394,222 +394,222 @@ msgstr ""
 msgid "Copying file: %u of %u"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "faol"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "nofaol"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr ""
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "XABAR"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr ""
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "Foydalanuvchi Nomi:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "Maxfiy so'z:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr ""
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "Tekshirilmoqda..."
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "Tasdiqdan o'tmadi."
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "Bo'sh ekran"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "Tasodifiy"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d daqiqa"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -617,15 +617,15 @@ msgstr[0] "%d soniya"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -633,35 +633,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "Hech qachon"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "Asosiy interfeysni yuklab boʻlmadi"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr ""
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr ""
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr ""
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr ""
 
diff --git a/po/vi.po b/po/vi.po
index 858a8c2..3b26027 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -18,60 +18,60 @@ msgstr ""
 "Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "Bộ bảo vệ màn hình"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "Lập các tùy thích cho trình bảo vệ màn hình"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "Xem thử ảnh bảo vệ màn hình"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>Xem thử ảnh bảo vệ màn hình</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "Tùy thích Bộ bảo vệ màn hình"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "_Quản lý điện năng"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "_Xem thử"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "_Sắc thái của ảnh bảo vệ màn hình:"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "Co_i như máy tính nghỉ sau :"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "_Hoạt hoá bộ bảo vệ màn hình khi máy tính mới nghỉ"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "_Khoá màn hình khi bộ bảo vệ màn hình hoạt động"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>Cảnh báo : màn hình sẽ không bị khoá cho người dùng chủ (root).</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "Ảnh bảo vệ màn hình"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "Sắc thái của ảnh bảo vệ màn hình"
@@ -394,222 +394,222 @@ msgstr "Có vẻ là %s không phải là một sắc thái bảo vệ màn hìn
 msgid "Copying file: %u of %u"
 msgstr "Đang sao chép tập tin: %u trên %u"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "Làm cho bộ bảo vệ màn hình thoát cho đúng"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "Truy vấn tính trạng của bộ bảo vệ màn hình"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr "Truy vấn khoảng thời gian hoạt động của bộ bảo vệ màn hình"
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "Báo tiến trình bảo vệ màn hình đang chạy phải khoá ngay màn hình"
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "Nếu bộ bảo vệ màn hình có hoạt động thì chuyển đổi sang một chứng minh đồ họa khác"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "Khởi chạy bộ bảo vệ màn hình (làm trắng màn hình)"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "Nếu bộ bảo vệ màn hình có hoạt động thì tắt nó (bỏ trắng màn hình)"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "Thức bộ bảo vệ màn hình đang chạy, để mô phỏng hoạt động của người dùng"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr "Ngăn chặn bộ bảo vệ màn hình kích hoạt. Lệnh chặn trong khi khả năng ngăn chặn còn hoạt động."
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr "Ứng dụng gọi mà ngăn chặn bộ bảo vệ màn hình"
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr "Lý do ngăn chặn bộ bảo vệ màn hình"
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "Phiên bản ứng dụng này"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "Bộ bảo vệ màn hình là %s\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "hoạt động"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "không hoạt động"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr "Bộ bảo vệ màn hình không phải bị thu hồi\n"
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr "Bộ bảo vệ màn hình đang bị thu hồi bởi:\n"
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr "Bộ bảo vệ màn hình đã hoạt động trong vòng %d giây.\n"
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr "Bộ bảo vệ màn hình hiện tại không hoạt động.\n"
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "Hiện dữ liệu xuất gỡ lỗi"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "Hiện cái nút đăng xuất"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "Lệnh cần chạy từ cái nút đăng xuất"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "Hiện cái nút chuyển đổi người dùng"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr "Thông điệp cần hiển thị trong hộp thoại"
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "THÔNG ĐIỆP"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr "Không dùng"
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "Tên người dùng:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "Mật khẩu :"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr "Bạn phải thay đổi ngay mật khẩu (mật khẩu quá cũ)"
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "Bạn phải thay đổi ngay mật khẩu (người chủ ép buộc)"
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "Tài khoản của bạn đã hết hạn dùng: hãy liên lạc với nhà quản trị hệ thống"
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "Chưa cung cấp mật khẩu"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "Chưa thay đổi mật khẩu"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "Không thể lấy tên người dùng"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "Gõ lại mật khẩu UNIX mới:"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "Nhập mật khẩu UNIX mới:"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "Mật khẩu UNIX (hiện có):"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "Gặp lỗi khi thay đổi mật khẩu NIS."
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "Bạn phải chọn mật khẩu dài hơn"
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "Mật khẩu đã được dùng. Hãy chọn mật khẩu khác."
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "Bạn phải đợi thêm nữa, để thay đổi mật khẩu"
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "Tiếc là hai mật khẩu không trùng"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "Đang kiểm tra..."
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "Lỗi xác thực."
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "Màn hình trắng"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "Ngẫu nhiên"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d giờ"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d phút"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -617,15 +617,15 @@ msgstr[0] "%d giây"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -633,35 +633,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "Không bao giờ"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "Không thể tải giao diện chính"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "Hãy chắc là bộ bảo vệ màn hình được cài đặt đúng"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "Đừng chạy trong nền"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "Bật chạy mã gỡ lỗi"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr "Chạy bộ bảo vệ màn hình và các chương trình khóa"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 7f66398..0115b64 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -22,60 +22,60 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "屏幕保护程序"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "设定您的屏幕保护程序首选项"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "屏幕保护程序预览"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>屏幕保护程序预览</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "屏幕保护程序首选项"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "电源管理(_M)"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "预览(_P)"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "屏幕保护程序主题(_S):"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "于此时间后视计算机为空闲(_I):"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "计算机空闲时激活屏幕保护程序(_A)"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "屏幕保护程序激活时锁定屏幕(_L)"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>警告:屏幕锁定对 root 用户无效。</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "屏幕保护程序"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "屏幕保护程序主题"
@@ -398,222 +398,222 @@ msgstr "%s 似乎不是有效的屏幕保护程序主题。"
 msgid "Copying file: %u of %u"
 msgstr "正复制文件:第%u个,共%u个"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "使屏幕保护程序正常退出"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "查询屏幕保护程序的状态"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr "查询屏幕保护程序已经活动的时间"
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "通知正在运行的屏幕保护程序进程立即锁定屏幕"
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "如果屏幕保护程序正活动则切换到其它图像演示"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "开启屏幕保护程序(黑屏)"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "如果屏幕保护程序正活动则使之不活动(解除黑屏)"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "发送信息到正在运行的屏幕保护程序以模拟用户活动"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr "禁止屏幕保护程序激活。启动后其它命令将被阻塞。"
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr "正在禁用屏幕保护程序的应用程序"
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr "禁用屏幕保护程序的原因"
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "此应用程序的版本"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "屏幕保护程序为 %s\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "激活"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "未激活"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr "屏幕保护程序未被阻止\n"
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr "屏幕保护程序被阻止:\n"
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr "屏幕保护程序已运行 %d 秒。\n"
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr "屏幕保护当前没有激活。\n"
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "显示调试输出"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "显示注销按钮"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "注销按钮所调用的命令"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "显示切换用户按钮"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr "在对话框中显示的消息"
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "MESSAGE"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr "没有使用"
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "用户名:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "密码:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr "您必须立即更改您的密码(密码到期)"
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "您必须立即更改您的密码(root 强制)"
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "您的帐户已过期;请联系您的系统管理员"
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "没有提供密码"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "密码未改变"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "无法获取用户名"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "重新输入新 UNIX 密码:"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "输入新 UNIX 密码:"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "当前 UNIX 密码:"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "更改 NIS 密码出错。"
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "你必须选择一个更长些的密码"
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "密码已经被使用。请重新选择。"
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "您必须等待更久以修改您的密码"
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "对不起,密码不匹配"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "正在检查..."
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "验证失败。"
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "黑屏幕"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "随机"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d 小时"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d 分钟"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -621,15 +621,15 @@ msgstr[0] "%d 秒"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -637,35 +637,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "从不"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "无法装入主界面"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "请确定屏幕保护程序已经正确安装"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "不成为守护进程"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "启用调试代码"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr "运行屏幕保护及锁定程序"
 
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 069912a..b8df66e 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -21,60 +21,60 @@ msgstr ""
 "Language: zh_HK\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "螢幕保護程式"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "設定螢幕保護程式"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "螢幕保護程式預覽"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>螢幕保護程式預覽</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "螢幕保護程式偏好設定"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "電源管理(_M)"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "預覽(_P)"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "螢幕保護程式佈景主題(_S):"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "在此時間之後將電腦設為閒置(_I)"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "當作業階段閒置時啟用螢幕保護程式(_A)"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "當螢幕保護程式作用時鎖定螢幕(_L)"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>警告:root 使用者的畫面不會鎖上。</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "螢幕保護程式"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "螢幕保護程式佈景主題"
@@ -397,222 +397,222 @@ msgstr "%s 似乎不是有效的螢幕保護程式主題檔案。"
 msgid "Copying file: %u of %u"
 msgstr "複製檔案:%2$u 之 %1$u"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "令螢幕保護程式正常結束"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "查詢螢幕保護程式狀態"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr "查詢螢幕保護程式已啟動的時間"
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "要求螢幕保護程式立刻鎖定畫定"
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "如果螢幕保護程已經啟動,立刻切換直另一種畫面"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "啟動螢幕保護程式(畫面變黑)"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "如果螢幕保護程已經啟動,立刻回復狀態 (不變黑)"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "模擬用家使用電腦,令螢幕保護程式重設計時器"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr "禁止螢幕保護程式發生作用,這時螢幕保護程式會被封。"
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr "禁止螢幕保護程式發生作用的應用程式"
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr "禁止螢幕保護程式發生作用的理由"
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "本程式的版本"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "螢幕保護程式目前是 %s\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "啟動中"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "暫停運作"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr "螢幕保護程式並未被抑制\n"
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr "螢幕保護程式已被抑制:\n"
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr "螢幕保護程式己啟動了 %d 秒。\n"
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr "螢幕保護程式目前並未使用。\n"
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "顯示詳細偵錯訊息"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "顯示「登出」按鈕"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "「登出」按鈕呼叫的指令"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "顯示「切換使用者」按鈕"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr "要在對話視窗顯示的留言"
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "MESSAGE"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr "並未使用"
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "使用者名稱:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "密碼:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr "你必須立即更改密碼(密碼過期)"
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "你必須立即更改密碼(root 強制執行)"
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "你的帳戶已經過期,請聯絡系統管理員"
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "沒有提供密碼"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "密碼沒有更改"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "無法取得使用者名稱"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "再輸入新的 UNIX 密碼:"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "輸入新的 UNIX 密碼:"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "(目前的)UNIX 密碼:"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "更改 NIS 密碼時發生錯誤。"
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "你必須選用一個較長的密碼"
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "密碼已經使用,請選用另一個。"
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "更改密碼需要等候較長時間"
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "對不起,密碼不符"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "檢查中..."
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "認證失敗。"
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "空白畫面"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "隨機"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d 時"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d 分"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -620,15 +620,15 @@ msgstr[0] "%d 秒"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -636,35 +636,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "永不"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "無法載入主視窗介面"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "請確保螢幕保護程式已經正確安裝"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "不要成為服務程式"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "啟用除錯碼"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr ""
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index c9ebaac..a701f0c 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -24,60 +24,60 @@ msgstr ""
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:1
-#: ../src/mate-screensaver.desktop.in.in.h:1
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "螢幕保護程式"
 
-#: ../data/mate-screensaver-preferences.desktop.in.h:2
+#: ../data/xfce4-screensaver-preferences.desktop.in.h:2
 msgid "Set your screensaver preferences"
 msgstr "設定螢幕保護程式"
 
-#: ../data/mate-screensaver-preferences.ui.h:1
+#: ../data/xfce4-screensaver-preferences.ui.h:1
 msgid "Screensaver Preview"
 msgstr "螢幕保護程式預覽"
 
-#: ../data/mate-screensaver-preferences.ui.h:2
+#: ../data/xfce4-screensaver-preferences.ui.h:2
 msgid "<b>Screensaver preview</b>"
 msgstr "<b>螢幕保護程式預覽</b>"
 
-#: ../data/mate-screensaver-preferences.ui.h:3
+#: ../data/xfce4-screensaver-preferences.ui.h:3
 msgid "Screensaver Preferences"
 msgstr "螢幕保護程式偏好設定"
 
-#: ../data/mate-screensaver-preferences.ui.h:4
+#: ../data/xfce4-screensaver-preferences.ui.h:4
 msgid "Power _Management"
 msgstr "電源管理(_M)"
 
-#: ../data/mate-screensaver-preferences.ui.h:5
+#: ../data/xfce4-screensaver-preferences.ui.h:5
 msgid "_Preview"
 msgstr "預覽(_P)"
 
-#: ../data/mate-screensaver-preferences.ui.h:6
+#: ../data/xfce4-screensaver-preferences.ui.h:6
 msgid "_Screensaver theme:"
 msgstr "螢幕保護程式布景主題(_S):"
 
-#: ../data/mate-screensaver-preferences.ui.h:7
+#: ../data/xfce4-screensaver-preferences.ui.h:7
 msgid "Regard the computer as _idle after:"
 msgstr "在此時間之後將電腦設為閒置(_I)"
 
-#: ../data/mate-screensaver-preferences.ui.h:8
+#: ../data/xfce4-screensaver-preferences.ui.h:8
 msgid "_Activate screensaver when computer is idle"
 msgstr "當作業階段閒置時啟用螢幕保護程式(_A)"
 
-#: ../data/mate-screensaver-preferences.ui.h:9
+#: ../data/xfce4-screensaver-preferences.ui.h:9
 msgid "_Lock screen when screensaver is active"
 msgstr "當螢幕保護程式作用時鎖定螢幕(_L)"
 
-#: ../data/mate-screensaver-preferences.ui.h:10
+#: ../data/xfce4-screensaver-preferences.ui.h:10
 msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr "<b>警告:root 使用者的畫面不會鎖上。</b>"
 
-#: ../data/mate-screensaver.directory.in.h:1
+#: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "螢幕保護程式"
 
-#: ../data/mate-screensaver.directory.in.h:2
+#: ../data/xfce4-screensaver.directory.in.h:2
 #: ../data/org.mate.screensaver.gschema.xml.in.h:7
 msgid "Screensaver themes"
 msgstr "螢幕保護程式布景主題"
@@ -400,222 +400,222 @@ msgstr "%s 似乎不是有效的螢幕保護程式主題檔案。"
 msgid "Copying file: %u of %u"
 msgstr "複製檔案:%2$u 之 %1$u"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:59
 msgid "Causes the screensaver to exit gracefully"
 msgstr "令螢幕保護程式正常結束"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:63
 msgid "Query the state of the screensaver"
 msgstr "查詢螢幕保護程式狀態"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:67
 msgid "Query the length of time the screensaver has been active"
 msgstr "查詢螢幕保護程式已啟動的時間"
 
-#: ../src/mate-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:71
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "要求螢幕保護程式立刻鎖定畫定"
 
-#: ../src/mate-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:75
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "如果螢幕保護程已經啟動,立刻切換直另一種畫面"
 
-#: ../src/mate-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:79
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "啟動螢幕保護程式(畫面變黑)"
 
-#: ../src/mate-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:83
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "如果螢幕保護程已經啟動,立刻回復狀態 (不變黑)"
 
-#: ../src/mate-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:87
 msgid "Poke the running screensaver to simulate user activity"
 msgstr "模擬用家使用電腦,令螢幕保護程式重設計時器"
 
-#: ../src/mate-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:91
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
 msgstr "禁止螢幕保護程式發生作用,這時螢幕保護程式會被封。"
 
-#: ../src/mate-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:95
 msgid "The calling application that is inhibiting the screensaver"
 msgstr "禁止螢幕保護程式發生作用的應用程式"
 
-#: ../src/mate-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:99
 msgid "The reason for inhibiting the screensaver"
 msgstr "禁止螢幕保護程式發生作用的理由"
 
-#: ../src/mate-screensaver-command.c:103 ../src/mate-screensaver-dialog.c:58
-#: ../src/mate-screensaver.c:55
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:58
+#: ../src/xfce4-screensaver.c:55
 msgid "Version of this application"
 msgstr "本程式的版本"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "螢幕保護程式目前是 %s\n"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "active"
 msgstr "啟動中"
 
-#: ../src/mate-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:352
 msgid "inactive"
 msgstr "暫停運作"
 
-#: ../src/mate-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:368
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr "螢幕保護程式並未被抑制\n"
 
-#: ../src/mate-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:376
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr "螢幕保護程式已被抑制:\n"
 
-#: ../src/mate-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:411
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr "螢幕保護程式己啟動了 %d 秒。\n"
 
-#: ../src/mate-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr "螢幕保護程式目前並未使用。\n"
 
-#: ../src/mate-screensaver-dialog.c:57
+#: ../src/xfce4-screensaver-dialog.c:57
 msgid "Show debugging output"
 msgstr "顯示詳細偵錯訊息"
 
-#: ../src/mate-screensaver-dialog.c:59
+#: ../src/xfce4-screensaver-dialog.c:59
 msgid "Show the logout button"
 msgstr "顯示「登出」按鈕"
 
-#: ../src/mate-screensaver-dialog.c:60
+#: ../src/xfce4-screensaver-dialog.c:60
 msgid "Command to invoke from the logout button"
 msgstr "「登出」按鈕呼叫的指令"
 
-#: ../src/mate-screensaver-dialog.c:61
+#: ../src/xfce4-screensaver-dialog.c:61
 msgid "Show the switch user button"
 msgstr "顯示「切換使用者」按鈕"
 
-#: ../src/mate-screensaver-dialog.c:62
+#: ../src/xfce4-screensaver-dialog.c:62
 msgid "Message to show in the dialog"
 msgstr "要在對話視窗顯示的留言"
 
-#: ../src/mate-screensaver-dialog.c:62 ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:62 ../src/xfce4-screensaver-dialog.c:63
 msgid "MESSAGE"
 msgstr "MESSAGE"
 
-#: ../src/mate-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Not used"
 msgstr "並未使用"
 
 #. login: is whacked always translate to Username:
-#: ../src/mate-screensaver-dialog.c:165 ../src/mate-screensaver-dialog.c:166
-#: ../src/mate-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
+#: ../src/xfce4-screensaver-dialog.c:165 ../src/xfce4-screensaver-dialog.c:166
+#: ../src/xfce4-screensaver-dialog.c:167 ../src/gs-auth-pam.c:745
 msgid "Username:"
 msgstr "使用者名稱:"
 
-#: ../src/mate-screensaver-dialog.c:168 ../src/mate-screensaver-dialog.c:169
+#: ../src/xfce4-screensaver-dialog.c:168 ../src/xfce4-screensaver-dialog.c:169
 #: ../src/gs-auth-pam.c:171
 msgid "Password:"
 msgstr "密碼:"
 
-#: ../src/mate-screensaver-dialog.c:170
+#: ../src/xfce4-screensaver-dialog.c:170
 msgid "You are required to change your password immediately (password aged)"
 msgstr "您必須立即變更密碼(密碼過期)"
 
-#: ../src/mate-screensaver-dialog.c:171
+#: ../src/xfce4-screensaver-dialog.c:171
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "您必須立即變更密碼(root 強制執行)"
 
-#: ../src/mate-screensaver-dialog.c:172
+#: ../src/xfce4-screensaver-dialog.c:172
 msgid "Your account has expired; please contact your system administrator"
 msgstr "您的帳戶已經過期,請連絡系統管理員"
 
-#: ../src/mate-screensaver-dialog.c:173
+#: ../src/xfce4-screensaver-dialog.c:173
 msgid "No password supplied"
 msgstr "沒有提供密碼"
 
-#: ../src/mate-screensaver-dialog.c:174
+#: ../src/xfce4-screensaver-dialog.c:174
 msgid "Password unchanged"
 msgstr "密碼沒有變更"
 
-#: ../src/mate-screensaver-dialog.c:175
+#: ../src/xfce4-screensaver-dialog.c:175
 msgid "Can not get username"
 msgstr "無法取得使用者名稱"
 
-#: ../src/mate-screensaver-dialog.c:176
+#: ../src/xfce4-screensaver-dialog.c:176
 msgid "Retype new UNIX password:"
 msgstr "再輸入新的 UNIX 密碼:"
 
-#: ../src/mate-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:177
 msgid "Enter new UNIX password:"
 msgstr "輸入新的 UNIX 密碼:"
 
-#: ../src/mate-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "(current) UNIX password:"
 msgstr "(目前的)UNIX 密碼:"
 
-#: ../src/mate-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Error while changing NIS password."
 msgstr "變更 NIS 密碼時發生錯誤。"
 
-#: ../src/mate-screensaver-dialog.c:180
+#: ../src/xfce4-screensaver-dialog.c:180
 msgid "You must choose a longer password"
 msgstr "您必須選用一個較長的密碼"
 
-#: ../src/mate-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:181
 msgid "Password has been already used. Choose another."
 msgstr "密碼已經使用,請選用另一個。"
 
-#: ../src/mate-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You must wait longer to change your password"
 msgstr "變更密碼需要等候較長時間"
 
-#: ../src/mate-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "Sorry, passwords do not match"
 msgstr "對不起,密碼不符"
 
-#: ../src/mate-screensaver-dialog.c:254
+#: ../src/xfce4-screensaver-dialog.c:254
 msgid "Checking..."
 msgstr "檢查中…"
 
-#: ../src/mate-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
+#: ../src/xfce4-screensaver-dialog.c:300 ../src/gs-auth-pam.c:483
 msgid "Authentication failed."
 msgstr "認證失敗。"
 
-#: ../src/mate-screensaver-preferences.c:461
+#: ../src/xfce4-screensaver-preferences.c:461
 msgid "Blank screen"
 msgstr "空白畫面"
 
-#: ../src/mate-screensaver-preferences.c:467
+#: ../src/xfce4-screensaver-preferences.c:467
 msgid "Random"
 msgstr "隨機"
 
-#: ../src/mate-screensaver-preferences.c:953
-#: ../src/mate-screensaver-preferences.c:963
+#: ../src/xfce4-screensaver-preferences.c:953
+#: ../src/xfce4-screensaver-preferences.c:963
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d 時"
 
-#: ../src/mate-screensaver-preferences.c:956
-#: ../src/mate-screensaver-preferences.c:965
-#: ../src/mate-screensaver-preferences.c:974
-#: ../src/mate-screensaver-preferences.c:977
-#: ../src/mate-screensaver-preferences.c:982
-#: ../src/mate-screensaver-preferences.c:985
-#: ../src/mate-screensaver-preferences.c:990
-#: ../src/mate-screensaver-preferences.c:993
+#: ../src/xfce4-screensaver-preferences.c:956
+#: ../src/xfce4-screensaver-preferences.c:965
+#: ../src/xfce4-screensaver-preferences.c:974
+#: ../src/xfce4-screensaver-preferences.c:977
+#: ../src/xfce4-screensaver-preferences.c:982
+#: ../src/xfce4-screensaver-preferences.c:985
+#: ../src/xfce4-screensaver-preferences.c:990
+#: ../src/xfce4-screensaver-preferences.c:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d 分"
 
-#: ../src/mate-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:959
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -623,15 +623,15 @@ msgstr[0] "%d 秒"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:962
-#: ../src/mate-screensaver-preferences.c:1009
-#: ../src/mate-screensaver-preferences.c:1022
+#: ../src/xfce4-screensaver-preferences.c:962
+#: ../src/xfce4-screensaver-preferences.c:1009
+#: ../src/xfce4-screensaver-preferences.c:1022
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1004
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -639,35 +639,35 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:1014
-#: ../src/mate-screensaver-preferences.c:1027
-#: ../src/mate-screensaver-preferences.c:1063
+#: ../src/xfce4-screensaver-preferences.c:1014
+#: ../src/xfce4-screensaver-preferences.c:1027
+#: ../src/xfce4-screensaver-preferences.c:1063
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/mate-screensaver-preferences.c:1078
+#: ../src/xfce4-screensaver-preferences.c:1078
 #, c-format
 msgid "Never"
 msgstr "永不"
 
-#: ../src/mate-screensaver-preferences.c:1567
+#: ../src/xfce4-screensaver-preferences.c:1567
 msgid "Could not load the main interface"
 msgstr "無法載入主視窗介面"
 
-#: ../src/mate-screensaver-preferences.c:1569
+#: ../src/xfce4-screensaver-preferences.c:1569
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "請確保螢幕保護程式已經正確安裝"
 
-#: ../src/mate-screensaver.c:56
+#: ../src/xfce4-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "不要成為守護程式"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/xfce4-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "啟用除錯碼"
 
-#: ../src/mate-screensaver.desktop.in.in.h:2
+#: ../src/xfce4-screensaver.desktop.in.in.h:2
 msgid "Launch screensaver and locker program"
 msgstr "啟動螢幕保護程式以及鎖定程式"
 
diff --git a/savers/Makefile.am b/savers/Makefile.am
index 4f590cf..bfdd874 100644
--- a/savers/Makefile.am
+++ b/savers/Makefile.am
@@ -79,7 +79,7 @@ libgs_theme_engine_a_SOURCES =		\
 	gs-theme-engine.h		\
 	$(NULL)
 
-saverdir = $(libexecdir)/mate-screensaver
+saverdir = $(libexecdir)/xfce4-screensaver
 saver_PROGRAMS = 	\
 	floaters	\
 	popsquares	\
diff --git a/src/Makefile.am b/src/Makefile.am
index 65a0a13..adcdf17 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = 1.7
 
 NULL =
 
-saverdir = $(libexecdir)/mate-screensaver
+saverdir = $(libexecdir)/xfce4-screensaver
 themesdir = $(pkgdatadir)/themes
 
 AM_CPPFLAGS =							\
@@ -24,7 +24,7 @@ AM_CPPFLAGS =							\
 	-DSAVERDIR=\""$(saverdir)"\"				\
 	-DTHEMESDIR=\""$(themesdir)"\"				\
 	-DGTKBUILDERDIR=\"$(pkgdatadir)\"			\
-	-DPAM_SERVICE_NAME=\""mate-screensaver"\"		\
+	-DPAM_SERVICE_NAME=\""xfce4-screensaver"\"		\
 	$(WARN_CFLAGS)						\
 	$(AUTH_CFLAGS)						\
 	$(DEBUG_CFLAGS)						\
@@ -36,14 +36,14 @@ AM_CPPFLAGS =							\
 	$(NULL)
 
 bin_PROGRAMS = \
-	mate-screensaver		\
-	mate-screensaver-command	\
-	mate-screensaver-preferences	\
+	xfce4-screensaver		\
+	xfce4-screensaver-command	\
+	xfce4-screensaver-preferences	\
 	$(NULL)
 
 libexec_PROGRAMS = \
-	mate-screensaver-dialog	\
-	mate-screensaver-gl-helper	\
+	xfce4-screensaver-dialog	\
+	xfce4-screensaver-gl-helper	\
 	$(NULL)
 
 noinst_PROGRAMS = 	\
@@ -54,15 +54,15 @@ noinst_PROGRAMS = 	\
 	$(NULL)
 
 desktopdir = $(sysconfdir)/xdg/autostart
-desktop_in_files = mate-screensaver.desktop.in
+desktop_in_files = xfce4-screensaver.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
-mate_screensaver_command_SOURCES = 	\
-	mate-screensaver-command.c	\
+xfce4_screensaver_command_SOURCES = 	\
+	xfce4-screensaver-command.c	\
 	$(NULL)
 
-mate_screensaver_command_LDADD =	\
+xfce4_screensaver_command_LDADD =	\
 	$(MATE_SCREENSAVER_COMMAND_LIBS)	\
 	$(NULL)
 
@@ -134,8 +134,8 @@ test_window_LDADD =			\
 	$(SAVER_LIBS)			\
 	$(NULL)
 
-mate_screensaver_dialog_SOURCES = 	\
-	mate-screensaver-dialog.c	\
+xfce4_screensaver_dialog_SOURCES = 	\
+	xfce4-screensaver-dialog.c	\
 	gs-lock-plug.c			\
 	gs-lock-plug.h			\
 	gs-debug.c			\
@@ -172,7 +172,7 @@ mate_screensaver_dialog_SOURCES = 	\
 	$(AUTH_SOURCES)			\
 	$(NULL)
 
-EXTRA_mate_screensaver_dialog_SOURCES = \
+EXTRA_xfce4_screensaver_dialog_SOURCES = \
 	gs-auth-pam.c		\
 	gs-auth-helper.c	\
 	gs-auth-pwent.c		\
@@ -204,7 +204,7 @@ EXTRA_mate_screensaver_dialog_SOURCES = \
 	entry-directories.h \
 	$(NULL)
 
-mate_screensaver_dialog_LDADD =	\
+xfce4_screensaver_dialog_LDADD =	\
 	$(MATE_SCREENSAVER_DIALOG_LIBS)\
 	$(MATE_SCREENSAVER_LIBS)\
 	$(SAVER_LIBS)			\
@@ -226,9 +226,9 @@ gs-marshal.c: gs-marshal.list
 gs-marshal.h: gs-marshal.list
 	@GLIB_GENMARSHAL@ $< --prefix=gs_marshal --header > $@
 
-mate_screensaver_SOURCES =	\
-	mate-screensaver.c	\
-	mate-screensaver.h	\
+xfce4_screensaver_SOURCES =	\
+	xfce4-screensaver.c	\
+	xfce4-screensaver.h	\
 	gs-monitor.c		\
 	gs-monitor.h		\
 	gs-watcher-x11.c	\
@@ -292,27 +292,27 @@ mate_screensaver_SOURCES =	\
 	$(BUILT_SOURCES)	\
 	$(NULL)
 
-mate_screensaver_gl_helper_LDADD =	\
+xfce4_screensaver_gl_helper_LDADD =	\
 	$(MATE_SCREENSAVER_LIBS)	\
 	$(GL_LIBS)			\
 	$(NULL)
 
-mate_screensaver_gl_helper_SOURCES =	\
-	mate-screensaver-gl-helper.c	\
+xfce4_screensaver_gl_helper_SOURCES =	\
+	xfce4-screensaver-gl-helper.c	\
 	gs-visual-gl.c			\
 	gs-visual-gl.h			\
 	$(NULL)
 
-mate_screensaver_LDADD =		\
+xfce4_screensaver_LDADD =		\
 	$(MATE_SCREENSAVER_LIBS)	\
 	$(SAVER_LIBS)			\
 	$(SYSTEMD_LIBS)			\
 	$(NULL)
 
-mate_screensaver_LDFLAGS = -export-dynamic
+xfce4_screensaver_LDFLAGS = -export-dynamic
 
-mate_screensaver_preferences_SOURCES =	\
-	mate-screensaver-preferences.c	\
+xfce4_screensaver_preferences_SOURCES =	\
+	xfce4-screensaver-preferences.c	\
 	copy-theme-dialog.c		\
 	copy-theme-dialog.h		\
 	gs-theme-manager.c		\
@@ -352,14 +352,14 @@ mate_screensaver_preferences_SOURCES =	\
 	desktop-entries.h \
 	$(NULL)
 
-mate_screensaver_preferences_LDADD =	\
+xfce4_screensaver_preferences_LDADD =	\
 	$(MATE_SCREENSAVER_CAPPLET_LIBS)	\
 	$(NULL)
 
 EXTRA_DIST =				\
 	debug-screensaver.sh		\
 	gs-marshal.list			\
-	mate-screensaver.desktop.in	\
+	xfce4-screensaver.desktop.in	\
 	$(NULL)
 
 GLIB_GENMARSHAL = $(shell pkg-config --variable=glib_genmarshal glib-2.0)
@@ -372,7 +372,7 @@ xfcekbd-indicator-marshal.c: xfcekbd-indicator-marshal.h
 
 CLEANFILES = 				\
 	$(desktop_DATA) 		\
-	mate-screensaver.desktop.in	\
+	xfce4-screensaver.desktop.in	\
 	$(BUILT_SOURCES)
 
 MAINTAINERCLEANFILES =			\
@@ -382,7 +382,7 @@ MAINTAINERCLEANFILES =			\
 install-exec-hook:
 	@if [ "x at NEED_SETUID@" = "xyes" ]; then \
 	    echo "***" ; \
-	    echo "***  Warning: mate-screensaver has been compiled with support for" ; \
+	    echo "***  Warning: xfce4-screensaver has been compiled with support for" ; \
 	    if [ "x at AUTH_SCHEME@" = "xbsdauth" ]; then \
 		echo "***           bsd_auth(3) and must be installed as a setuid root" ; \
 	    else \
@@ -392,8 +392,8 @@ install-exec-hook:
 	    echo "***           program in order for locking to work. To do this, you" ; \
 	    echo "***           must run:" ; \
 	    echo "***" ; \
-	    echo "***           chown root $(DESTDIR)$(libexecdir)/mate-screensaver-dialog" ; \
-	    echo "***           chmod +s $(DESTDIR)$(libexecdir)/mate-screensaver-dialog" ; \
+	    echo "***           chown root $(DESTDIR)$(libexecdir)/xfce4-screensaver-dialog" ; \
+	    echo "***           chmod +s $(DESTDIR)$(libexecdir)/xfce4-screensaver-dialog" ; \
 	    echo "***" ; \
 	    echo "***           For now, it will be installed non-setuid, which" ; \
 	    echo "***           means that locking might not work." ; \
diff --git a/src/debug-screensaver.sh b/src/debug-screensaver.sh
index c8b1a93..64a3437 100755
--- a/src/debug-screensaver.sh
+++ b/src/debug-screensaver.sh
@@ -30,13 +30,13 @@ fi
 export G_DEBUG=fatal_criticals
 
 # kill the existing daemon
-mate-screensaver-command --exit
+xfce4-screensaver-command --exit
 
 # run the daemon in the debugger
-#gdb --args mate-screensaver --no-daemon --debug --sync
+#gdb --args xfce4-screensaver --no-daemon --debug --sync
 
 # or if that isn't helpful just get the debug output
-#mate-screensaver --no-daemon --debug > /tmp/gs-debug-log.txt 2>&1
+#xfce4-screensaver --no-daemon --debug > /tmp/gs-debug-log.txt 2>&1
 
 # or just run it with debugging on
-mate-screensaver --no-daemon --debug
+xfce4-screensaver --no-daemon --debug
diff --git a/src/gs-auth-bsdauth.c b/src/gs-auth-bsdauth.c
index 3463974..386e4d0 100644
--- a/src/gs-auth-bsdauth.c
+++ b/src/gs-auth-bsdauth.c
@@ -85,7 +85,7 @@ gs_auth_verify_user (const char       *username,
 	}
 
 	/* authenticate */
-	res = auth_userokay((char *)username, NULL, "auth-mate-screensaver", password);
+	res = auth_userokay((char *)username, NULL, "auth-xfce4-screensaver", password);
 
 	return res;
 }
diff --git a/src/gs-auth-helper.c b/src/gs-auth-helper.c
index ea9aefe..2e62e76 100644
--- a/src/gs-auth-helper.c
+++ b/src/gs-auth-helper.c
@@ -12,7 +12,7 @@
  * implied warranty.
  */
 
-/* The idea here is to be able to run mate-screensaver-dialog without any setuid bits.
+/* The idea here is to be able to run xfce4-screensaver-dialog without any setuid bits.
  * Password verification happens through an external program that you feed
  * your password to on stdin.  The external command is invoked with a user
  * name argument.
@@ -113,7 +113,7 @@ ext_run (const char *user,
 		}
 
 		/* Helper is invoked as helper service-name [user] */
-		execlp (PASSWD_HELPER_PROGRAM, PASSWD_HELPER_PROGRAM, "mate-screensaver", user, NULL);
+		execlp (PASSWD_HELPER_PROGRAM, PASSWD_HELPER_PROGRAM, "xfce4-screensaver", user, NULL);
 		if (verbose)
 		{
 			g_message ("%s: %s", PASSWD_HELPER_PROGRAM, g_strerror (errno));
diff --git a/src/gs-debug.c b/src/gs-debug.c
index 59f71f8..23ced42 100644
--- a/src/gs-debug.c
+++ b/src/gs-debug.c
@@ -95,7 +95,7 @@ gs_debug_init (gboolean debug,
 
 	if (debug && to_file)
 	{
-		const char path [50] = "mate_screensaver_debug_XXXXXX";
+		const char path [50] = "xfce4_screensaver_debug_XXXXXX";
 		int        fd;
 
 		fd = g_file_open_tmp (path, NULL, NULL);
diff --git a/src/gs-listener-dbus.c b/src/gs-listener-dbus.c
index d398601..80e001f 100644
--- a/src/gs-listener-dbus.c
+++ b/src/gs-listener-dbus.c
@@ -1733,7 +1733,7 @@ listener_dbus_handle_system_message (DBusConnection *connection,
 		/* NB that `ActiveChanged' refers to the active
 		 * session in ConsoleKit terminology - ie which
 		 * session is currently displayed on the screen.
-		 * mate-screensaver uses `active' to mean `is the
+		 * xfce4-screensaver uses `active' to mean `is the
 		 * screensaver active' (ie, is the screen locked) but
 		 * that's not what we're referring to here.
 		 */
diff --git a/src/gs-lock-plug.c b/src/gs-lock-plug.c
index c26db9d..956ef33 100644
--- a/src/gs-lock-plug.c
+++ b/src/gs-lock-plug.c
@@ -2096,7 +2096,7 @@ gs_lock_plug_init (GSLockPlug *plug)
 	clear_clipboards (plug);
 
 #ifdef WITH_LIBNOTIFY
-	notify_init ("mate-screensaver-dialog");
+	notify_init ("xfce4-screensaver-dialog");
 	plug->priv->leave_note_enabled = TRUE;
 #else
 	plug->priv->leave_note_enabled = FALSE;
diff --git a/src/gs-monitor.c b/src/gs-monitor.c
index 732a59b..d2d92a6 100644
--- a/src/gs-monitor.c
+++ b/src/gs-monitor.c
@@ -31,7 +31,7 @@
 #include <glib-object.h>
 #include <gdk/gdkx.h>
 
-#include "mate-screensaver.h"
+#include "xfce4-screensaver.h"
 
 #include "gs-manager.h"
 #include "gs-watcher.h"
@@ -223,7 +223,7 @@ static void listener_lock_cb(GSListener* listener, GSMonitor* monitor)
 static void listener_quit_cb(GSListener* listener, GSMonitor* monitor)
 {
 	gs_listener_set_active(monitor->priv->listener, FALSE);
-	mate_screensaver_quit();
+	xfce4_screensaver_quit();
 }
 
 static void listener_cycle_cb(GSListener* listener, GSMonitor* monitor)
diff --git a/src/gs-theme-manager.c b/src/gs-theme-manager.c
index 42b3c5f..e35956b 100644
--- a/src/gs-theme-manager.c
+++ b/src/gs-theme-manager.c
@@ -376,7 +376,7 @@ gs_theme_manager_get_info_list (GSThemeManager *theme_manager)
 
 	if (root != NULL)
 	{
-		make_theme_list (&l, root, "mate-screensavers.menu");
+		make_theme_list (&l, root, "xfce4-screensavers.menu");
 		xfcemenu_tree_item_unref (root);
 	}
 
@@ -402,7 +402,7 @@ get_themes_tree (void)
 	   and since this is only run once we'll do it here */
 	add_known_engine_locations_to_path ();
 
-	themes_tree = xfcemenu_tree_lookup ("mate-screensavers.menu", MATEMENU_TREE_FLAGS_NONE);
+	themes_tree = xfcemenu_tree_lookup ("xfce4-screensavers.menu", MATEMENU_TREE_FLAGS_NONE);
 
 	return themes_tree;
 }
diff --git a/src/gs-window-x11.c b/src/gs-window-x11.c
index c15c15a..46731e2 100644
--- a/src/gs-window-x11.c
+++ b/src/gs-window-x11.c
@@ -515,7 +515,7 @@ get_best_visual_for_display (GdkDisplay *display)
 	visual = NULL;
 	screen = gdk_display_get_default_screen (display);
 
-	command = g_build_filename (LIBEXECDIR, "mate-screensaver-gl-helper", NULL);
+	command = g_build_filename (LIBEXECDIR, "xfce4-screensaver-gl-helper", NULL);
 
 	error = NULL;
 	std_output = NULL;
@@ -1691,7 +1691,7 @@ popup_dialog (GSWindow *window)
 
 	gs_debug ("Popping up dialog");
 
-	tmp = g_build_filename (LIBEXECDIR, "mate-screensaver-dialog", NULL);
+	tmp = g_build_filename (LIBEXECDIR, "xfce4-screensaver-dialog", NULL);
 	command = g_string_new (tmp);
 	g_free (tmp);
 
diff --git a/src/mate-screensaver-command.c b/src/xfce4-screensaver-command.c
similarity index 100%
rename from src/mate-screensaver-command.c
rename to src/xfce4-screensaver-command.c
diff --git a/src/mate-screensaver-dialog.c b/src/xfce4-screensaver-dialog.c
similarity index 99%
rename from src/mate-screensaver-dialog.c
rename to src/xfce4-screensaver-dialog.c
index 62daa98..0d3120c 100644
--- a/src/mate-screensaver-dialog.c
+++ b/src/xfce4-screensaver-dialog.c
@@ -360,7 +360,7 @@ static gboolean auth_check_idle(GSLockPlug* plug)
 		{
 			gs_debug ("Authentication failed, quitting (max failures)");
 			again = FALSE;
-			/* Don't quit immediately, but rather request that mate-screensaver
+			/* Don't quit immediately, but rather request that xfce4-screensaver
 			 * terminates us after it has finished the dialog shake. Time out
 			 * after 5 seconds and quit anyway if this doesn't happen though */
 			g_idle_add((GSourceFunc) response_request_quit, NULL);
diff --git a/src/mate-screensaver-gl-helper.c b/src/xfce4-screensaver-gl-helper.c
similarity index 100%
rename from src/mate-screensaver-gl-helper.c
rename to src/xfce4-screensaver-gl-helper.c
diff --git a/src/mate-screensaver-preferences.c b/src/xfce4-screensaver-preferences.c
similarity index 99%
rename from src/mate-screensaver-preferences.c
rename to src/xfce4-screensaver-preferences.c
index bf62bdd..952f29c 100644
--- a/src/mate-screensaver-preferences.c
+++ b/src/xfce4-screensaver-preferences.c
@@ -46,7 +46,7 @@
 #include "gs-job.h"
 #include "gs-prefs.h" /* for GS_MODE enum */
 
-#define GTK_BUILDER_FILE "mate-screensaver-preferences.ui"
+#define GTK_BUILDER_FILE "xfce4-screensaver-preferences.ui"
 
 #define LOCKDOWN_SETTINGS_SCHEMA "org.mate.lockdown"
 #define KEY_LOCK_DISABLE "disable-lock-screen"
@@ -1429,7 +1429,7 @@ get_best_visual_for_display (GdkDisplay *display)
 	visual = NULL;
 	screen = gdk_display_get_default_screen (display);
 
-	command = g_build_filename (LIBEXECDIR, "mate-screensaver-gl-helper", NULL);
+	command = g_build_filename (LIBEXECDIR, "xfce4-screensaver-gl-helper", NULL);
 
 	error = NULL;
 	std_output = NULL;
diff --git a/src/mate-screensaver.c b/src/xfce4-screensaver.c
similarity index 94%
rename from src/mate-screensaver.c
rename to src/xfce4-screensaver.c
index 04add35..56a337e 100644
--- a/src/mate-screensaver.c
+++ b/src/xfce4-screensaver.c
@@ -33,11 +33,11 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-#include "mate-screensaver.h"
+#include "xfce4-screensaver.h"
 #include "gs-monitor.h"
 #include "gs-debug.h"
 
-void mate_screensaver_quit(void)
+void xfce4_screensaver_quit(void)
 {
 	gtk_main_quit();
 }
@@ -89,7 +89,7 @@ int main(int argc, char **argv)
 
 	/* debug to a file if in deamon mode */
 	gs_debug_init(debug, FALSE);
-	gs_debug("initializing mate-screensaver %s", VERSION);
+	gs_debug("initializing xfce4-screensaver %s", VERSION);
 
 	monitor = gs_monitor_new();
 
@@ -119,7 +119,7 @@ int main(int argc, char **argv)
 
 	g_object_unref(monitor);
 
-	gs_debug("mate-screensaver finished");
+	gs_debug("xfce4-screensaver finished");
 
 	gs_debug_shutdown();
 
diff --git a/src/mate-screensaver.desktop.in.in b/src/xfce4-screensaver.desktop.in.in
similarity index 83%
rename from src/mate-screensaver.desktop.in.in
rename to src/xfce4-screensaver.desktop.in.in
index cff653c..7f33b2f 100644
--- a/src/mate-screensaver.desktop.in.in
+++ b/src/xfce4-screensaver.desktop.in.in
@@ -3,12 +3,12 @@ Type=Application
 _Name=Screensaver
 _Comment=Launch screensaver and locker program
 Icon=preferences-desktop-screensaver
-Exec=mate-screensaver
+Exec=xfce4-screensaver
 OnlyShowIn=MATE;
 NoDisplay=true
 X-MATE-Autostart-Phase=Application
 X-MATE-Autostart-Notify=true
 X-MATE-Bugzilla-Bugzilla=MATE
-X-MATE-Bugzilla-Product=mate-screensaver
+X-MATE-Bugzilla-Product=xfce4-screensaver
 X-MATE-Bugzilla-Component=general
 X-MATE-Bugzilla-Version=@VERSION@
diff --git a/src/mate-screensaver.h b/src/xfce4-screensaver.h
similarity index 96%
rename from src/mate-screensaver.h
rename to src/xfce4-screensaver.h
index 2a5830a..572eb08 100644
--- a/src/mate-screensaver.h
+++ b/src/xfce4-screensaver.h
@@ -27,7 +27,7 @@
 
 G_BEGIN_DECLS
 
-void mate_screensaver_quit(void);
+void xfce4_screensaver_quit(void);
 
 G_END_DECLS
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Xfce4-commits mailing list