diff options
author | Richard Hughes <richard@hughsie.com> | 2016-12-06 15:44:10 +0000 |
---|---|---|
committer | Richard Hughes <richard@hughsie.com> | 2016-12-06 16:45:55 +0000 |
commit | 42b52703c0fcdd12a942cc1d37e9de1ba7633160 (patch) | |
tree | 42eb048bdac72e89c90602fa9ef2dae285d5283b | |
parent | 5657b80771358c2f7f681977e13a599a80dda1a4 (diff) | |
download | gnome-color-manager-42b52703c0fcdd12a942cc1d37e9de1ba7633160.tar.gz |
Port away from intltool
-rw-r--r-- | Makefile.am | 2 | ||||
-rwxr-xr-x | autogen.sh | 2 | ||||
-rw-r--r-- | configure.ac | 5 | ||||
-rw-r--r-- | contrib/gnome-color-manager.spec.in | 1 | ||||
-rw-r--r-- | data/Makefile.am | 5 | ||||
-rw-r--r-- | data/appdata/Makefile.am | 4 | ||||
-rw-r--r-- | data/appdata/org.gnome.ColorProfileViewer.appdata.xml.in | 12 | ||||
-rw-r--r-- | data/gcm-calibrate.desktop.in | 4 | ||||
-rw-r--r-- | data/gcm-import.desktop.in | 4 | ||||
-rw-r--r-- | data/gcm-picker.desktop.in | 4 | ||||
-rw-r--r-- | data/org.gnome.ColorProfileViewer.desktop.in | 6 | ||||
-rw-r--r-- | po/.gitignore | 20 | ||||
-rw-r--r-- | po/Makevars | 78 | ||||
-rw-r--r-- | po/POTFILES.in | 6 |
14 files changed, 122 insertions, 31 deletions
diff --git a/Makefile.am b/Makefile.am index 00dd1ca..45a0a73 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,6 +13,8 @@ DISTCLEANFILES = \ MAINTAINERCLEANFILES = \ *~ \ + ABOUT-NLS \ + config.rpath \ Makefile.in \ aclocal.m4 \ compile \ @@ -23,4 +23,4 @@ which gnome-autogen.sh || { exit 1 } -REQUIRED_AUTOMAKE_VERSION=1.7 GNOME_DATADIR="$gnome_datadir" USE_GNOME2_MACROS=1 . gnome-autogen.sh +REQUIRED_AUTOMAKE_VERSION=1.7 GNOME_DATADIR="$gnome_datadir" . gnome-autogen.sh diff --git a/configure.ac b/configure.ac index 268f30c..af87581 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,6 @@ AC_PROG_INSTALL AC_PROG_RANLIB LT_INIT AM_PROG_CC_C_O -IT_PROG_INTLTOOL([0.35.0]) YELP_HELP_INIT # validate AppData @@ -72,11 +71,11 @@ AC_SUBST(WARN_CFLAGS) dnl --------------------------------------------------------------------------- dnl - gettext stuff dnl --------------------------------------------------------------------------- +AM_GNU_GETTEXT([external]) +AM_GNU_GETTEXT_VERSION([0.19.7]) GETTEXT_PACKAGE=AC_PACKAGE_NAME AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE(GETTEXT_PACKAGE, "AC_PACKAGE_NAME", [foo]) - -AM_GLIB_GNU_GETTEXT GLIB_GSETTINGS dnl --------------------------------------------------------------------------- diff --git a/contrib/gnome-color-manager.spec.in b/contrib/gnome-color-manager.spec.in index 73c0931..b836bd0 100644 --- a/contrib/gnome-color-manager.spec.in +++ b/contrib/gnome-color-manager.spec.in @@ -18,7 +18,6 @@ BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: vte3-devel BuildRequires: gnome-doc-utils -BuildRequires: intltool BuildRequires: lcms2-devel BuildRequires: libtiff-devel BuildRequires: libexif-devel diff --git a/data/Makefile.am b/data/Makefile.am index aee334e..dd750af 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -6,7 +6,9 @@ SUBDIRS = \ figures \ icons -@INTLTOOL_DESKTOP_RULE@ +%.desktop: %.desktop.in + $(AM_V_GEN) msgfmt --desktop -d $(top_srcdir)/po --template $< -o $@ + desktopdir = $(datadir)/applications desktop_in_files = \ org.gnome.ColorProfileViewer.desktop.in \ @@ -30,6 +32,7 @@ clean-local : DISTCLEANFILES = \ org.gnome.ColorManager.service \ + org.gnome.ColorProfileViewer.desktop \ gcm-calibrate.desktop \ gcm-picker.desktop \ gcm-viewer.desktop \ diff --git a/data/appdata/Makefile.am b/data/appdata/Makefile.am index 1ab8c96..740f86d 100644 --- a/data/appdata/Makefile.am +++ b/data/appdata/Makefile.am @@ -1,4 +1,6 @@ -@INTLTOOL_XML_RULE@ +%.appdata.xml: %.appdata.xml.in + $(AM_V_GEN) msgfmt --xml -d $(top_srcdir)/po --template $< -o $@ + appdatadir = $(datadir)/appdata appdata_DATA = $(appdata_in_files:.xml.in=.xml) appdata_in_files = org.gnome.ColorProfileViewer.appdata.xml.in diff --git a/data/appdata/org.gnome.ColorProfileViewer.appdata.xml.in b/data/appdata/org.gnome.ColorProfileViewer.appdata.xml.in index f93d516..6f16444 100644 --- a/data/appdata/org.gnome.ColorProfileViewer.appdata.xml.in +++ b/data/appdata/org.gnome.ColorProfileViewer.appdata.xml.in @@ -4,18 +4,18 @@ <id>org.gnome.ColorProfileViewer.desktop</id> <metadata_license>CC0-1.0</metadata_license> <project_license>GPL-2.0+</project_license> - <_name>GNOME Color Manager</_name> - <_summary>Inspect and compare installed color profiles</_summary> + <name>GNOME Color Manager</name> + <summary>Inspect and compare installed color profiles</summary> <description> - <_p> + <p> GNOME Color Profile Viewer shows installed color profiles on your system and allows you to calibrate displays, printers and cameras using a wizard. - </_p> - <_p> + </p> + <p> This functionality is typically used by GNOME Control Center from the color panel although can be used on its own. - </_p> + </p> </description> <screenshots> <screenshot type="default"> diff --git a/data/gcm-calibrate.desktop.in b/data/gcm-calibrate.desktop.in index 60937d9..518cf35 100644 --- a/data/gcm-calibrate.desktop.in +++ b/data/gcm-calibrate.desktop.in @@ -1,6 +1,6 @@ [Desktop Entry] -_Name=Color -_Comment=Color Calibration +Name=Color +Comment=Color Calibration Icon=gnome-color-manager Exec=gcm-calibrate Terminal=false diff --git a/data/gcm-import.desktop.in b/data/gcm-import.desktop.in index 70f11af..e13480d 100644 --- a/data/gcm-import.desktop.in +++ b/data/gcm-import.desktop.in @@ -1,6 +1,6 @@ [Desktop Entry] -_Name=ICC Profile Installer -_Comment=Install ICC profiles +Name=ICC Profile Installer +Comment=Install ICC profiles Categories=System; Exec=/usr/bin/gcm-import %F Terminal=false diff --git a/data/gcm-picker.desktop.in b/data/gcm-picker.desktop.in index 718fc9c..03c2d8b 100644 --- a/data/gcm-picker.desktop.in +++ b/data/gcm-picker.desktop.in @@ -1,6 +1,6 @@ [Desktop Entry] -_Name=Color Picker -_Comment=Use the color sensor to sample spot colors +Name=Color Picker +Comment=Use the color sensor to sample spot colors Icon=gnome-color-manager Exec=gcm-picker Terminal=false diff --git a/data/org.gnome.ColorProfileViewer.desktop.in b/data/org.gnome.ColorProfileViewer.desktop.in index 046d041..311db47 100644 --- a/data/org.gnome.ColorProfileViewer.desktop.in +++ b/data/org.gnome.ColorProfileViewer.desktop.in @@ -1,13 +1,13 @@ [Desktop Entry] -_Name=Color Profile Viewer -_Comment=Inspect and compare installed color profiles +Name=Color Profile Viewer +Comment=Inspect and compare installed color profiles Icon=gnome-color-manager Exec=gcm-viewer Terminal=false Type=Application Categories=GNOME;GTK;System; NotShowIn=GNOME; -_Keywords=Color;ICC; +Keywords=Color;ICC; StartupNotify=true X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=gnome-color-manager diff --git a/po/.gitignore b/po/.gitignore index 6ddb60a..d5904f3 100644 --- a/po/.gitignore +++ b/po/.gitignore @@ -1,9 +1,19 @@ +boldquot.sed +en@boldquot.header +en@quot.header +*.gmo +insert-header.sin Makefile Makefile.in -.intltool-merge-cache +Makefile.in.in +Makefile.in.in~ +Makevars.template +*.po~ +*.pot POTFILES +quot.sed +remove-potcdate.sed +remove-potcdate.sin +Rules-quot stamp-it -*.pot -*.gmo -Makefile.in.in - +stamp-po diff --git a/po/Makevars b/po/Makevars new file mode 100644 index 0000000..0dfd398 --- /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 + +# 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 = Richard Hughes + +# 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 = richard@hughsie.com + +# 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 = --no-location --no-wrap + +# 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 = --no-wrap + +# 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 247aa44..640617d 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,11 +1,9 @@ -# List of source files containing translatable strings. -# Please keep this file sorted alphabetically. data/appdata/org.gnome.ColorProfileViewer.appdata.xml.in data/gcm-calibrate.desktop.in data/gcm-import.desktop.in data/gcm-picker.desktop.in -[type: gettext/glade]data/gcm-picker.ui -[type: gettext/glade]data/gcm-viewer.ui +data/gcm-picker.ui +data/gcm-viewer.ui data/org.gnome.ColorProfileViewer.desktop.in src/gcm-calibrate-argyll.c src/gcm-calibrate.c |