ChangeLog

+commit 9a1203d72732534f0f7529a6a378f7c60c27a100
+Author: Sean Davis <smd.seandavis@gmail.com>
+Date:   Wed Jun 20 18:42:02 2018 -0400
+
+    Update NEWS
+
+commit b4a151988c2ea23bc726a0cf19c5d77100346863
+Author: Igor <f2404@yandex.ru>
+Date:   Tue Jun 19 00:31:05 2018 +0200
+
+    I18n: Update translation ru (100%).
+    
+    376 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit 5b9a4732e92d1ff2cb9e04b08be98b2c0c7d148a
+Author: Sean Davis <smd.seandavis@gmail.com>
+Date:   Sun Jun 17 21:28:53 2018 -0400
+
+    Fix redefinition of DISTCLEANFILES
+
+commit 44e5cd7d9f089bfa5290b0896e116ae8ebeed0e5
+Author: Sean Davis <smd.seandavis@gmail.com>
+Date:   Sun Jun 17 21:23:56 2018 -0400
+
+    PRECISON -> PRECISION
+
+commit 08ad6d120129f10e2c94a151962981e6e30509f8
+Author: Sean Davis <smd.seandavis@gmail.com>
+Date:   Sun Jun 17 21:21:31 2018 -0400
+
+    AC_CONFIG_MACRO_DIR -> AC_CONFIG_MACRO_DIRS
+
+commit b8b8f11a8592e3c0f031906af4f4337c0f3efe2d
+Author: Sean Davis <smd.seandavis@gmail.com>
+Date:   Sun Jun 17 09:22:54 2018 -0400
+
+    Post release tag bump
+
+commit 70fc1d0c99c41e361051fbaafa58189fab4ae5ea
+Author: Sean Davis <smd.seandavis@gmail.com>
+Date:   Sun Jun 17 09:13:06 2018 -0400
+
+    Updates for release
+
 commit aa3ff1a0a4046a2f25eb0400fa6e92386fda1aad
 Author: Sean Davis <smd.seandavis@gmail.com>
 Date:   Sun Jun 17 09:08:17 2018 -0400

NEWS

+4.13.4
+======
+- Fix: Redefinition of DISTCLEANFILES
+- Fix: Typo, "PRECISON" to "PRECISION"
+- Replaced "AC_CONFIG_MACRO_DIR" usage with "AC_CONFIG_MACRO_DIRS"
+- Translation updates: Russian
+
 4.13.3
 ======
 - Fix: Uninitialized scalar variables (CID #292062, #292063)
@@ -81,6 +88,22 @@
   Polish, Portuguese, Portuguese (Brazil), Romanian, Russian, Serbian,
   Slovak, Spanish, Swedish, Ukrainian
 
+4.12.4
+======
+- Fix: xfsettingsd --replace does not replace old daemon (Xfce #14381)
+- Fix: Uninitialized scalar variables (CID #292062, #292063)
+- Fix: -Wcast-function-type (GCC 8)
+- Fix: Redefinition of DISTCLEANFILES
+- Improved display manufucturer name recognition:
+  - Refreshed PNP IDs from hwdata
+  - Added support for VBX (VirtualBox)
+  - Standardized and shortened manufacturer names
+  - Updated laptop detection to include eDP in XfceRandr
+- Updated --help copyright information to 2018
+- Replaced "AC_CONFIG_MACRO_DIR" usage with "AC_CONFIG_MACRO_DIRS"
+- Translation updates: Belarusian, Catalan, English (Australia), Galician,
+  Hungarian, Japanese, Korean, Portuguese, Ukrainian
+
 4.12.3
 ======
 - Improvements for multimonitor support:

configure

 #! /bin/sh
-# From configure.ac aa3ff1a.
+# From configure.ac 9a1203d.
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for xfce4-settings 4.13.3.
+# Generated by GNU Autoconf 2.69 for xfce4-settings 4.13.4.
 #
 # Report bugs to <http://bugzilla.xfce.org/>.
 #
@@ -594,8 +594,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='xfce4-settings'
 PACKAGE_TARNAME='xfce4-settings'
-PACKAGE_VERSION='4.13.3'
-PACKAGE_STRING='xfce4-settings 4.13.3'
+PACKAGE_VERSION='4.13.4'
+PACKAGE_STRING='xfce4-settings 4.13.4'
 PACKAGE_BUGREPORT='http://bugzilla.xfce.org/'
 PACKAGE_URL=''
@@ -1523,7 +1523,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures xfce4-settings 4.13.3 to adapt to many kinds of systems.
+\`configure' configures xfce4-settings 4.13.4 to adapt to many kinds of systems.
 Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1598,7 +1598,7 @@ fi
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of xfce4-settings 4.13.3:";;
+     short | recursive ) echo "Configuration of xfce4-settings 4.13.4:";;
    esac
   cat <<\_ACEOF
@@ -1758,7 +1758,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-xfce4-settings configure 4.13.3
+xfce4-settings configure 4.13.4
 generated by GNU Autoconf 2.69
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2130,7 +2130,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
-It was created by xfce4-settings $as_me 4.13.3, which was
+It was created by xfce4-settings $as_me 4.13.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
   $ $0 $@
@@ -2997,7 +2997,7 @@ fi
 # Define the identity of the package.
  PACKAGE='xfce4-settings'
- VERSION='4.13.3'
+ VERSION='4.13.4'
 cat >>confdefs.h <<_ACEOF
@@ -20944,7 +20944,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by xfce4-settings $as_me 4.13.3, which was
+This file was extended by xfce4-settings $as_me 4.13.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
   CONFIG_FILES    = $CONFIG_FILES
@@ -21010,7 +21010,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-xfce4-settings config.status 4.13.3
+xfce4-settings config.status 4.13.4
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"

configure.ac

@@ -16,9 +16,9 @@ dnl *** Version information ***
 dnl ***************************
 m4_define([xfce4_settings_version_major], [4])
 m4_define([xfce4_settings_version_minor], [13])
-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], [aa3ff1a])
+m4_define([xfce4_settings_version_build], [9a1203d])
 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()])])
 
@@ -41,8 +41,8 @@ AC_COPYRIGHT([Copyright (c) 2008-2015
         The Xfce development team. All rights reserved.])
 AC_INIT([xfce4-settings], [xfce4_settings_version], [http://bugzilla.xfce.org/])
 AC_PREREQ([2.60])
-AC_CONFIG_MACRO_DIR([m4])
-AC_REVISION([aa3ff1a])
+AC_CONFIG_MACRO_DIRS([m4])
+AC_REVISION([9a1203d])
 
 dnl ***************************
 dnl *** Initialize automake ***

debian/changelog

+xfce4-settings (4.13.4-1) UNRELEASED; urgency=medium
+
+  * New upstream version 4.13.4
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Fri, 06 Jul 2018 23:13:40 +0200
+
 xfce4-settings (4.13.3-1) experimental; urgency=medium
 
   [ Unit 193 ]

dialogs/display-settings/display-name.c

@@ -861,7 +861,7 @@ static const struct Vendor vendors[] =
     { "FNI", "Funai" },
     { "FOA", "FOR-A Company Limited" },
     { "FOS", "Foss Tecator" },
-    { "FOX", "HON HAI PRECISON IND.CO.,LTD." },
+    { "FOX", "HON HAI PRECISION IND.CO.,LTD." },
     //{ "FPE", "Fujitsu Peripherals Ltd" },
     { "FPE", "Fujitsu" },
     { "FPS", "Deltec Corporation" },

po/ru.po

@@ -16,7 +16,7 @@ msgstr ""
 "Project-Id-Version: Xfce4-settings\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-03-11 18:31+0100\n"
-"PO-Revision-Date: 2018-03-12 01:13+0000\n"
+"PO-Revision-Date: 2018-06-18 18:40+0000\n"
 "Last-Translator: Igor <f2404@yandex.ru>\n"
 "Language-Team: Russian (http://www.transifex.com/xfce/xfce4-settings/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -52,7 +52,7 @@ msgstr "Вспомогательные технологии будут дост
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:7
 msgid "No AT-SPI provider was found on your system"
-msgstr "В вашей системе не найден AP-SPI"
+msgstr "В вашей системе не найден провайдер AP-SPI"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:8
 msgid "Assistive _Technologies"
@@ -101,7 +101,7 @@ msgstr "Использовать замедленные _клавиши"
 msgid ""
 "To help prevent accidental keystrokes, slow keys requires that a key is held"
 " for a certain minimum amount of time before the keystroke will be accepted"
-msgstr "Позволяет установить минимальное время, которое необходимо удерживать клавишу до того как она будет принята. Это позволяет предотвратить случайные нажатия клавиш"
+msgstr "Позволяет установить минимальное время, которое необходимо удерживать клавишу до того, как она будет принята. Это позволяет предотвратить случайные нажатия клавиш"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:18
 msgid "Acceptance _delay:"
@@ -330,11 +330,11 @@ msgstr "Внешний вид"
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:12
 #: ../dialogs/appearance-settings/xfce-ui-settings.desktop.in.h:2
 msgid "Customize the look of your desktop"
-msgstr "Настройки внешнего вид рабочего стола"
+msgstr "Настройки внешнего вида рабочего стола"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:13
 msgid "St_yle"
-msgstr "С_тили"
+msgstr "С_тиль"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:14
 msgid "_Icons"
@@ -409,7 +409,7 @@ msgstr "Задать _DPI:"
 msgid ""
 "Override the detected monitor resolution if fonts look too large or too "
 "small"
-msgstr "Переопределить автоматически определённое разрешение монитора. Используйте если шрифты выглядят слишком маленькими или слишком большими"
+msgstr "Переопределить автоматически определённое разрешение монитора. Используйте, если шрифты выглядят слишком маленькими или слишком большими"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:30
 msgid "DPI"
@@ -433,7 +433,7 @@ msgstr "Показывать значки на _кнопках"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:35
 msgid "Specify whether icons should be displayed next to text in buttons"
-msgstr "Определяет, должны ли значки отображаться на кнопках"
+msgstr "Определяет, должны ли значки отображаться на кнопках рядом с текстом"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:36
 msgid "Show images in _menus"
@@ -561,7 +561,7 @@ msgstr "<big><b>Сохранить настройки?</b></big>"
 msgid ""
 "The previous configuration will be restored in 10 seconds if you do not "
 "reply to this question."
-msgstr "Предыдущие настройки будут восстановлены через 10 секунд если вы не ответите на этот вопрос."
+msgstr "Предыдущие настройки будут восстановлены через 10 секунд, если вы не ответите на этот вопрос."
 
 #: ../dialogs/display-settings/display-dialog.glade.h:1
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:1
@@ -676,7 +676,7 @@ msgstr "Минимальный интерфейс для настройки вн
 msgid ""
 "The previous configuration will be restored in %i seconds if you do not "
 "reply to this question."
-msgstr "Предыдущие настройки будут восстановлены через %i с если вы не ответите на этот вопрос."
+msgstr "Предыдущие настройки будут восстановлены через %i с, если вы не ответите на этот вопрос."
 
 #. Insert the mode
 #: ../dialogs/display-settings/main.c:544
@@ -699,7 +699,7 @@ msgstr "Последний активный выход не должен быт
 
 #: ../dialogs/display-settings/main.c:1108
 msgid "Selected output not disabled"
-msgstr "Выбранный выход недоступен"
+msgstr "Выбранный выход не отключён"
 
 #: ../dialogs/display-settings/main.c:2264
 msgid ""
@@ -793,7 +793,7 @@ msgstr "Команда для комбинаций клавиш"
 #: ../dialogs/mime-settings/xfce-mime-window.c:932
 #: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:144
 msgid "Cancel"
-msgstr "Отменить"
+msgstr "Отмена"
 
 #: ../dialogs/keyboard-settings/command-dialog.c:114
 msgid "OK"
@@ -1194,7 +1194,7 @@ msgstr "ИМЯ УСТРОЙСТВА"
 #: ../dialogs/mouse-settings/main.c:141
 #, c-format
 msgid "%g px"
-msgstr "%g px"
+msgstr "%g пикс"
 
 #. miliseconds value for some of the scales in the dialog
 #: ../dialogs/mouse-settings/main.c:151
@@ -1230,7 +1230,7 @@ msgstr "Перо (абсолютно)"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:6
 msgid "Mouse (relative)"
-msgstr "Мыши (относительно)"
+msgstr "Мышь (относительно)"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:7
 msgid "None (right-handed)"

xfce4-settings-editor/Makefile.am

@@ -64,18 +64,21 @@ xfce-settings-marshal.c: xfce-settings-marshal.list Makefile
 	&& glib-genmarshal --prefix=_xfce_settings_marshal --body $< >> $@
 
 DISTCLEANFILES = \
-	$(xfce4_settings_editor_built_sources)
+	$(xfce4_settings_editor_built_sources) \
+	$(desktop_DATA)
 
 BUILT_SOURCES = \
 	$(xfce4_settings_editor_built_sources)
 
+else
+
+DISTCLEANFILES = \
+	$(desktop_DATA)
+
 endif
 
 EXTRA_DIST = \
 	xfce-settings-marshal.list \
 	$(desktop_in_files)
 
-DISTCLEANFILES = \
-	$(desktop_DATA)
-
 # vi:set ts=8 sw=8 noet ai nocindent syntax=automake:

xfce4-settings-editor/Makefile.in

@@ -509,11 +509,12 @@ xfce4_settings_editor_LDADD = \
 desktopdir = $(datadir)/applications
 desktop_in_files = xfce4-settings-editor.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-@MAINTAINER_MODE_TRUE@DISTCLEANFILES = \
-@MAINTAINER_MODE_TRUE@	$(xfce4_settings_editor_built_sources)
+@MAINTAINER_MODE_FALSE@DISTCLEANFILES = \
+@MAINTAINER_MODE_FALSE@	$(desktop_DATA)
 
-DISTCLEANFILES = \
-	$(desktop_DATA)
+@MAINTAINER_MODE_TRUE@DISTCLEANFILES = \
+@MAINTAINER_MODE_TRUE@	$(xfce4_settings_editor_built_sources) \
+@MAINTAINER_MODE_TRUE@	$(desktop_DATA)
 
 @MAINTAINER_MODE_TRUE@BUILT_SOURCES = \
 @MAINTAINER_MODE_TRUE@	$(xfce4_settings_editor_built_sources)