Commit #15: internationalization does not depend on intltool anymore, but only on GNU gettext

496949f9 · madmurphy · e01c4fdf · 496949f9 · 496949f9 · 496949f9
Commit 496949f9 authored May 27, 2021 by madmurphy
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,14 @@ Change Log
 ==========


+## 1.0.3 (2021-05-27)
+
+Changes:
+
+* Internationalization does not depend on **XDG intltool** anymore, but only on
+  **GNU gettext**
+
+
 ## 1.0.2 (2021-05-24)

 Changes:

--- 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

--- a/NEWS
+++ b/NEWS
-News
+NEWS
 ====


-0.1.5
-----
+## 1.0.3
+
+* Internationalization does not depend on **XDG intltool** anymore, but only on
+  **GNU gettext**
+
+
+## 0.1.5

 * Added Turkish translation


-0.1.1
-----
+## 0.1.1

 * Added German translation


-0.1.0
-----
+## 0.1.0

 **Nautilus Bluetooth** has been published.

--- a/README
+++ b/README
@@ -11,21 +11,21 @@ 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-bluetooth**. This
-package comes with only two strings to translate:
+Let's say you want to create a Dutch translation of **Nautilus Nluetooth**
+(`nl`). This package comes with only two strings to translate:

 1. “Send via Bluetooth”
 2. “Send the selected files to a Bluetooth device”

-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-bluetooth/po
-intltool-update -p --gettext-package=nautilus-bluetooth
-msginit -l nl
-rm nautilus-bluetooth.pot
+./bootstrap
+make -C po nautilus-bluetooth.pot
+(cd po && msginit -l nl)
+./bootstrap --clean
 ```

 Now edit the `po/LINGUAS` file and add a new line containing the abbreviated
@@ -34,17 +34,7 @@ name of the new language (`nl`).
 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-bluetooth/po
-intltool-update -p --gettext-package=nautilus-bluetooth
-mv nl.po nl.po.bak && msgmerge nl.po.bak nautilus-bluetooth.pot > nl.po
-rm nautilus-bluetooth.pot nl.po.bak
-```
-
-For any issue, [drop me a message][1].
+For any issue, [drop a message][1].


 NExtGen

--- a/bootstrap
+++ b/bootstrap
@@ -42,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
@@ -65,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
@@ -74,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
@@ -83,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
@@ -111,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
@@ -122,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
@@ -131,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
@@ -142,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
@@ -194,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"

--- a/configure.ac
+++ b/configure.ac
 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 Bluetooth],
-	[1.0.2],
+	[1.0.3],
 	[madmurphy333@gmail.com],
 	[nautilus-bluetooth],
 	[https://gitlab.gnome.org/madmurphy/nautilus-bluetooth])
@@ -32,6 +31,8 @@ AM_SILENT_RULES([yes])

 AC_PROG_CC

+AC_PROG_GREP
+
 PKG_CHECK_MODULES([NAUTILUS_BLUETOOTH], [glib-2.0 libnautilus-extension])

 AC_CHECK_PROG([HAVE_PKGCONFIG], [pkg-config], [yes], [no])
@@ -40,10 +41,9 @@ AS_IF([test "x${HAVE_PKGCONFIG}" = xno],
 	[AC_MSG_ERROR([you need to have pkgconfig installed!])])


-dnl  ***************************************************************************
+dnl  **************************************************************************
 dnl     B L U E T O O T H   S E T T I N G S
-dnl  ***************************************************************************
-
+dnl  **************************************************************************

 dnl  Default program used by nautilus-bluetooth when the user does not specify a
 dnl  BLUETOOTH_SENDTO argument variable
@@ -70,12 +70,13 @@ AS_IF([test "x${BLUETOOTH_SENDTO}" = x], [
 ])


-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])

@@ -83,21 +84,30 @@ 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_BLUETOOTH_LOCALEDIR])
 ])


-
-dnl  ***************************************************************************
+dnl  **************************************************************************
 dnl     F I N A L I Z A T I O N
-dnl  ***************************************************************************
-
-
-AC_SUBST([NAUTILUS_EXTENSION_DIR], m4_normalize(["$(
-	"${PKG_CONFIG}" --define-variable='libdir=${libdir}'
-		--variable=extensiondir libnautilus-extension
-)"]))
+dnl  **************************************************************************
+
+AC_ARG_WITH([nautilus-libdir],
+	[AS_HELP_STRING([--without-nautilus-libdir],
+		[ignore the <libdir> variable used by libnautilus-extension and
+		and use the current <libdir> 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])

 LT_INIT([disable-static])


--- a/package.json
+++ b/package.json
 {
 	"name": "nautilus-bluetooth",
-	"version": "1.0.2",
+	"version": "1.0.3",
 	"description": "A simple Nautilus extension that adds a \"Send via Bluetooth\" entry to Nautilus' right-click menu",
 	"homepage": "https://gitlab.gnome.org/madmurphy/nautilus-bluetooth",
 	"author": "madmurphy333@gmail.com",
@@ -15,8 +15,8 @@
 		"gnome-bluetooth": "*"
 	},
 	"devDependencies": {
-		"pkgconf": "*",
-		"intltool": "*"
+		"gettext": "*",
+		"pkgconf": "*"
 	},
 	"src": [
 		"src/nautilus-bluetooth.c"

--- a/po/Makevars
+++ b/po/Makevars
+# 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
+
--- a/po/de.po
+++ b/po/de.po
@@ -6,9 +6,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0.2\n"
-"Report-Msgid-Bugs-To: <madmurphy333@gmail.com>\n"
-"POT-Creation-Date: 2021-05-24 14:17+0100\n"
+"Project-Id-Version: 1.0.3\n"
+"Report-Msgid-Bugs-To: madmurphy333@gmail.com\n"
+"POT-Creation-Date: 2021-05-27 00:23+0200\n"
 "PO-Revision-Date: 2019-09-01 00:19+0200\n"
 "Last-Translator: Jannis Schmidt <jschmidt@posteo.de>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
@@ -18,10 +18,10 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"

-#: ../src/nautilus-bluetooth.c:160
+#: src/nautilus-bluetooth.c:154
 msgid "Send via Bluetooth"
 msgstr "Via Bluetooth senden"

-#: ../src/nautilus-bluetooth.c:161
+#: src/nautilus-bluetooth.c:155
 msgid "Send the selected files to a Bluetooth device"
 msgstr "Versende die ausgewählten Dateien an ein Bluetooth-Gerät"
--- a/po/es.po
+++ b/po/es.po
@@ -6,9 +6,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0.2\n"
-"Report-Msgid-Bugs-To: <madmurphy333@gmail.com>\n"
-"POT-Creation-Date: 2021-05-24 14:17+0200\n"
+"Project-Id-Version: 1.0.3\n"
+"Report-Msgid-Bugs-To: madmurphy333@gmail.com\n"
+"POT-Creation-Date: 2021-05-27 00:23+0200\n"
 "PO-Revision-Date: 2019-08-28 13:59+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish <es@tp.org.es>\n"
@@ -18,10 +18,10 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"

-#: ../src/nautilus-bluetooth.c:160
+#: src/nautilus-bluetooth.c:154
 msgid "Send via Bluetooth"
 msgstr "Enviar por Bluetooth"

-#: ../src/nautilus-bluetooth.c:161
+#: src/nautilus-bluetooth.c:155
 msgid "Send the selected files to a Bluetooth device"
 msgstr "Enviar los archivos seleccionados a un dispositivo Bluetooth"
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,9 +6,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0.2\n"
-"Report-Msgid-Bugs-To: <madmurphy333@gmail.com>\n"
-"POT-Creation-Date: 2021-05-24 14:17+0200\n"
+"Project-Id-Version: 1.0.3\n"
+"Report-Msgid-Bugs-To: madmurphy333@gmail.com\n"
+"POT-Creation-Date: 2021-05-27 00:23+0200\n"
 "PO-Revision-Date: 2019-08-28 13:59+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -18,10 +18,10 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"

-#: ../src/nautilus-bluetooth.c:160
+#: src/nautilus-bluetooth.c:154
 msgid "Send via Bluetooth"
 msgstr "Envoyer via Bluetooth"

-#: ../src/nautilus-bluetooth.c:161
+#: src/nautilus-bluetooth.c:155
 msgid "Send the selected files to a Bluetooth device"
 msgstr "Envoyer les fichiers sélectionnés à un périphérique Bluetooth"
--- a/po/it.po
+++ b/po/it.po
@@ -6,9 +6,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0.2\n"
-"Report-Msgid-Bugs-To: <madmurphy333@gmail.com>\n"
-"POT-Creation-Date: 2021-05-24 14:17+0200\n"
+"Project-Id-Version: 1.0.3\n"
+"Report-Msgid-Bugs-To: madmurphy333@gmail.com\n"
+"POT-Creation-Date: 2021-05-27 00:23+0200\n"
 "PO-Revision-Date: 2019-08-26 17:05+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -18,10 +18,10 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"

-#: ../src/nautilus-bluetooth.c:160
+#: src/nautilus-bluetooth.c:154
 msgid "Send via Bluetooth"
 msgstr "Invia tramite Bluetooth"

-#: ../src/nautilus-bluetooth.c:161
+#: src/nautilus-bluetooth.c:155
 msgid "Send the selected files to a Bluetooth device"
 msgstr "Invia i file selezionati a un dispositivo Bluetooth"
--- a/po/la.po
+++ b/po/la.po
@@ -6,9 +6,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0.2\n"
-"Report-Msgid-Bugs-To: <madmurphy333@gmail.com>\n"
-"POT-Creation-Date: 2021-05-24 14:17+0200\n"
+"Project-Id-Version: 1.0.3\n"
+"Report-Msgid-Bugs-To: madmurphy333@gmail.com\n"
+"POT-Creation-Date: 2021-05-27 00:23+0200\n"
 "PO-Revision-Date: 2021-05-02 23:19+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Latin\n"
@@ -16,11 +16,12 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"

-#: ../src/nautilus-bluetooth.c:160
+#: src/nautilus-bluetooth.c:154
 msgid "Send via Bluetooth"
 msgstr "Mittere per Bluetooth"

-#: ../src/nautilus-bluetooth.c:161
+#: src/nautilus-bluetooth.c:155
 msgid "Send the selected files to a Bluetooth device"
 msgstr "Mittere electos codicillos ad Bluetooth apparatum"
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,9 +6,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0.2\n"
-"Report-Msgid-Bugs-To: <madmurphy333@gmail.com>\n"
-"POT-Creation-Date: 2021-05-24 14:17+0200\n"
+"Project-Id-Version: 1.0.3\n"
+"Report-Msgid-Bugs-To: madmurphy333@gmail.com\n"
+"POT-Creation-Date: 2021-05-27 00:23+0200\n"
 "PO-Revision-Date: 2020-07-11 15:05+0300\n"
 "Last-Translator: Cihan Alkan\n"
 "Language-Team: Turkish <gnome-turk@gnome.org>\n"
@@ -19,10 +19,10 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 2.3.1\n"

-#: ../src/nautilus-bluetooth.c:160
+#: src/nautilus-bluetooth.c:154
 msgid "Send via Bluetooth"
 msgstr "Bluetooth ile gönder"

-#: ../src/nautilus-bluetooth.c:161
+#: src/nautilus-bluetooth.c:155
 msgid "Send the selected files to a Bluetooth device"
 msgstr "Seçilen dosyaları bir Bluetooth cihazına gönder"
--- a/src/nautilus-bluetooth.c
+++ b/src/nautilus-bluetooth.c
@@ -45,7 +45,7 @@
 #ifdef ENABLE_NLS
 #include <glib/gi18n-lib.h>
 #define I18N_INIT() \
-	bindtextdomain(GETTEXT_PACKAGE, NAUTILUS_BLUETOOTH_LOCALEDIR)
+	bindtextdomain(GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR)
 #else
 #define _(STRING) STRING
 #define I18N_INIT()
@@ -59,12 +59,6 @@
 |*|
 \*/

-
-#ifdef G_LOG_DOMAIN
-#undef G_LOG_DOMAIN
-#endif
-#define G_LOG_DOMAIN "Nautilus-Bluetooth"
-
 typedef struct {
 	GObject parent_slot;
 } NautilusBluetooth;