[gedit-plugins] build: Stop using intltool
- From: Jeremy Bicha <jbicha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gedit-plugins] build: Stop using intltool
- Date: Thu, 10 Jan 2019 03:06:18 +0000 (UTC)
commit 021f6d68ed967134c36e97d69913f7608735888e
Author: Jeremy Bicha <jbicha ubuntu com>
Date: Sun Jan 6 23:02:15 2019 -0500
build: Stop using intltool
Recent gettext version can extract and merge back strings from and to
various file formats, no need for intltool anymore.
https://wiki.gnome.org/Initiatives/GnomeGoals/GettextMigration
Makefile.am | 12 +---
autogen.sh | 9 +--
configure.ac | 4 +-
plugins/Makefile.am | 8 ++-
plugins/bookmarks/bookmarks.plugin.desktop.in.in | 4 +-
plugins/bookmarks/gedit-bookmarks.metainfo.xml.in | 4 +-
.../bracketcompletion.plugin.desktop.in.in | 4 +-
.../gedit-bracketcompletion.metainfo.xml.in | 4 +-
plugins/charmap/charmap.plugin.desktop.in.in | 4 +-
plugins/charmap/gedit-charmap.metainfo.xml.in | 4 +-
.../codecomment/codecomment.plugin.desktop.in.in | 4 +-
.../codecomment/gedit-codecomment.metainfo.xml.in | 4 +-
.../colorpicker/colorpicker.plugin.desktop.in.in | 4 +-
.../colorpicker/gedit-colorpicker.metainfo.xml.in | 4 +-
.../colorschemer/colorschemer.plugin.desktop.in.in | 4 +-
.../gedit-colorschemer.metainfo.xml.in | 4 +-
plugins/commander/commander.plugin.desktop.in.in | 4 +-
plugins/commander/gedit-commander.metainfo.xml.in | 4 +-
plugins/dashboard/dashboard.plugin.desktop.in.in | 4 +-
plugins/dashboard/gedit-dashboard.metainfo.xml.in | 4 +-
plugins/drawspaces/drawspaces.plugin.desktop.in.in | 4 +-
.../drawspaces/gedit-drawspaces.metainfo.xml.in | 4 +-
.../findinfiles/findinfiles.plugin.desktop.in.in | 4 +-
.../findinfiles/gedit-findinfiles.metainfo.xml.in | 4 +-
plugins/git/gedit-git.metainfo.xml.in | 5 +-
plugins/git/git.plugin.desktop.in.in | 4 +-
plugins/joinlines/gedit-joinlines.metainfo.xml.in | 4 +-
plugins/joinlines/joinlines.plugin.desktop.in.in | 4 +-
plugins/multiedit/gedit-multiedit.metainfo.xml.in | 4 +-
plugins/multiedit/multiedit.plugin.desktop.in.in | 4 +-
.../smartspaces/gedit-smartspaces.metainfo.xml.in | 4 +-
.../smartspaces/smartspaces.plugin.desktop.in.in | 4 +-
plugins/synctex/gedit-synctex.metainfo.xml.in | 4 +-
plugins/synctex/synctex.plugin.desktop.in.in | 4 +-
plugins/terminal/gedit-terminal.metainfo.xml.in | 4 +-
plugins/terminal/terminal.plugin.desktop.in.in | 4 +-
plugins/textsize/gedit-textsize.metainfo.xml.in | 4 +-
plugins/textsize/textsize.plugin.desktop.in.in | 4 +-
plugins/translate/gedit-translate.metainfo.xml.in | 4 +-
plugins/translate/translate.plugin.desktop.in.in | 4 +-
.../gedit-wordcompletion.metainfo.xml.in | 4 +-
.../wordcompletion.plugin.desktop.in.in | 4 +-
plugins/zeitgeist/gedit-zeitgeist.metainfo.xml.in | 4 +-
plugins/zeitgeist/zeitgeist.plugin.desktop.in | 4 +-
po/Makevars | 78 ++++++++++++++++++++++
po/POTFILES.in | 10 +--
46 files changed, 173 insertions(+), 109 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index e469c4c..7034d8d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,18 +5,11 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
EXTRA_DIST = \
autogen.sh \
ChangeLog-20090414 \
- gedit-plugins.doap \
- intltool-extract.in \
- intltool-merge.in \
- intltool-update.in
+ gedit-plugins.doap
CLEANFILES =
BUILT_SOURCES =
-
-DISTCLEANFILES = \
- intltool-extract \
- intltool-merge \
- intltool-update
+DISTCLEANFILES =
MAINTAINERCLEANFILES = \
$(GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL) \
@@ -30,7 +23,6 @@ MAINTAINERCLEANFILES = \
test-driver \
m4/gnome-doc-utils.m4 \
m4/gtk-doc.m4 \
- m4/intltool.m4 \
m4/codeset.m4 \
m4/fcntl-o.m4 \
m4/gettext.m4 \
diff --git a/autogen.sh b/autogen.sh
index 7117a23..b81c05e 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -7,20 +7,13 @@ test -n "$srcdir" || srcdir=.
olddir=`pwd`
cd "$srcdir"
-INTLTOOLIZE=`which intltoolize`
-if test -z $INTLTOOLIZE; then
- echo "*** No intltoolize found, please install the intltool package ***"
- exit 1
-fi
-
AUTORECONF=`which autoreconf`
if test -z $AUTORECONF; then
echo "*** No autoreconf found, please install it ***"
exit 1
fi
-autopoint --force
-AUTOPOINT='intltoolize --automake --copy' autoreconf --force --install --verbose
+autoreconf --force --install --verbose
cd "$olddir"
test -n "$NOCONFIGURE" || "$srcdir/configure" "$@"
diff --git a/configure.ac b/configure.ac
index d871aca..6925e52 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,9 +44,7 @@ esac
AC_MSG_RESULT([$platform_win32])
AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = "yes")
-IT_PROG_INTLTOOL([0.50.2])
-
-AM_GNU_GETTEXT_VERSION([0.17])
+AM_GNU_GETTEXT_VERSION([0.19.8])
AM_GNU_GETTEXT([external])
GETTEXT_PACKAGE=gedit-plugins
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 1a8a5ed..59ee75d 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -33,16 +33,18 @@ include plugins/translate/Makefile.am
include plugins/wordcompletion/Makefile.am
include plugins/zeitgeist/Makefile.am
-@INTLTOOL_DESKTOP_RULE@
-@INTLTOOL_XML_RULE@
@GSETTINGS_RULES@
-%.plugin: %.plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE)
$(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
+%.plugin: %.plugin.desktop.in $(wildcard $(top_srcdir)/po/*po)
+ $(AM_V_GEN) $(MSGFMT) --desktop --keyword=Name --keyword=Description --template $< -d
$(top_srcdir)/po -o $@
GENERATED_PLUGIN_FILES = $(plugin_in_files:.plugin.desktop.in=.plugin)
plugin_DATA = $(GENERATED_PLUGIN_FILES)
+$(appstream_DATA): $(appstream_in_files) $(wildcard $(top_srcdir)/po/*po)
+ $(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
+
GENERATED_APPSTREAM_FILES = $(appstream_in_files:.xml.in=.xml)
appstream_DATA = $(GENERATED_APPSTREAM_FILES)
diff --git a/plugins/bookmarks/bookmarks.plugin.desktop.in.in
b/plugins/bookmarks/bookmarks.plugin.desktop.in.in
index ce70272..05b6f0d 100644
--- a/plugins/bookmarks/bookmarks.plugin.desktop.in.in
+++ b/plugins/bookmarks/bookmarks.plugin.desktop.in.in
@@ -1,8 +1,8 @@
[Plugin]
Module=bookmarks
IAge=3
-_Name=Bookmarks
-_Description=Easy document navigation with bookmarks
+Name=Bookmarks
+Description=Easy document navigation with bookmarks
Authors=Jesse van den Kieboom <jesse icecrew nl>
Copyright=Copyright @ 2009 Jesse van den Kieboom
Website=http://www.gedit.org
diff --git a/plugins/bookmarks/gedit-bookmarks.metainfo.xml.in
b/plugins/bookmarks/gedit-bookmarks.metainfo.xml.in
index a15bec6..b6f8e3a 100644
--- a/plugins/bookmarks/gedit-bookmarks.metainfo.xml.in
+++ b/plugins/bookmarks/gedit-bookmarks.metainfo.xml.in
@@ -3,8 +3,8 @@
<component type="addon">
<id>gedit-bookmarks</id>
<extends>org.gnome.gedit.desktop</extends>
- <_name>Bookmarks</_name>
- <_summary>Easy document navigation with bookmarks</_summary>
+ <name>Bookmarks</name>
+ <summary>Easy document navigation with bookmarks</summary>
<url type="homepage">https://wiki.gnome.org/Apps/Gedit/ShippedPlugins</url>
<url type="bugtracker">https://bugzilla.gnome.org/enter_bug.cgi?product=gedit&component=Plugins</url>
<metadata_license>CC0-1.0</metadata_license>
diff --git a/plugins/bracketcompletion/bracketcompletion.plugin.desktop.in.in
b/plugins/bracketcompletion/bracketcompletion.plugin.desktop.in.in
index 71b32b6..fa15596 100644
--- a/plugins/bracketcompletion/bracketcompletion.plugin.desktop.in.in
+++ b/plugins/bracketcompletion/bracketcompletion.plugin.desktop.in.in
@@ -2,8 +2,8 @@
Loader=python3
Module=bracketcompletion
IAge=3
-_Name=Bracket Completion
-_Description=Automatically adds closing brackets.
+Name=Bracket Completion
+Description=Automatically adds closing brackets.
Authors=Steve Frécinaux <steve istique net>
Copyright=Copyright @ 2006 Steve Frécinaux
Website=http://www.gedit.org
diff --git a/plugins/bracketcompletion/gedit-bracketcompletion.metainfo.xml.in
b/plugins/bracketcompletion/gedit-bracketcompletion.metainfo.xml.in
index 3d81db4..8f13548 100644
--- a/plugins/bracketcompletion/gedit-bracketcompletion.metainfo.xml.in
+++ b/plugins/bracketcompletion/gedit-bracketcompletion.metainfo.xml.in
@@ -3,8 +3,8 @@
<component type="addon">
<id>gedit-bracketcompletion</id>
<extends>org.gnome.gedit.desktop</extends>
- <_name>Bracket Completion</_name>
- <_summary>Automatically add a closing bracket when you insert one</_summary>
+ <name>Bracket Completion</name>
+ <summary>Automatically add a closing bracket when you insert one</summary>
<url type="homepage">https://wiki.gnome.org/Apps/Gedit/ShippedPlugins</url>
<url type="bugtracker">https://bugzilla.gnome.org/enter_bug.cgi?product=gedit&component=Plugins</url>
<metadata_license>CC0-1.0</metadata_license>
diff --git a/plugins/charmap/charmap.plugin.desktop.in.in b/plugins/charmap/charmap.plugin.desktop.in.in
index bb82259..8666d9e 100644
--- a/plugins/charmap/charmap.plugin.desktop.in.in
+++ b/plugins/charmap/charmap.plugin.desktop.in.in
@@ -2,8 +2,8 @@
Loader=python3
Module=charmap
IAge=3
-_Name=Character Map
-_Description=Insert special characters just by clicking on them.
+Name=Character Map
+Description=Insert special characters just by clicking on them.
Icon=accessories-character-map
Authors=Steve Frécinaux <steve istique net>;Ignacio Casal Quinteiro <icq gnome org>
Copyright=Copyright @ 2006 Steve Frécinaux
diff --git a/plugins/charmap/gedit-charmap.metainfo.xml.in b/plugins/charmap/gedit-charmap.metainfo.xml.in
index 1b7a266..9b2377e 100644
--- a/plugins/charmap/gedit-charmap.metainfo.xml.in
+++ b/plugins/charmap/gedit-charmap.metainfo.xml.in
@@ -3,8 +3,8 @@
<component type="addon">
<id>gedit-charmap</id>
<extends>org.gnome.gedit.desktop</extends>
- <_name>Charmap</_name>
- <_summary>Select characters from a character map</_summary>
+ <name>Charmap</name>
+ <summary>Select characters from a character map</summary>
<url type="homepage">https://wiki.gnome.org/Apps/Gedit/ShippedPlugins</url>
<url type="bugtracker">https://bugzilla.gnome.org/enter_bug.cgi?product=gedit&component=Plugins</url>
<metadata_license>CC0-1.0</metadata_license>
diff --git a/plugins/codecomment/codecomment.plugin.desktop.in.in
b/plugins/codecomment/codecomment.plugin.desktop.in.in
index 6561a2d..1fa4635 100644
--- a/plugins/codecomment/codecomment.plugin.desktop.in.in
+++ b/plugins/codecomment/codecomment.plugin.desktop.in.in
@@ -2,8 +2,8 @@
Loader=python3
Module=codecomment
IAge=3
-_Name=Code Comment
-_Description=Comment out or uncomment a selected block of code.
+Name=Code Comment
+Description=Comment out or uncomment a selected block of code.
Authors=Alejandro Garcia <alex igalia com>;Matthew Dugan <matthew dugan gmail com>
Copyright=Copyright @ 2005-2006 Igalia, S.L.;Copyright @ 2006 Matthew Dugan
Website=http://www.gedit.org
diff --git a/plugins/codecomment/gedit-codecomment.metainfo.xml.in
b/plugins/codecomment/gedit-codecomment.metainfo.xml.in
index 2d621d3..c00efc0 100644
--- a/plugins/codecomment/gedit-codecomment.metainfo.xml.in
+++ b/plugins/codecomment/gedit-codecomment.metainfo.xml.in
@@ -3,8 +3,8 @@
<component type="addon">
<id>gedit-codecomment</id>
<extends>org.gnome.gedit.desktop</extends>
- <_name>Code Comment</_name>
- <_summary>Comment or uncomment blocks of code</_summary>
+ <name>Code Comment</name>
+ <summary>Comment or uncomment blocks of code</summary>
<url type="homepage">https://wiki.gnome.org/Apps/Gedit/ShippedPlugins</url>
<url type="bugtracker">https://bugzilla.gnome.org/enter_bug.cgi?product=gedit&component=Plugins</url>
<metadata_license>CC0-1.0</metadata_license>
diff --git a/plugins/colorpicker/colorpicker.plugin.desktop.in.in
b/plugins/colorpicker/colorpicker.plugin.desktop.in.in
index c02867e..a66a0c9 100644
--- a/plugins/colorpicker/colorpicker.plugin.desktop.in.in
+++ b/plugins/colorpicker/colorpicker.plugin.desktop.in.in
@@ -2,8 +2,8 @@
Loader=python3
Module=colorpicker
IAge=3
-_Name=Color Picker
-_Description=Pick a color from a dialog and insert its hexadecimal representation.
+Name=Color Picker
+Description=Pick a color from a dialog and insert its hexadecimal representation.
Authors=Jesse van den Kieboom <jesse icecrew nl>;Ignacio Casal Quinteiro <icq gnome org>
Copyright=Copyright © 2006 Jesse van den Kieboom;Copyright © 2012 Ignacio Casal Quinteiro
Website=http://www.gedit.org
diff --git a/plugins/colorpicker/gedit-colorpicker.metainfo.xml.in
b/plugins/colorpicker/gedit-colorpicker.metainfo.xml.in
index faaece1..b8a379c 100644
--- a/plugins/colorpicker/gedit-colorpicker.metainfo.xml.in
+++ b/plugins/colorpicker/gedit-colorpicker.metainfo.xml.in
@@ -3,8 +3,8 @@
<component type="addon">
<id>gedit-colorpicker</id>
<extends>org.gnome.gedit.desktop</extends>
- <_name>Color picker</_name>
- <_summary>Select and insert a color from a dialog (for HTML, CSS, PHP)</_summary>
+ <name>Color picker</name>
+ <summary>Select and insert a color from a dialog (for HTML, CSS, PHP)</summary>
<url type="homepage">https://wiki.gnome.org/Apps/Gedit/ShippedPlugins</url>
<url type="bugtracker">https://bugzilla.gnome.org/enter_bug.cgi?product=gedit&component=Plugins</url>
<metadata_license>CC0-1.0</metadata_license>
diff --git a/plugins/colorschemer/colorschemer.plugin.desktop.in.in
b/plugins/colorschemer/colorschemer.plugin.desktop.in.in
index 2d2b1f0..e479893 100644
--- a/plugins/colorschemer/colorschemer.plugin.desktop.in.in
+++ b/plugins/colorschemer/colorschemer.plugin.desktop.in.in
@@ -2,8 +2,8 @@
Loader=python3
Module=colorschemer
IAge=3
-_Name=Color Scheme Editor
-_Description=Source code color scheme editor
+Name=Color Scheme Editor
+Description=Source code color scheme editor
Authors=Jono <jono foodnotblogs com>
Copyright=Copyright © 2013 Jono Finger
Website=https://github.com/jonocodes/GeditSchemer
diff --git a/plugins/colorschemer/gedit-colorschemer.metainfo.xml.in
b/plugins/colorschemer/gedit-colorschemer.metainfo.xml.in
index 4689038..c46cf37 100644
--- a/plugins/colorschemer/gedit-colorschemer.metainfo.xml.in
+++ b/plugins/colorschemer/gedit-colorschemer.metainfo.xml.in
@@ -3,8 +3,8 @@
<component type="addon">
<id>gedit-colorschemer</id>
<extends>org.gnome.gedit.desktop</extends>
- <_name>Color Scheme Editor</_name>
- <_summary>Create and edit the color scheme used for syntax highlighting</_summary>
+ <name>Color Scheme Editor</name>
+ <summary>Create and edit the color scheme used for syntax highlighting</summary>
<url type="homepage">https://wiki.gnome.org/Apps/Gedit/ShippedPlugins</url>
<url type="bugtracker">https://bugzilla.gnome.org/enter_bug.cgi?product=gedit&component=Plugins</url>
<metadata_license>CC0-1.0</metadata_license>
diff --git a/plugins/commander/commander.plugin.desktop.in.in
b/plugins/commander/commander.plugin.desktop.in.in
index 0f0cb01..2dc4ae4 100644
--- a/plugins/commander/commander.plugin.desktop.in.in
+++ b/plugins/commander/commander.plugin.desktop.in.in
@@ -2,8 +2,8 @@
Loader=python3
Module=commander
IAge=3
-_Name=Commander
-_Description=Command line interface for advanced editing
+Name=Commander
+Description=Command line interface for advanced editing
Authors=Jesse van den Kieboom <jessevdk gnome org>
Copyright=Copyright © 2009 Jesse van den Kieboom
Website=http://www.gedit.org
diff --git a/plugins/commander/gedit-commander.metainfo.xml.in
b/plugins/commander/gedit-commander.metainfo.xml.in
index a9796c1..b91b690 100644
--- a/plugins/commander/gedit-commander.metainfo.xml.in
+++ b/plugins/commander/gedit-commander.metainfo.xml.in
@@ -3,8 +3,8 @@
<component type="addon">
<id>gedit-commander</id>
<extends>org.gnome.gedit.desktop</extends>
- <_name>Commander</_name>
- <_summary>Command line interface for advanced editing</_summary>
+ <name>Commander</name>
+ <summary>Command line interface for advanced editing</summary>
<url type="homepage">https://wiki.gnome.org/Apps/Gedit/ShippedPlugins</url>
<url type="bugtracker">https://bugzilla.gnome.org/enter_bug.cgi?product=gedit&component=Plugins</url>
<metadata_license>CC0-1.0</metadata_license>
diff --git a/plugins/dashboard/dashboard.plugin.desktop.in.in
b/plugins/dashboard/dashboard.plugin.desktop.in.in
index 2e74944..01bf18f 100644
--- a/plugins/dashboard/dashboard.plugin.desktop.in.in
+++ b/plugins/dashboard/dashboard.plugin.desktop.in.in
@@ -2,8 +2,8 @@
Loader=python3
Module=dashboard
IAge=3
-_Name=Dashboard
-_Description=A Dashboard for new tabs
+Name=Dashboard
+Description=A Dashboard for new tabs
Authors=Seif Lotfy <seif lotfy com>
Copyright=Copyright © 2011 Collabora Ltd.
Website=http://www.gedit.org
diff --git a/plugins/dashboard/gedit-dashboard.metainfo.xml.in
b/plugins/dashboard/gedit-dashboard.metainfo.xml.in
index 44ab22f..65cd425 100644
--- a/plugins/dashboard/gedit-dashboard.metainfo.xml.in
+++ b/plugins/dashboard/gedit-dashboard.metainfo.xml.in
@@ -3,8 +3,8 @@
<component type="addon">
<id>gedit-dashboard</id>
<extends>org.gnome.gedit.desktop</extends>
- <_name>Dashboard</_name>
- <_summary>Displays a grid of recently/most used files upon opening a new tab</_summary>
+ <name>Dashboard</name>
+ <summary>Displays a grid of recently/most used files upon opening a new tab</summary>
<url type="homepage">https://wiki.gnome.org/Apps/Gedit/ShippedPlugins</url>
<url type="bugtracker">https://bugzilla.gnome.org/enter_bug.cgi?product=gedit&component=Plugins</url>
<metadata_license>CC0-1.0</metadata_license>
diff --git a/plugins/drawspaces/drawspaces.plugin.desktop.in.in
b/plugins/drawspaces/drawspaces.plugin.desktop.in.in
index adf6fca..8374851 100644
--- a/plugins/drawspaces/drawspaces.plugin.desktop.in.in
+++ b/plugins/drawspaces/drawspaces.plugin.desktop.in.in
@@ -1,8 +1,8 @@
[Plugin]
Module=drawspaces
IAge=3
-_Name=Draw Spaces
-_Description=Draw spaces and tabs
+Name=Draw Spaces
+Description=Draw spaces and tabs
Authors=Paolo Borelli <pborelli katamail com>;Steve Frécinaux <code istique net>;Ignacio Casal Quinteiro
<nacho resa gmail com>
Copyright=Copyright © 2006 Paolo Borelli;Copyright © 2007 Steve Frécinaux;Copyright © 2008 Ignacio Casal
Quinteiro
Website=http://www.gedit.org
diff --git a/plugins/drawspaces/gedit-drawspaces.metainfo.xml.in
b/plugins/drawspaces/gedit-drawspaces.metainfo.xml.in
index cf2b9c4..3167321 100644
--- a/plugins/drawspaces/gedit-drawspaces.metainfo.xml.in
+++ b/plugins/drawspaces/gedit-drawspaces.metainfo.xml.in
@@ -3,8 +3,8 @@
<component type="addon">
<id>gedit-drawspaces</id>
<extends>org.gnome.gedit.desktop</extends>
- <_name>Draw spaces</_name>
- <_summary>Draw Spaces and Tabs</_summary>
+ <name>Draw spaces</name>
+ <summary>Draw Spaces and Tabs</summary>
<url type="homepage">https://wiki.gnome.org/Apps/Gedit/ShippedPlugins</url>
<url type="bugtracker">https://bugzilla.gnome.org/enter_bug.cgi?product=gedit&component=Plugins</url>
<metadata_license>CC0-1.0</metadata_license>
diff --git a/plugins/findinfiles/findinfiles.plugin.desktop.in.in
b/plugins/findinfiles/findinfiles.plugin.desktop.in.in
index 2d7e4a4..a0edcdc 100644
--- a/plugins/findinfiles/findinfiles.plugin.desktop.in.in
+++ b/plugins/findinfiles/findinfiles.plugin.desktop.in.in
@@ -1,8 +1,8 @@
[Plugin]
Module=findinfiles
IAge=3
-_Name=Find in Files
-_Description=Find text in all files of a folder.
+Name=Find in Files
+Description=Find text in all files of a folder.
Authors=The Lemon Man <thatlemon at google's mail service dot com>
Copyright=Copyright © 2015 The Lemon Man
Website=http://www.gedit.org
diff --git a/plugins/findinfiles/gedit-findinfiles.metainfo.xml.in
b/plugins/findinfiles/gedit-findinfiles.metainfo.xml.in
index fb08313..6f6be0a 100644
--- a/plugins/findinfiles/gedit-findinfiles.metainfo.xml.in
+++ b/plugins/findinfiles/gedit-findinfiles.metainfo.xml.in
@@ -3,8 +3,8 @@
<component type="addon">
<id>gedit-findinfiles</id>
<extends>org.gnome.gedit.desktop</extends>
- <_name>Find in Files</_name>
- <_summary>Find text in all files of a folder</_summary>
+ <name>Find in Files</name>
+ <summary>Find text in all files of a folder</summary>
<url type="homepage">https://wiki.gnome.org/Apps/Gedit/ShippedPlugins</url>
<url type="bugtracker">https://bugzilla.gnome.org/enter_bug.cgi?product=gedit&component=Plugins</url>
<metadata_license>CC0-1.0</metadata_license>
diff --git a/plugins/git/gedit-git.metainfo.xml.in b/plugins/git/gedit-git.metainfo.xml.in
index 8872860..09ecf30 100644
--- a/plugins/git/gedit-git.metainfo.xml.in
+++ b/plugins/git/gedit-git.metainfo.xml.in
@@ -1,9 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright 2014 Igor Gnatenko <i gnatenko brain gmail com> -->
<component type="addon">
<id>gedit-git</id>
<extends>org.gnome.gedit.desktop</extends>
- <_name>Git</_name>
- <_summary>Use git information to display which lines and files changed since last commit</_summary>
+ <name>Git</name>
+ <summary>Use git information to display which lines and files changed since last commit</summary>
<url type="homepage">https://wiki.gnome.org/Apps/Gedit/ShippedPlugins</url>
<url type="bugtracker">https://bugzilla.gnome.org/enter_bug.cgi?product=gedit&component=Plugins</url>
<metadata_license>CC0-1.0</metadata_license>
diff --git a/plugins/git/git.plugin.desktop.in.in b/plugins/git/git.plugin.desktop.in.in
index f03a0a9..2baa943 100644
--- a/plugins/git/git.plugin.desktop.in.in
+++ b/plugins/git/git.plugin.desktop.in.in
@@ -2,8 +2,8 @@
Loader=python3
Module=git
IAge=3
-_Name=Git
-_Description=Highlight lines that have been changed since the last commit
+Name=Git
+Description=Highlight lines that have been changed since the last commit
Authors=Ignacio Casal Quintiero <icq gnome org>;Garrett Regier <garrettregier gmail com>
Copyright=Copyright © 2013 Ignacio Casal Quinteiro
Website=http://www.gedit.org
diff --git a/plugins/joinlines/gedit-joinlines.metainfo.xml.in
b/plugins/joinlines/gedit-joinlines.metainfo.xml.in
index 97f8919..bb18e89 100644
--- a/plugins/joinlines/gedit-joinlines.metainfo.xml.in
+++ b/plugins/joinlines/gedit-joinlines.metainfo.xml.in
@@ -3,8 +3,8 @@
<component type="addon">
<id>gedit-joinlines</id>
<extends>org.gnome.gedit.desktop</extends>
- <_name>Join lines/ Split lines</_name>
- <_summary>Join or split multiple lines through Ctrl+J and Ctrl+Shift+J</_summary>
+ <name>Join lines/ Split lines</name>
+ <summary>Join or split multiple lines through Ctrl+J and Ctrl+Shift+J</summary>
<url type="homepage">https://wiki.gnome.org/Apps/Gedit/ShippedPlugins</url>
<url type="bugtracker">https://bugzilla.gnome.org/enter_bug.cgi?product=gedit&component=Plugins</url>
<metadata_license>CC0-1.0</metadata_license>
diff --git a/plugins/joinlines/joinlines.plugin.desktop.in.in
b/plugins/joinlines/joinlines.plugin.desktop.in.in
index 5ea1a42..7f6dbfe 100644
--- a/plugins/joinlines/joinlines.plugin.desktop.in.in
+++ b/plugins/joinlines/joinlines.plugin.desktop.in.in
@@ -2,8 +2,8 @@
Loader=python3
Module=joinlines
IAge=3
-_Name=Join/Split Lines
-_Description=Join several lines or split long ones
+Name=Join/Split Lines
+Description=Join several lines or split long ones
Authors=Steve Frécinaux <steve istique net>;André Homeyer
Copyright=Copyright @ 2006-2007 Steve Frécinaux, André Homeyer
Website=http://www.gedit.org
diff --git a/plugins/multiedit/gedit-multiedit.metainfo.xml.in
b/plugins/multiedit/gedit-multiedit.metainfo.xml.in
index f0f2d6b..7fb4906 100644
--- a/plugins/multiedit/gedit-multiedit.metainfo.xml.in
+++ b/plugins/multiedit/gedit-multiedit.metainfo.xml.in
@@ -3,8 +3,8 @@
<component type="addon">
<id>gedit-multiedit</id>
<extends>org.gnome.gedit.desktop</extends>
- <_name>Multi edit</_name>
- <_summary>Edit document in multiple places at once</_summary>
+ <name>Multi edit</name>
+ <summary>Edit document in multiple places at once</summary>
<url type="homepage">https://wiki.gnome.org/Apps/Gedit/ShippedPlugins</url>
<url type="bugtracker">https://bugzilla.gnome.org/enter_bug.cgi?product=gedit&component=Plugins</url>
<metadata_license>CC0-1.0</metadata_license>
diff --git a/plugins/multiedit/multiedit.plugin.desktop.in.in
b/plugins/multiedit/multiedit.plugin.desktop.in.in
index 7b7b137..bee22e2 100644
--- a/plugins/multiedit/multiedit.plugin.desktop.in.in
+++ b/plugins/multiedit/multiedit.plugin.desktop.in.in
@@ -2,8 +2,8 @@
Loader=python3
Module=multiedit
IAge=3
-_Name=Multi Edit
-_Description=Edit document in multiple places at once
+Name=Multi Edit
+Description=Edit document in multiple places at once
Authors=Jesse van den Kieboom <jessevdk gnome org>
Copyright=Copyright © 2009 Jesse van den Kieboom
Website=http://www.gedit.org
diff --git a/plugins/smartspaces/gedit-smartspaces.metainfo.xml.in
b/plugins/smartspaces/gedit-smartspaces.metainfo.xml.in
index 76e5b20..756894a 100644
--- a/plugins/smartspaces/gedit-smartspaces.metainfo.xml.in
+++ b/plugins/smartspaces/gedit-smartspaces.metainfo.xml.in
@@ -3,8 +3,8 @@
<component type="addon">
<id>gedit-smartspaces</id>
<extends>org.gnome.gedit.desktop</extends>
- <_name>Smart Spaces</_name>
- <_summary>Allow to unindent like if you were using tabs while you’re using spaces</_summary>
+ <name>Smart Spaces</name>
+ <summary>Allow to unindent like if you were using tabs while you’re using spaces</summary>
<url type="homepage">https://wiki.gnome.org/Apps/Gedit/ShippedPlugins</url>
<url type="bugtracker">https://bugzilla.gnome.org/enter_bug.cgi?product=gedit&component=Plugins</url>
<metadata_license>CC0-1.0</metadata_license>
diff --git a/plugins/smartspaces/smartspaces.plugin.desktop.in.in
b/plugins/smartspaces/smartspaces.plugin.desktop.in.in
index f9ca79a..603157a 100644
--- a/plugins/smartspaces/smartspaces.plugin.desktop.in.in
+++ b/plugins/smartspaces/smartspaces.plugin.desktop.in.in
@@ -2,8 +2,8 @@
Loader=python3
Module=smartspaces
IAge=3
-_Name=Smart Spaces
-_Description=Forget you’re not using tabulations.
+Name=Smart Spaces
+Description=Forget you’re not using tabulations.
Authors=Steve Frécinaux <steve istique net>
Copyright=Copyright © 2006 Steve Frécinaux
Website=http://www.gedit.org
diff --git a/plugins/synctex/gedit-synctex.metainfo.xml.in b/plugins/synctex/gedit-synctex.metainfo.xml.in
index 14b27ea..519f283 100644
--- a/plugins/synctex/gedit-synctex.metainfo.xml.in
+++ b/plugins/synctex/gedit-synctex.metainfo.xml.in
@@ -3,8 +3,8 @@
<component type="addon">
<id>gedit-synctex</id>
<extends>org.gnome.gedit.desktop</extends>
- <_name>SyncTeX</_name>
- <_summary>Synchronize between LaTeX and PDF with gedit and evince</_summary>
+ <name>SyncTeX</name>
+ <summary>Synchronize between LaTeX and PDF with gedit and evince</summary>
<url type="homepage">https://wiki.gnome.org/Apps/Gedit/ShippedPlugins</url>
<url type="bugtracker">https://bugzilla.gnome.org/enter_bug.cgi?product=gedit&component=Plugins</url>
<suggests>
diff --git a/plugins/synctex/synctex.plugin.desktop.in.in b/plugins/synctex/synctex.plugin.desktop.in.in
index b465129..c2881f2 100644
--- a/plugins/synctex/synctex.plugin.desktop.in.in
+++ b/plugins/synctex/synctex.plugin.desktop.in.in
@@ -2,8 +2,8 @@
Loader=python3
Module=synctex
IAge=3
-_Name=SyncTeX
-_Description=Synchronize between LaTeX and PDF with gedit and evince.
+Name=SyncTeX
+Description=Synchronize between LaTeX and PDF with gedit and evince.
Authors=José Aliste <jaliste src gnome org>
Copyright=Copyright © 2010 José Aliste
Website=http://www.gedit.org
diff --git a/plugins/terminal/gedit-terminal.metainfo.xml.in b/plugins/terminal/gedit-terminal.metainfo.xml.in
index 41ca4d2..0b5e869 100644
--- a/plugins/terminal/gedit-terminal.metainfo.xml.in
+++ b/plugins/terminal/gedit-terminal.metainfo.xml.in
@@ -3,8 +3,8 @@
<component type="addon">
<id>gedit-terminal</id>
<extends>org.gnome.gedit.desktop</extends>
- <_name>Terminal</_name>
- <_summary>A simple terminal widget accessible from the bottom panel</_summary>
+ <name>Terminal</name>
+ <summary>A simple terminal widget accessible from the bottom panel</summary>
<url type="homepage">https://wiki.gnome.org/Apps/Gedit/ShippedPlugins</url>
<url type="bugtracker">https://bugzilla.gnome.org/enter_bug.cgi?product=gedit&component=Plugins</url>
<metadata_license>CC0-1.0</metadata_license>
diff --git a/plugins/terminal/terminal.plugin.desktop.in.in b/plugins/terminal/terminal.plugin.desktop.in.in
index dac9ac1..eb60a2d 100644
--- a/plugins/terminal/terminal.plugin.desktop.in.in
+++ b/plugins/terminal/terminal.plugin.desktop.in.in
@@ -2,8 +2,8 @@
Loader=python3
Module=terminal
IAge=3
-_Name=Embedded Terminal
-_Description=Embed a terminal in the bottom pane.
+Name=Embedded Terminal
+Description=Embed a terminal in the bottom pane.
Icon=utilities-terminal
Authors=Paolo Borelli
Copyright=Copyright © 2005 Paolo Borelli
diff --git a/plugins/textsize/gedit-textsize.metainfo.xml.in b/plugins/textsize/gedit-textsize.metainfo.xml.in
index 0ed1760..0443b23 100644
--- a/plugins/textsize/gedit-textsize.metainfo.xml.in
+++ b/plugins/textsize/gedit-textsize.metainfo.xml.in
@@ -3,8 +3,8 @@
<component type="addon">
<id>gedit-textsize</id>
<extends>org.gnome.gedit.desktop</extends>
- <_name>Text size</_name>
- <_summary>Easily increase and decrease the text size</_summary>
+ <name>Text size</name>
+ <summary>Easily increase and decrease the text size</summary>
<url type="homepage">https://wiki.gnome.org/Apps/Gedit/ShippedPlugins</url>
<url type="bugtracker">https://bugzilla.gnome.org/enter_bug.cgi?product=gedit&component=Plugins</url>
<metadata_license>CC0-1.0</metadata_license>
diff --git a/plugins/textsize/textsize.plugin.desktop.in.in b/plugins/textsize/textsize.plugin.desktop.in.in
index 8c12009..3b22b24 100644
--- a/plugins/textsize/textsize.plugin.desktop.in.in
+++ b/plugins/textsize/textsize.plugin.desktop.in.in
@@ -2,8 +2,8 @@
Loader=python3
Module=textsize
IAge=3
-_Name=Text Size
-_Description=Easily increase and decrease the text size
+Name=Text Size
+Description=Easily increase and decrease the text size
Authors=Konstantin Mikhaylov <jtraub devel gmail com>;Wouter Bolsterlee <wbolster gnome org>;Jesse van den
Kieboom <jessevdk gnome org>
Copyright=Copyright © 2008 by the authors
Website=http://www.gedit.org
diff --git a/plugins/translate/gedit-translate.metainfo.xml.in
b/plugins/translate/gedit-translate.metainfo.xml.in
index 5dbdd2f..ef73e36 100644
--- a/plugins/translate/gedit-translate.metainfo.xml.in
+++ b/plugins/translate/gedit-translate.metainfo.xml.in
@@ -2,8 +2,8 @@
<component type="addon">
<id>gedit-translate</id>
<extends>org.gnome.gedit.desktop</extends>
- <_name>Translate</_name>
- <_summary>Translates text into different languages</_summary>
+ <name>Translate</name>
+ <summary>Translates text into different languages</summary>
<url type="homepage">https://wiki.gnome.org/Apps/Gedit/ShippedPlugins</url>
<url type="bugtracker">https://bugzilla.gnome.org/enter_bug.cgi?product=gedit&component=Plugins</url>
<metadata_license>CC0-1.0</metadata_license>
diff --git a/plugins/translate/translate.plugin.desktop.in.in
b/plugins/translate/translate.plugin.desktop.in.in
index 76ecfb7..9e25658 100644
--- a/plugins/translate/translate.plugin.desktop.in.in
+++ b/plugins/translate/translate.plugin.desktop.in.in
@@ -2,8 +2,8 @@
Loader=python3
Module=translate
IAge=3
-_Name=Translate
-_Description=Translates text into different languages
+Name=Translate
+Description=Translates text into different languages
Authors=Jordi Mas i Hernàndez <jmas softcatala org>
Copyright=Copyright @ 2017 Jordi Mas i Hernàndez. Powered by Apertium and Yandex.Translate translation
engines.
Website=http://www.gedit.org
diff --git a/plugins/wordcompletion/gedit-wordcompletion.metainfo.xml.in
b/plugins/wordcompletion/gedit-wordcompletion.metainfo.xml.in
index b76aaab..0876876 100644
--- a/plugins/wordcompletion/gedit-wordcompletion.metainfo.xml.in
+++ b/plugins/wordcompletion/gedit-wordcompletion.metainfo.xml.in
@@ -3,8 +3,8 @@
<component type="addon">
<id>gedit-wordcompletion</id>
<extends>org.gnome.gedit.desktop</extends>
- <_name>Word completion</_name>
- <_summary>Propose automatic completion using words already present in the document</_summary>
+ <name>Word completion</name>
+ <summary>Propose automatic completion using words already present in the document</summary>
<url type="homepage">https://wiki.gnome.org/Apps/Gedit/ShippedPlugins</url>
<url type="bugtracker">https://bugzilla.gnome.org/enter_bug.cgi?product=gedit&component=Plugins</url>
<metadata_license>CC0-1.0</metadata_license>
diff --git a/plugins/wordcompletion/wordcompletion.plugin.desktop.in.in
b/plugins/wordcompletion/wordcompletion.plugin.desktop.in.in
index ba4f121..2abcb66 100644
--- a/plugins/wordcompletion/wordcompletion.plugin.desktop.in.in
+++ b/plugins/wordcompletion/wordcompletion.plugin.desktop.in.in
@@ -1,8 +1,8 @@
[Plugin]
Module=wordcompletion
IAge=3
-_Name=Word Completion
-_Description=Word completion using the completion framework
+Name=Word Completion
+Description=Word completion using the completion framework
Authors=Jesse van den Kieboom <jesse gnome org>\nIgnacio Casal Quinteiro <icq gnome org>
Copyright=Copyright © 2009 Jesse van den Kieboom
Website=http://www.gedit.org
diff --git a/plugins/zeitgeist/gedit-zeitgeist.metainfo.xml.in
b/plugins/zeitgeist/gedit-zeitgeist.metainfo.xml.in
index c439e84..b36742d 100644
--- a/plugins/zeitgeist/gedit-zeitgeist.metainfo.xml.in
+++ b/plugins/zeitgeist/gedit-zeitgeist.metainfo.xml.in
@@ -3,8 +3,8 @@
<component type="addon">
<id>gedit-zeitgeist</id>
<extends>org.gnome.gedit.desktop</extends>
- <_name>Zeitgeist Data provider</_name>
-<_summary>Records user activity and giving easy access to recently-used and frequently-used files</_summary>
+ <name>Zeitgeist Data provider</name>
+ <summary>Records user activity and giving easy access to recently-used and frequently-used files</summary>
<url type="homepage">https://wiki.gnome.org/Apps/Gedit/ShippedPlugins</url>
<url type="bugtracker">https://bugzilla.gnome.org/enter_bug.cgi?product=gedit&component=Plugins</url>
<metadata_license>CC0-1.0</metadata_license>
diff --git a/plugins/zeitgeist/zeitgeist.plugin.desktop.in b/plugins/zeitgeist/zeitgeist.plugin.desktop.in
index c99109c..bde3aa4 100644
--- a/plugins/zeitgeist/zeitgeist.plugin.desktop.in
+++ b/plugins/zeitgeist/zeitgeist.plugin.desktop.in
@@ -1,8 +1,8 @@
[Plugin]
Module=zeitgeist
IAge=3
-_Name=Zeitgeist dataprovider
-_Description=Logs access and leave event for documents used with gedit
+Name=Zeitgeist dataprovider
+Description=Logs access and leave event for documents used with gedit
Authors=Michal Hruby <michal mhr gmail com>
Copyright=Copyright © 2011 Michal Hruby
Website=http://www.gedit.org
diff --git a/po/Makevars b/po/Makevars
new file mode 100644
index 0000000..c0e2b2d
--- /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 = The gedit authors
+
+# 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 = https://gitlab.gnome.org/GNOME/gedit-plugins/issues
+
+# 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 6f33296..6632a76 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -17,7 +17,7 @@ plugins/colorpicker/gedit-colorpicker.metainfo.xml.in
plugins/colorschemer/colorschemer.plugin.desktop.in.in
plugins/colorschemer/gedit-colorschemer.metainfo.xml.in
plugins/colorschemer/schemer/__init__.py
-[type: gettext/glade]plugins/colorschemer/schemer.ui
+plugins/colorschemer/schemer.ui
plugins/commander/commander/appactivatable.py
plugins/commander/commander.plugin.desktop.in.in
plugins/commander/gedit-commander.metainfo.xml.in
@@ -26,10 +26,10 @@ plugins/dashboard/dashboard.plugin.desktop.in.in
plugins/dashboard/gedit-dashboard.metainfo.xml.in
plugins/drawspaces/drawspaces.plugin.desktop.in.in
plugins/drawspaces/gedit-drawspaces-app-activatable.c
-[type: gettext/glade]plugins/drawspaces/gedit-drawspaces-configurable.ui
+plugins/drawspaces/gedit-drawspaces-configurable.ui
plugins/drawspaces/gedit-drawspaces.metainfo.xml.in
plugins/drawspaces/org.gnome.gedit.plugins.drawspaces.gschema.xml
-[type: gettext/glade]plugins/findinfiles/dialog.ui
+plugins/findinfiles/dialog.ui
plugins/findinfiles/dialog.vala
plugins/findinfiles/findinfiles.plugin.desktop.in.in
plugins/findinfiles/gedit-findinfiles.metainfo.xml.in
@@ -62,8 +62,8 @@ plugins/translate/translate/__init__.py
plugins/translate/translate.plugin.desktop.in.in
plugins/translate/translate/preferences.py
plugins/translate/translate/services/yandex.py
-[type: gettext/glade]plugins/translate/translate/ui/preferences.ui
-[type: gettext/glade]plugins/wordcompletion/gedit-word-completion-configure.ui
+plugins/translate/translate/ui/preferences.ui
+plugins/wordcompletion/gedit-word-completion-configure.ui
plugins/wordcompletion/gedit-wordcompletion.metainfo.xml.in
plugins/wordcompletion/gedit-word-completion-plugin.c
plugins/wordcompletion/org.gnome.gedit.plugins.wordcompletion.gschema.xml
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
