From d19b62785293db5999bb14b6ebb611aa76a7253a Mon Sep 17 00:00:00 2001 From: Wu Xiaotian Date: Mon, 4 Nov 2019 17:37:08 +0800 Subject: migrate from intltool to gettext --- Makefile.am | 14 +--- backend/comics/Makefile.am | 8 +-- .../comics/comicsdocument.atril-backend.desktop.in | 4 ++ backend/comics/comicsdocument.atril-backend.in | 4 -- backend/djvu/Makefile.am | 8 +-- backend/djvu/djvudocument.atril-backend.desktop.in | 4 ++ backend/djvu/djvudocument.atril-backend.in | 4 -- backend/dvi/Makefile.am | 8 +-- backend/dvi/dvidocument.atril-backend.desktop.in | 4 ++ backend/dvi/dvidocument.atril-backend.in | 4 -- backend/epub/Makefile.am | 13 ++-- backend/epub/epubdocument.atril-backend.desktop.in | 4 ++ backend/epub/epubdocument.atril-backend.in | 4 -- backend/pdf/Makefile.am | 7 +- backend/pdf/pdfdocument.atril-backend.desktop.in | 5 ++ backend/pdf/pdfdocument.atril-backend.in | 5 -- backend/pixbuf/Makefile.am | 8 +-- .../pixbuf/pixbufdocument.atril-backend.desktop.in | 4 ++ backend/pixbuf/pixbufdocument.atril-backend.in | 4 -- backend/ps/Makefile.am | 9 +-- backend/ps/psdocument.atril-backend.desktop.in | 5 ++ backend/ps/psdocument.atril-backend.in | 5 -- backend/tiff/Makefile.am | 8 +-- backend/tiff/tiffdocument.atril-backend.desktop.in | 4 ++ backend/tiff/tiffdocument.atril-backend.in | 4 -- backend/xps/Makefile.am | 8 +-- backend/xps/xpsdocument.atril-backend.desktop.in | 5 ++ backend/xps/xpsdocument.atril-backend.in | 5 -- configure.ac | 7 +- data/Makefile.am | 7 +- data/atril.appdata.xml.in | 6 +- data/atril.desktop.in.in | 6 +- po/Makevars | 79 ++++++++++++++++++++++ po/POTFILES.in | 23 +++---- properties/Makefile.am | 7 +- ...il-properties-page.caja-extension.desktop.in.in | 8 +++ .../libatril-properties-page.caja-extension.in.in | 8 --- 37 files changed, 197 insertions(+), 123 deletions(-) create mode 100644 backend/comics/comicsdocument.atril-backend.desktop.in delete mode 100644 backend/comics/comicsdocument.atril-backend.in create mode 100644 backend/djvu/djvudocument.atril-backend.desktop.in delete mode 100644 backend/djvu/djvudocument.atril-backend.in create mode 100644 backend/dvi/dvidocument.atril-backend.desktop.in delete mode 100644 backend/dvi/dvidocument.atril-backend.in create mode 100644 backend/epub/epubdocument.atril-backend.desktop.in delete mode 100644 backend/epub/epubdocument.atril-backend.in create mode 100644 backend/pdf/pdfdocument.atril-backend.desktop.in delete mode 100644 backend/pdf/pdfdocument.atril-backend.in create mode 100644 backend/pixbuf/pixbufdocument.atril-backend.desktop.in delete mode 100644 backend/pixbuf/pixbufdocument.atril-backend.in create mode 100644 backend/ps/psdocument.atril-backend.desktop.in delete mode 100644 backend/ps/psdocument.atril-backend.in create mode 100644 backend/tiff/tiffdocument.atril-backend.desktop.in delete mode 100644 backend/tiff/tiffdocument.atril-backend.in create mode 100644 backend/xps/xpsdocument.atril-backend.desktop.in delete mode 100644 backend/xps/xpsdocument.atril-backend.in create mode 100644 po/Makevars create mode 100644 properties/libatril-properties-page.caja-extension.desktop.in.in delete mode 100644 properties/libatril-properties-page.caja-extension.in.in diff --git a/Makefile.am b/Makefile.am index f06d0bdb..916d8cf7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,7 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} SUBDIRS = \ + po \ cut-n-paste \ data \ libdocument \ @@ -9,7 +10,6 @@ SUBDIRS = \ libmisc \ properties \ shell \ - po \ help if ENABLE_TESTS @@ -39,24 +39,14 @@ header_DATA = \ $(NULL) # Applications - -intltool_extra = intltool-extract.in intltool-merge.in intltool-update.in - EXTRA_DIST = \ - $(intltool_extra) \ $(header_DATA) \ autogen.sh -DISTCLEANFILES = \ - intltool-extract \ - intltool-merge \ - intltool-update +DISTCLEANFILES = MAINTAINERCLEANFILES = \ ChangeLog \ - intltool-extract \ - intltool-merge \ - intltool-update \ $(srcdir)/INSTALL \ $(srcdir)/aclocal.m4 \ $(srcdir)/autoscan.log \ diff --git a/backend/comics/Makefile.am b/backend/comics/Makefile.am index 99ef5f4d..49821093 100644 --- a/backend/comics/Makefile.am +++ b/backend/comics/Makefile.am @@ -20,13 +20,13 @@ libcomicsdocument_la_LIBADD = \ $(BACKEND_LIBS) \ $(LIB_LIBS) -backend_in_files = comicsdocument.atril-backend.in -backend_DATA = $(backend_in_files:.atril-backend.in=.atril-backend) +backend_in_files = comicsdocument.atril-backend.desktop.in +backend_DATA = $(backend_in_files:.atril-backend.desktop.in=.atril-backend) +$(backend_DATA): $(backend_in_files) + $(AM_V_GEN) $(MSGFMT) --desktop --keyword=TypeDescription --template $< -d $(top_srcdir)/po -o $@ EXTRA_DIST = $(backend_in_files) CLEANFILES = $(backend_DATA) -@EV_INTLTOOL_ATRIL_BACKEND_RULE@ - -include $(top_srcdir)/git.mk diff --git a/backend/comics/comicsdocument.atril-backend.desktop.in b/backend/comics/comicsdocument.atril-backend.desktop.in new file mode 100644 index 00000000..b21c73cf --- /dev/null +++ b/backend/comics/comicsdocument.atril-backend.desktop.in @@ -0,0 +1,4 @@ +[Atril Backend] +Module=comicsdocument +TypeDescription=Comic Books +MimeType=application/x-cbr;application/x-cbz;application/x-cb7;application/x-cbt;application/vnd.comicbook+zip;application/vnd.comicbook-rar; diff --git a/backend/comics/comicsdocument.atril-backend.in b/backend/comics/comicsdocument.atril-backend.in deleted file mode 100644 index a99486b2..00000000 --- a/backend/comics/comicsdocument.atril-backend.in +++ /dev/null @@ -1,4 +0,0 @@ -[Atril Backend] -Module=comicsdocument -_TypeDescription=Comic Books -MimeType=application/x-cbr;application/x-cbz;application/x-cb7;application/x-cbt;application/vnd.comicbook+zip;application/vnd.comicbook-rar; diff --git a/backend/djvu/Makefile.am b/backend/djvu/Makefile.am index f53cdb53..75fde7eb 100644 --- a/backend/djvu/Makefile.am +++ b/backend/djvu/Makefile.am @@ -26,13 +26,13 @@ libdjvudocument_la_LIBADD = \ $(BACKEND_LIBS) \ $(DJVU_LIBS) -backend_in_files = djvudocument.atril-backend.in -backend_DATA = $(backend_in_files:.atril-backend.in=.atril-backend) +backend_in_files = djvudocument.atril-backend.desktop.in +backend_DATA = $(backend_in_files:.atril-backend.desktop.in=.atril-backend) +$(backend_DATA): $(backend_in_files) + $(AM_V_GEN) $(MSGFMT) --desktop --keyword=TypeDescription --template $< -d $(top_srcdir)/po -o $@ EXTRA_DIST = $(backend_in_files) CLEANFILES = $(backend_DATA) -@EV_INTLTOOL_ATRIL_BACKEND_RULE@ - -include $(top_srcdir)/git.mk diff --git a/backend/djvu/djvudocument.atril-backend.desktop.in b/backend/djvu/djvudocument.atril-backend.desktop.in new file mode 100644 index 00000000..2d5f1531 --- /dev/null +++ b/backend/djvu/djvudocument.atril-backend.desktop.in @@ -0,0 +1,4 @@ +[Atril Backend] +Module=djvudocument +TypeDescription=DjVu Documents +MimeType=image/vnd.djvu;image/vnd.djvu+multipage diff --git a/backend/djvu/djvudocument.atril-backend.in b/backend/djvu/djvudocument.atril-backend.in deleted file mode 100644 index 9f97925e..00000000 --- a/backend/djvu/djvudocument.atril-backend.in +++ /dev/null @@ -1,4 +0,0 @@ -[Atril Backend] -Module=djvudocument -_TypeDescription=DjVu Documents -MimeType=image/vnd.djvu;image/vnd.djvu+multipage diff --git a/backend/dvi/Makefile.am b/backend/dvi/Makefile.am index b090f47a..c94c10ad 100644 --- a/backend/dvi/Makefile.am +++ b/backend/dvi/Makefile.am @@ -33,13 +33,13 @@ if WITH_TYPE1_FONTS libdvidocument_la_LIBADD += -lt1 endif -backend_in_files = dvidocument.atril-backend.in -backend_DATA = $(backend_in_files:.atril-backend.in=.atril-backend) +backend_in_files = dvidocument.atril-backend.desktop.in +backend_DATA = $(backend_in_files:.atril-backend.desktop.in=.atril-backend) +$(backend_DATA): $(backend_in_files) + $(AM_V_GEN) $(MSGFMT) --desktop --keyword=TypeDescription --template $< -d $(top_srcdir)/po -o $@ EXTRA_DIST = $(backend_in_files) CLEANFILES = $(backend_DATA) -@EV_INTLTOOL_ATRIL_BACKEND_RULE@ - -include $(top_srcdir)/git.mk diff --git a/backend/dvi/dvidocument.atril-backend.desktop.in b/backend/dvi/dvidocument.atril-backend.desktop.in new file mode 100644 index 00000000..9bfd6f77 --- /dev/null +++ b/backend/dvi/dvidocument.atril-backend.desktop.in @@ -0,0 +1,4 @@ +[Atril Backend] +Module=dvidocument +TypeDescription=DVI Documents +MimeType=application/x-dvi;application/x-bzdvi;application/x-gzdvi diff --git a/backend/dvi/dvidocument.atril-backend.in b/backend/dvi/dvidocument.atril-backend.in deleted file mode 100644 index c60f7adb..00000000 --- a/backend/dvi/dvidocument.atril-backend.in +++ /dev/null @@ -1,4 +0,0 @@ -[Atril Backend] -Module=dvidocument -_TypeDescription=DVI Documents -MimeType=application/x-dvi;application/x-bzdvi;application/x-gzdvi diff --git a/backend/epub/Makefile.am b/backend/epub/Makefile.am index dc34ad2b..c71a320b 100644 --- a/backend/epub/Makefile.am +++ b/backend/epub/Makefile.am @@ -22,16 +22,17 @@ libepubdocument_la_LIBADD = \ $(top_builddir)/libdocument/libatrildocument.la \ minizip/libminizip.la \ $(EPUB_LIBS) \ - $(BACKEND_LIBS) - + $(BACKEND_LIBS) -backend_in_files = epubdocument.atril-backend.in -backend_DATA = $(backend_in_files:.atril-backend.in=.atril-backend) + +backend_in_files = epubdocument.atril-backend.desktop.in +backend_DATA = $(backend_in_files:.atril-backend.desktop.in=.atril-backend) + +$(backend_DATA): $(backend_in_files) + $(AM_V_GEN) $(MSGFMT) --desktop --keyword=TypeDescription --template $< -d $(top_srcdir)/po -o $@ EXTRA_DIST = $(backend_in_files) CLEANFILES = $(backend_DATA) -@EV_INTLTOOL_ATRIL_BACKEND_RULE@ - -include $(top_srcdir)/git.mk diff --git a/backend/epub/epubdocument.atril-backend.desktop.in b/backend/epub/epubdocument.atril-backend.desktop.in new file mode 100644 index 00000000..9c787594 --- /dev/null +++ b/backend/epub/epubdocument.atril-backend.desktop.in @@ -0,0 +1,4 @@ +[Atril Backend] +Module=epubdocument +TypeDescription=epub Documents +MimeType=application/epub+zip; diff --git a/backend/epub/epubdocument.atril-backend.in b/backend/epub/epubdocument.atril-backend.in deleted file mode 100644 index ef7767eb..00000000 --- a/backend/epub/epubdocument.atril-backend.in +++ /dev/null @@ -1,4 +0,0 @@ -[Atril Backend] -Module=epubdocument -_TypeDescription=epub Documents -MimeType=application/epub+zip; diff --git a/backend/pdf/Makefile.am b/backend/pdf/Makefile.am index 8634bb63..e51dfdca 100644 --- a/backend/pdf/Makefile.am +++ b/backend/pdf/Makefile.am @@ -22,13 +22,14 @@ libpdfdocument_la_LIBADD = \ $(CAIRO_PDF_LIBS) \ $(CAIRO_PS_LIBS) -backend_in_files = pdfdocument.atril-backend.in -backend_DATA = $(backend_in_files:.atril-backend.in=.atril-backend) +backend_in_files = pdfdocument.atril-backend.desktop.in +backend_DATA = $(backend_in_files:.atril-backend.desktop.in=.atril-backend) EXTRA_DIST = $(backend_in_files) CLEANFILES = $(backend_DATA) -@EV_INTLTOOL_ATRIL_BACKEND_RULE@ +$(backend_DATA): $(backend_in_files) + $(AM_V_GEN) $(MSGFMT) --desktop --keyword=TypeDescription --template $< -d $(top_srcdir)/po -o $@ -include $(top_srcdir)/git.mk diff --git a/backend/pdf/pdfdocument.atril-backend.desktop.in b/backend/pdf/pdfdocument.atril-backend.desktop.in new file mode 100644 index 00000000..5daca01f --- /dev/null +++ b/backend/pdf/pdfdocument.atril-backend.desktop.in @@ -0,0 +1,5 @@ +[Atril Backend] +Module=pdfdocument +Resident=true +TypeDescription=PDF Documents +MimeType=application/pdf;application/x-bzpdf;application/x-gzpdf;application/x-xzpdf;application/x-ext-pdf; diff --git a/backend/pdf/pdfdocument.atril-backend.in b/backend/pdf/pdfdocument.atril-backend.in deleted file mode 100644 index 017b585d..00000000 --- a/backend/pdf/pdfdocument.atril-backend.in +++ /dev/null @@ -1,5 +0,0 @@ -[Atril Backend] -Module=pdfdocument -Resident=true -_TypeDescription=PDF Documents -MimeType=application/pdf;application/x-bzpdf;application/x-gzpdf;application/x-xzpdf;application/x-ext-pdf; diff --git a/backend/pixbuf/Makefile.am b/backend/pixbuf/Makefile.am index 26b43c51..194c6be5 100644 --- a/backend/pixbuf/Makefile.am +++ b/backend/pixbuf/Makefile.am @@ -18,13 +18,13 @@ libpixbufdocument_la_LIBADD = \ $(top_builddir)/libdocument/libatrildocument.la \ $(BACKEND_LIBS) -backend_in_files = pixbufdocument.atril-backend.in -backend_DATA = $(backend_in_files:.atril-backend.in=.atril-backend) +backend_in_files = pixbufdocument.atril-backend.desktop.in +backend_DATA = $(backend_in_files:.atril-backend.desktop.in=.atril-backend) +$(backend_DATA): $(backend_in_files) + $(AM_V_GEN) $(MSGFMT) --desktop --keyword=TypeDescription --template $< -d $(top_srcdir)/po -o $@ EXTRA_DIST = $(backend_in_files) CLEANFILES = $(backend_DATA) -@EV_INTLTOOL_ATRIL_BACKEND_RULE@ - -include $(top_srcdir)/git.mk diff --git a/backend/pixbuf/pixbufdocument.atril-backend.desktop.in b/backend/pixbuf/pixbufdocument.atril-backend.desktop.in new file mode 100644 index 00000000..b05dd3c7 --- /dev/null +++ b/backend/pixbuf/pixbufdocument.atril-backend.desktop.in @@ -0,0 +1,4 @@ +[Atril Backend] +Module=pixbufdocument +TypeDescription=Images +MimeType=image/*; diff --git a/backend/pixbuf/pixbufdocument.atril-backend.in b/backend/pixbuf/pixbufdocument.atril-backend.in deleted file mode 100644 index 056d04cf..00000000 --- a/backend/pixbuf/pixbufdocument.atril-backend.in +++ /dev/null @@ -1,4 +0,0 @@ -[Atril Backend] -Module=pixbufdocument -_TypeDescription=Images -MimeType=image/*; diff --git a/backend/ps/Makefile.am b/backend/ps/Makefile.am index ba65b5be..0cac11ff 100644 --- a/backend/ps/Makefile.am +++ b/backend/ps/Makefile.am @@ -20,13 +20,14 @@ libpsdocument_la_LIBADD = \ $(BACKEND_LIBS) \ $(SPECTRE_LIBS) -backend_in_files = psdocument.atril-backend.in -backend_DATA = $(backend_in_files:.atril-backend.in=.atril-backend) +backend_in_files = psdocument.atril-backend.desktop.in +backend_DATA = $(backend_in_files:.atril-backend.desktop.in=.atril-backend) + +$(backend_DATA): $(backend_in_files) + $(AM_V_GEN) $(MSGFMT) --desktop --keyword=TypeDescription --template $< -d $(top_srcdir)/po -o $@ EXTRA_DIST = $(backend_in_files) CLEANFILES = $(backend_DATA) -@EV_INTLTOOL_ATRIL_BACKEND_RULE@ - -include $(top_srcdir)/git.mk diff --git a/backend/ps/psdocument.atril-backend.desktop.in b/backend/ps/psdocument.atril-backend.desktop.in new file mode 100644 index 00000000..3b5f99de --- /dev/null +++ b/backend/ps/psdocument.atril-backend.desktop.in @@ -0,0 +1,5 @@ +[Atril Backend] +Module=psdocument +Resident=true +TypeDescription=PostScript Documents +MimeType=application/postscript;application/x-bzpostscript;application/x-gzpostscript;image/x-eps;image/x-bzeps;image/x-gzeps diff --git a/backend/ps/psdocument.atril-backend.in b/backend/ps/psdocument.atril-backend.in deleted file mode 100644 index 8b559a58..00000000 --- a/backend/ps/psdocument.atril-backend.in +++ /dev/null @@ -1,5 +0,0 @@ -[Atril Backend] -Module=psdocument -Resident=true -_TypeDescription=PostScript Documents -MimeType=application/postscript;application/x-bzpostscript;application/x-gzpostscript;image/x-eps;image/x-bzeps;image/x-gzeps diff --git a/backend/tiff/Makefile.am b/backend/tiff/Makefile.am index cdf23450..1be66eca 100644 --- a/backend/tiff/Makefile.am +++ b/backend/tiff/Makefile.am @@ -21,13 +21,13 @@ libtiffdocument_la_LIBADD = \ $(BACKEND_LIBS) \ -ltiff -backend_in_files = tiffdocument.atril-backend.in -backend_DATA = $(backend_in_files:.atril-backend.in=.atril-backend) +backend_in_files = tiffdocument.atril-backend.desktop.in +backend_DATA = $(backend_in_files:.atril-backend.desktop.in=.atril-backend) +$(backend_DATA): $(backend_in_files) + $(AM_V_GEN) $(MSGFMT) --desktop --keyword=TypeDescription --template $< -d $(top_srcdir)/po -o $@ EXTRA_DIST = $(backend_in_files) CLEANFILES = $(backend_DATA) -@EV_INTLTOOL_ATRIL_BACKEND_RULE@ - -include $(top_srcdir)/git.mk diff --git a/backend/tiff/tiffdocument.atril-backend.desktop.in b/backend/tiff/tiffdocument.atril-backend.desktop.in new file mode 100644 index 00000000..ddb60cbf --- /dev/null +++ b/backend/tiff/tiffdocument.atril-backend.desktop.in @@ -0,0 +1,4 @@ +[Atril Backend] +Module=tiffdocument +TypeDescription=Tiff Documents +MimeType=image/tiff diff --git a/backend/tiff/tiffdocument.atril-backend.in b/backend/tiff/tiffdocument.atril-backend.in deleted file mode 100644 index 2866e474..00000000 --- a/backend/tiff/tiffdocument.atril-backend.in +++ /dev/null @@ -1,4 +0,0 @@ -[Atril Backend] -Module=tiffdocument -_TypeDescription=Tiff Documents -MimeType=image/tiff diff --git a/backend/xps/Makefile.am b/backend/xps/Makefile.am index 5fd1c0c1..b0be0664 100644 --- a/backend/xps/Makefile.am +++ b/backend/xps/Makefile.am @@ -19,13 +19,13 @@ libxpsdocument_la_LIBADD = \ $(BACKEND_LIBS) \ $(GXPS_LIBS) -backend_in_files = xpsdocument.atril-backend.in -backend_DATA = $(backend_in_files:.atril-backend.in=.atril-backend) +backend_in_files = xpsdocument.atril-backend.desktop.in +backend_DATA = $(backend_in_files:.atril-backend.desktop.in=.atril-backend) +$(backend_DATA): $(backend_in_files) + $(AM_V_GEN) $(MSGFMT) --desktop --keyword=TypeDescription --template $< -d $(top_srcdir)/po -o $@ EXTRA_DIST = $(backend_in_files) CLEANFILES = $(backend_DATA) -@EV_INTLTOOL_ATRIL_BACKEND_RULE@ - -include $(top_srcdir)/git.mk diff --git a/backend/xps/xpsdocument.atril-backend.desktop.in b/backend/xps/xpsdocument.atril-backend.desktop.in new file mode 100644 index 00000000..1a4e2ad3 --- /dev/null +++ b/backend/xps/xpsdocument.atril-backend.desktop.in @@ -0,0 +1,5 @@ +[Atril Backend] +Module=xpsdocument +Resident=true +TypeDescription=XPS Documents +MimeType=application/oxps;application/vnd.ms-xpsdocument diff --git a/backend/xps/xpsdocument.atril-backend.in b/backend/xps/xpsdocument.atril-backend.in deleted file mode 100644 index 3fca5801..00000000 --- a/backend/xps/xpsdocument.atril-backend.in +++ /dev/null @@ -1,5 +0,0 @@ -[Atril Backend] -Module=xpsdocument -Resident=true -_TypeDescription=XPS Documents -MimeType=application/oxps;application/vnd.ms-xpsdocument diff --git a/configure.ac b/configure.ac index 5ee6d51a..4e317e49 100644 --- a/configure.ac +++ b/configure.ac @@ -68,12 +68,13 @@ dnl FIXME: remove this when required gtk+ >= 2.19.7 DISABLE_DEPRECATED= AC_SUBST([DISABLE_DEPRECATED]) -IT_PROG_INTLTOOL([0.50.1]) +AM_GNU_GETTEXT_VERSION([0.19.8]) +AM_GNU_GETTEXT_REQUIRE_VERSION([0.19.8]) +AM_GNU_GETTEXT([external]) GETTEXT_PACKAGE=atril AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"], [Gettext package]) -AM_GLIB_GNU_GETTEXT m4_pattern_allow([AM_V_GEN])dnl Make autoconf not complain about the rule below EV_INTLTOOL_ATRIL_BACKEND_RULE='%.atril-backend: %.atril-backend.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(AM_V_GEN) LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' @@ -744,7 +745,7 @@ libview/Makefile Makefile po/Makefile.in previewer/Makefile -properties/libatril-properties-page.caja-extension.in +properties/libatril-properties-page.caja-extension.desktop.in properties/Makefile shell/Makefile test/Makefile diff --git a/data/Makefile.am b/data/Makefile.am index c6606d01..de20e8cc 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -21,13 +21,13 @@ ui_DATA = \ # Desktop file # -@INTLTOOL_DESKTOP_RULE@ - DESKTOP_IN_FILES= atril.desktop.in.in DESKTOP_FILES= $(DESKTOP_IN_FILES:.desktop.in.in=.desktop) desktopdir = $(datadir)/applications desktop_DATA = $(DESKTOP_FILES) +$(desktop_DATA): $(DESKTOP_IN_FILES) + $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ # # DBus servide file @@ -44,10 +44,11 @@ endif # # App data file # -@INTLTOOL_XML_NOMERGE_RULE@ appdatadir = $(datadir)/metainfo appdata_in_files = atril.appdata.xml.in appdata_DATA = $(appdata_in_files:.xml.in=.xml) +$(appdata_DATA): $(appdata_in_files) + $(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@ # # GSettings schema diff --git a/data/atril.appdata.xml.in b/data/atril.appdata.xml.in index 3d5b56ff..c54aee98 100644 --- a/data/atril.appdata.xml.in +++ b/data/atril.appdata.xml.in @@ -5,8 +5,8 @@ CC0-1.0 GPL-2.0+ Atril Document Viewer - <_summary>A Document Viewer for the MATE desktop environment - <_description> + A Document Viewer for the MATE desktop environment +

Atril is a simple multi-page document viewer. It can display and print PostScript (PS), Encapsulated PostScript (EPS), DJVU, DVI, @@ -20,7 +20,7 @@ If you would like to know more about MATE and Atril, please visit the project's home page.

- + diff --git a/data/atril.desktop.in.in b/data/atril.desktop.in.in index 0f7fd7b3..e0b85dd8 100644 --- a/data/atril.desktop.in.in +++ b/data/atril.desktop.in.in @@ -1,7 +1,7 @@ [Desktop Entry] -_Name=Atril Document Viewer -_GenericName=Document Viewer -_Comment=View multi-page documents +Name=Atril Document Viewer +GenericName=Document Viewer +Comment=View multi-page documents TryExec=atril Exec=atril %U StartupNotify=true diff --git a/po/Makevars b/po/Makevars new file mode 100644 index 00000000..f32fa197 --- /dev/null +++ b/po/Makevars @@ -0,0 +1,79 @@ +# Makefile variables for PO directory in any package using GNU gettext. + +# Usually the message domain is the same as the package name. +DOMAIN = $(PACKAGE) + +# These two variables depend on the location of this directory. +subdir = po +top_builddir = .. + +# These options get passed to xgettext. +XGETTEXT_OPTIONS = --from-code=UTF-8 --keyword=_ --keyword=N_ --keyword=C_:1c,2 --keyword=NC_:1c,2 --keyword=g_dngettext:2,3 --keyword=Description --keyword=TypeDescription --add-comments=Translators: + +# This is the copyright holder that gets inserted into the header of the +# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding +# package. (Note that the msgstr strings, extracted from the package's +# sources, belong to the copyright holder of the package.) Translators are +# expected to transfer the copyright for their translations to this person +# or entity, or to disclaim their copyright. The empty string stands for +# the public domain; in this case the translators are expected to disclaim +# their copyright. +COPYRIGHT_HOLDER = MATE Desktop Environment team + +# This tells whether or not to prepend "GNU " prefix to the package +# name that gets inserted into the header of the $(DOMAIN).pot file. +# Possible values are "yes", "no", or empty. If it is empty, try to +# detect it automatically by scanning the files in $(top_srcdir) for +# "GNU packagename" string. +PACKAGE_GNU = + +# This is the email address or URL to which the translators shall report +# bugs in the untranslated strings: +# - Strings which are not entire sentences, see the maintainer guidelines +# in the GNU gettext documentation, section 'Preparing Strings'. +# - Strings which use unclear terms or require additional context to be +# understood. +# - Strings which make invalid assumptions about notation of date, time or +# money. +# - Pluralisation problems. +# - Incorrect English spelling. +# - Incorrect formatting. +# It can be your email address, or a mailing list address where translators +# can write to without being subscribed, or the URL of a web page through +# which the translators can contact you. +MSGID_BUGS_ADDRESS = + +# This is the list of locale categories, beyond LC_MESSAGES, for which the +# message catalogs shall be used. It is usually empty. +EXTRA_LOCALE_CATEGORIES = + +# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt' +# context. Possible values are "yes" and "no". Set this to yes if the +# package uses functions taking also a message context, like pgettext(), or +# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument. +USE_MSGCTXT = no + +# These options get passed to msgmerge. +# Useful options are in particular: +# --previous to keep previous msgids of translated messages, +# --quiet to reduce the verbosity. +MSGMERGE_OPTIONS = + +# These options get passed to msginit. +# If you want to disable line wrapping when writing PO files, add +# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and +# MSGINIT_OPTIONS. +MSGINIT_OPTIONS = + +# This tells whether or not to regenerate a PO file when $(DOMAIN).pot +# has changed. Possible values are "yes" and "no". Set this to no if +# the POT file is checked in the repository and the version control +# program ignores timestamps. +PO_DEPENDS_ON_POT = yes + +# This tells whether or not to forcibly update $(DOMAIN).pot and +# regenerate PO files on "make dist". Possible values are "yes" and +# "no". Set this to no if the POT file and PO files are maintained +# externally. +DIST_DEPENDS_ON_UPDATE_PO = yes +$(DOMAIN).pot-update: export GETTEXTDATADIRS = $(top_srcdir) diff --git a/po/POTFILES.in b/po/POTFILES.in index 694d5dc9..b9c91457 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,22 +1,21 @@ # List of source files containing translatable strings. # Please keep this file sorted alphabetically. -[encoding: UTF-8] backend/comics/comics-document.c -[type: gettext/ini] backend/comics/comicsdocument.atril-backend.in +backend/comics/comicsdocument.atril-backend.desktop.in backend/djvu/djvu-document.c -[type: gettext/ini] backend/djvu/djvudocument.atril-backend.in +backend/djvu/djvudocument.atril-backend.desktop.in backend/dvi/dvi-document.c -[type: gettext/ini] backend/dvi/dvidocument.atril-backend.in +backend/dvi/dvidocument.atril-backend.desktop.in backend/epub/epub-document.c -[type: gettext/ini] backend/epub/epubdocument.atril-backend.in +backend/epub/epubdocument.atril-backend.desktop.in backend/pdf/ev-poppler.cc -[type: gettext/ini] backend/pdf/pdfdocument.atril-backend.in -[type: gettext/ini] backend/pixbuf/pixbufdocument.atril-backend.in +backend/pdf/pdfdocument.atril-backend.desktop.in +backend/pixbuf/pixbufdocument.atril-backend.desktop.in backend/ps/ev-spectre.c -[type: gettext/ini] backend/ps/psdocument.atril-backend.in +backend/ps/psdocument.atril-backend.desktop.in backend/tiff/tiff-document.c -[type: gettext/ini] backend/tiff/tiffdocument.atril-backend.in -[type: gettext/ini] backend/xps/xpsdocument.atril-backend.in +backend/tiff/tiffdocument.atril-backend.desktop.in +backend/xps/xpsdocument.atril-backend.desktop.in libdocument/ev-attachment.c libdocument/ev-document-factory.c libdocument/ev-file-helpers.c @@ -27,12 +26,12 @@ cut-n-paste/toolbar-editor/egg-toolbar-editor.c cut-n-paste/zoom-control/ephy-zoom.h data/atril.appdata.xml.in data/atril.desktop.in.in -[type: gettext/gsettings]data/org.mate.Atril.gschema.xml +data/org.mate.Atril.gschema.xml previewer/ev-previewer.c previewer/ev-previewer-window.c properties/ev-properties-main.c properties/ev-properties-view.c -[type: gettext/ini]properties/libatril-properties-page.caja-extension.in +properties/libatril-properties-page.caja-extension.desktop.in libmisc/ev-page-action.c libmisc/ev-page-action-widget.c libview/ev-print-operation.c diff --git a/properties/Makefile.am b/properties/Makefile.am index b0b46659..a3cb40fb 100644 --- a/properties/Makefile.am +++ b/properties/Makefile.am @@ -31,9 +31,10 @@ libatril_properties_page_la_LIBADD = \ libatril_properties_page_la_LDFLAGS = -module -avoid-version -no-undefined extensiondir = $(datadir)/caja/extensions -extension_in_files = libatril-properties-page.caja-extension.in -extension_DATA = $(extension_in_files:.caja-extension.in=.caja-extension) -%.caja-extension: %.caja-extension.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(AM_V_GEN) LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@ +extension_in_files = libatril-properties-page.caja-extension.desktop.in +extension_DATA = $(extension_in_files:.caja-extension.desktop.in=.caja-extension) +$(extension_DATA): $(extension_in_files) + $(AM_V_GEN) $(MSGFMT) --desktop --keyword=Description --template $< -d $(top_srcdir)/po -o $@ EXTRA_DIST = $(extension_in_files) diff --git a/properties/libatril-properties-page.caja-extension.desktop.in.in b/properties/libatril-properties-page.caja-extension.desktop.in.in new file mode 100644 index 00000000..6a45fa97 --- /dev/null +++ b/properties/libatril-properties-page.caja-extension.desktop.in.in @@ -0,0 +1,8 @@ +[Caja Extension] +Icon=atril +Name=Atril properties +Description=Shows details for Atril documents +Version=@VERSION@ +Author=Andrew Sobala ;Bastien Nocera +Website=https://mate-desktop.org/ +Copyright=Copyright (C) 2000, 2001 Eazel Inc.\nCopyright (C) 2003 Andrew Sobala \nCopyright (C) 2005 Bastien Nocera \nCopyright (C) 2005 Red Hat, Inc\nCopyright (C) 2012–2018 The MATE developers diff --git a/properties/libatril-properties-page.caja-extension.in.in b/properties/libatril-properties-page.caja-extension.in.in deleted file mode 100644 index 059da2d4..00000000 --- a/properties/libatril-properties-page.caja-extension.in.in +++ /dev/null @@ -1,8 +0,0 @@ -[Caja Extension] -Icon=atril -_Name=Atril properties -_Description=Shows details for Atril documents -Version=@VERSION@ -Author=Andrew Sobala ;Bastien Nocera -Website=https://mate-desktop.org/ -Copyright=Copyright (C) 2000, 2001 Eazel Inc.\nCopyright (C) 2003 Andrew Sobala \nCopyright (C) 2005 Bastien Nocera \nCopyright (C) 2005 Red Hat, Inc\nCopyright (C) 2012–2018 The MATE developers -- cgit v1.2.1