GNOME.org
 

[eog-plugins] Convert from intltool to gettext

commit d50feee91fa27732e1899c6cb6edb8653de8c441
Author: Felix Riemann <friemann gnome org>
Date:   Sun Jun 4 20:23:32 2017 +0200

    Convert from intltool to gettext
    
    See https://wiki.gnome.org/Initiatives/GnomeGoals/GettextMigration

 Makefile.am                                        |    5 +-
 autogen.sh                                         |    1 -
 configure.ac                                       |    7 +-
 plugins/exif-display/Makefile.am                   |   14 ++-
 .../exif-display/eog-exif-display.metainfo.xml.in  |    4 +-
 .../exif-display/exif-display.plugin.desktop.in    |    6 +-
 plugins/export-to-folder/Makefile.am               |    9 ++-
 .../eog-export-to-folder.metainfo.xml.in           |    4 +-
 .../export-to-folder.plugin.desktop.in             |    6 +-
 plugins/fit-to-width/Makefile.am                   |   11 ++-
 .../fit-to-width/eog-fit-to-width.metainfo.xml.in  |    4 +-
 .../fit-to-width/fit-to-width.plugin.desktop.in    |    6 +-
 plugins/fullscreenbg/Makefile.am                   |   10 ++-
 .../fullscreenbg/eog-fullscreenbg.metainfo.xml.in  |    4 +-
 .../fullscreenbg/fullscreenbg.plugin.desktop.in    |    4 +-
 plugins/hide-titlebar/Makefile.am                  |    9 +-
 .../eog-hide-titlebar.metainfo.xml.in              |    4 +-
 .../hide-titlebar/hide-titlebar.plugin.desktop.in  |    6 +-
 plugins/light-theme/Makefile.am                    |   12 ++-
 .../light-theme/eog-light-theme.metainfo.xml.in    |    4 +-
 plugins/light-theme/light-theme.plugin.desktop.in  |    6 +-
 plugins/map/Makefile.am                            |   11 ++-
 plugins/map/eog-map.metainfo.xml.in                |    4 +-
 plugins/map/map.plugin.desktop.in                  |    6 +-
 plugins/maximize-windows/Makefile.am               |    9 ++-
 .../eog-maximize-windows.metainfo.xml.in           |    4 +-
 .../maximize-windows.plugin.desktop.in             |    4 +-
 plugins/postasa/Makefile.am                        |   12 ++-
 plugins/postasa/eog-postasa.metainfo.xml.in        |    4 +-
 plugins/postasa/postasa.plugin.desktop.in          |    6 +-
 plugins/postr/Makefile.am                          |   11 ++-
 plugins/postr/eog-postr.metainfo.xml.in            |    4 +-
 plugins/postr/postr.plugin.desktop.in              |    6 +-
 plugins/pythonconsole/Makefile.am                  |   10 ++-
 .../eog-pythonconsole.metainfo.xml.in              |    4 +-
 .../pythonconsole/pythonconsole.plugin.desktop.in  |    6 +-
 plugins/send-by-mail/Makefile.am                   |   12 ++-
 .../send-by-mail/eog-send-by-mail.metainfo.xml.in  |    4 +-
 .../send-by-mail/send-by-mail.plugin.desktop.in    |    6 +-
 plugins/slideshowshuffle/Makefile.am               |    9 ++-
 .../eog-slideshowshuffle.metainfo.xml.in           |    4 +-
 .../slideshowshuffle.plugin.desktop.in             |    6 +-
 po/Makevars                                        |   78 ++++++++++++++++++++
 po/POTFILES.in                                     |   20 +++---
 44 files changed, 251 insertions(+), 125 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 3cbda03..f4cd9da 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,10 +6,7 @@ EXTRA_DIST =                   \
        autogen.sh              \
        ChangeLog.pre-git
 
-DISTCLEANFILES =               \
-       intltool-extract        \
-       intltool-merge          \
-       intltool-update
+DISTCLEANFILES =
 
 MAINTAINERCLEANFILES =         \
        $(srcdir)/aclocal.m4    \
diff --git a/autogen.sh b/autogen.sh
index aba0505..3c9eb9c 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -18,6 +18,5 @@ which gnome-autogen.sh || {
 }
 REQUIRED_AUTOCONF_VERSION=2.59
 REQUIRED_AUTOMAKE_VERSION=1.11
-REQUIRED_INTLTOOL_VERSION=0.50.1
 REQUIRED_PKG_CONFIG_VERSION=0.16.0
 USE_GNOME2_MACROS=1 . gnome-autogen.sh
diff --git a/configure.ac b/configure.ac
index c241777..151b251 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,14 +30,13 @@ AC_PROG_MAKE_SET
 # ***********
 # Translation 
 # ***********
-
-AM_GLIB_GNU_GETTEXT
-IT_PROG_INTLTOOL([0.50.1])
-
 GETTEXT_PACKAGE=eog-plugins
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package])
 
+AM_GNU_GETTEXT_VERSION([0.19.7])
+AM_GNU_GETTEXT([external])
+
 # **********
 # GNOME Libs 
 # **********
diff --git a/plugins/exif-display/Makefile.am b/plugins/exif-display/Makefile.am
index e29fe60..b21adbf 100644
--- a/plugins/exif-display/Makefile.am
+++ b/plugins/exif-display/Makefile.am
@@ -8,7 +8,7 @@ AM_CPPFLAGS = \
        $(EOG_CFLAGS)                                   \
        $(WARN_CFLAGS)                                  \
        $(EXIFDISPLAY_CFLAGS)                           \
-       -DEOG_LOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+       -DEOG_LOCALEDIR=\""$(localedir)"\" \
        -DEOG_EXIF_DISPLAY_DATA_DIR=\""$(uidir)"\"
 
 plugin_LTLIBRARIES = libexif-display.la
@@ -37,15 +37,19 @@ eog-exif-display-plugin-resources.c: eog-exif-display-plugin.gresource.xml $(she
 # Plugin Info
 
 plugin_in_files = exif-display.plugin.desktop.in
+plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin)
 
-%.plugin: %.plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; 
$(AM_V_GEN)$(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
+# msgfmt 0.19.8 has a bug that adding additional keywords for translation
+# disables the default keywords, so we have to explicitly name them for now.
+$(plugin_DATA): %.plugin: %.plugin.desktop.in $(wildcard $(top_srcdir)/po/*po)
+       $(AM_V_GEN)$(MSGFMT) --desktop --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po 
-o $@
 
-plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin)
 
 appstream_in_files = eog-exif-display.metainfo.xml.in
-
 appstream_DATA = $(appstream_in_files:.xml.in=.xml)
-@INTLTOOL_XML_RULE@
+$(appstream_DATA): $(appstream_in_files)
+       $(AM_V_GEN)$(MSGFMT) --xml --language=appdata --template $< -d $(top_srcdir)/po -o $@
+
 
 gsettings_SCHEMAS = org.gnome.eog.plugins.exif-display.gschema.xml
 @GSETTINGS_RULES@
diff --git a/plugins/exif-display/eog-exif-display.metainfo.xml.in 
b/plugins/exif-display/eog-exif-display.metainfo.xml.in
index bb43da9..4d39701 100644
--- a/plugins/exif-display/eog-exif-display.metainfo.xml.in
+++ b/plugins/exif-display/eog-exif-display.metainfo.xml.in
@@ -3,8 +3,8 @@
 <component type="addon">
   <id>eog-exif-display</id>
   <extends>eog.desktop</extends>
-  <_name>Exif Display</_name>
-  <_summary>Displays Exif tags in the side panel and optionally the statusbar</_summary>
+  <name>Exif Display</name>
+  <summary>Displays Exif tags in the side panel and optionally the statusbar</summary>
   <url type="homepage">https://wiki.gnome.org/Apps/EyeOfGnome/Plugins</url>
   <url type="bugtracker">https://bugzilla.gnome.org/enter_bug.cgi?product=eog&amp;component=plugins</url>
   <metadata_license>CC0-1.0</metadata_license>
diff --git a/plugins/exif-display/exif-display.plugin.desktop.in 
b/plugins/exif-display/exif-display.plugin.desktop.in
index da0f3a4..1dcf6c1 100644
--- a/plugins/exif-display/exif-display.plugin.desktop.in
+++ b/plugins/exif-display/exif-display.plugin.desktop.in
@@ -1,9 +1,11 @@
 [Plugin]
 Module=exif-display
 IAge=3
-_Name=Exif Display
+Name=Exif Display
+# TRANSLATORS: Do NOT translate or transliterate this text!
+# This is an icon file name
 Icon=zoom-fit-best
-_Description=Displays camera settings and histogram
+Description=Displays camera settings and histogram
 Authors=Emmanuel Touzery
 Copyright=Copyright © 2009 Emmanuel Touzery
 Website=http://www.gnome.org/projects/eog
diff --git a/plugins/export-to-folder/Makefile.am b/plugins/export-to-folder/Makefile.am
index ed5be21..c59b668 100644
--- a/plugins/export-to-folder/Makefile.am
+++ b/plugins/export-to-folder/Makefile.am
@@ -15,12 +15,17 @@ gsettings_SCHEMAS = org.gnome.eog.plugins.export-to-folder.gschema.xml
 gsettings_SCHEMAS_in_files = org.gnome.eog.plugins.export-to-folder.gschema.xml.in
 @GSETTINGS_RULES@
 
-%.plugin: %.plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; 
$(AM_V_GEN)$(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
 
 plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin)
+# msgfmt 0.19.8 has a bug that adding additional keywords for translation
+# disables the default keywords, so we have to explicitly name them for now.
+$(plugin_DATA): %.plugin: %.plugin.desktop.in $(wildcard $(top_srcdir)/po/*po)
+       $(AM_V_GEN)$(MSGFMT) --desktop --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po 
-o $@
+
 
 appstream_DATA = $(appstream_in_files:.xml.in=.xml)
-@INTLTOOL_XML_RULE@
+$(appstream_DATA): $(appstream_in_files)
+       $(AM_V_GEN)$(MSGFMT) --xml --language=appdata --template $< -d $(top_srcdir)/po -o $@
 
 EXTRA_DIST = \
        $(plugin_in_files)      \
diff --git a/plugins/export-to-folder/eog-export-to-folder.metainfo.xml.in 
b/plugins/export-to-folder/eog-export-to-folder.metainfo.xml.in
index ea4e40c..d42dadb 100644
--- a/plugins/export-to-folder/eog-export-to-folder.metainfo.xml.in
+++ b/plugins/export-to-folder/eog-export-to-folder.metainfo.xml.in
@@ -3,8 +3,8 @@
 <component type="addon">
   <id>eog-export-to-folder</id>
   <extends>eog.desktop</extends>
-  <_name>Export to Folder</_name>
-  <_summary>Export the current image to a separate directory</_summary>
+  <name>Export to Folder</name>
+  <summary>Export the current image to a separate directory</summary>
   <url type="homepage">https://wiki.gnome.org/Apps/EyeOfGnome/Plugins</url>
   <url type="bugtracker">https://bugzilla.gnome.org/enter_bug.cgi?product=eog&amp;component=plugins</url>
   <metadata_license>CC0-1.0</metadata_license>
diff --git a/plugins/export-to-folder/export-to-folder.plugin.desktop.in 
b/plugins/export-to-folder/export-to-folder.plugin.desktop.in
index c42d833..81adf19 100644
--- a/plugins/export-to-folder/export-to-folder.plugin.desktop.in
+++ b/plugins/export-to-folder/export-to-folder.plugin.desktop.in
@@ -2,9 +2,11 @@
 Loader=python3
 Module=export-to-folder
 IAge=3
-_Name=Export to Folder
+Name=Export to Folder
+# TRANSLATORS: Do NOT translate or transliterate this text!
+# This is an icon file name
 Icon=eog
-_Description=Export the current image to a separate directory
+Description=Export the current image to a separate directory
 Authors=Jendrik Seipp <jendrikseipp web de>
 Copyright=Copyright © 2012 Jendrik Seipp
 Website=https://bitbucket.org/jendrikseipp/eog-export
diff --git a/plugins/fit-to-width/Makefile.am b/plugins/fit-to-width/Makefile.am
index aa68f12..2979a1b 100644
--- a/plugins/fit-to-width/Makefile.am
+++ b/plugins/fit-to-width/Makefile.am
@@ -22,15 +22,16 @@ libfit_to_width_la_LIBADD = $(EOG_LIBS)
 # Plugin Info
 
 plugin_in_files = fit-to-width.plugin.desktop.in
-
-%.plugin: %.plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; 
$(AM_V_GEN)$(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
-
 plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin)
+# msgfmt 0.19.8 has a bug that adding additional keywords for translation
+# disables the default keywords, so we have to explicitly name them for now.
+$(plugin_DATA): %.plugin: %.plugin.desktop.in $(wildcard $(top_srcdir)/po/*po)
+       $(AM_V_GEN)$(MSGFMT) --desktop --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po 
-o $@
 
 appstream_in_files = eog-fit-to-width.metainfo.xml.in
-
 appstream_DATA = $(appstream_in_files:.xml.in=.xml)
-@INTLTOOL_XML_RULE@
+$(appstream_DATA): $(appstream_in_files)
+       $(AM_V_GEN)$(MSGFMT) --xml --language=appdata --template $< -d $(top_srcdir)/po -o $@
 
 EXTRA_DIST = $(plugin_in_files) $(appstream_in_files)
 
diff --git a/plugins/fit-to-width/eog-fit-to-width.metainfo.xml.in 
b/plugins/fit-to-width/eog-fit-to-width.metainfo.xml.in
index 3368138..36b5abb 100644
--- a/plugins/fit-to-width/eog-fit-to-width.metainfo.xml.in
+++ b/plugins/fit-to-width/eog-fit-to-width.metainfo.xml.in
@@ -3,8 +3,8 @@
 <component type="addon">
   <id>eog-fit-to-width</id>
   <extends>eog.desktop</extends>
-  <_name>Zoom to Fit Image Width</_name>
-  <_summary>Adjusts the zoom to have the image’s width fit into the window</_summary>
+  <name>Zoom to Fit Image Width</name>
+  <summary>Adjusts the zoom to have the image’s width fit into the window</summary>
   <url type="homepage">https://wiki.gnome.org/Apps/EyeOfGnome/Plugins</url>
   <url type="bugtracker">https://bugzilla.gnome.org/enter_bug.cgi?product=eog&amp;component=plugins</url>
   <metadata_license>CC0-1.0</metadata_license>
diff --git a/plugins/fit-to-width/fit-to-width.plugin.desktop.in 
b/plugins/fit-to-width/fit-to-width.plugin.desktop.in
index 449dc94..a1a0d59 100644
--- a/plugins/fit-to-width/fit-to-width.plugin.desktop.in
+++ b/plugins/fit-to-width/fit-to-width.plugin.desktop.in
@@ -1,9 +1,11 @@
 [Plugin]
 Module=fit-to-width
 IAge=3
-_Name=Zoom to Fit Image Width
+Name=Zoom to Fit Image Width
+# TRANSLATORS: Do NOT translate or transliterate this text!
+# This is an icon file name
 Icon=gtk-zoom-fit
-_Description=Fit images to the window width
+Description=Fit images to the window width
 Authors=Javier Sánchez <jsanchez deskblue com>
 Copyright=Copyright © 2009 Javier Sánchez
 Website=http://www.gnome.org/projects/eog
diff --git a/plugins/fullscreenbg/Makefile.am b/plugins/fullscreenbg/Makefile.am
index 140a1e0..62810b3 100644
--- a/plugins/fullscreenbg/Makefile.am
+++ b/plugins/fullscreenbg/Makefile.am
@@ -14,13 +14,17 @@ uidir = $(EOG_PLUGINS_DATA_DIR)/fullscreenbg
 plugin_PYTHON = \
        fullscreenbg.py
 
-%.plugin: %.plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; 
$(AM_V_GEN)$(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
-
 plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin)
+# msgfmt 0.19.8 has a bug that adding additional keywords for translation
+# disables the default keywords, so we have to explicitly name them for now.
+$(plugin_DATA): %.plugin: %.plugin.desktop.in $(wildcard $(top_srcdir)/po/*po)
+       $(AM_V_GEN)$(MSGFMT) --desktop --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po 
-o $@
+
 
 appstream_DATA = $(appstream_in_files:.xml.in=.xml)
+$(appstream_DATA): $(appstream_in_files)
+       $(AM_V_GEN)$(MSGFMT) --xml --language=appdata --template $< -d $(top_srcdir)/po -o $@
 
-@INTLTOOL_XML_RULE@
 @GSETTINGS_RULES@
 
 EXTRA_DIST = $(plugin_in_files)\
diff --git a/plugins/fullscreenbg/eog-fullscreenbg.metainfo.xml.in 
b/plugins/fullscreenbg/eog-fullscreenbg.metainfo.xml.in
index 41766c6..6ec8884 100644
--- a/plugins/fullscreenbg/eog-fullscreenbg.metainfo.xml.in
+++ b/plugins/fullscreenbg/eog-fullscreenbg.metainfo.xml.in
@@ -3,8 +3,8 @@
 <component type="addon">
   <id>eog-fullscreenbg</id>
   <extends>eog.desktop</extends>
-  <_name>Fullscreen Background</_name>
-  <_summary>Enables changing background in fullscreen mode</_summary>
+  <name>Fullscreen Background</name>
+  <summary>Enables changing background in fullscreen mode</summary>
   <url type="homepage">https://wiki.gnome.org/Apps/EyeOfGnome/Plugins</url>
   <url type="bugtracker">https://bugzilla.gnome.org/enter_bug.cgi?product=eog&amp;component=plugins</url>
   <metadata_license>CC0-1.0</metadata_license>
diff --git a/plugins/fullscreenbg/fullscreenbg.plugin.desktop.in 
b/plugins/fullscreenbg/fullscreenbg.plugin.desktop.in
index a12bc5d..ed892ca 100644
--- a/plugins/fullscreenbg/fullscreenbg.plugin.desktop.in
+++ b/plugins/fullscreenbg/fullscreenbg.plugin.desktop.in
@@ -2,8 +2,8 @@
 Loader=python3
 Module=fullscreenbg
 IAge=3
-_Name=Fullscreen Background
-_Description=Enables changing background in fullscreen mode
+Name=Fullscreen Background
+Description=Enables changing background in fullscreen mode
 Authors=Adrian Zgorzałek <a zgorzalek gmail com>
 Copyright=Copyright © 2012 Adrian Zgorzałek <a zgorzalek gmail com>
 Website=http://projects.gnome.org/eog
diff --git a/plugins/hide-titlebar/Makefile.am b/plugins/hide-titlebar/Makefile.am
index b2c94ea..6ef03b5 100644
--- a/plugins/hide-titlebar/Makefile.am
+++ b/plugins/hide-titlebar/Makefile.am
@@ -22,15 +22,14 @@ libhide_titlebar_la_LIBADD = $(EOG_LIBS)
 # Plugin Info
 
 plugin_in_files = hide-titlebar.plugin.desktop.in
-
-%.plugin: %.plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; 
$(AM_V_GEN)$(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
-
 plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin)
+$(plugin_DATA): %.plugin: %.plugin.desktop.in $(wildcard $(top_srcdir)/po/*po)
+       $(AM_V_GEN)$(MSGFMT) --desktop --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po 
-o $@
 
 appstream_in_files = eog-hide-titlebar.metainfo.xml.in
-
 appstream_DATA = $(appstream_in_files:.xml.in=.xml)
-@INTLTOOL_XML_RULE@
+$(appstream_DATA): $(appstream_in_files)
+       $(AM_V_GEN)$(MSGFMT) --xml --language=appdata --template $< -d $(top_srcdir)/po -o $@
 
 EXTRA_DIST = $(plugin_in_files) $(appstream_in_files)
 
diff --git a/plugins/hide-titlebar/eog-hide-titlebar.metainfo.xml.in 
b/plugins/hide-titlebar/eog-hide-titlebar.metainfo.xml.in
index 745cbbe..d8e81be 100644
--- a/plugins/hide-titlebar/eog-hide-titlebar.metainfo.xml.in
+++ b/plugins/hide-titlebar/eog-hide-titlebar.metainfo.xml.in
@@ -3,8 +3,8 @@
 <component type="addon">
   <id>eog-hide-titlebar</id>
   <extends>eog.desktop</extends>
-  <_name>Hide Titlebar</_name>
-  <_summary>Hides the titlebar of maximized windows</_summary>
+  <name>Hide Titlebar</name>
+  <summary>Hides the titlebar of maximized windows</summary>
   <url type="homepage">https://wiki.gnome.org/Apps/EyeOfGnome/Plugins</url>
   <url type="bugtracker">https://bugzilla.gnome.org/enter_bug.cgi?product=eog&amp;component=plugins</url>
   <metadata_license>CC0-1.0</metadata_license>
diff --git a/plugins/hide-titlebar/hide-titlebar.plugin.desktop.in 
b/plugins/hide-titlebar/hide-titlebar.plugin.desktop.in
index 5358ea5..4f5a24b 100644
--- a/plugins/hide-titlebar/hide-titlebar.plugin.desktop.in
+++ b/plugins/hide-titlebar/hide-titlebar.plugin.desktop.in
@@ -1,9 +1,11 @@
 [Plugin]
 Module=hide-titlebar
 IAge=3
-_Name=Hide Titlebar
+Name=Hide Titlebar
+# TRANSLATORS: Do NOT translate or transliterate this text!
+# This is an icon file name
 Icon=eog-plugin
-_Description=Hides the titlebar of maximized Eye of GNOME windows
+Description=Hides the titlebar of maximized Eye of GNOME windows
 Authors=Claudio Saavedra <csaavedra igalia com>, Felix Riemann <friemann gnome org>
 Copyright=Copyright © 2012 The Free Software Foundation
 Website=http://www.gnome.org/projects/eog
diff --git a/plugins/light-theme/Makefile.am b/plugins/light-theme/Makefile.am
index 501a317..32f4d2e 100644
--- a/plugins/light-theme/Makefile.am
+++ b/plugins/light-theme/Makefile.am
@@ -22,15 +22,17 @@ liblight_theme_la_LIBADD = $(EOG_LIBS)
 # Plugin Info
 
 plugin_in_files = light-theme.plugin.desktop.in
-
-%.plugin: %.plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; 
$(AM_V_GEN)$(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
-
 plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin)
+# msgfmt 0.19.8 has a bug that adding additional keywords for translation
+# disables the default keywords, so we have to explicitly name them for now.
+$(plugin_DATA): %.plugin: %.plugin.desktop.in $(wildcard $(top_srcdir)/po/*po)
+       $(AM_V_GEN)$(MSGFMT) --desktop --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po 
-o $@
 
-appstream_in_files = eog-light-theme.metainfo.xml.in
 
+appstream_in_files = eog-light-theme.metainfo.xml.in
 appstream_DATA = $(appstream_in_files:.xml.in=.xml)
-@INTLTOOL_XML_RULE@
+$(appstream_DATA): $(appstream_in_files)
+       $(AM_V_GEN)$(MSGFMT) --xml --language=appdata --template $< -d $(top_srcdir)/po -o $@
 
 EXTRA_DIST = $(plugin_in_files) $(appstream_in_files)
 
diff --git a/plugins/light-theme/eog-light-theme.metainfo.xml.in 
b/plugins/light-theme/eog-light-theme.metainfo.xml.in
index ecc0be0..8dce5cd 100644
--- a/plugins/light-theme/eog-light-theme.metainfo.xml.in
+++ b/plugins/light-theme/eog-light-theme.metainfo.xml.in
@@ -3,8 +3,8 @@
 <component type="addon">
   <id>eog-light-theme</id>
   <extends>eog.desktop</extends>
-  <_name>Disable Dark Theme</_name>
-  <_summary>Disables dark theme</_summary>
+  <name>Disable Dark Theme</name>
+  <summary>Disables dark theme</summary>
   <url type="homepage">https://wiki.gnome.org/Apps/EyeOfGnome/Plugins</url>
   <url type="bugtracker">https://bugzilla.gnome.org/enter_bug.cgi?product=eog&amp;component=plugins</url>
   <metadata_license>CC0-1.0</metadata_license>
diff --git a/plugins/light-theme/light-theme.plugin.desktop.in 
b/plugins/light-theme/light-theme.plugin.desktop.in
index 1103970..4a9b338 100644
--- a/plugins/light-theme/light-theme.plugin.desktop.in
+++ b/plugins/light-theme/light-theme.plugin.desktop.in
@@ -1,9 +1,11 @@
 [Plugin]
 Module=light-theme
 IAge=3
-_Name=Disable Dark Theme
+Name=Disable Dark Theme
+# TRANSLATORS: Do NOT translate or transliterate this text!
+# This is an icon file name
 Icon=eog-plugin
-_Description=Disables Eye of GNOME’s preference of dark theme variants
+Description=Disables Eye of GNOME’s preference of dark theme variants
 Authors=Felix Riemann <friemann gnome org>
 Copyright=Copyright © 2012 Felix Riemann
 Website=http://www.gnome.org/projects/eog
diff --git a/plugins/map/Makefile.am b/plugins/map/Makefile.am
index e4e9303..b4ad708 100644
--- a/plugins/map/Makefile.am
+++ b/plugins/map/Makefile.am
@@ -23,15 +23,16 @@ libmap_la_LDFLAGS = \
 # Plugin Info
 
 plugin_in_files = map.plugin.desktop.in
-
-%.plugin: %.plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; 
$(AM_V_GEN)$(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
-
 plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin)
+# msgfmt 0.19.8 has a bug that adding additional keywords for translation
+# disables the default keywords, so we have to explicitly name them for now.
+$(plugin_DATA): %.plugin: %.plugin.desktop.in $(wildcard $(top_srcdir)/po/*po)
+       $(AM_V_GEN)$(MSGFMT) --desktop --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po 
-o $@
 
 appstream_in_files = eog-map.metainfo.xml.in
-
 appstream_DATA = $(appstream_in_files:.xml.in=.xml)
-@INTLTOOL_XML_RULE@
+$(appstream_DATA): $(appstream_in_files)
+       $(AM_V_GEN)$(MSGFMT) --xml --language=appdata --template $< -d $(top_srcdir)/po -o $@
 
 EXTRA_DIST = $(plugin_in_files) $(appstream_in_files)
 
diff --git a/plugins/map/eog-map.metainfo.xml.in b/plugins/map/eog-map.metainfo.xml.in
index a5bb6e9..cb76514 100644
--- a/plugins/map/eog-map.metainfo.xml.in
+++ b/plugins/map/eog-map.metainfo.xml.in
@@ -3,8 +3,8 @@
 <component type="addon">
   <id>eog-map</id>
   <extends>eog.desktop</extends>
-  <_name>Map</_name>
-  <_summary>Displays on a map in the side panel where the picture was taken</_summary>
+  <name>Map</name>
+  <summary>Displays on a map in the side panel where the picture was taken</summary>
   <url type="homepage">https://wiki.gnome.org/Apps/EyeOfGnome/Plugins</url>
   <url type="bugtracker">https://bugzilla.gnome.org/enter_bug.cgi?product=eog&amp;component=plugins</url>
   <metadata_license>CC0-1.0</metadata_license>
diff --git a/plugins/map/map.plugin.desktop.in b/plugins/map/map.plugin.desktop.in
index b2836e4..3f0e6d9 100644
--- a/plugins/map/map.plugin.desktop.in
+++ b/plugins/map/map.plugin.desktop.in
@@ -1,9 +1,11 @@
 [Plugin]
 Module=map
 IAge=3
-_Name=Map
+Name=Map
+# TRANSLATORS: Do NOT translate or transliterate this text!
+# This is an icon file name
 Icon=map
-_Description=Display the geolocation of the image on a map
+Description=Display the geolocation of the image on a map
 Authors=Pierre-Luc Beaudoin <pierre-luc pierlux com>
 Copyright=Copyright © 2008, 2010 Pierre-Luc Beaudoin
 Website=http://projects.gnome.org/libchamplain
diff --git a/plugins/maximize-windows/Makefile.am b/plugins/maximize-windows/Makefile.am
index 7c1721b..ed1561c 100644
--- a/plugins/maximize-windows/Makefile.am
+++ b/plugins/maximize-windows/Makefile.am
@@ -7,13 +7,16 @@ appstream_in_files = eog-maximize-windows.metainfo.xml.in
 plugin_PYTHON = \
        maximize-windows.py
 
-%.plugin: %.plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; 
$(AM_V_GEN)$(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
-
 plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin)
+# msgfmt 0.19.8 has a bug that adding additional keywords for translation
+# disables the default keywords, so we have to explicitly name them for now.
+$(plugin_DATA): %.plugin: %.plugin.desktop.in $(wildcard $(top_srcdir)/po/*po)
+       $(AM_V_GEN)$(MSGFMT) --desktop --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po 
-o $@
 
 appstream_DATA = $(appstream_in_files:.xml.in=.xml)
+$(appstream_DATA): $(appstream_in_files)
+       $(AM_V_GEN)$(MSGFMT) --xml --language=appdata --template $< -d $(top_srcdir)/po -o $@
 
-@INTLTOOL_XML_RULE@
 
 EXTRA_DIST = $(plugin_in_files)\
             $(appstream_in_files)
diff --git a/plugins/maximize-windows/eog-maximize-windows.metainfo.xml.in 
b/plugins/maximize-windows/eog-maximize-windows.metainfo.xml.in
index 2c0dc51..d9202c3 100644
--- a/plugins/maximize-windows/eog-maximize-windows.metainfo.xml.in
+++ b/plugins/maximize-windows/eog-maximize-windows.metainfo.xml.in
@@ -2,8 +2,8 @@
 <component type="addon">
   <id>eog-maximize-windows</id>
   <extends>eog.desktop</extends>
-  <_name>Maximize Windows</_name>
-  <_summary>New windows will open maximized</_summary>
+  <name>Maximize Windows</name>
+  <summary>New windows will open maximized</summary>
   <url type="homepage">https://wiki.gnome.org/Apps/EyeOfGnome/Plugins</url>
   <url type="bugtracker">https://bugzilla.gnome.org/enter_bug.cgi?product=eog&amp;component=plugins</url>
   <metadata_license>CC0-1.0</metadata_license>
diff --git a/plugins/maximize-windows/maximize-windows.plugin.desktop.in 
b/plugins/maximize-windows/maximize-windows.plugin.desktop.in
index b2f4ec0..fe8b961 100644
--- a/plugins/maximize-windows/maximize-windows.plugin.desktop.in
+++ b/plugins/maximize-windows/maximize-windows.plugin.desktop.in
@@ -2,8 +2,8 @@
 Loader=python3
 Module=maximize-windows
 IAge=3
-_Name=Maximize Windows
-_Description=Maximize new windows
+Name=Maximize Windows
+Description=Maximize new windows
 Authors=Felix Riemann <friemann gnome org>
 Copyright=Copyright © 2015 Felix Riemann <friemann gnome org>
 Website=http://projects.gnome.org/eog
diff --git a/plugins/postasa/Makefile.am b/plugins/postasa/Makefile.am
index 57d48cc..35d40a7 100644
--- a/plugins/postasa/Makefile.am
+++ b/plugins/postasa/Makefile.am
@@ -37,15 +37,17 @@ UI_FILES = postasa-config.xml postasa-uploads.xml
 # Plugin Info
 
 plugin_in_files = postasa.plugin.desktop.in
-
-%.plugin: %.plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; 
$(AM_V_GEN)$(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
-
 plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin)
+# msgfmt 0.19.8 has a bug that adding additional keywords for translation
+# disables the default keywords, so we have to explicitly name them for now.
+$(plugin_DATA): %.plugin: %.plugin.desktop.in $(wildcard $(top_srcdir)/po/*po)
+       $(AM_V_GEN)$(MSGFMT) --desktop --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po 
-o $@
 
 appstream_in_files = eog-postasa.metainfo.xml.in
-
 appstream_DATA = $(appstream_in_files:.xml.in=.xml)
-@INTLTOOL_XML_RULE@
+$(appstream_DATA): $(appstream_in_files)
+       $(AM_V_GEN)$(MSGFMT) --xml --language=appdata --template $< -d $(top_srcdir)/po -o $@
+
 
 EXTRA_DIST = \
        $(plugin_in_files)      \
diff --git a/plugins/postasa/eog-postasa.metainfo.xml.in b/plugins/postasa/eog-postasa.metainfo.xml.in
index a01dc31..4a1d513 100644
--- a/plugins/postasa/eog-postasa.metainfo.xml.in
+++ b/plugins/postasa/eog-postasa.metainfo.xml.in
@@ -2,8 +2,8 @@
 <component type="addon">
   <id>eog-postasa</id>
   <extends>eog.desktop</extends>
-  <_name>Picasa Web Uploader</_name>
-  <_summary>Supports uploading photos to Google Picasa Web</_summary>
+  <name>Picasa Web Uploader</name>
+  <summary>Supports uploading photos to Google Picasa Web</summary>
   <url type="homepage">https://wiki.gnome.org/Apps/EyeOfGnome/Plugins</url>
   <url type="bugtracker">https://bugzilla.gnome.org/enter_bug.cgi?product=eog&amp;component=plugins</url>
   <metadata_license>CC0-1.0</metadata_license>
diff --git a/plugins/postasa/postasa.plugin.desktop.in b/plugins/postasa/postasa.plugin.desktop.in
index 5618fe2..2bbdcdf 100644
--- a/plugins/postasa/postasa.plugin.desktop.in
+++ b/plugins/postasa/postasa.plugin.desktop.in
@@ -1,9 +1,11 @@
 [Plugin]
 Module=postasa
 IAge=3
-_Name=PicasaWeb Uploader
+Name=PicasaWeb Uploader
+# TRANSLATORS: Do NOT translate or transliterate this text!
+# This is an icon file name
 Icon=eog-plugin
-_Description=Upload your pictures to PicasaWeb
+Description=Upload your pictures to PicasaWeb
 Authors=Richard Schwarting <aquarichy gmail com>
 Copyright=Copyright © 2009 Richard Schwarting
 Website=http://www.gnome.org/projects/eog
diff --git a/plugins/postr/Makefile.am b/plugins/postr/Makefile.am
index 7681fdf..8f1a73b 100644
--- a/plugins/postr/Makefile.am
+++ b/plugins/postr/Makefile.am
@@ -23,15 +23,16 @@ libpostr_la_LIBADD = $(EOG_LIBS)
 # Plugin Info
 
 plugin_in_files = postr.plugin.desktop.in
-
-%.plugin: %.plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; 
$(AM_V_GEN)$(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
-
 plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin)
+# msgfmt 0.19.8 has a bug that adding additional keywords for translation
+# disables the default keywords, so we have to explicitly name them for now.
+$(plugin_DATA): %.plugin: %.plugin.desktop.in $(wildcard $(top_srcdir)/po/*po)
+       $(AM_V_GEN)$(MSGFMT) --desktop --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po 
-o $@
 
 appstream_in_files = eog-postr.metainfo.xml.in
-
 appstream_DATA = $(appstream_in_files:.xml.in=.xml)
-@INTLTOOL_XML_RULE@
+$(appstream_DATA): $(appstream_in_files)
+       $(AM_V_GEN)$(MSGFMT) --xml --language=appdata --template $< -d $(top_srcdir)/po -o $@
 
 EXTRA_DIST = $(plugin_in_files) $(appstream_in_files)
 
diff --git a/plugins/postr/eog-postr.metainfo.xml.in b/plugins/postr/eog-postr.metainfo.xml.in
index 2a6b744..950753b 100644
--- a/plugins/postr/eog-postr.metainfo.xml.in
+++ b/plugins/postr/eog-postr.metainfo.xml.in
@@ -3,8 +3,8 @@
 <component type="addon">
   <id>eog-postr</id>
   <extends>eog.desktop</extends>
-  <_name>Postr</_name>
-  <_summary>Supports uploading photos to Flickr</_summary>
+  <name>Postr</name>
+  <summary>Supports uploading photos to Flickr</summary>
   <url type="homepage">https://wiki.gnome.org/Apps/EyeOfGnome/Plugins</url>
   <url type="bugtracker">https://bugzilla.gnome.org/enter_bug.cgi?product=eog&amp;component=plugins</url>
   <metadata_license>CC0-1.0</metadata_license>
diff --git a/plugins/postr/postr.plugin.desktop.in b/plugins/postr/postr.plugin.desktop.in
index fe32a4d..706bd97 100644
--- a/plugins/postr/postr.plugin.desktop.in
+++ b/plugins/postr/postr.plugin.desktop.in
@@ -1,9 +1,11 @@
 [Plugin]
 Module=postr
 IAge=3
-_Name=Flickr Uploader
+Name=Flickr Uploader
+# TRANSLATORS: Do NOT translate or transliterate this text!
+# This is an icon file name
 Icon=postr
-_Description=Upload your pictures to Flickr
+Description=Upload your pictures to Flickr
 Authors=Lucas Rocha <lucasr gnome org>
 Copyright=Copyright © 2007 Lucas Rocha
 Website=http://www.gnome.org/projects/eog
diff --git a/plugins/pythonconsole/Makefile.am b/plugins/pythonconsole/Makefile.am
index 2c01617..e9eb830 100644
--- a/plugins/pythonconsole/Makefile.am
+++ b/plugins/pythonconsole/Makefile.am
@@ -14,12 +14,16 @@ pythonconsole_PYTHON =      \
 UI_FILES = config.ui
 ui_DATA = $(UI_FILES)
 
-%.plugin: %.plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; 
$(AM_V_GEN)$(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
-
 plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin)
+# msgfmt 0.19.8 has a bug that adding additional keywords for translation
+# disables the default keywords, so we have to explicitly name them for now.
+$(plugin_DATA): %.plugin: %.plugin.desktop.in $(wildcard $(top_srcdir)/po/*po)
+       $(AM_V_GEN)$(MSGFMT) --desktop --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po 
-o $@
 
 appstream_DATA = $(appstream_in_files:.xml.in=.xml)
-@INTLTOOL_XML_RULE@
+$(appstream_DATA): $(appstream_in_files)
+       $(AM_V_GEN)$(MSGFMT) --xml --language=appdata --template $< -d $(top_srcdir)/po -o $@
+
 
 gsettings_SCHEMAS = org.gnome.eog.plugins.pythonconsole.gschema.xml
 @GSETTINGS_RULES@
diff --git a/plugins/pythonconsole/eog-pythonconsole.metainfo.xml.in 
b/plugins/pythonconsole/eog-pythonconsole.metainfo.xml.in
index 49360c3..2125eb2 100644
--- a/plugins/pythonconsole/eog-pythonconsole.metainfo.xml.in
+++ b/plugins/pythonconsole/eog-pythonconsole.metainfo.xml.in
@@ -3,8 +3,8 @@
 <component type="addon">
   <id>eog-pythonconsole</id>
   <extends>eog.desktop</extends>
-  <_name>Python Console</_name>
-  <_summary>Adds a Python console</_summary>
+  <name>Python Console</name>
+  <summary>Adds a Python console</summary>
   <url type="homepage">https://wiki.gnome.org/Apps/EyeOfGnome/Plugins</url>
   <url type="bugtracker">https://bugzilla.gnome.org/enter_bug.cgi?product=eog&amp;component=plugins</url>
   <metadata_license>CC0-1.0</metadata_license>
diff --git a/plugins/pythonconsole/pythonconsole.plugin.desktop.in 
b/plugins/pythonconsole/pythonconsole.plugin.desktop.in
index efdcd9f..1f74831 100644
--- a/plugins/pythonconsole/pythonconsole.plugin.desktop.in
+++ b/plugins/pythonconsole/pythonconsole.plugin.desktop.in
@@ -2,8 +2,10 @@
 Loader=python3
 Module=pythonconsole
 IAge=3
-_Name=Python Console
-_Description=Python console for Eye of GNOME
+Name=Python Console
+Description=Python console for Eye of GNOME
+# TRANSLATORS: Do NOT translate or transliterate this text!
+# This is an icon file name
 Icon=about
 Authors=Diego Escalante Urrelo <diegoe gnome org>
 Copyright=Copyright © 2008 Diego Escalante Urrelo
diff --git a/plugins/send-by-mail/Makefile.am b/plugins/send-by-mail/Makefile.am
index 3c4bad8..3ae855c 100644
--- a/plugins/send-by-mail/Makefile.am
+++ b/plugins/send-by-mail/Makefile.am
@@ -22,15 +22,17 @@ libsend_by_mail_la_LIBADD = $(EOG_LIBS)
 # Plugin Info
 
 plugin_in_files = send-by-mail.plugin.desktop.in
-
-%.plugin: %.plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; 
$(AM_V_GEN)$(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
-
 plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin)
+# msgfmt 0.19.8 has a bug that adding additional keywords for translation
+# disables the default keywords, so we have to explicitly name them for now.
+$(plugin_DATA): %.plugin: %.plugin.desktop.in $(wildcard $(top_srcdir)/po/*po)
+       $(AM_V_GEN)$(MSGFMT) --desktop --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po 
-o $@
 
 appstream_in_files = eog-send-by-mail.metainfo.xml.in
-
 appstream_DATA = $(appstream_in_files:.xml.in=.xml)
-@INTLTOOL_XML_RULE@
+$(appstream_DATA): $(appstream_in_files)
+       $(AM_V_GEN)$(MSGFMT) --xml --language=appdata --template $< -d $(top_srcdir)/po -o $@
+
 
 EXTRA_DIST = $(plugin_in_files) $(appstream_in_files)
 
diff --git a/plugins/send-by-mail/eog-send-by-mail.metainfo.xml.in 
b/plugins/send-by-mail/eog-send-by-mail.metainfo.xml.in
index 6869b24..70f8c3d 100644
--- a/plugins/send-by-mail/eog-send-by-mail.metainfo.xml.in
+++ b/plugins/send-by-mail/eog-send-by-mail.metainfo.xml.in
@@ -3,8 +3,8 @@
 <component type="addon">
   <id>eog-send-by-mail</id>
   <extends>eog.desktop</extends>
-  <_name>Send by Mail</_name>
-  <_summary>Sends an image attached to a new mail</_summary>
+  <name>Send by Mail</name>
+  <summary>Sends an image attached to a new mail</summary>
   <url type="homepage">https://wiki.gnome.org/Apps/EyeOfGnome/Plugins</url>
   <url type="bugtracker">https://bugzilla.gnome.org/enter_bug.cgi?product=eog&amp;component=plugins</url>
   <metadata_license>CC0-1.0</metadata_license>
diff --git a/plugins/send-by-mail/send-by-mail.plugin.desktop.in 
b/plugins/send-by-mail/send-by-mail.plugin.desktop.in
index 72ed8ba..9068342 100644
--- a/plugins/send-by-mail/send-by-mail.plugin.desktop.in
+++ b/plugins/send-by-mail/send-by-mail.plugin.desktop.in
@@ -1,9 +1,11 @@
 [Plugin]
 Module=send-by-mail
 IAge=3
-_Name=Send By Mail
+Name=Send By Mail
+# TRANSLATORS: Do NOT translate or transliterate this text!
+# This is an icon file name
 Icon=mail-send-symbolic
-_Description=Sends an image attached to a new mail
+Description=Sends an image attached to a new mail
 Authors=Felix Riemann <friemann gnome org>
 Copyright=Copyright © 2009 Felix Riemann
 Website=http://www.gnome.org/projects/eog
diff --git a/plugins/slideshowshuffle/Makefile.am b/plugins/slideshowshuffle/Makefile.am
index ea4bb7e..674357a 100644
--- a/plugins/slideshowshuffle/Makefile.am
+++ b/plugins/slideshowshuffle/Makefile.am
@@ -7,12 +7,15 @@ appstream_in_files = eog-slideshowshuffle.metainfo.xml.in
 plugin_PYTHON = \
        slideshowshuffle.py
 
-%.plugin: %.plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; 
$(AM_V_GEN)$(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
-
 plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin)
+# msgfmt 0.19.8 has a bug that adding additional keywords for translation
+# disables the default keywords, so we have to explicitly name them for now.
+$(plugin_DATA): %.plugin: %.plugin.desktop.in $(wildcard $(top_srcdir)/po/*po)
+       $(AM_V_GEN)$(MSGFMT) --desktop --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po 
-o $@
 
 appstream_DATA = $(appstream_in_files:.xml.in=.xml)
-@INTLTOOL_XML_RULE@
+$(appstream_DATA): $(appstream_in_files)
+       $(AM_V_GEN)$(MSGFMT) --xml --language=appdata --template $< -d $(top_srcdir)/po -o $@
 
 EXTRA_DIST = $(plugin_in_files) $(appstream_in_files)
 
diff --git a/plugins/slideshowshuffle/eog-slideshowshuffle.metainfo.xml.in 
b/plugins/slideshowshuffle/eog-slideshowshuffle.metainfo.xml.in
index e86ecdc..ef91237 100644
--- a/plugins/slideshowshuffle/eog-slideshowshuffle.metainfo.xml.in
+++ b/plugins/slideshowshuffle/eog-slideshowshuffle.metainfo.xml.in
@@ -3,8 +3,8 @@
 <component type="addon">
   <id>eog-slideshowshuffle</id>
   <extends>eog.desktop</extends>
-  <_name>Slideshow Shuffle</_name>
-  <_summary>Shuffles the photos in slideshow mode</_summary>
+  <name>Slideshow Shuffle</name>
+  <summary>Shuffles the photos in slideshow mode</summary>
   <url type="homepage">https://wiki.gnome.org/Apps/EyeOfGnome/Plugins</url>
   <url type="bugtracker">https://bugzilla.gnome.org/enter_bug.cgi?product=eog&amp;component=plugins</url>
   <metadata_license>CC0-1.0</metadata_license>
diff --git a/plugins/slideshowshuffle/slideshowshuffle.plugin.desktop.in 
b/plugins/slideshowshuffle/slideshowshuffle.plugin.desktop.in
index c592027..0074802 100644
--- a/plugins/slideshowshuffle/slideshowshuffle.plugin.desktop.in
+++ b/plugins/slideshowshuffle/slideshowshuffle.plugin.desktop.in
@@ -2,8 +2,10 @@
 Loader=python3
 Module=slideshowshuffle
 IAge=3
-_Name=Slideshow Shuffle
+Name=Slideshow Shuffle
+# TRANSLATORS: Do NOT translate or transliterate this text!
+# This is an icon file name
 Icon=media-playlist-shuffle
-_Description=Shuffles images in slideshow mode
+Description=Shuffles images in slideshow mode
 Authors=Johannes Marbach <jm rapidrabbit de>
 Copyright=Copyright © 2008 Johannes Marbach
diff --git a/po/Makevars b/po/Makevars
new file mode 100644
index 0000000..4690431
--- /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 = --from-code=UTF-8 --keyword=_ --keyword=N_ --keyword=C_:1c,2 --keyword=NC_:1c,2 
--keyword=g_dngettext:2,3 --keyword=Description --add-comments
+
+# 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 = Eye of GNOME Plugins contributors
+
+# 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 = no
+
+# 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 = yes
+
+# 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 154d3d3..afacc91 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,20 +1,20 @@
 plugins/exif-display/eog-exif-display-plugin.c
-[type: gettext/glade]plugins/exif-display/exif-display-config.ui
+plugins/exif-display/exif-display-config.ui
 plugins/exif-display/exif-display.plugin.desktop.in
 plugins/exif-display/eog-exif-display.metainfo.xml.in
-[type: gettext/glade]plugins/exif-display/exif-display.ui
+plugins/exif-display/exif-display.ui
 plugins/export-to-folder/eog-export-to-folder.metainfo.xml.in
 plugins/export-to-folder/export-to-folder.plugin.desktop.in
 plugins/export-to-folder/export-to-folder.py
-[type: gettext/gsettings]plugins/export-to-folder/org.gnome.eog.plugins.export-to-folder.gschema.xml.in
-[type: gettext/glade]plugins/export-to-folder/preferences_dialog.ui
+plugins/export-to-folder/org.gnome.eog.plugins.export-to-folder.gschema.xml.in
+plugins/export-to-folder/preferences_dialog.ui
 plugins/fit-to-width/eog-fit-to-width.metainfo.xml.in
 plugins/fit-to-width/eog-fit-to-width-plugin.c
 plugins/fit-to-width/fit-to-width.plugin.desktop.in
 plugins/fullscreenbg/eog-fullscreenbg.metainfo.xml.in
 plugins/fullscreenbg/fullscreenbg.plugin.desktop.in
-[type: gettext/gsettings]plugins/fullscreenbg/org.gnome.eog.plugins.fullscreenbg.gschema.xml.in
-[type: gettext/glade]plugins/fullscreenbg/preferences_dialog.ui
+plugins/fullscreenbg/org.gnome.eog.plugins.fullscreenbg.gschema.xml.in
+plugins/fullscreenbg/preferences_dialog.ui
 plugins/hide-titlebar/eog-hide-titlebar.metainfo.xml.in
 plugins/hide-titlebar/hide-titlebar.plugin.desktop.in
 plugins/light-theme/eog-light-theme.metainfo.xml.in
@@ -26,16 +26,16 @@ plugins/maximize-windows/eog-maximize-windows.metainfo.xml.in
 plugins/maximize-windows/maximize-windows.plugin.desktop.in
 plugins/postasa/eog-postasa.metainfo.xml.in
 plugins/postasa/eog-postasa-plugin.c
-[type: gettext/glade]plugins/postasa/postasa-config.xml
+plugins/postasa/postasa-config.xml
 plugins/postasa/postasa.plugin.desktop.in
-[type: gettext/glade]plugins/postasa/postasa-uploads.xml
+plugins/postasa/postasa-uploads.xml
 plugins/postr/eog-postr.metainfo.xml.in
 plugins/postr/eog-postr-plugin.c
 plugins/postr/postr.plugin.desktop.in
-[type: gettext/glade]plugins/pythonconsole/config.ui
+plugins/pythonconsole/config.ui
 plugins/pythonconsole/eog-pythonconsole.metainfo.xml.in
 plugins/pythonconsole/__init__.py
-[type: gettext/gsettings]plugins/pythonconsole/org.gnome.eog.plugins.pythonconsole.gschema.xml.in
+plugins/pythonconsole/org.gnome.eog.plugins.pythonconsole.gschema.xml.in
 plugins/pythonconsole/pythonconsole.plugin.desktop.in
 plugins/send-by-mail/eog-send-by-mail.metainfo.xml.in
 plugins/send-by-mail/eog-send-by-mail-plugin.c
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]