migrate from intltools to gettext

23 files changed, 171 insertions, 76 deletions

diff --git a/baobab/data/Makefile.am b/baobab/data/Makefile.am
index 4fd73c37..ea1b3914 100644
--- a/baobab/data/Makefile.am
+++ b/baobab/data/Makefile.am
@@ -5,13 +5,14 @@ baobabapp_DATA = $(baobabapp_in_files:.desktop.in=.desktop)
 $(baobabapp_in_files): $(baobabapp_in_files:.desktop.in=.desktop.in.in)
 	sed -e "s|\@VERSION\@|@VERSION@|" $< > $@
 
-@INTLTOOL_DESKTOP_RULE@
+$(baobabapp_DATA): $(baobabapp_in_files)
+	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 
-
-@INTLTOOL_XML_RULE@
 appdatadir = $(datadir)/metainfo
 appdata_in_files = mate-disk-usage-analyzer.appdata.xml.in
 appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+$(appdata_DATA): $(appdata_in_files)
+	$(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
 
 gsettings_SCHEMAS = org.mate.disk-usage-analyzer.gschema.xml
 @GSETTINGS_RULES@
diff --git a/baobab/data/mate-disk-usage-analyzer.appdata.xml.in b/baobab/data/mate-disk-usage-analyzer.appdata.xml.in
index 89c94312..728ca89c 100644
--- a/baobab/data/mate-disk-usage-analyzer.appdata.xml.in
+++ b/baobab/data/mate-disk-usage-analyzer.appdata.xml.in
@@ -5,8 +5,8 @@
  <metadata_license>CC0-1.0</metadata_license>
  <project_license>GPL-2.0+</project_license>
  <name>MATE Disk Usage Analyzer</name>
- <_summary>A disk usage analyzing tool for MATE Desktop</_summary>
- <_description>
+ <summary>A disk usage analyzing tool for MATE Desktop</summary>
+ <description>
   <p>
    As its name implies, Disk Usage Analyzer is a graphical utility that you
    can use to view and monitor your disk usage and folder structure. It displays
@@ -17,7 +17,7 @@
    or remote. There is also an option to constantly monitor any external changes
    to the home directory and warn the user if a file is added/removed.
   </p>
- </_description>
+ </description>
  <screenshots>
   <screenshot type="default">
    <image width="960" height="540">
diff --git a/baobab/data/mate-disk-usage-analyzer.desktop.in.in b/baobab/data/mate-disk-usage-analyzer.desktop.in.in
index cf5b3e9a..a59993f9 100644
--- a/baobab/data/mate-disk-usage-analyzer.desktop.in.in
+++ b/baobab/data/mate-disk-usage-analyzer.desktop.in.in
@@ -1,13 +1,15 @@
 [Desktop Entry]
-_Name=MATE Disk Usage Analyzer
-_Comment=Check folder sizes and available disk space
+Name=MATE Disk Usage Analyzer
+Comment=Check folder sizes and available disk space
 TryExec=mate-disk-usage-analyzer
 Exec=mate-disk-usage-analyzer
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=mate-disk-usage-analyzer
 Terminal=false
 Type=Application
 StartupNotify=true
 Categories=GTK;System;Filesystem;
+# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 Keywords=MATE;check;disk;usage;analyze;size;space;
 OnlyShowIn=MATE;
 X-MATE-Bugzilla-Bugzilla=MATE
diff --git a/configure.ac b/configure.ac
index 244e217c..48dd878b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,8 +17,6 @@ AM_SILENT_RULES([yes])
 MATE_COMMON_INIT
 MATE_DEBUG_CHECK([no])
 
-IT_PROG_INTLTOOL([0.50.1])
-
 AC_PROG_CXX
 AC_PROG_CC
 AC_PROG_CPP
@@ -325,10 +323,12 @@ AS_IF([test "x$enable_zlib" != "xno"],
 AC_SUBST(Z_LIBS)
 
 dnl Internationalization
+AM_GNU_GETTEXT_VERSION([0.19.8])
+AM_GNU_GETTEXT([external])
+
 GETTEXT_PACKAGE=mate-utils
 AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], "$GETTEXT_PACKAGE", [Define the gettext package to use])
 AC_SUBST(GETTEXT_PACKAGE)
-AM_GLIB_GNU_GETTEXT
 
 GLIB_GSETTINGS
 
diff --git a/gsearchtool/data/Makefile.am b/gsearchtool/data/Makefile.am
index 63f2c1a8..feffd01c 100644
--- a/gsearchtool/data/Makefile.am
+++ b/gsearchtool/data/Makefile.am
@@ -4,21 +4,21 @@ icon_DATA = thumbnail_frame.png
 gsettingsschema_in_files = org.mate.search-tool.gschema.xml.in
 gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml)
 .PRECIOUS: $(gsettings_SCHEMAS)
-
-@INTLTOOL_DESKTOP_RULE@
-
 @GSETTINGS_RULES@
 
-@INTLTOOL_XML_RULE@
 appdatadir = $(datadir)/metainfo
 appdata_in_files = mate-search-tool.appdata.xml.in
 appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+$(appdata_DATA): $(appdata_in_files)
+	$(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
 
 man_MANS = mate-search-tool.1
 
 Utilitiesdir = $(datadir)/applications
 Utilities_in_files = mate-search-tool.desktop.in
 Utilities_DATA = $(Utilities_in_files:.desktop.in=.desktop)
+$(Utilities_DATA): $(Utilities_in_files)
+	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 
 EXTRA_DIST = \
 	$(icon_DATA) \
diff --git a/gsearchtool/data/mate-search-tool.appdata.xml.in b/gsearchtool/data/mate-search-tool.appdata.xml.in
index cd4a1df2..7863d6f4 100644
--- a/gsearchtool/data/mate-search-tool.appdata.xml.in
+++ b/gsearchtool/data/mate-search-tool.appdata.xml.in
@@ -5,8 +5,8 @@
  <metadata_license>CC0-1.0</metadata_license>
  <project_license>GPL-2.0+</project_license>
  <name>MATE Search Tool</name>
- <_summary>A file searching tool for MATE Desktop</_summary>
- <_description>
+ <summary>A file searching tool for MATE Desktop</summary>
+ <description>
   <p>
    MATE Search Tool is a simple but powerful utility that allows you to
    search for files and folders on any mounted file system. Its interface
@@ -14,7 +14,7 @@
    such as text contained within a file, ownership, date of modification,
    file size, folder exclusion, etc..
   </p>
- </_description>
+ </description>
  <screenshots>
   <screenshot type="default">
    <image width="960" height="540">
diff --git a/gsearchtool/data/mate-search-tool.desktop.in b/gsearchtool/data/mate-search-tool.desktop.in
index 56645ceb..95e7c0fa 100644
--- a/gsearchtool/data/mate-search-tool.desktop.in
+++ b/gsearchtool/data/mate-search-tool.desktop.in
@@ -1,12 +1,14 @@
 [Desktop Entry]
-_Name=MATE Search Tool
-_Comment=Locate documents and folders on this computer by name or content
+Name=MATE Search Tool
+Comment=Locate documents and folders on this computer by name or content
 Exec=mate-search-tool
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=system-search
 Terminal=false
 Type=Application
 StartupNotify=true
 Categories=GTK;Utility;Core;
+# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 Keywords=MATE;search;files;locate;documents;folders;computer;name;content;find;tool;
 OnlyShowIn=MATE;
 X-MATE-DocPath=mate-search-tool/mate-search-tool.xml
diff --git a/logview/data/Makefile.am b/logview/data/Makefile.am
index 451f93fa..23c27a2e 100644
--- a/logview/data/Makefile.am
+++ b/logview/data/Makefile.am
@@ -5,14 +5,12 @@ desktop_in_files = mate-system-log.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 $(desktop_in_files): $(desktop_in_files:.desktop.in=.desktop.in.in)
 	@sed -e "s|\@VERSION\@|@VERSION@|" $< > $@
-@INTLTOOL_DESKTOP_RULE@
+$(desktop_DATA): $(desktop_in_files)
+	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 
 man_MANS = mate-system-log.1
 
 gsettings_SCHEMAS = org.mate.system-log.gschema.xml
-
-@INTLTOOL_XML_RULE@
-
 @GSETTINGS_RULES@
 
 EXTRA_DIST = 			\
diff --git a/logview/data/mate-system-log.desktop.in.in b/logview/data/mate-system-log.desktop.in.in
index 77bb9595..a1c020bd 100644
--- a/logview/data/mate-system-log.desktop.in.in
+++ b/logview/data/mate-system-log.desktop.in.in
@@ -1,12 +1,14 @@
 [Desktop Entry]
-_Name=Log File Viewer
-_Comment=View or monitor system log files
+Name=Log File Viewer
+Comment=View or monitor system log files
 Exec=mate-system-log
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=mate-system-log
 Terminal=false
 Type=Application
 StartupNotify=true
 Categories=GTK;System;Monitor;
+# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 Keywords=MATE;monitor;view;system;log;files;logviewer;
 OnlyShowIn=MATE;
 X-MATE-DocPath=mate-system-log/mate-system-log.xml
diff --git a/mate-dictionary/data/Makefile.am b/mate-dictionary/data/Makefile.am
index 8db2aa70..f7dee120 100644
--- a/mate-dictionary/data/Makefile.am
+++ b/mate-dictionary/data/Makefile.am
@@ -9,8 +9,6 @@ gdictapp_DATA = $(gdictapp_in_files:.desktop.in=.desktop)
 $(gdictapp_in_files): $(gdictapp_in_files:.desktop.in=.desktop.in.in)
 	$(AM_V_GEN)sed -e "s|\@VERSION\@|@VERSION@|" $< > $@
 
-@INTLTOOL_DESKTOP_RULE@
-
 # dictionary sources definitions
 dictsourcedir = $(datadir)/mate-dict/sources
 dictsource_in_files = \
@@ -18,7 +16,9 @@ dictsource_in_files = \
 	thai.desktop.in \
 	$(NULL)
 dictsource_DATA = $(dictsource_in_files:.desktop.in=.desktop)
-@INTLTOOL_DESKTOP_RULE@
+
+%.desktop: %.desktop.in
+	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 
 builderdir = $(datadir)/mate-dictionary
 builder_DATA = \
@@ -33,15 +33,16 @@ if BUILD_GDICT_APPLET
 
 # applet file, dbus service, and menu definition
 appletdir = $(datadir)/mate-panel/applets
-applet_in_files = org.mate.DictionaryApplet.mate-panel-applet.in
-applet_DATA = $(applet_in_files:.mate-panel-applet.in=.mate-panel-applet)
+applet_in_files = org.mate.DictionaryApplet.mate-panel-applet.desktop.in
+applet_DATA = $(applet_in_files:.mate-panel-applet.desktop.in=.mate-panel-applet)
 
 $(applet_in_files): $(applet_in_files).in Makefile
 	$(AM_V_GEN)sed \
 		-e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
 		$< > $@
 
-%.mate-panel-applet: %.mate-panel-applet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
+$(applet_DATA): $(applet_in_files) Makefile
+	$(AM_V_GEN) $(MSGFMT) --desktop --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
 
 servicedir = $(datadir)/dbus-1/services
 service_in_files = org.mate.panel.applet.DictionaryAppletFactory.service.in
@@ -56,18 +57,19 @@ ui_DATA += dictionary-applet-menu.xml
 
 endif # BUILD_GDICT_APPLET
 
-@INTLTOOL_XML_RULE@
 appdatadir = $(datadir)/metainfo
 appdata_in_files = mate-dictionary.appdata.xml.in
 appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+$(appdata_DATA): $(appdata_in_files)
+	$(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
 
 gsettings_SCHEMAS = org.mate.dictionary.gschema.xml
 @GSETTINGS_RULES@
 
 EXTRA_DIST = \
-	org.mate.DictionaryApplet.mate-panel-applet.in.in \
+	$(applet_in_files).in \
 	$(service_in_files) \
-	mate-dictionary.desktop.in.in \
+	$(gdictapp_in_files).in \
 	$(dictsource_in_files) \
 	$(man_MANS) \
 	$(appdata_in_files) \
@@ -78,6 +80,7 @@ EXTRA_DIST = \
 CLEANFILES = \
 	$(applet_DATA) \
 	$(applet_DATA).in \
+	$(applet_in_files) \
 	$(service_DATA) \
 	$(dictsource_DATA) \
 	$(gdictapp_in_files) \
diff --git a/mate-dictionary/data/default.desktop.in b/mate-dictionary/data/default.desktop.in
index 395433e8..50556ea6 100644
--- a/mate-dictionary/data/default.desktop.in
+++ b/mate-dictionary/data/default.desktop.in
@@ -1,6 +1,6 @@
 [Dictionary Source]
 Name=Default
-_Description=Default Dictionary Server
+Description=Default Dictionary Server
 Transport=dictd
 Hostname=dict.org
 Port=2628
diff --git a/mate-dictionary/data/mate-dictionary.appdata.xml.in b/mate-dictionary/data/mate-dictionary.appdata.xml.in
index b47dd2f2..fa776a36 100644
--- a/mate-dictionary/data/mate-dictionary.appdata.xml.in
+++ b/mate-dictionary/data/mate-dictionary.appdata.xml.in
@@ -5,15 +5,15 @@
  <metadata_license>CC0-1.0</metadata_license>
  <project_license>GPL-2.0+</project_license>
  <name>MATE Dictionary</name>
- <_summary>A dictionary for MATE Desktop</_summary>
- <_description>
+ <summary>A dictionary for MATE Desktop</summary>
+ <description>
   <p>
    MATE Dictionary allows you to look up words in on-line dictionaries.
    It comes preconfigured with a list of Dict servers (RFC 2229), to which
    you can add your own sources, while you can select specific servers
    for a specific query.
   </p>
- </_description>
+ </description>
  <screenshots>
   <screenshot type="default">
    <image width="960" height="540">
diff --git a/mate-dictionary/data/mate-dictionary.desktop.in.in b/mate-dictionary/data/mate-dictionary.desktop.in.in
index 84033f73..5179bab3 100644
--- a/mate-dictionary/data/mate-dictionary.desktop.in.in
+++ b/mate-dictionary/data/mate-dictionary.desktop.in.in
@@ -1,12 +1,14 @@
 [Desktop Entry]
-_Name=MATE Dictionary
-_Comment=Check word definitions and spellings in an online dictionary
+Name=MATE Dictionary
+Comment=Check word definitions and spellings in an online dictionary
 Exec=mate-dictionary
 Terminal=false
 Type=Application
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=accessories-dictionary
 StartupNotify=true
 Categories=GTK;Office;Dictionary;
+# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 Keywords=MATE;dictionary;applet;thesaurus;spelling;definitions;online;
 OnlyShowIn=MATE;
 X-MATE-DocPath=mate-dictionary/mate-dictionary.xml
diff --git a/mate-dictionary/data/org.mate.DictionaryApplet.mate-panel-applet.desktop.in.in b/mate-dictionary/data/org.mate.DictionaryApplet.mate-panel-applet.desktop.in.in
new file mode 100644
index 00000000..db553811
--- /dev/null
+++ b/mate-dictionary/data/org.mate.DictionaryApplet.mate-panel-applet.desktop.in.in
@@ -0,0 +1,12 @@
+[Applet Factory]
+Id=DictionaryAppletFactory
+Location=@LIBEXECDIR@/mate-dictionary-applet
+Name=Dictionary Applet Factory
+Description=Factory for the dictionary applet
+
+[DictionaryApplet]
+Name=Dictionary Look up
+Description=Look up words in a dictionary
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+Icon=accessories-dictionary
+MateComponentId=OAFIID:MATE_DictionaryApplet
diff --git a/mate-dictionary/data/org.mate.DictionaryApplet.mate-panel-applet.in.in b/mate-dictionary/data/org.mate.DictionaryApplet.mate-panel-applet.in.in
deleted file mode 100644
index ab8ecd82..00000000
--- a/mate-dictionary/data/org.mate.DictionaryApplet.mate-panel-applet.in.in
+++ /dev/null
@@ -1,11 +0,0 @@
-[Applet Factory]
-Id=DictionaryAppletFactory
-Location=@LIBEXECDIR@/mate-dictionary-applet
-_Name=Dictionary Applet Factory
-_Description=Factory for the dictionary applet
-
-[DictionaryApplet]
-_Name=Dictionary Look up
-_Description=Look up words in a dictionary
-Icon=accessories-dictionary
-MateComponentId=OAFIID:MATE_DictionaryApplet
diff --git a/mate-dictionary/data/thai.desktop.in b/mate-dictionary/data/thai.desktop.in
index 1922f280..ce0b0ab2 100644
--- a/mate-dictionary/data/thai.desktop.in
+++ b/mate-dictionary/data/thai.desktop.in
@@ -1,6 +1,6 @@
 [Dictionary Source]
 Name=Thai
-_Description=Longdo Thai-English Dictionaries
+Description=Longdo Thai-English Dictionaries
 Transport=dictd
 Hostname=dict.longdo.com
 Port=2628
diff --git a/mate-disk-image-mounter/data/Makefile.am b/mate-disk-image-mounter/data/Makefile.am
index 1ec524e5..25c1d75d 100644
--- a/mate-disk-image-mounter/data/Makefile.am
+++ b/mate-disk-image-mounter/data/Makefile.am
@@ -3,7 +3,8 @@ NULL =
 diskimagemounterdir = $(datadir)/applications
 diskimagemounter_in_files = mate-disk-image-mounter.desktop.in
 diskimagemounter_DATA = $(diskimagemounter_in_files:.desktop.in=.desktop)
-@INTLTOOL_DESKTOP_RULE@
+$(diskimagemounter_DATA): $(diskimagemounter_in_files)
+	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 
 EXTRA_DIST = 					\
 	$(diskimagemounter_in_files)		\
diff --git a/mate-disk-image-mounter/data/mate-disk-image-mounter.desktop.in b/mate-disk-image-mounter/data/mate-disk-image-mounter.desktop.in
index f728a506..aa1dc459 100644
--- a/mate-disk-image-mounter/data/mate-disk-image-mounter.desktop.in
+++ b/mate-disk-image-mounter/data/mate-disk-image-mounter.desktop.in
@@ -1,6 +1,6 @@
 [Desktop Entry]
-_Name=MATE Disk Image Mounter
-_Comment=Attach and mount one or more disk image files
+Name=MATE Disk Image Mounter
+Comment=Attach and mount one or more disk image files
 TryExec=mate-disk-image-mounter
 Exec=mate-disk-image-mounter %U
 # Translators: Do NOT translate or transliterate this text (this is an icon file name)!
diff --git a/mate-screenshot/data/Makefile.am b/mate-screenshot/data/Makefile.am
index 2b4ede33..9a9664b4 100644
--- a/mate-screenshot/data/Makefile.am
+++ b/mate-screenshot/data/Makefile.am
@@ -1,14 +1,16 @@
 mate_screenshotdir  = $(datadir)/applications
 mate_screenshot_in_files = mate-screenshot.desktop.in
 mate_screenshot_DATA = $(mate_screenshot_in_files:.desktop.in=.desktop)
-@INTLTOOL_DESKTOP_RULE@
+$(mate_screenshot_DATA): $(mate_screenshot_in_files)
+	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 
 man_MANS = mate-screenshot.1
 
-@INTLTOOL_XML_RULE@
 appdatadir = $(datadir)/metainfo
 appdata_in_files = mate-screenshot.appdata.xml.in
 appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+$(appdata_DATA): $(appdata_in_files)
+	$(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
 
 gsettings_SCHEMAS = org.mate.screenshot.gschema.xml
 @GSETTINGS_RULES@
diff --git a/mate-screenshot/data/mate-screenshot.appdata.xml.in b/mate-screenshot/data/mate-screenshot.appdata.xml.in
index 0960b922..8c7fda4a 100644
--- a/mate-screenshot/data/mate-screenshot.appdata.xml.in
+++ b/mate-screenshot/data/mate-screenshot.appdata.xml.in
@@ -5,15 +5,15 @@
  <metadata_license>CC0-1.0</metadata_license>
  <project_license>GPL-2.0+</project_license>
  <name>MATE Screenshot</name>
- <_summary>A screenshot utility for MATE Desktop</_summary>
- <_description>
+ <summary>A screenshot utility for MATE Desktop</summary>
+ <description>
   <p>
    MATE Screenshot is a simple utility that lets you capture screenshots
    of your desktop or of application windows. You can select to copy them
    to the system clipboard or save them in Portable Network Graphics (.png)
    image format.
   </p>
- </_description>
+ </description>
  <screenshots>
   <screenshot type="default">
    <image width="800" height="450">
diff --git a/mate-screenshot/data/mate-screenshot.desktop.in b/mate-screenshot/data/mate-screenshot.desktop.in
index fedc1321..2b18c154 100644
--- a/mate-screenshot/data/mate-screenshot.desktop.in
+++ b/mate-screenshot/data/mate-screenshot.desktop.in
@@ -1,12 +1,14 @@
 [Desktop Entry]
-_Name=Take Screenshot
-_Comment=Save images of your desktop or individual windows
+Name=Take Screenshot
+Comment=Save images of your desktop or individual windows
 Exec=mate-screenshot --interactive
 Terminal=false
 Type=Application
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=applets-screenshooter
 StartupNotify=true
 Categories=GTK;Utility;
+# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 Keywords=MATE;screenshot;snapshot;desktop;window;image;
 OnlyShowIn=MATE;
 X-MATE-Bugzilla-Bugzilla=MATE
diff --git a/po/Makevars b/po/Makevars
new file mode 100644
index 00000000..31f6faf1
--- /dev/null
+++ b/po/Makevars
@@ -0,0 +1,79 @@
+# 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 = --from-code=UTF-8 --keyword=_ --keyword=N_ --keyword=C_:1c,2 --keyword=NC_:1c,2 --keyword=g_dngettext:2,3 --add-comments=Translators:
+
+# 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 = MATE Desktop Environment team
+
+# 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 = yes
+
+# 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 = yes
+$(DOMAIN).pot-update: export GETTEXTDATADIRS = $(top_srcdir)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index d69629f9..e41153b4 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,9 +1,9 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
 baobab/data/mate-disk-usage-analyzer.desktop.in.in
-[type: gettext/glade]baobab/data/baobab-dialog-scan-props.ui
-[type: gettext/glade]baobab/data/baobab-main-window.ui
-[type: gettext/gsettings]baobab/data/org.mate.disk-usage-analyzer.gschema.xml.in
+baobab/data/baobab-dialog-scan-props.ui
+baobab/data/baobab-main-window.ui
+baobab/data/org.mate.disk-usage-analyzer.gschema.xml.in
 baobab/data/mate-disk-usage-analyzer.appdata.xml.in
 baobab/src/baobab.c
 baobab/src/baobab-chart.c
@@ -16,15 +16,15 @@ baobab/src/baobab-ringschart.c
 baobab/src/callbacks.c
 gsearchtool/data/mate-search-tool.appdata.xml.in
 gsearchtool/data/mate-search-tool.desktop.in
-[type: gettext/gsettings]gsearchtool/data/org.mate.search-tool.gschema.xml.in
+gsearchtool/data/org.mate.search-tool.gschema.xml.in
 gsearchtool/libeggsmclient/eggdesktopfile.c
 gsearchtool/libeggsmclient/eggsmclient.c
 gsearchtool/src/gsearchtool.c
 gsearchtool/src/gsearchtool-callbacks.c
 gsearchtool/src/gsearchtool-support.c
 logview/data/mate-system-log.desktop.in.in
-[type: gettext/gsettings]logview/data/org.mate.system-log.gschema.xml.in
-[type: gettext/glade]logview/data/logview-filter.ui
+logview/data/org.mate.system-log.gschema.xml.in
+logview/data/logview-filter.ui
 logview/src/logview-about.h
 logview/src/logview-app.c
 logview/src/logview-filter-manager.c
@@ -36,8 +36,8 @@ logview/src/logview-window.c
 mate-dictionary/data/default.desktop.in
 mate-dictionary/data/mate-dictionary.desktop.in.in
 mate-dictionary/data/mate-dictionary.appdata.xml.in
-[type: gettext/ini]mate-dictionary/data/org.mate.DictionaryApplet.mate-panel-applet.in.in
-[type: gettext/gsettings]mate-dictionary/data/org.mate.dictionary.gschema.xml.in
+mate-dictionary/data/org.mate.DictionaryApplet.mate-panel-applet.desktop.in.in
+mate-dictionary/data/org.mate.dictionary.gschema.xml.in
 mate-dictionary/data/org.mate.panel.applet.DictionaryAppletFactory.service.in
 mate-dictionary/data/thai.desktop.in
 mate-dictionary/libgdict/gdict-client-context.c
@@ -61,14 +61,14 @@ mate-dictionary/src/gdict-sidebar.c
 mate-dictionary/src/gdict-source-dialog.c
 mate-dictionary/src/gdict-window.c
 mate-dictionary/src/main.c
-[type: gettext/glade]mate-dictionary/data/mate-dictionary-preferences.ui
-[type: gettext/glade]mate-dictionary/data/mate-dictionary-source.ui
-[type: gettext/ini]mate-disk-image-mounter/data/mate-disk-image-mounter.desktop.in
+mate-dictionary/data/mate-dictionary-preferences.ui
+mate-dictionary/data/mate-dictionary-source.ui
+mate-disk-image-mounter/data/mate-disk-image-mounter.desktop.in
 mate-disk-image-mounter/src/main.c
 mate-screenshot/data/mate-screenshot.appdata.xml.in
 mate-screenshot/data/mate-screenshot.desktop.in
-[type: gettext/glade]mate-screenshot/data/mate-screenshot.ui
-[type: gettext/gsettings]mate-screenshot/data/org.mate.screenshot.gschema.xml.in
+mate-screenshot/data/mate-screenshot.ui
+mate-screenshot/data/org.mate.screenshot.gschema.xml.in
 mate-screenshot/src/mate-screenshot.c
 mate-screenshot/src/screenshot-dialog.c
 mate-screenshot/src/screenshot-save.c