Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package xfce4-settings for openSUSE:Factory 
checked in at 2022-11-13 18:09:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xfce4-settings (Old)
 and      /work/SRC/openSUSE:Factory/.xfce4-settings.new.1597 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "xfce4-settings"

Sun Nov 13 18:09:06 2022 rev:49 rq:1035461 version:4.16.4

Changes:
--------
--- /work/SRC/openSUSE:Factory/xfce4-settings/xfce4-settings.changes    
2022-07-06 15:42:12.282535364 +0200
+++ /work/SRC/openSUSE:Factory/.xfce4-settings.new.1597/xfce4-settings.changes  
2022-11-13 18:09:20.631572211 +0100
@@ -1,0 +2,7 @@
+Wed Nov  9 04:59:17 UTC 2022 - Maurizio Galli <maurizio.ga...@suse.com>
+
+- Update to version 4.16.4
+  * Escape characters which do not belong into an URI/URL 
(gxo#xfce/xfce4-settings#390)
+  * Prefer full command when basic command is env (gxo#xfce/xfce4-settings#358)
+
+-------------------------------------------------------------------

Old:
----
  xfce4-settings-4.16.3.tar.bz2

New:
----
  xfce4-settings-4.16.4.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ xfce4-settings.spec ++++++
--- /var/tmp/diff_new_pack.FUk8sI/_old  2022-11-13 18:09:21.087574862 +0100
+++ /var/tmp/diff_new_pack.FUk8sI/_new  2022-11-13 18:09:21.091574885 +0100
@@ -19,7 +19,7 @@
 %bcond_with git
 
 Name:           xfce4-settings
-Version:        4.16.3
+Version:        4.16.4
 Release:        0
 Summary:        Tools for Managing Xfce Settings
 License:        GPL-2.0-only AND GPL-2.0-or-later

++++++ xfce4-settings-4.16.3.tar.bz2 -> xfce4-settings-4.16.4.tar.bz2 ++++++
++++ 1985 lines of diff (skipped)
++++    retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/xfce4-settings-4.16.3/ChangeLog new/xfce4-settings-4.16.4/ChangeLog
--- old/xfce4-settings-4.16.3/ChangeLog 2022-07-05 15:58:13.000000000 +0200
+++ new/xfce4-settings-4.16.4/ChangeLog 2022-11-07 21:26:26.000000000 +0100
@@ -1,3 +1,69 @@
+commit 55e3c5fb667e96ad1412cf249879262b369d28d7
+Author: Alexander Schwinn <alexxc...@xfce.org>
+Date:   Mon Nov 7 09:56:31 2022 +0100
+
+    Escape characters which do not belong into an URI/URL (Issue #390)
+    
+    In order to prevent argument injection
+
+commit 7489b73f537584229087e8841b0d2bbb94dea031
+Author: Anonymous <nore...@xfce.org>
+Date:   Mon Oct 31 00:46:51 2022 +0100
+
+    I18n: Update translation pt (100%).
+    
+    569 translated messages.
+    
+    Transifex (https://explore.transifex.com/xfce/).
+
+commit d314651f2421246a2805f9a062e64829d7f9028a
+Author: Anonymous <nore...@xfce.org>
+Date:   Sat Oct 29 00:47:09 2022 +0200
+
+    I18n: Update translation ja (100%).
+    
+    569 translated messages.
+    
+    Transifex (https://explore.transifex.com/xfce/).
+
+commit 51a8327d58e4dd96031cc73cd20691eb0c7c03cf
+Author: Anonymous <nore...@xfce.org>
+Date:   Mon Sep 12 00:49:00 2022 +0200
+
+    I18n: Update translation ru (100%).
+    
+    569 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit 42aa66d0384a935bd777966ace3e05b5f8dccbe9
+Author: Anonymous <nore...@xfce.org>
+Date:   Sat Sep 10 00:49:08 2022 +0200
+
+    I18n: Update translation ru (100%).
+    
+    569 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit 341443f88e7dd04c2330754ec03611a1d28bf564
+Author: Sean Davis <s...@bluesabre.org>
+Date:   Fri Apr 8 16:52:59 2022 -0400
+
+    Prefer full command when basic command is env (Fixes #358)
+
+commit 8d4106b35fbbccdbf10d2971133c528a7b7e7938
+Author: Simon Steinbeiss <simon.steinbe...@elfenbeinturm.at>
+Date:   Tue Jul 5 16:00:13 2022 +0200
+
+    Back to development
+
+commit 024399b1c8da7ce700bf9b7a42fc8c56bad4d468
+Author: Simon Steinbeiss <simon.steinbe...@elfenbeinturm.at>
+Date:   Tue Jul 5 15:58:54 2022 +0200
+
+    Updates for release
+
 commit af601e32a7c635fa83e8189c548b546428224ce9
 Author: Romain Bouvier <skun...@alteroot.org>
 Date:   Mon May 30 13:39:52 2022 +0200
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/xfce4-settings-4.16.3/NEWS new/xfce4-settings-4.16.4/NEWS
--- old/xfce4-settings-4.16.3/NEWS      2022-07-05 15:58:00.000000000 +0200
+++ new/xfce4-settings-4.16.4/NEWS      2022-11-07 21:26:00.000000000 +0100
@@ -1,3 +1,10 @@
+4.16.4 (2022-11-07)
+======
+- Escape characters which do not belong into an URI/URL (Issue #390)
+- Prefer full command when basic command is env (Fixes #358)
+- Translation Updates:
+  Japanese, Portuguese, Russian
+
 4.16.3
 ======
 - xfsettingsd: Fix recursive lock in libX11 (Fixes #369)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/xfce4-settings-4.16.3/config.h.in new/xfce4-settings-4.16.4/config.h.in
--- old/xfce4-settings-4.16.3/config.h.in       2022-07-05 15:58:09.000000000 
+0200
+++ new/xfce4-settings-4.16.4/config.h.in       2022-11-07 21:26:16.000000000 
+0100
@@ -15,6 +15,15 @@
 /* Name of default gettext domain */
 #undef GETTEXT_PACKAGE
 
+/* Prevent post 2_50 APIs */
+#undef GLIB_VERSION_MAX_ALLOWED
+
+/* Ignore post 2_50 APIs */
+#undef GLIB_VERSION_MIN_REQUIRED
+
+/* Use GLib structured logging */
+#undef G_LOG_USE_STRUCTURED
+
 /* Define if colord >= 1.0.2 present */
 #undef HAVE_COLORD
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/xfce4-settings-4.16.3/configure.ac new/xfce4-settings-4.16.4/configure.ac
--- old/xfce4-settings-4.16.3/configure.ac      2022-07-05 15:58:04.000000000 
+0200
+++ new/xfce4-settings-4.16.4/configure.ac      2022-11-07 21:26:08.000000000 
+0100
@@ -16,9 +16,9 @@
 dnl ***************************
 m4_define([xfce4_settings_version_major], [4])
 m4_define([xfce4_settings_version_minor], [16])
-m4_define([xfce4_settings_version_micro], [3])
+m4_define([xfce4_settings_version_micro], [4])
 m4_define([xfce4_settings_version_nano], [])
-m4_define([xfce4_settings_version_build], [af601e32])
+m4_define([xfce4_settings_version_build], [55e3c5fb])
 m4_define([xfce4_settings_version_tag], []) # Leave empty for releases
 m4_define([xfce4_settings_version], 
[xfce4_settings_version_major().xfce4_settings_version_minor().xfce4_settings_version_micro()ifelse(xfce4_settings_version_nano(),
 [], [], [.xfce4_settings_version_nano()])ifelse(xfce4_settings_version_tag(), 
[git], [xfce4_settings_version_tag()-xfce4_settings_version_build()], 
[xfce4_settings_version_tag()])])
 
@@ -42,7 +42,7 @@
 AC_INIT([xfce4-settings], [xfce4_settings_version], 
[https://bugzilla.xfce.org/])
 AC_PREREQ([2.60])
 AC_CONFIG_MACRO_DIRS([m4])
-AC_REVISION([af601e32])
+AC_REVISION([55e3c5fb])
 
 dnl ***************************
 dnl *** Initialize automake ***
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/xfce4-settings-4.16.3/dialogs/mime-settings/xfce-mime-helper.c 
new/xfce4-settings-4.16.4/dialogs/mime-settings/xfce-mime-helper.c
--- old/xfce4-settings-4.16.3/dialogs/mime-settings/xfce-mime-helper.c  
2022-07-05 15:51:07.000000000 +0200
+++ new/xfce4-settings-4.16.4/dialogs/mime-settings/xfce-mime-helper.c  
2022-11-07 21:25:38.000000000 +0100
@@ -155,6 +155,46 @@
 }
 
 
+/**
+ * Substitute env command usage.
+ * For launchers that modify the env, such as snaps, this is required
+ * to get a functional command from the commands_with_parameter. Otherwise
+ * the launcher will only run `env`, quietly doing nothing.
+ */
+static gchar**
+substitute_env (const gchar *commands,
+                const gchar *commands_with_parameter,
+                const gchar *binary)
+{
+  gchar **result;
+
+  result = substitute_binary (commands, binary);
+
+  if (G_UNLIKELY(*result != NULL && exo_str_is_equal (*result, "env")))
+    {
+      gchar **replaced;
+      gchar  *command = exo_str_replace (commands_with_parameter, "%s", "");
+      gchar  *cleaned = exo_str_replace (command, "\"\"", "");
+
+      replaced = substitute_binary (cleaned, binary);
+      if (*replaced != NULL && !exo_str_is_equal (*replaced, "env"))
+        {
+          g_strfreev (result);
+          result = replaced;
+        }
+      else
+        {
+          g_strfreev (replaced);
+        }
+
+      g_free (cleaned);
+      g_free (command);
+    }
+
+  return result;
+}
+
+
 
 static XfceMimeHelper*
 xfce_mime_helper_new (const gchar *id,
@@ -233,7 +273,7 @@
     }
 
   /* substitute the binary (if any) */
-  helper->commands = substitute_binary (commands, binary);
+  helper->commands = substitute_env (commands, commands_with_parameter, 
binary);
   helper->commands_with_flag = substitute_binary (commands_with_flag, binary);
   helper->commands_with_parameter = substitute_binary 
(commands_with_parameter, binary);
   g_free (binary);
@@ -375,7 +415,7 @@
   gint          status;
   gint          result;
   gint          pid;
-  const gchar  *real_parameter = parameter;
+  gchar        *real_parameter = NULL;
 
   // FIXME: startup-notification
 
@@ -387,23 +427,43 @@
   if (G_UNLIKELY (screen == NULL))
     screen = gdk_screen_get_default ();
 
-  /* strip the mailto part if needed */
-  if (real_parameter != NULL && g_str_has_prefix (real_parameter, "mailto:";))
-    real_parameter = parameter + 7;
+  if (parameter != NULL)
+    {
+      if (helper->category == XFCE_MIME_HELPER_WEBBROWSER || helper->category 
== XFCE_MIME_HELPER_FILEMANAGER)
+        {
+          /* escape characters which do not belong into an URI/URL */
+          real_parameter = g_uri_escape_string (parameter, 
":/?#[]@!$&'()*+,;=%", TRUE);
+        }
+      else if (g_str_has_prefix (real_parameter, "mailto:";))
+        {
+          /* strip the mailto part if needed */
+          real_parameter = g_strdup (parameter + 7);
+        }
+      else
+        {
+          real_parameter = g_strdup (parameter);
+        }
+    }
 
   /* determine the command set to use */
-  if (exo_str_is_flag (real_parameter)) {
-    commands = helper->commands_with_flag;
-  } else if (exo_str_is_empty (real_parameter)) {
-    commands = helper->commands;
-  } else {
-    commands = helper->commands_with_parameter;
-  }
+  if (exo_str_is_flag (real_parameter))
+    {
+      commands = helper->commands_with_flag;
+    }
+  else if (exo_str_is_empty (real_parameter))
+    {
+      commands = helper->commands;
+    }
+  else
+    {
+      commands = helper->commands_with_parameter;
+    }
 
   /* verify that we have atleast one command */
   if (G_UNLIKELY (*commands == NULL))
     {
       g_set_error (error, G_SPAWN_ERROR, G_SPAWN_ERROR_INVAL, _("No command 
specified"));
+      g_free (real_parameter);
       return FALSE;
     }
 
@@ -493,6 +553,7 @@
   if (G_UNLIKELY (!succeed))
     g_propagate_error (error, err);
 
+  g_free (real_parameter);
   return succeed;
 }
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/xfce4-settings-4.16.3/m4/intltool.m4 
new/xfce4-settings-4.16.4/m4/intltool.m4
--- old/xfce4-settings-4.16.3/m4/intltool.m4    2018-08-08 22:09:14.000000000 
+0200
+++ new/xfce4-settings-4.16.4/m4/intltool.m4    1970-01-01 01:00:00.000000000 
+0100
@@ -1,212 +0,0 @@
-## intltool.m4 - Configure intltool for the target system. -*-Shell-script-*-
-## Copyright (C) 2001 Eazel, Inc.
-## Author: Maciej Stachowiak <m...@noisehavoc.org>
-##         Kenneth Christiansen <kenn...@gnu.org>
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful, but
-## WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-##
-## As a special exception to the GNU General Public License, if you
-## distribute this file as part of a program that contains a
-## configuration script generated by Autoconf, you may include it under
-## the same distribution terms that you use for the rest of that program.
-
-dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
-# serial 42 IT_PROG_INTLTOOL
-AC_DEFUN([IT_PROG_INTLTOOL], [
-AC_PREREQ([2.50])dnl
-AC_REQUIRE([AM_NLS])dnl
-
-case "$am__api_version" in
-    1.[01234])
-       AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool])
-    ;;
-    *)
-    ;;
-esac
-
-INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 
* 100 + $ 3; }'`
-INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
-INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ 
print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-if test -n "$1"; then
-    AC_MSG_CHECKING([for intltool >= $1])
-    AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
-    test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 
"$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
-       AC_MSG_ERROR([Your intltool is too old.  You need intltool $1 or 
later.])
-fi
-
-AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update])
-AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge])
-AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract])
-if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z 
"$INTLTOOL_EXTRACT"; then
-    AC_MSG_ERROR([The intltool scripts were not found. Please install 
intltool.])
-fi
-
-if test -z "$AM_DEFAULT_VERBOSITY"; then
-  AM_DEFAULT_VERBOSITY=1
-fi
-AC_SUBST([AM_DEFAULT_VERBOSITY])
-
-INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))'
-INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))'
-INTLTOOL__v_MERGE_0='@echo "  ITMRG " [$]@;'
-AC_SUBST(INTLTOOL_V_MERGE)
-AC_SUBST(INTLTOOL__v_MERGE_)
-AC_SUBST(INTLTOOL__v_MERGE_0)
-
-INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))'
-intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))'
-intltool__v_merge_options_0='-q'
-AC_SUBST(INTLTOOL_V_MERGE_OPTIONS)
-AC_SUBST(intltool__v_merge_options_)
-AC_SUBST(intltool__v_merge_options_0)
-
-  INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) 
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C 
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c 
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) 
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C 
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c 
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-     INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) 
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C 
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c 
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-     INTLTOOL_PROP_RULE='%.prop:      %.prop.in      $(INTLTOOL_MERGE) 
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C 
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c 
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_OAF_RULE='%.oaf:       %.oaf.in       $(INTLTOOL_MERGE) 
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C 
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< [$]@'
-     INTLTOOL_PONG_RULE='%.pong:      %.pong.in      $(INTLTOOL_MERGE) 
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C 
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c 
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-   INTLTOOL_SERVER_RULE='%.server:    %.server.in    $(INTLTOOL_MERGE) 
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C 
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c 
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_SHEET_RULE='%.sheet:     %.sheet.in     $(INTLTOOL_MERGE) 
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C 
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c 
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) 
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C 
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c 
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-       INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) 
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C 
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c 
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) 
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C 
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c 
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then
-      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) 
; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x 
-u --no-translations $< [$]@'
-else
-      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) 
; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.[$][$]RANDOM && mkdir 
[$][$]_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x 
-u [$][$]_it_tmp_dir $< [$]@ && rmdir [$][$]_it_tmp_dir'
-fi
-      INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) 
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C 
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c 
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) 
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C 
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c 
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) 
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C 
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c 
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-  INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) 
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C 
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c 
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) 
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C 
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c 
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) 
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C 
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c 
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-   INTLTOOL_POLICY_RULE='%.policy:    %.policy.in    $(INTLTOOL_MERGE) 
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C 
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c 
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-
-_IT_SUBST(INTLTOOL_DESKTOP_RULE)
-_IT_SUBST(INTLTOOL_DIRECTORY_RULE)
-_IT_SUBST(INTLTOOL_KEYS_RULE)
-_IT_SUBST(INTLTOOL_PROP_RULE)
-_IT_SUBST(INTLTOOL_OAF_RULE)
-_IT_SUBST(INTLTOOL_PONG_RULE)
-_IT_SUBST(INTLTOOL_SERVER_RULE)
-_IT_SUBST(INTLTOOL_SHEET_RULE)
-_IT_SUBST(INTLTOOL_SOUNDLIST_RULE)
-_IT_SUBST(INTLTOOL_UI_RULE)
-_IT_SUBST(INTLTOOL_XAM_RULE)
-_IT_SUBST(INTLTOOL_KBD_RULE)
-_IT_SUBST(INTLTOOL_XML_RULE)
-_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE)
-_IT_SUBST(INTLTOOL_CAVES_RULE)
-_IT_SUBST(INTLTOOL_SCHEMAS_RULE)
-_IT_SUBST(INTLTOOL_THEME_RULE)
-_IT_SUBST(INTLTOOL_SERVICE_RULE)
-_IT_SUBST(INTLTOOL_POLICY_RULE)
-
-# Check the gettext tools to make sure they are GNU
-AC_PATH_PROG(XGETTEXT, xgettext)
-AC_PATH_PROG(MSGMERGE, msgmerge)
-AC_PATH_PROG(MSGFMT, msgfmt)
-AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
-    AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
-fi
-xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
-mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
-mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
-if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
-    AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
-fi
-
-AC_PATH_PROG(INTLTOOL_PERL, perl)
-if test -z "$INTLTOOL_PERL"; then
-   AC_MSG_ERROR([perl not found])
-fi
-AC_MSG_CHECKING([for perl >= 5.8.1])
-$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
-if test $? -ne 0; then
-   AC_MSG_ERROR([perl 5.8.1 is required for intltool])
-else
-   IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"`
-   AC_MSG_RESULT([$IT_PERL_VERSION])
-fi
-if test "x$2" != "xno-xml"; then
-   AC_MSG_CHECKING([for XML::Parser])
-   if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
-       AC_MSG_RESULT([ok])
-   else
-       AC_MSG_ERROR([XML::Parser perl module is required for intltool])
-   fi
-fi
-
-# Substitute ALL_LINGUAS so we can use it in po/Makefile
-AC_SUBST(ALL_LINGUAS)
-
-IT_PO_SUBDIR([po])
-
-])
-
-
-# IT_PO_SUBDIR(DIRNAME)
-# ---------------------
-# All po subdirs have to be declared with this macro; the subdir "po" is
-# declared by IT_PROG_INTLTOOL.
-#
-AC_DEFUN([IT_PO_SUBDIR],
-[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
-dnl
-dnl The following CONFIG_COMMANDS should be executed at the very end
-dnl of config.status.
-AC_CONFIG_COMMANDS_PRE([
-  AC_CONFIG_COMMANDS([$1/stamp-it], [
-    if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then
-       AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.])
-    fi
-    rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
-    >"$1/stamp-it.tmp"
-    [sed '/^#/d
-        s/^[[].*] *//
-        /^[    ]*$/d
-       '"s|^|  $ac_top_srcdir/|" \
-      "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES"
-    ]
-    [sed '/^POTFILES =/,/[^\\]$/ {
-               /^POTFILES =/!d
-               r $1/POTFILES
-         }
-        ' "$1/Makefile.in" >"$1/Makefile"]
-    rm -f "$1/Makefile.tmp"
-    mv "$1/stamp-it.tmp" "$1/stamp-it"
-  ])
-])dnl
-])
-
-# _IT_SUBST(VARIABLE)
-# -------------------
-# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
-#
-AC_DEFUN([_IT_SUBST],
-[
-AC_SUBST([$1])
-m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
-]
-)
-
-# deprecated macros
-AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
-# A hint is needed for aclocal from Automake <= 1.9.4:
-# AC_DEFUN([AC_PROG_INTLTOOL], ...)
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/xfce4-settings-4.16.3/po/ja.po new/xfce4-settings-4.16.4/po/ja.po
--- old/xfce4-settings-4.16.3/po/ja.po  2022-07-05 15:51:07.000000000 +0200
+++ new/xfce4-settings-4.16.4/po/ja.po  2022-11-07 21:25:38.000000000 +0100
@@ -5,6 +5,7 @@
 # 
 # Translators:
 # Xfce Bot <transi...@xfce.org>, 2021
+# Green, 2022
 # 
 #, fuzzy
 msgid ""
@@ -13,7 +14,7 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-06 12:51+0100\n"
 "PO-Revision-Date: 2020-12-28 17:23+0000\n"
-"Last-Translator: Xfce Bot <transi...@xfce.org>, 2021\n"
+"Last-Translator: Green, 2022\n"
 "Language-Team: Japanese (https://www.transifex.com/xfce/teams/16840/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -63,7 +64,7 @@
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:1
 #: 
../dialogs/accessibility-settings/xfce4-accessibility-settings.desktop.in.h:1
 msgid "Accessibility"
-msgstr "アクセシビリティ"
+msgstr "アクセシビリティ (操作支援)"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:2
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:12
@@ -100,7 +101,7 @@
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:5
 msgid "_Enable assistive technologies"
-msgstr "福祉情報技術を有効にする(_E)"
+msgstr "操作支援技術を有効にする(_E)"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:6
 msgid "Start With Session"
@@ -108,7 +109,7 @@
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:7
 msgid "Assistive technologies will be available the next time you login"
-msgstr "福祉情報技術は次回ログイン時から有効になります"
+msgstr "操作支援技術は次回ログイン時から有効になります"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:8
 msgid "No AT-SPI provider was found on your system"
@@ -116,7 +117,7 @@
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:9
 msgid "Assistive _Technologies"
-msgstr "福祉情報技術(_T)"
+msgstr "操作支援技術(_T)"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:10
 msgid ""
@@ -443,7 +444,7 @@
 msgid ""
 "This font will be used as the default monospace font, for example by "
 "terminal emulators."
-msgstr 
"このフォントがターミナルエミュレーターなどで使用されるデフォルト
 monospace フォントとして使用されます。"
+msgstr 
"このフォントが端末エミュレーターなどで使用されるデフォルト
 monospace フォントとして使用されます。"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:21
 msgid "Select a default monospace font"
@@ -1593,7 +1594,7 @@
 
 #: ../dialogs/mime-settings/xfce-mime-helper-chooser.c:508
 msgid "Choose a custom Terminal Emulator"
-msgstr "ターミナルエミュレーターを選択してください"
+msgstr "端末エミュレーターを選択してください"
 
 #: ../dialogs/mime-settings/xfce-mime-helper-chooser.c:513
 msgid ""
@@ -1831,13 +1832,13 @@
 #: ../dialogs/mime-settings/xfce-mime-window.c:327
 #: ../dialogs/mime-settings/xfce4-terminal-emulator.desktop.in.h:1
 msgid "Terminal Emulator"
-msgstr "ターミナルエミュレーター"
+msgstr "端末エミュレーター"
 
 #: ../dialogs/mime-settings/xfce-mime-window.c:335
 msgid ""
 "The default Terminal Emulator will be used to run commands that require a "
 "CLI environment."
-msgstr 
"ここで指定したでデフォルトのターミナルエミュレーターは、コマンドラインインターフェイスがå¿
…要なコマンドを実行する際に使用されます。"
+msgstr 
"ここで指定したデフォルトの端末エミュレーターは、コマンドラインインターフェイスがå¿
…要なコマンドを実行する際に使用されます。"
 
 #. Mimes
 #: ../dialogs/mime-settings/xfce-mime-window.c:354
@@ -1890,7 +1891,7 @@
 #: ../dialogs/mime-settings/xfce-mime-window.c:859
 #, c-format
 msgid "Failed to set application \"%s\" for mime type \"%s\"."
-msgstr "MIME タイプ \"%2$s\" へのアプリケーション \"%1$s\" 
の設定に失敗しました。"
+msgstr "MIME タイプ \"%s\" へのアプリケーション \"%s\" 
の設定に失敗しました。"
 
 #: ../dialogs/mime-settings/xfce-mime-window.c:1122
 #, c-format
@@ -1924,7 +1925,7 @@
 msgid ""
 "file;type;extension;association;open with;web browser;mail reader;file "
 "manager;terminal emulator;"
-msgstr 
"ファイル;タイプ;拡張子;関連付け;開く;ウェブブラウザー;メーラー;ファイルマネージャー;ターミナルエミュレーター;
 "
+msgstr 
"ファイル;タイプ;拡張子;関連付け;開く;ウェブブラウザー;メーラー;ファイルマネージャー;端末エミュレーター;
 "
 
 #: ../dialogs/mime-settings/xfce4-file-manager.desktop.in.h:2
 msgid "Browse the file system"
@@ -1968,7 +1969,7 @@
 
 #: 
../dialogs/mime-settings/helpers/debian-x-terminal-emulator.desktop.in.in.h:1
 msgid "Debian X Terminal Emulator"
-msgstr "Debian X ターミナルエミュレーター"
+msgstr "Debian X 端末エミュレーター"
 
 #: ../dialogs/mime-settings/helpers/dillo.desktop.in.in.h:1
 msgid "Dillo"
@@ -1984,7 +1985,7 @@
 
 #: ../dialogs/mime-settings/helpers/eterm.desktop.in.in.h:1
 msgid "Enlightened Terminal Emulator"
-msgstr "Enlightened ターミナルエミュレーター"
+msgstr "Enlightened 端末エミュレーター"
 
 #: ../dialogs/mime-settings/helpers/evolution.desktop.in.in.h:1
 msgid "Evolution"
@@ -2096,7 +2097,7 @@
 
 #: ../dialogs/mime-settings/helpers/rodent.desktop.in.in.h:1
 msgid "Rodent File Manager"
-msgstr "Rodent File Manager"
+msgstr "Rodent ファイルマネージャ"
 
 #: ../dialogs/mime-settings/helpers/rox-filer.desktop.in.in.h:1
 msgid "ROX-Filer"
@@ -2144,15 +2145,15 @@
 
 #: ../dialogs/mime-settings/helpers/xfce4-terminal.desktop.in.in.h:1
 msgid "Xfce Terminal"
-msgstr "Xfce Terminal"
+msgstr "Xfce 端末"
 
 #: ../dialogs/mime-settings/helpers/xfe.desktop.in.in.h:1
 msgid "Xfe File Manager"
-msgstr "Xfe File Manager"
+msgstr "Xfe ファイルマネージャ"
 
 #: ../dialogs/mime-settings/helpers/xterm.desktop.in.in.h:1
 msgid "X Terminal"
-msgstr "X ターミナル"
+msgstr "X 端末"
 
 #: ../dialogs/mouse-settings/main.c:85
 msgid "Active device in the dialog"
@@ -2624,7 +2625,7 @@
 
 #: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:438
 msgid "Settings"
-msgstr "設定マネージャー"
+msgstr "設定"
 
 #: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:950
 #: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:961
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/xfce4-settings-4.16.3/po/pt.po new/xfce4-settings-4.16.4/po/pt.po
--- old/xfce4-settings-4.16.3/po/pt.po  2022-07-05 15:51:07.000000000 +0200
+++ new/xfce4-settings-4.16.4/po/pt.po  2022-11-07 21:25:38.000000000 +0100
@@ -20,7 +20,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pt\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 
1000000 == 0 ? 1 : 2;\n"
 
 #. Translators: "Unknown" here is used to identify a monitor for which
 #. * we don't know the vendor. When a vendor is known, the name of the
@@ -1969,6 +1969,7 @@
 msgid_plural "%d MIME types found"
 msgstr[0] "%d tipo MIME encontrado"
 msgstr[1] "Encontrados %d tipos de MIME"
+msgstr[2] "Encontrados %d tipos de MIME"
 
 #: ../dialogs/mime-settings/xfce-mime-window.c:859
 #, c-format
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/xfce4-settings-4.16.3/po/ru.po new/xfce4-settings-4.16.4/po/ru.po
--- old/xfce4-settings-4.16.3/po/ru.po  2022-07-05 15:51:07.000000000 +0200
+++ new/xfce4-settings-4.16.4/po/ru.po  2022-11-07 21:25:38.000000000 +0100
@@ -5,6 +5,7 @@
 # 
 # Translators:
 # Xfce Bot <transi...@xfce.org>, 2021
+# Andrei Stepanov, 2022
 # 
 #, fuzzy
 msgid ""
@@ -13,7 +14,7 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-06 12:51+0100\n"
 "PO-Revision-Date: 2020-12-28 17:23+0000\n"
-"Last-Translator: Xfce Bot <transi...@xfce.org>, 2021\n"
+"Last-Translator: Andrei Stepanov, 2022\n"
 "Language-Team: Russian (https://www.transifex.com/xfce/teams/16840/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -561,7 +562,7 @@
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:38
 msgid "Enable e_ditable accelerators"
-msgstr "Включить редактируемые комбинации 
к_лавиш"
+msgstr "Включить изменяемые комбинации 
к_лавиш"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:39
 msgid ""
@@ -583,7 +584,7 @@
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:42
 msgid "Enable or disable event sounds globally (requires \"Canberra\" support)"
 msgstr ""
-"Включить или выключить звуки событий 
глобально (требуется поддержка "
+"Включить или отключить звуки событий 
глобально (требуется поддержка "
 "«Canberra»)"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:43
@@ -1066,7 +1067,7 @@
 
 #: ../dialogs/display-settings/display-dialog.glade.h:32
 msgid "Show popup windows to identify displays"
-msgstr "Показать всплывающее окно для 
идентификации дисплеев"
+msgstr "Показать всплывающее окно для 
идентификации экранов"
 
 #: ../dialogs/display-settings/display-dialog.glade.h:33
 msgid "<b>Identifying Displays</b>"
@@ -1264,7 +1265,7 @@
 
 #: ../dialogs/display-settings/main.c:3653
 msgid "(Disabled)"
-msgstr "(выключено)"
+msgstr "(отключено)"
 
 #: ../dialogs/display-settings/main.c:4103
 #, c-format
@@ -1297,8 +1298,7 @@
 msgid ""
 
"display;settings;screen;resolution;refresh;rate;rotation;external;projectors;monitors;LCD;CRT;HiDPI;"
 msgstr ""
-"дисплей;настройки;экран;разрешение;обновление;частота;поворот;внешний;проекторы;мониторы;LCD;CRT;HiDPI;"
-" "
+"дисплей;настройки;экран;разрешение;обновление;частота;поворот;внешний;проекторы;мониторы;LCD;CRT;HiDPI;Â
 "
 
 #. Set dialog title and icon
 #: ../dialogs/keyboard-settings/command-dialog.c:110
@@ -2267,7 +2267,7 @@
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:1
 msgid "Disabled"
-msgstr "Выключено"
+msgstr "Отключено"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:2
 msgid "Edge scrolling"
@@ -2752,7 +2752,7 @@
 
 #: ../xfsettingsd/accessibility.c:414
 msgid "Sticky keys are disabled"
-msgstr "Залипание клавиш выключено"
+msgstr "Залипание клавиш отключено"
 
 #: ../xfsettingsd/accessibility.c:416
 msgid "Sticky keys"
@@ -2776,7 +2776,7 @@
 
 #: ../xfsettingsd/accessibility.c:432
 msgid "Bounce keys are disabled"
-msgstr "«Прыгающие» клавиши выключены"
+msgstr "«Прыгающие» клавиши отключены"
 
 #: ../xfsettingsd/accessibility.c:434
 msgid "Bounce keys"

Reply via email to