diff options
| -rw-r--r-- | Makefile.am | 12 | ||||
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | data/Makefile.am | 7 | ||||
| -rw-r--r-- | data/libcaja-user-share.caja-extension.in.in | 4 | ||||
| -rw-r--r-- | data/mate-user-share-obexftp.desktop.in.in | 4 | ||||
| -rw-r--r-- | data/mate-user-share-obexpush.desktop.in.in | 4 | ||||
| -rw-r--r-- | data/mate-user-share-properties.desktop.in | 4 | ||||
| -rw-r--r-- | data/mate-user-share-webdav.desktop.in.in | 4 | ||||
| -rw-r--r-- | po/Makevars | 78 | ||||
| -rw-r--r-- | po/POTFILES.in | 4 |
10 files changed, 99 insertions, 28 deletions
diff --git a/Makefile.am b/Makefile.am index 14b07ce..5491be7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,17 +1,9 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} -SUBDIRS = data po src man help +SUBDIRS = po data src man help EXTRA_DIST = \ - autogen.sh \ - intltool-extract.in \ - intltool-merge.in \ - intltool-update.in - -DISTCLEANFILES = \ - intltool-extract \ - intltool-merge \ - intltool-update + autogen.sh DISTCHECK_CONFIGURE_FLAGS = --disable-schemas-compile \ --with-cajadir='$${libdir}/caja/extensions-2.0-distcheck' \ diff --git a/configure.ac b/configure.ac index b23dd06..162081c 100644 --- a/configure.ac +++ b/configure.ac @@ -11,8 +11,6 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) AM_SANITY_CHECK AM_MAINTAINER_MODE -IT_PROG_INTLTOOL([0.35.0]) - YELP_HELP_INIT AC_C_CONST @@ -113,8 +111,8 @@ dnl ========================================================================== GETTEXT_PACKAGE=mate-user-share AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],"$GETTEXT_PACKAGE", [The gettext package]) - -AM_GLIB_GNU_GETTEXT +AM_GNU_GETTEXT_VERSION([0.19.8]) +AM_GNU_GETTEXT([external]) dnl ========================================================================== dnl Check for SELinux diff --git a/data/Makefile.am b/data/Makefile.am index 157ed16..eda2d4f 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,6 +1,8 @@ SUBDIRS = icons -@INTLTOOL_DESKTOP_RULE@ +%.desktop: %.desktop.in + $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ + desktopdir = $(datadir)/applications desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) desktop_in_files = mate-user-share-properties.desktop.in @@ -18,7 +20,8 @@ gsettings_SCHEMAS = org.mate.FileSharing.gschema.xml extensiondir = $(datadir)/caja/extensions extension_in_files = libcaja-user-share.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 $< $@ +%.caja-extension: %.caja-extension.in + $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ EXTRA_DIST = $(gsettings_SCHEMAS) \ $(app_DATA) \ diff --git a/data/libcaja-user-share.caja-extension.in.in b/data/libcaja-user-share.caja-extension.in.in index 543c968..a5942da 100644 --- a/data/libcaja-user-share.caja-extension.in.in +++ b/data/libcaja-user-share.caja-extension.in.in @@ -1,7 +1,7 @@ [Caja Extension] Icon=user-share -_Name=User Share -_Description=Integrates with user-share +Name=User Share +Description=Integrates with user-share Copyright=Copyright (C) 2005 William Jon McCann <[email protected]> Version=@VERSION@ Website=https://mate-desktop.org/ diff --git a/data/mate-user-share-obexftp.desktop.in.in b/data/mate-user-share-obexftp.desktop.in.in index 1cafcad..844c758 100644 --- a/data/mate-user-share-obexftp.desktop.in.in +++ b/data/mate-user-share-obexftp.desktop.in.in @@ -1,6 +1,6 @@ [Desktop Entry] -_Name=Personal File Sharing obexftp -_Comment=Launch Personal File Sharing if enabled +Name=Personal File Sharing obexftp +Comment=Launch Personal File Sharing if enabled Keywords=share;files;bluetooth;obex;http;network;copy;send; AutostartCondition=GSettings org.mate.FileSharing bluetooth-enabled Icon=folder-remote diff --git a/data/mate-user-share-obexpush.desktop.in.in b/data/mate-user-share-obexpush.desktop.in.in index 7436c28..b6066f4 100644 --- a/data/mate-user-share-obexpush.desktop.in.in +++ b/data/mate-user-share-obexpush.desktop.in.in @@ -1,6 +1,6 @@ [Desktop Entry] -_Name=Personal File Sharing obexpush -_Comment=Launch Personal File Sharing if enabled +Name=Personal File Sharing obexpush +Comment=Launch Personal File Sharing if enabled Keywords=share;files;bluetooth;obex;http;network;copy;send; AutostartCondition=GSettings org.mate.FileSharing bluetooth-obexpush-enabled Icon=folder-remote diff --git a/data/mate-user-share-properties.desktop.in b/data/mate-user-share-properties.desktop.in index 858afa3..317a60f 100644 --- a/data/mate-user-share-properties.desktop.in +++ b/data/mate-user-share-properties.desktop.in @@ -1,6 +1,6 @@ [Desktop Entry] -_Name=Personal File Sharing -_Comment=Preferences for sharing of files +Name=Personal File Sharing +Comment=Preferences for sharing of files Exec=mate-file-share-properties Icon=folder-remote StartupNotify=true diff --git a/data/mate-user-share-webdav.desktop.in.in b/data/mate-user-share-webdav.desktop.in.in index feb3cd9..9384c58 100644 --- a/data/mate-user-share-webdav.desktop.in.in +++ b/data/mate-user-share-webdav.desktop.in.in @@ -1,6 +1,6 @@ [Desktop Entry] -_Name=Personal File Sharing webdav -_Comment=Launch Personal File Sharing if enabled +Name=Personal File Sharing webdav +Comment=Launch Personal File Sharing if enabled Keywords=share;files;bluetooth;obex;http;network;copy;send; AutostartCondition=GSettings org.mate.FileSharing enabled Icon=folder-remote diff --git a/po/Makevars b/po/Makevars new file mode 100644 index 0000000..5c3836c --- /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 --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 = 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 diff --git a/po/POTFILES.in b/po/POTFILES.in index 6830b85..6fc2110 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,7 +1,7 @@ # List of source files containing translatable strings. # Please keep this file sorted alphabetically. -[type: gettext/glade]data/file-share-properties.ui -[type: gettext/ini]data/libcaja-user-share.caja-extension.in.in +data/file-share-properties.ui +data/libcaja-user-share.caja-extension.in.in data/mate-user-share-properties.desktop.in data/mate-user-share-obexftp.desktop.in.in data/mate-user-share-obexpush.desktop.in.in |