From 0f1279cf3913cef879c4ca458bc10a1278f35e90 Mon Sep 17 00:00:00 2001 From: madmurphy Date: Thu, 27 May 2021 00:49:18 +0200 Subject: [PATCH] Commit #7: internationalization does not depend on intltool anymore, but only on GNU gettext --- ChangeLog | 8 +++++ Makefile.am | 42 ++++++++--------------- NEWS | 13 +++++++ README | 39 ++++++++------------- bootstrap | 41 +++++++++++++++++----- configure.ac | 44 ++++++++++++++++-------- package.json | 6 ++-- po/Makevars | 83 +++++++++++++++++++++++++++++++++++++++++++++ po/it.po | 41 +++++++++++----------- src/nautilus-hide.c | 9 +---- 10 files changed, 218 insertions(+), 108 deletions(-) create mode 100644 po/Makevars diff --git a/ChangeLog b/ChangeLog index bbea1d3..44ad38f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,14 @@ Change Log ========== +## 0.2.4 (2021-05-27) + +Changes: + +* Internationalization does not depend on **XDG intltool** anymore, but only on + **GNU gettext** + + ## 0.2.3 (2021-05-24) Changes: diff --git a/Makefile.am b/Makefile.am index 3f56a6e..9ff1dcd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,6 +3,8 @@ ACLOCAL_AMFLAGS = -I m4 +AM_DISTCHECK_CONFIGURE_FLAGS = --without-nautilus-libdir + SUBDIRS = \ src @@ -13,11 +15,6 @@ dist_doc_DATA = \ NEWS \ README -INTLTOOL_FILES = \ - intltool-extract.in \ - intltool-merge.in \ - intltool-update.in - EXTRA_DIST = \ ChangeLog.md \ INSTALL \ @@ -25,19 +22,7 @@ EXTRA_DIST = \ README.md \ bootstrap \ package.json \ - .editorconfig \ - $(INTLTOOL_FILES) - -DISTCLEANFILES = \ - intltool-extract \ - intltool-merge \ - intltool-update \ - po/.intltool-merge-cache - - -# Shell expansion is supported here -_distclean_dirs_ = \ - 'po/backups' + .editorconfig if NLS_ENABLED @@ -53,9 +38,14 @@ EXTRA_DIST += \ endif !NLS_ENABLED -# Remove doc directory on uninstall +# Shell expansion is supported here +_distclean_dirs_ = \ + 'po/backups' + + +# Remove `$(docdir)` directory on uninstall uninstall-local: - -rm -r '$(DESTDIR)$(docdir)' + -rm -r '$(DESTDIR)$(docdir)'; distclean-local: @@ -65,13 +55,11 @@ distclean-local: # Update translations .PHONY: i18n-update i18n-update: - (cd 'po' && intltool-update -p --gettext-package='$(PACKAGE_TARNAME)' \ - && mkdir -p 'backups' && grep -o '^\s*\w\S\+' 'LINGUAS' | while read \ - coin; do mv "$${coin}.po" "$${coin}.po.bak" && msgmerge \ - "$${coin}.po.bak" '$(PACKAGE_TARNAME).pot' > "$${coin}.po" && mv \ - "$${coin}.po.bak" 'backups' && sed -i \ - 's/"Project-Id-Version:\s*\([0-9]\+\(\.[0-9]\+\(\.[0-9]\)\?\)\?\)\?\+\\n"/"Project-Id-Version: @PACKAGE_VERSION@\\n"/' \ - "$${coin}.po"; done; rm '$(PACKAGE_TARNAME).pot') + $(MKDIR_P) 'po/backups' && $(GREP) -o '^\s*\w\S\+' 'po/LINGUAS' | \ + while read _i_; do cp "po/$${_i_}.po" "po/backups/$${_i_}.po.bak" && \ + $(MAKE) -C 'po' "$${_i_}.po" && sed -i \ + 's/"Project-Id-Version:.*$$/"Project-Id-Version: @PACKAGE_VERSION@\\n"/' \ + "po/$${_i_}.po"; done; # EOF diff --git a/NEWS b/NEWS index fa9a8f0..8def207 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,19 @@ NEWS ==== +## 0.2.4 + +Changes: + +* Internationalization does not depend on **XDG intltool** anymore, but only on + **GNU gettext** + + +## 0.2.0 + +* The extension now checks for the database of hidden files' read/write access + + ## 0.1.0 **Nautilus Hide** has been published. diff --git a/README b/README index a7a72c1..b6e60ec 100644 --- a/README +++ b/README @@ -25,46 +25,35 @@ Get involved The package needs help with internationalization. If a translation into your language is missing and you wish to get involved, here is what to do. -Let's say you want to create a Dutch translation of **Nautilus Hide**. This -package comes with only a bunch of strings to translate, whose most important -ones are: +Let's say you want to create a Dutch translation of **Nautilus Hide** (`nl`). +This package comes with only a bunch of strings to translate, whose most +important ones are: 1. “Hide file(s)” 2. “Hide the selected file(s)” 3. “Unhide file(s)” 4. “Unhide the selected file(s)” -Other translatable strings are only debug messages sent to the error stream and -can be left untraslated. +Other translatable strings are only debug messages and can be left untraslated. -First thing to do is to make sure that `gettext` and `intltool` are installed -on your system. Then clone this repository and launch the following four -commands: +First thing to do is to make sure that **GNU Autotools** and **GNU gettext** +are installed on your system. Then clone this repository and launch the +following commands: ``` sh -cd nautilus-hide/po -intltool-update -p --gettext-package=nautilus-hide -msginit -l nl -rm nautilus-hide.pot +./bootstrap +make -C po nautilus-hide.pot +(cd po && msginit -l nl) +./bootstrap --clean ``` Now edit the `po/LINGUAS` file and add a new line containing the abbreviated name of the new language (`nl`). -Finally, open the `po/nl.po` file and translate the strings above. All you have -to do now is to commit your changes. +Finally, open the file `po/nl.po` and translate the two strings above. All you +have to do now is to commit your changes. -If you want to update an existing Dutch translation to the most recent changes -in the extension source code, launch - -``` sh -cd nautilus-hide/po -intltool-update -p --gettext-package=nautilus-hide -mv nl.po nl.po.bak && msgmerge nl.po.bak nautilus-hide.pot > nl.po -rm nautilus-hide.pot nl.po.bak -``` - -For any issue, [drop me a message][1]. +For any issue, [drop a message][1]. NExtGen diff --git a/bootstrap b/bootstrap index ee6ead0..7f65dd8 100755 --- a/bootstrap +++ b/bootstrap @@ -1,3 +1,4 @@ + #!/bin/bash # Run this to generate all the initial makefiles, etc. @@ -41,7 +42,13 @@ if test "${CLEANONLY}" -ne 0; then echo 'Cleaning package...' test -f 'Makefile' && make maintainer-clean rm -Rf autom4te.cache m4 build-aux no-dist `find . -type d -name .deps` - rm -f aclocal.m4 compile config.* configure configure~ depcomp install-sh libtool ltmain.sh missing intltool-* `find . -name Makefile.in` + rm -f *'~' 'ABOUT-NLS' 'aclocal.m4' 'compile' 'config'.* 'configure' \ + 'depcomp' 'install-sh' 'intltool-*' 'libtool' 'ltmain.sh' \ + 'missing' `find . -name Makefile.in` 'po/boldquot.sed' \ + 'po/en@boldquot.header' 'po/en@quot.header' \ + 'po/insert-header.sin' 'po/'*'~' 'po/Makefile.in.in' \ + 'po/Makevars.template' 'po/quot.sed' 'po/remove-potcdate.sin' \ + 'po/Rules-quot' echo 'Done' exit 0 fi @@ -64,7 +71,8 @@ test -f "${srcdir}/configure.ac" || { autoconf --version < /dev/null > /dev/null 2>&1 || { echo echo '**Error**: You must have `autoconf` installed. Download the appropriate package' - echo 'for your distribution, or get the source tarball at ftp://ftp.gnu.org/pub/gnu/' + echo 'for your distribution, or get the source tarball at' + echo 'https://www.gnu.org/software/autoconf/' echo DIE=1 } >&2 @@ -73,7 +81,7 @@ if grep "^IT_PROG_INTLTOOL" "${srcdir}/configure.ac" >/dev/null; then intltoolize --version < /dev/null > /dev/null 2>&1 || { echo echo '**Error**: You must have `intltool` installed. You can get it from' - echo 'ftp://ftp.gnome.org/pub/GNOME/' + echo 'https://freedesktop.org/wiki/Software/intltool/' echo DIE=1 } >&2 @@ -82,8 +90,8 @@ fi if grep "^AM_PROG_XML_I18N_TOOLS" "${srcdir}/configure.ac" >/dev/null; then xml-i18n-toolize --version < /dev/null > /dev/null 2>&1 || { echo - echo '**Error**: You must have `xml-i18n-toolize` installed. You can get it from' - echo 'ftp://ftp.gnome.org/pub/GNOME/' + echo '**Error**: You must have `xml-i18n-tools` installed. You can get it from' + echo 'https://download.gnome.org/sources/xml-i18n-tools/' echo DIE=1 } >&2 @@ -110,7 +118,18 @@ if grep "^LT_INIT" "${srcdir}/configure.ac" >/dev/null; then ("${LIBTOOL}" --version) < /dev/null > /dev/null 2>&1 || { echo echo '**Error**: You must have `libtool` installed. You can get it from' - echo 'ftp://ftp.gnu.org/pub/gnu/' + echo 'https://www.gnu.org/software/libtool/' + echo + DIE=1 + } >&2 +fi + +if grep "^AM_GNU_GETTEXT" "${srcdir}/configure.ac" >/dev/null; then + grep "sed.*POTFILES" "${srcdir}/configure.ac" > /dev/null || \ + gettextize --version < /dev/null > /dev/null 2>&1 || { + echo + echo '**Error**: You must have `gettext` installed. You can get it from' + echo 'https://www.gnu.org/software/gettext/' echo DIE=1 } >&2 @@ -121,7 +140,7 @@ if grep "^AM_GLIB_GNU_GETTEXT" "${srcdir}/configure.ac" >/dev/null; then glib-gettextize --version < /dev/null > /dev/null 2>&1 || { echo echo '**Error**: You must have `glib` installed. You can get it from' - echo 'ftp://ftp.gtk.org/pub/gtk' + echo 'https://download.gnome.org/sources/glib/' echo DIE=1 } >&2 @@ -130,7 +149,7 @@ fi (automake --version) < /dev/null > /dev/null 2>&1 || { echo echo '**Error**: You must have `automake` installed. You can get it from' - echo 'ftp://ftp.gnu.org/pub/gnu/' + echo 'https://www.gnu.org/software/automake/' echo DIE=1 NO_AUTOMAKE=yes @@ -141,7 +160,7 @@ fi test -n "${NO_AUTOMAKE}" || (aclocal --version) < /dev/null > /dev/null 2>&1 || { echo echo '**Error**: Missing `aclocal`. The version of `automake` installed doesn'\''t appear' - echo 'recent enough. You can get automake from ftp://ftp.gnu.org/pub/gnu/' + echo 'recent enough. You can get automake from https://www.gnu.org/software/automake/' echo DIE=1 } >&2 @@ -193,6 +212,10 @@ for coin in `find "${srcdir}" -path "${srcdir}/CVS" -prune -o -name configure.ac aclocalinclude="${ACLOCAL_FLAGS}" [[ -d 'm4' ]] || mkdir 'm4' + if grep "^AM_GNU_GETTEXT" configure.ac >/dev/null; then + echo 'Running autopoint...' + autopoint --force + fi if grep "^AM_GLIB_GNU_GETTEXT" configure.ac >/dev/null; then echo "Creating ${dr}/aclocal.m4..." test -r "${dr}/aclocal.m4" || touch "${dr}/aclocal.m4" diff --git a/configure.ac b/configure.ac index 52e6f39..0c5a181 100644 --- a/configure.ac +++ b/configure.ac @@ -1,15 +1,15 @@ dnl Process this file with autoconf to produce a configure script. -dnl *************************************************************************** +dnl ************************************************************************** dnl A U T O C O N F E N V I R O N M E N T -dnl *************************************************************************** +dnl ************************************************************************** AC_PREREQ([2.69]) AC_INIT([Nautilus Hide], - [0.2.3], + [0.2.4], [madmurphy333@gmail.com], [nautilus-hide], [https://gitlab.gnome.org/madmurphy/nautilus-hide]) @@ -32,6 +32,8 @@ AM_SILENT_RULES([yes]) AC_PROG_CC +AC_PROG_GREP + PKG_CHECK_MODULES([NAUTILUS_HIDE], [glib-2.0 libnautilus-extension]) AC_CHECK_PROG([HAVE_PKGCONFIG], [pkg-config], [yes], [no]) @@ -40,12 +42,13 @@ AS_IF([test "x${HAVE_PKGCONFIG}" = xno], [AC_MSG_ERROR([you need to have pkgconfig installed!])]) -dnl *************************************************************************** +dnl ************************************************************************** dnl I N T E R N A T I O N A L I Z A T I O N -dnl *************************************************************************** +dnl ************************************************************************** +AM_GNU_GETTEXT([external]) -IT_PROG_INTLTOOL([0.35.0]) +AM_GNU_GETTEXT_VERSION([0.21]) AM_CONDITIONAL([NLS_ENABLED], [test "x${USE_NLS}" != xno]) @@ -53,20 +56,31 @@ AM_COND_IF([NLS_ENABLED], [ AC_SUBST([GETTEXT_PACKAGE], AC_PACKAGE_TARNAME) AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["${GETTEXT_PACKAGE}"], [GETTEXT package name]) - AM_GLIB_GNU_GETTEXT - AM_GLIB_DEFINE_LOCALEDIR([NAUTILUS_HIDE_LOCALEDIR]) ]) -dnl *************************************************************************** +dnl ************************************************************************** dnl F I N A L I Z A T I O N -dnl *************************************************************************** - +dnl ************************************************************************** + +AC_ARG_WITH([nautilus-libdir], + [AS_HELP_STRING([--without-nautilus-libdir], + [ignore the variable used by libnautilus-extension and + and use the current instead @<:@default=no@:>@])], + [:], + [AS_VAR_SET([with_nautilus_libdir], ['yes'])]) + +AS_IF([test "x${with_nautilus_libdir}" = xno], + [AS_VAR_SET([NAUTILUS_EXTENSION_DIR], m4_normalize(["$( + "${PKG_CONFIG}" --define-variable='libdir=${libdir}' + --variable=extensiondir libnautilus-extension + )"]))], + [AS_VAR_SET([NAUTILUS_EXTENSION_DIR], m4_normalize(["$( + "${PKG_CONFIG}" --variable=extensiondir libnautilus-extension + )"]))]) + +AC_SUBST([NAUTILUS_EXTENSION_DIR]) -AC_SUBST([NAUTILUS_EXTENSION_DIR], m4_normalize(["$( - "${PKG_CONFIG}" --define-variable='libdir=${libdir}' - --variable=extensiondir libnautilus-extension -)"])) LT_INIT([disable-static]) diff --git a/package.json b/package.json index 0d6230a..56f5aac 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nautilus-hide", - "version": "0.2.3", + "version": "0.2.4", "description": "A simple Nautilus extension that adds \"Hide\" and \"Unhide\" to Nautilus right-click menu", "homepage": "https://gitlab.gnome.org/madmurphy/nautilus-hide", "author": "madmurphy333@gmail.com", @@ -14,8 +14,8 @@ "libnautilus-extension": "*", }, "devDependencies": { - "pkgconf": "*", - "intltool": "*" + "gettext": "*", + "pkgconf": "*" }, "src": [ "src/nautilus-hide.c" diff --git a/po/Makevars b/po/Makevars new file mode 100644 index 0000000..f0d7051 --- /dev/null +++ b/po/Makevars @@ -0,0 +1,83 @@ +# Makefile variables for PO directory in any package using GNU gettext. +# +# Copyright (C) 2003-2019 Free Software Foundation, Inc. +# This file is free software; the Free Software Foundation gives +# unlimited permission to use, copy, distribute, and modify it. + +# 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 = $(PACKAGE_BUGREPORT) + +# 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 = $(PACKAGE_BUGREPORT) + +# 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 = --previous + +# 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/it.po b/po/it.po index 206c3f9..844b916 100644 --- a/po/it.po +++ b/po/it.po @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: 0.2.3\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-05-24 11:52+0200\n" +"Project-Id-Version: 0.2.4\n" +"Report-Msgid-Bugs-To: madmurphy333@gmail.com\n" +"POT-Creation-Date: 2021-05-26 23:06+0200\n" "PO-Revision-Date: 2021-05-24 11:52+0200\n" "Last-Translator: FULL NAME \n" "Language-Team: Italian \n" @@ -17,37 +17,36 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../src/nautilus-hide.c:119 +#: src/nautilus-hide.c:112 msgid "Could not close the database of hidden files" msgstr "Impossibile chiudere il database dei file nascosti" -#: ../src/nautilus-hide.c:136 ../src/nautilus-hide.c:149 -#: ../src/nautilus-hide.c:159 ../src/nautilus-hide.c:252 -#: ../src/nautilus-hide.c:300 +#: src/nautilus-hide.c:129 src/nautilus-hide.c:142 src/nautilus-hide.c:152 +#: src/nautilus-hide.c:245 src/nautilus-hide.c:293 msgid "Error allocating memory" msgstr "Errore nell'allocare memoria" -#: ../src/nautilus-hide.c:209 +#: src/nautilus-hide.c:202 msgid "Error attempting to access the database of hidden files" msgstr "Impossibile accedere al database dei file nascosti" -#: ../src/nautilus-hide.c:226 +#: src/nautilus-hide.c:219 msgid "Could not calculate the size of the database of hidden files" msgstr "Impossibile calcolare le dimensioni del database dei file nascosti" -#: ../src/nautilus-hide.c:239 +#: src/nautilus-hide.c:232 msgid "Database of hidden files is too big" msgstr "Il database dei file nascosti è troppo grande" -#: ../src/nautilus-hide.c:264 +#: src/nautilus-hide.c:257 msgid "I/O error while accessing database of hidden files" msgstr "Errore I/O nell'accedere al database dei file nascosti" -#: ../src/nautilus-hide.c:440 +#: src/nautilus-hide.c:433 msgid "No files have been selected to be hidden" msgstr "Non ci sono file selezionati da nascondere" -#: ../src/nautilus-hide.c:453 +#: src/nautilus-hide.c:446 msgid "" "Could not hide the selected files, error attempting to group them according " "to their parent directories" @@ -55,18 +54,18 @@ msgstr "" "Impossibile nascondere i file selezionati, errore nel tentativo di " "raggrupparli in base alla loro directory di appartenenza" -#: ../src/nautilus-hide.c:481 +#: src/nautilus-hide.c:474 msgid "" "Could not hide the selected files, error attempting to edit the database" msgstr "" "Impossibile nascondere i file selezionati, errore nel tentativo di " "modificare il database" -#: ../src/nautilus-hide.c:606 +#: src/nautilus-hide.c:599 msgid "No files have been selected to be unhidden" msgstr "Non ci sono file selezionati da rendere visibili" -#: ../src/nautilus-hide.c:619 +#: src/nautilus-hide.c:612 msgid "" "Could not unhide the selected files, error attempting to group them " "according to their parent directories" @@ -74,32 +73,32 @@ msgstr "" "Impossibile rendere visibili i file selezionati, errore nel tentativo di " "raggrupparli in base alla loro directory di appartenenza" -#: ../src/nautilus-hide.c:659 +#: src/nautilus-hide.c:652 msgid "" "Could not unhide the selected files, error attempting to edit the database" msgstr "" "Impossibile rendere visibili i file selezionati, errore nel tentativo di " "modificare il database" -#: ../src/nautilus-hide.c:918 +#: src/nautilus-hide.c:911 msgid "_Hide file" msgid_plural "_Hide files" msgstr[0] "_Nascondi" msgstr[1] "_Nascondi i file" -#: ../src/nautilus-hide.c:924 +#: src/nautilus-hide.c:917 msgid "Hide the selected file" msgid_plural "Hide the selected files" msgstr[0] "Nascondi il file selezionato" msgstr[1] "Nascondi i file selezionati" -#: ../src/nautilus-hide.c:957 +#: src/nautilus-hide.c:950 msgid "_Unhide file" msgid_plural "_Unhide files" msgstr[0] "Ripristina _visibilità" msgstr[1] "Ripristina _visibilità dei file" -#: ../src/nautilus-hide.c:963 +#: src/nautilus-hide.c:956 msgid "Unhide the selected file" msgid_plural "Unhide the selected files" msgstr[0] "Rendi visibile il file selezionato" diff --git a/src/nautilus-hide.c b/src/nautilus-hide.c index 9a5df73..20ce10c 100644 --- a/src/nautilus-hide.c +++ b/src/nautilus-hide.c @@ -49,10 +49,9 @@ #ifdef ENABLE_NLS -#include #include #define I18N_INIT() \ - bindtextdomain(GETTEXT_PACKAGE, NAUTILUS_HIDE_LOCALEDIR) + bindtextdomain(GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR) #else #define _(STRING) ((char *) (STRING)) #define g_dngettext(DOMAIN, STRING1, STRING2, NUM) \ @@ -68,12 +67,6 @@ |*| \*/ - -#ifdef G_LOG_DOMAIN -#undef G_LOG_DOMAIN -#endif -#define G_LOG_DOMAIN "Nautilus-Hide" - #define NH_R_OK 1 #define NH_W_OK 2