use upstream gettext & itstool

21 files changed, 617 insertions, 210 deletions

diff --git a/Makefile.am b/Makefile.am
index 84d29cb0..ccbad70b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,9 +22,22 @@ MAINTAINERCLEANFILES = \
 	$(GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN) \
 	$(GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL) \
 	`find "m4" -type f -name "*.m4" -print` \
+	$(srcdir)/ABOUT-NLS \
 	$(srcdir)/INSTALL \
+	$(srcdir)/build-aux/config.rpath \
 	$(srcdir)/config.h.in~ \
 	$(srcdir)/configure \
+	$(srcdir)/po/Makefile.in.in \
+	$(srcdir)/po/Makevars.template \
+	$(srcdir)/po/Rules-quot \
+	$(srcdir)/po/boldquot.sed \
+	$(srcdir)/po/en@boldquot.header \
+	$(srcdir)/po/en@quot.header \
+	$(srcdir)/po/metacity.pot \
+	$(srcdir)/po/insert-header.sin \
+	$(srcdir)/po/quot.sed \
+	$(srcdir)/po/remove-potcdate.sin \
+	$(srcdir)/po/stamp-po \
 	$(NULL)
 
 GITIGNOREFILES = $(PACKAGE)-\*.tar.{gz,bz2,xz}
diff --git a/autogen.sh b/autogen.sh
index 16d24959..4e9c78d1 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -21,7 +21,6 @@ fi
 
 set -x
 aclocal --install || exit 1
-intltoolize --force --copy --automake || exit 1
 autoreconf --verbose --force --install -Wno-portability || exit 1
 { set +x; } 2>/dev/null
 
diff --git a/configure.ac b/configure.ac
index d1e9b644..9956db57 100644
--- a/configure.ac
+++ b/configure.ac
@@ -63,6 +63,19 @@ dnl **************************************************************************
 
 AC_PATH_PROG([GLIB_MKENUMS], [glib-mkenums])
 AC_PATH_PROG([GLIB_COMPILE_RESOURCES], [glib-compile-resources])
+AC_PATH_PROG([ITSTOOL], [itstool])
+
+dnl **************************************************************************
+dnl Internationalization
+dnl **************************************************************************
+
+AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_VERSION([0.19.4])
+
+GETTEXT_PACKAGE=metacity
+AC_SUBST([GETTEXT_PACKAGE])
+AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"],
+                   [Name of default gettext domain])
 
 dnl **************************************************************************
 dnl Check for required packages
@@ -86,11 +99,6 @@ dnl **************************************************************************
 # Honor aclocal flags
 AC_SUBST(ACLOCAL_AMFLAGS, "\${ACLOCAL_FLAGS}")
 
-GETTEXT_PACKAGE=metacity
-AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[Name of default gettext domain])
-
-IT_PROG_INTLTOOL([0.34.90])
 AC_PROG_CC
 AC_ISC_POSIX
 AC_HEADER_STDC
@@ -155,8 +163,6 @@ AC_ARG_ENABLE(render,
                  [disable metacity's use of the RENDER extension]),,
   enable_render=auto)
 
-AM_GLIB_GNU_GETTEXT
-
 ## here we get the flags we'll actually use
 PKG_CHECK_MODULES(ALL, glib-2.0 >= 2.36.0 gthread-2.0 >= 2.32.0)
 # gtk_window_set_icon_name requires gtk2+-2.60
@@ -425,8 +431,11 @@ AC_CONFIG_FILES([
   Makefile
 
   data/Makefile
+  data/applications/Makefile
+  data/keybindings/Makefile
   data/pkgconfig/Makefile
   data/pkgconfig/libmetacity.pc
+  data/schemas/Makefile
   data/ui/Makefile
 
   doc/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 38625224..7cb5ad54 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,7 +1,10 @@
 NULL =
 
 SUBDIRS = \
+	applications \
+	keybindings \
 	pkgconfig \
+	schemas \
 	ui \
 	$(NULL)
 
diff --git a/data/applications/Makefile.am b/data/applications/Makefile.am
new file mode 100644
index 00000000..369846a1
--- /dev/null
+++ b/data/applications/Makefile.am
@@ -0,0 +1,22 @@
+NULL =
+
+desktop_in_files = \
+  metacity.desktop.in \
+  $(NULL)
+
+desktopdir=$(datadir)/applications
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+
+%.desktop: %.desktop.in
+	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -o $@-t \
+		-d $(top_srcdir)/po && mv $@-t $@
+
+EXTRA_DIST = \
+	$(desktop_in_files) \
+	$(NULL)
+
+CLEANFILES = \
+	$(desktop_DATA) \
+	$(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/src/metacity.desktop.in b/data/applications/metacity.desktop.in
index 220ed51d..bb53bb29 100644
--- a/src/metacity.desktop.in
+++ b/data/applications/metacity.desktop.in
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
-_Name=Metacity
+Name=Metacity
 Exec=metacity
 NoDisplay=true
 # name of loadable control center module
diff --git a/data/keybindings/50-metacity-navigation.xml b/data/keybindings/50-metacity-navigation.xml
new file mode 100644
index 00000000..4311ce6a
--- /dev/null
+++ b/data/keybindings/50-metacity-navigation.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<KeyListEntries schema="org.gnome.desktop.wm.keybindings"
+                group="system"
+                name="Navigation"
+                wm_name="Metacity"
+                package="metacity">
+
+	<KeyListEntry name="move-to-workspace-1"
+	              description="Move window to workspace 1" />
+
+	<KeyListEntry name="move-to-workspace-2"
+	              description="Move window to workspace 2" />
+
+	<KeyListEntry name="move-to-workspace-3"
+	              description="Move window to workspace 3" />
+
+	<KeyListEntry name="move-to-workspace-4"
+	              description="Move window to workspace 4" />
+
+	<KeyListEntry name="move-to-workspace-left"
+	              description="Move window one workspace to the left" />
+
+	<KeyListEntry name="move-to-workspace-right"
+	              description="Move window one workspace to the right" />
+
+	<KeyListEntry name="move-to-workspace-up"
+	              description="Move window one workspace up" />
+
+	<KeyListEntry name="move-to-workspace-down"
+	              description="Move window one workspace down" />
+
+	<KeyListEntry name="switch-windows"
+	              description="Switch windows" />
+
+	<KeyListEntry name="switch-applications"
+	              description="Switch applications" />
+
+	<KeyListEntry name="switch-group"
+	              description="Switch windows of an application" />
+
+	<KeyListEntry name="switch-panels"
+	              description="Switch system controls" />
+
+	<KeyListEntry name="cycle-windows"
+	              description="Switch windows directly" />
+
+	<KeyListEntry name="cycle-group"
+	              description="Switch windows of an app directly" />
+
+	<KeyListEntry name="cycle-panels"
+	              description="Switch system controls directly" />
+
+	<KeyListEntry name="show-desktop"
+	              description="Hide all normal windows" />
+
+	<KeyListEntry name="switch-to-workspace-1"
+	              description="Switch to workspace 1" />
+
+	<KeyListEntry name="switch-to-workspace-2"
+	              description="Switch to workspace 2" />
+
+	<KeyListEntry name="switch-to-workspace-3"
+	              description="Switch to workspace 3" />
+
+	<KeyListEntry name="switch-to-workspace-4"
+	              description="Switch to workspace 4" />
+
+	<KeyListEntry name="switch-to-workspace-left"
+	              description="Move to workspace left" />
+
+	<KeyListEntry name="switch-to-workspace-right"
+	              description="Move to workspace right" />
+
+	<KeyListEntry name="switch-to-workspace-up"
+	              description="Move to workspace above" />
+
+	<KeyListEntry name="switch-to-workspace-down"
+	              description="Move to workspace below" />
+
+</KeyListEntries>
diff --git a/data/keybindings/50-metacity-system.xml b/data/keybindings/50-metacity-system.xml
new file mode 100644
index 00000000..d6ea705b
--- /dev/null
+++ b/data/keybindings/50-metacity-system.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<KeyListEntries schema="org.gnome.desktop.wm.keybindings"
+                group="system"
+                name="System"
+                wm_name="Metacity"
+                package="metacity">
+
+	<KeyListEntry name="panel-run-dialog"
+	              description="Show the run command prompt" />
+
+	<KeyListEntry name="panel-main-menu"
+	               description="Show the applications menu" />
+
+</KeyListEntries>
diff --git a/data/keybindings/50-metacity-windows.xml b/data/keybindings/50-metacity-windows.xml
new file mode 100644
index 00000000..c7777890
--- /dev/null
+++ b/data/keybindings/50-metacity-windows.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<KeyListEntries schema="org.gnome.desktop.wm.keybindings"
+                group="system"
+                name="Windows"
+                wm_name="Metacity"
+                package="metacity">
+
+	<KeyListEntry name="activate-window-menu"
+	              description="Activate the window menu" />
+
+	<KeyListEntry name="toggle-fullscreen"
+	              description="Toggle fullscreen mode" />
+
+	<KeyListEntry name="toggle-maximized"
+	              description="Toggle maximization state" />
+
+	<KeyListEntry name="maximize"
+	              description="Maximize window" />
+
+	<KeyListEntry name="unmaximize"
+	              description="Restore window" />
+
+	<KeyListEntry name="toggle-shaded"
+	              description="Toggle shaded state" />
+
+	<KeyListEntry name="close"
+	              description="Close window" />
+
+	<KeyListEntry name="minimize"
+	              description="Minimize window" />
+
+	<KeyListEntry name="begin-move"
+	              description="Move window" />
+
+	<KeyListEntry name="begin-resize"
+	              description="Resize window" />
+
+	<KeyListEntry name="toggle-on-all-workspaces"
+	              description="Toggle window on all workspaces or one" />
+
+	<KeyListEntry name="raise-or-lower"
+	              description="Raise window if covered, otherwise lower it" />
+
+	<KeyListEntry name="raise"
+	              description="Raise window above other windows" />
+
+	<KeyListEntry name="lower"
+	              description="Lower window below other windows" />
+
+	<KeyListEntry name="maximize-vertically"
+	              description="Maximize window vertically" />
+
+	<KeyListEntry name="maximize-horizontally"
+	              description="Maximize window horizontally" />
+
+	<KeyListEntry name="toggle-tiled-left"
+	              schema="org.gnome.metacity.keybindings"
+	              description="View split on left" />
+
+	<KeyListEntry name="toggle-tiled-right"
+	              schema="org.gnome.metacity.keybindings"
+	              description="View split on right" />
+
+</KeyListEntries>
diff --git a/data/keybindings/Makefile.am b/data/keybindings/Makefile.am
new file mode 100644
index 00000000..82804f92
--- /dev/null
+++ b/data/keybindings/Makefile.am
@@ -0,0 +1,19 @@
+NULL =
+
+keybindingsdir = @GNOME_KEYBINDINGS_KEYSDIR@
+keybindings_DATA = \
+	50-metacity-navigation.xml \
+	50-metacity-system.xml \
+	50-metacity-windows.xml \
+	$(NULL)
+
+keybindings.pot: $(keybindings_DATA) keybindings.its
+	$(AM_V_GEN) $(ITSTOOL) -i keybindings.its -o $@ $(keybindings_DATA)
+
+EXTRA_DIST = \
+	$(keybindings_DATA) \
+	keybindings.its \
+	keybindings.pot \
+	$(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/data/keybindings/keybindings.its b/data/keybindings/keybindings.its
new file mode 100644
index 00000000..71336a2f
--- /dev/null
+++ b/data/keybindings/keybindings.its
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<its:rules xmlns:its="http://www.w3.org/2005/11/its"
+           xmlns:gt="https://www.gnu.org/s/gettext/ns/its/extensions/1.0"
+           version="2.0">
+  <its:translateRule selector="/KeyListEntries" translate="no" />
+  <its:translateRule selector="//KeyListEntries/@name" translate="yes" />
+
+  <its:translateRule selector="/KeyListEntry" translate="no" />
+  <its:translateRule selector="//KeyListEntry/@description" translate="yes" />
+</its:rules>
diff --git a/data/keybindings/keybindings.pot b/data/keybindings/keybindings.pot
new file mode 100644
index 00000000..66c2e2bf
--- /dev/null
+++ b/data/keybindings/keybindings.pot
@@ -0,0 +1,246 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2016-02-18 23:06+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. (itstool) path: 50-metacity-navigation.xml/KeyListEntries@name
+#: 50-metacity-navigation.xml:6
+msgid "Navigation"
+msgstr ""
+
+#. (itstool) path: KeyListEntries/KeyListEntry@description
+#: 50-metacity-navigation.xml:9
+msgid "Move window to workspace 1"
+msgstr ""
+
+#. (itstool) path: KeyListEntries/KeyListEntry@description
+#: 50-metacity-navigation.xml:12
+msgid "Move window to workspace 2"
+msgstr ""
+
+#. (itstool) path: KeyListEntries/KeyListEntry@description
+#: 50-metacity-navigation.xml:15
+msgid "Move window to workspace 3"
+msgstr ""
+
+#. (itstool) path: KeyListEntries/KeyListEntry@description
+#: 50-metacity-navigation.xml:18
+msgid "Move window to workspace 4"
+msgstr ""
+
+#. (itstool) path: KeyListEntries/KeyListEntry@description
+#: 50-metacity-navigation.xml:21
+msgid "Move window one workspace to the left"
+msgstr ""
+
+#. (itstool) path: KeyListEntries/KeyListEntry@description
+#: 50-metacity-navigation.xml:24
+msgid "Move window one workspace to the right"
+msgstr ""
+
+#. (itstool) path: KeyListEntries/KeyListEntry@description
+#: 50-metacity-navigation.xml:27
+msgid "Move window one workspace up"
+msgstr ""
+
+#. (itstool) path: KeyListEntries/KeyListEntry@description
+#: 50-metacity-navigation.xml:30
+msgid "Move window one workspace down"
+msgstr ""
+
+#. (itstool) path: KeyListEntries/KeyListEntry@description
+#: 50-metacity-navigation.xml:33
+msgid "Switch windows"
+msgstr ""
+
+#. (itstool) path: KeyListEntries/KeyListEntry@description
+#: 50-metacity-navigation.xml:36
+msgid "Switch applications"
+msgstr ""
+
+#. (itstool) path: KeyListEntries/KeyListEntry@description
+#: 50-metacity-navigation.xml:39
+msgid "Switch windows of an application"
+msgstr ""
+
+#. (itstool) path: KeyListEntries/KeyListEntry@description
+#: 50-metacity-navigation.xml:42
+msgid "Switch system controls"
+msgstr ""
+
+#. (itstool) path: KeyListEntries/KeyListEntry@description
+#: 50-metacity-navigation.xml:45
+msgid "Switch windows directly"
+msgstr ""
+
+#. (itstool) path: KeyListEntries/KeyListEntry@description
+#: 50-metacity-navigation.xml:48
+msgid "Switch windows of an app directly"
+msgstr ""
+
+#. (itstool) path: KeyListEntries/KeyListEntry@description
+#: 50-metacity-navigation.xml:51
+msgid "Switch system controls directly"
+msgstr ""
+
+#. (itstool) path: KeyListEntries/KeyListEntry@description
+#: 50-metacity-navigation.xml:54
+msgid "Hide all normal windows"
+msgstr ""
+
+#. (itstool) path: KeyListEntries/KeyListEntry@description
+#: 50-metacity-navigation.xml:57
+msgid "Switch to workspace 1"
+msgstr ""
+
+#. (itstool) path: KeyListEntries/KeyListEntry@description
+#: 50-metacity-navigation.xml:60
+msgid "Switch to workspace 2"
+msgstr ""
+
+#. (itstool) path: KeyListEntries/KeyListEntry@description
+#: 50-metacity-navigation.xml:63
+msgid "Switch to workspace 3"
+msgstr ""
+
+#. (itstool) path: KeyListEntries/KeyListEntry@description
+#: 50-metacity-navigation.xml:66
+msgid "Switch to workspace 4"
+msgstr ""
+
+#. (itstool) path: KeyListEntries/KeyListEntry@description
+#: 50-metacity-navigation.xml:69
+msgid "Move to workspace left"
+msgstr ""
+
+#. (itstool) path: KeyListEntries/KeyListEntry@description
+#: 50-metacity-navigation.xml:72
+msgid "Move to workspace right"
+msgstr ""
+
+#. (itstool) path: KeyListEntries/KeyListEntry@description
+#: 50-metacity-navigation.xml:75
+msgid "Move to workspace above"
+msgstr ""
+
+#. (itstool) path: KeyListEntries/KeyListEntry@description
+#: 50-metacity-navigation.xml:78
+msgid "Move to workspace below"
+msgstr ""
+
+#. (itstool) path: 50-metacity-system.xml/KeyListEntries@name
+#: 50-metacity-system.xml:6
+msgid "System"
+msgstr ""
+
+#. (itstool) path: KeyListEntries/KeyListEntry@description
+#: 50-metacity-system.xml:9
+msgid "Show the run command prompt"
+msgstr ""
+
+#. (itstool) path: KeyListEntries/KeyListEntry@description
+#: 50-metacity-system.xml:12
+msgid "Show the applications menu"
+msgstr ""
+
+#. (itstool) path: 50-metacity-windows.xml/KeyListEntries@name
+#: 50-metacity-windows.xml:6
+msgid "Windows"
+msgstr ""
+
+#. (itstool) path: KeyListEntries/KeyListEntry@description
+#: 50-metacity-windows.xml:9
+msgid "Activate the window menu"
+msgstr ""
+
+#. (itstool) path: KeyListEntries/KeyListEntry@description
+#: 50-metacity-windows.xml:12
+msgid "Toggle fullscreen mode"
+msgstr ""
+
+#. (itstool) path: KeyListEntries/KeyListEntry@description
+#: 50-metacity-windows.xml:15
+msgid "Toggle maximization state"
+msgstr ""
+
+#. (itstool) path: KeyListEntries/KeyListEntry@description
+#: 50-metacity-windows.xml:18
+msgid "Maximize window"
+msgstr ""
+
+#. (itstool) path: KeyListEntries/KeyListEntry@description
+#: 50-metacity-windows.xml:21
+msgid "Restore window"
+msgstr ""
+
+#. (itstool) path: KeyListEntries/KeyListEntry@description
+#: 50-metacity-windows.xml:24
+msgid "Toggle shaded state"
+msgstr ""
+
+#. (itstool) path: KeyListEntries/KeyListEntry@description
+#: 50-metacity-windows.xml:27
+msgid "Close window"
+msgstr ""
+
+#. (itstool) path: KeyListEntries/KeyListEntry@description
+#: 50-metacity-windows.xml:30
+msgid "Minimize window"
+msgstr ""
+
+#. (itstool) path: KeyListEntries/KeyListEntry@description
+#: 50-metacity-windows.xml:33
+msgid "Move window"
+msgstr ""
+
+#. (itstool) path: KeyListEntries/KeyListEntry@description
+#: 50-metacity-windows.xml:36
+msgid "Resize window"
+msgstr ""
+
+#. (itstool) path: KeyListEntries/KeyListEntry@description
+#: 50-metacity-windows.xml:39
+msgid "Toggle window on all workspaces or one"
+msgstr ""
+
+#. (itstool) path: KeyListEntries/KeyListEntry@description
+#: 50-metacity-windows.xml:42
+msgid "Raise window if covered, otherwise lower it"
+msgstr ""
+
+#. (itstool) path: KeyListEntries/KeyListEntry@description
+#: 50-metacity-windows.xml:45
+msgid "Raise window above other windows"
+msgstr ""
+
+#. (itstool) path: KeyListEntries/KeyListEntry@description
+#: 50-metacity-windows.xml:48
+msgid "Lower window below other windows"
+msgstr ""
+
+#. (itstool) path: KeyListEntries/KeyListEntry@description
+#: 50-metacity-windows.xml:51
+msgid "Maximize window vertically"
+msgstr ""
+
+#. (itstool) path: KeyListEntries/KeyListEntry@description
+#: 50-metacity-windows.xml:54
+msgid "Maximize window horizontally"
+msgstr ""
+
+#. (itstool) path: KeyListEntries/KeyListEntry@description
+#: 50-metacity-windows.xml:58
+msgid "View split on left"
+msgstr ""
+
+#. (itstool) path: KeyListEntries/KeyListEntry@description
+#: 50-metacity-windows.xml:62
+msgid "View split on right"
+msgstr ""
+
diff --git a/data/schemas/Makefile.am b/data/schemas/Makefile.am
new file mode 100644
index 00000000..b3a48f45
--- /dev/null
+++ b/data/schemas/Makefile.am
@@ -0,0 +1,17 @@
+NULL =
+
+gsettings_SCHEMAS = \
+	org.gnome.metacity.gschema.xml \
+	$(NULL)
+
+@GSETTINGS_RULES@
+
+EXTRA_DIST = \
+	$(gsettings_SCHEMAS) \
+	$(NULL)
+
+CLEANFILES = \
+	*.gschema.valid \
+	$(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/src/org.gnome.metacity.gschema.xml.in b/data/schemas/org.gnome.metacity.gschema.xml
index 23a893be..9f1952fe 100644
--- a/src/org.gnome.metacity.gschema.xml.in
+++ b/data/schemas/org.gnome.metacity.gschema.xml
@@ -1,4 +1,4 @@
-<schemalist>
+<schemalist gettext-domain="metacity">
 
   <enum id="org.gnome.metacity.MetaPlacementMode">
     <value nick="smart" value="0" />
@@ -8,19 +8,20 @@
     <value nick="random" value="4" />
   </enum>
 
-  <schema id="org.gnome.metacity" path="/org/gnome/metacity/"
-          gettext-domain="@GETTEXT_PACKAGE@">
+  <schema id="org.gnome.metacity" path="/org/gnome/metacity/">
+
     <key name="compositing-manager" type="b">
       <default>true</default>
-      <_summary>Compositing Manager</_summary>
-      <_description>
+      <summary>Compositing Manager</summary>
+      <description>
         Determines whether Metacity is a compositing manager.
-      </_description>
+      </description>
     </key>
+
     <key name="reduced-resources" type="b">
       <default>false</default>
-      <_summary>If true, trade off usability for less resource usage</_summary>
-      <_description>
+      <summary>If true, trade off usability for less resource usage</summary>
+      <description>
         If true, Metacity will give the user less feedback by using wireframes,
         avoiding animations, or other means. This is a significant reduction
         in usability for many users, but may allow legacy applications to
@@ -28,21 +29,23 @@
         for terminal servers.
 
         However, the wireframe feature is disabled when accessibility is on.
-      </_description>
+      </description>
     </key>
+
     <key name="edge-tiling" type="b">
       <default>true</default>
-      <_summary>Enable edge tiling when dropping windows on screen edges</_summary>
-      <_description>
+      <summary>Enable edge tiling when dropping windows on screen edges</summary>
+      <description>
         If enabled, dropping windows on vertical screen edges maximizes them
         vertically and resizes them horizontally to cover half of the available
         area. Dropping windows on the top screen edge maximizes them completely.
-      </_description>
+      </description>
     </key>
+
     <key name="placement-mode" enum="org.gnome.metacity.MetaPlacementMode">
       <default>'smart'</default>
-      <_summary>Window placement behavior</_summary>
-      <_description>
+      <summary>Window placement behavior</summary>
+      <description>
         Metacity's default window-placement behavior is smart (first-fit),
         similar to behaviors in some other window managers. It will try to tile
         windows so that they do not overlap. Set this option to "smart" for this
@@ -52,33 +55,39 @@
         of their workspaces, "origin" for the upper-left corners of the
         workspaces, or "random" to place new windows at random locations within
         their workspaces.
-      </_description>
+      </description>
     </key>
+
     <key name="alt-tab-thumbnails" type="b">
       <default>false</default>
-      <_summary>Show window content thumbnail in Alt-Tab</_summary>
-      <_description>
+      <summary>Show window content thumbnail in Alt-Tab</summary>
+      <description>
         If set to true, Metacity will show window content thumbnails in the
         Alt-Tab window instead of only icons.
-      </_description>
+      </description>
     </key>
+
     <key name="theme" type="s">
       <default>'Adwaita'</default>
-      <_summary>Current theme</_summary>
-      <_description>
+      <summary>Current theme</summary>
+      <description>
         The theme determines the appearance of window borders, titlebar,
         and so forth.
-      </_description>
+      </description>
     </key>
+
   </schema>
 
   <schema id="org.gnome.metacity.keybindings" path="/org/gnome/metacity/keybindings/">
+
     <key name="toggle-tiled-left" type="as">
       <default><![CDATA[['<Super>Left']]]></default>
     </key>
+
     <key name="toggle-tiled-right" type="as">
       <default><![CDATA[['<Super>Right']]]></default>
     </key>
+
   </schema>
 
 </schemalist>
diff --git a/po/Makevars b/po/Makevars
new file mode 100644
index 00000000..579ebd17
--- /dev/null
+++ b/po/Makevars
@@ -0,0 +1,78 @@
+# Makefile variables for PO directory in any package using GNU gettext.
+
+# Usually the message domain is the same as the package name.
+DOMAIN = $(PACKAGE)
+
+# These two variables depend on the location of this directory.
+subdir = po
+top_builddir = ..
+
+# These options get passed to xgettext.
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
+
+# This is the copyright holder that gets inserted into the header of the
+# $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
+# package.  (Note that the msgstr strings, extracted from the package's
+# sources, belong to the copyright holder of the package.)  Translators are
+# expected to transfer the copyright for their translations to this person
+# or entity, or to disclaim their copyright.  The empty string stands for
+# the public domain; in this case the translators are expected to disclaim
+# their copyright.
+COPYRIGHT_HOLDER = Free Software Foundation, Inc.
+
+# This tells whether or not to prepend "GNU " prefix to the package
+# name that gets inserted into the header of the $(DOMAIN).pot file.
+# Possible values are "yes", "no", or empty.  If it is empty, try to
+# detect it automatically by scanning the files in $(top_srcdir) for
+# "GNU packagename" string.
+PACKAGE_GNU =
+
+# This is the email address or URL to which the translators shall report
+# bugs in the untranslated strings:
+# - Strings which are not entire sentences, see the maintainer guidelines
+#   in the GNU gettext documentation, section 'Preparing Strings'.
+# - Strings which use unclear terms or require additional context to be
+#   understood.
+# - Strings which make invalid assumptions about notation of date, time or
+#   money.
+# - Pluralisation problems.
+# - Incorrect English spelling.
+# - Incorrect formatting.
+# It can be your email address, or a mailing list address where translators
+# can write to without being subscribed, or the URL of a web page through
+# which the translators can contact you.
+MSGID_BUGS_ADDRESS =
+
+# This is the list of locale categories, beyond LC_MESSAGES, for which the
+# message catalogs shall be used.  It is usually empty.
+EXTRA_LOCALE_CATEGORIES =
+
+# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt'
+# context.  Possible values are "yes" and "no".  Set this to yes if the
+# package uses functions taking also a message context, like pgettext(), or
+# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument.
+USE_MSGCTXT = no
+
+# These options get passed to msgmerge.
+# Useful options are in particular:
+#   --previous            to keep previous msgids of translated messages,
+#   --quiet               to reduce the verbosity.
+MSGMERGE_OPTIONS =
+
+# These options get passed to msginit.
+# If you want to disable line wrapping when writing PO files, add
+# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and
+# MSGINIT_OPTIONS.
+MSGINIT_OPTIONS =
+
+# This tells whether or not to regenerate a PO file when $(DOMAIN).pot
+# has changed.  Possible values are "yes" and "no".  Set this to no if
+# the POT file is checked in the repository and the version control
+# program ignores timestamps.
+PO_DEPENDS_ON_POT = no
+
+# This tells whether or not to forcibly update $(DOMAIN).pot and
+# regenerate PO files on "make dist".  Possible values are "yes" and
+# "no".  Set this to no if the POT file and PO files are maintained
+# externally.
+DIST_DEPENDS_ON_UPDATE_PO = no
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c3a7ab63..fabcc7bc 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,6 +1,9 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
-[type: gettext/glade]data/ui/theme-viewer-window.ui
+data/applications/metacity.desktop.in
+data/keybindings/keybindings.pot
+data/schemas/org.gnome.metacity.gschema.xml
+data/ui/theme-viewer-window.ui
 libmetacity/meta-color-spec.c
 libmetacity/meta-draw-op.c
 libmetacity/meta-draw-spec.c
@@ -10,9 +13,6 @@ libmetacity/meta-gradient-spec.c
 libmetacity/meta-theme.c
 libmetacity/meta-theme-impl.c
 libmetacity/meta-theme-metacity.c
-src/50-metacity-navigation.xml.in
-src/50-metacity-system.xml.in
-src/50-metacity-windows.xml.in
 src/core/bell.c
 src/core/core.c
 src/core/delete.c
@@ -27,8 +27,6 @@ src/core/util.c
 src/core/window.c
 src/core/window-props.c
 src/core/xprops.c
-src/metacity.desktop.in
-src/org.gnome.metacity.gschema.xml.in
 src/tools/metacity-message.c
 src/ui/frames.c
 src/ui/menu.c
diff --git a/src/50-metacity-navigation.xml.in b/src/50-metacity-navigation.xml.in
deleted file mode 100644
index 597cc47b..00000000
--- a/src/50-metacity-navigation.xml.in
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<KeyListEntries schema="org.gnome.desktop.wm.keybindings"
-                group="system"
-                _name="Navigation"
-                wm_name="Metacity"
-                package="metacity">
-
-	<KeyListEntry name="move-to-workspace-1"
-	              _description="Move window to workspace 1" />
-
-	<KeyListEntry name="move-to-workspace-2"
-	              _description="Move window to workspace 2" />
-
-	<KeyListEntry name="move-to-workspace-3"
-	              _description="Move window to workspace 3" />
-
-	<KeyListEntry name="move-to-workspace-4"
-	              _description="Move window to workspace 4" />
-
-	<KeyListEntry name="move-to-workspace-left"
-	              _description="Move window one workspace to the left" />
-
-	<KeyListEntry name="move-to-workspace-right"
-	              _description="Move window one workspace to the right" />
-
-	<KeyListEntry name="move-to-workspace-up"
-	              _description="Move window one workspace up" />
-
-	<KeyListEntry name="move-to-workspace-down"
-	              _description="Move window one workspace down" />
-
-	<KeyListEntry name="switch-windows"
-	              _description="Switch windows"/>
-
-	<KeyListEntry name="switch-applications"
-	              _description="Switch applications"/>
-
-	<KeyListEntry name="switch-group"
-	              _description="Switch windows of an application"/>
-
-	<KeyListEntry name="switch-panels"
-	              _description="Switch system controls"/>
-
-	<KeyListEntry name="cycle-windows"
-	              _description="Switch windows directly"/>
-
-	<KeyListEntry name="cycle-group"
-	              _description="Switch windows of an app directly"/>
-
-	<KeyListEntry name="cycle-panels"
-	              _description="Switch system controls directly"/>
-
-	<KeyListEntry name="show-desktop"
-	              _description="Hide all normal windows"/>
-
-	<KeyListEntry name="switch-to-workspace-1"
-	              _description="Switch to workspace 1" />
-
-	<KeyListEntry name="switch-to-workspace-2"
-	              _description="Switch to workspace 2" />
-
-	<KeyListEntry name="switch-to-workspace-3"
-	              _description="Switch to workspace 3" />
-
-	<KeyListEntry name="switch-to-workspace-4"
-	              _description="Switch to workspace 4" />
-
-	<KeyListEntry name="switch-to-workspace-left"
-	              _description="Move to workspace left" />
-
-	<KeyListEntry name="switch-to-workspace-right"
-	              _description="Move to workspace right" />
-
-	<KeyListEntry name="switch-to-workspace-up"
-	              _description="Move to workspace above" />
-
-	<KeyListEntry name="switch-to-workspace-down"
-	              _description="Move to workspace below" />
-
-</KeyListEntries>
diff --git a/src/50-metacity-system.xml.in b/src/50-metacity-system.xml.in
deleted file mode 100644
index 8dd5e528..00000000
--- a/src/50-metacity-system.xml.in
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<KeyListEntries schema="org.gnome.desktop.wm.keybindings"
-                group="system"
-                _name="System"
-                wm_name="Metacity"
-                package="metacity">
-
-	<KeyListEntry name="panel-run-dialog" _description="Show the run command prompt"/>
-
-	<KeyListEntry name="panel-main-menu" _description="Show the applications menu"/>
-
-</KeyListEntries>
-
diff --git a/src/50-metacity-windows.xml.in b/src/50-metacity-windows.xml.in
deleted file mode 100644
index af4d2658..00000000
--- a/src/50-metacity-windows.xml.in
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<KeyListEntries schema="org.gnome.desktop.wm.keybindings"
-                group="system"
-                _name="Windows"
-                wm_name="Metacity"
-                package="metacity">
-
-	<KeyListEntry name="activate-window-menu" _description="Activate the window menu"/>
-
-	<KeyListEntry name="toggle-fullscreen" _description="Toggle fullscreen mode"/>
-
-	<KeyListEntry name="toggle-maximized" _description="Toggle maximization state"/>
-
-	<KeyListEntry name="maximize" _description="Maximize window"/>
-
-	<KeyListEntry name="unmaximize" _description="Restore window"/>
-
-	<KeyListEntry name="toggle-shaded" _description="Toggle shaded state"/>
-
-	<KeyListEntry name="close" _description="Close window"/>
-
-	<KeyListEntry name="minimize" _description="Minimize window"/>
-
-	<KeyListEntry name="begin-move" _description="Move window"/>
-
-	<KeyListEntry name="begin-resize" _description="Resize window"/>
-
-	<KeyListEntry name="toggle-on-all-workspaces"
-	              _description="Toggle window on all workspaces or one"/>
-
-	<KeyListEntry name="raise-or-lower" _description="Raise window if covered, otherwise lower it"/>
-
-	<KeyListEntry name="raise" _description="Raise window above other windows"/>
-
-	<KeyListEntry name="lower" _description="Lower window below other windows"/>
-
-	<KeyListEntry name="maximize-vertically" _description="Maximize window vertically"/>
-
-	<KeyListEntry name="maximize-horizontally" _description="Maximize window horizontally"/>
-
-	<KeyListEntry name="toggle-tiled-left"
-	              schema="org.gnome.metacity.keybindings"
-	              _description="View split on left"/>
-
-	<KeyListEntry name="toggle-tiled-right"
-	              schema="org.gnome.metacity.keybindings"
-	              _description="View split on right"/>
-
-</KeyListEntries>
-
diff --git a/src/Makefile.am b/src/Makefile.am
index 67b6a9ed..d652ad11 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -110,10 +110,6 @@ metacity_SOURCES= 				\
 	ui/ui.c					\
 	$(NULL)
 
-gsettings_SCHEMAS = org.gnome.metacity.gschema.xml
-@INTLTOOL_XML_NOMERGE_RULE@
-@GSETTINGS_RULES@
-
 bin_PROGRAMS=metacity
 
 metacity_LDADD=@METACITY_LIBS@ $(top_builddir)/libmetacity/libmetacity.la
@@ -128,29 +124,4 @@ testboxes_LDADD= @METACITY_LIBS@
 testgradient_LDADD= @METACITY_LIBS@
 testasyncgetprop_LDADD= @METACITY_LIBS@
 
-@INTLTOOL_DESKTOP_RULE@
-
-desktopfilesdir=$(datadir)/applications
-desktopfiles_in_files=metacity.desktop.in
-desktopfiles_files=$(desktopfiles_in_files:.desktop.in=.desktop)
-desktopfiles_DATA = $(desktopfiles_files)
-
-xmldir       = @GNOME_KEYBINDINGS_KEYSDIR@
-xml_in_files = \
-	50-metacity-navigation.xml.in	\
-	50-metacity-system.xml.in	\
-	50-metacity-windows.xml.in
-
-xml_DATA     = $(xml_in_files:.xml.in=.xml)
-
-@INTLTOOL_SCHEMAS_RULE@
-
-CLEANFILES = \
-	metacity.desktop org.gnome.metacity.gschema.xml 50-metacity-launchers.xml 50-metacity-navigation.xml 50-metacity-screenshot.xml 50-metacity-system.xml 50-metacity-windows.xml
-
-EXTRA_DIST=$(desktopfiles_files)	 	\
-	$(desktopfiles_in_files)		\
-	org.gnome.metacity.gschema.xml.in	\
-	$(xml_in_files)
-
 -include $(top_srcdir)/git.mk
diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am
index ebf8bd5e..c6b1a76f 100644
--- a/src/tools/Makefile.am
+++ b/src/tools/Makefile.am
@@ -1,5 +1,3 @@
-@INTLTOOL_DESKTOP_RULE@
-
 icondir=$(pkgdatadir)/icons
 icon_DATA=metacity-window-demo.png