Merging upstream version 2.40.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 32 insertions, 26 deletions

diff --git a/po-man/sr.po b/po-man/sr.po
index 61d6a3e..a8cd7a2 100644
--- a/po-man/sr.po
+++ b/po-man/sr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux-man 2.39-rc3\n"
 "Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n"
-"POT-Creation-Date: 2024-03-27 12:11+0100\n"
+"POT-Creation-Date: 2024-05-01 21:34+0200\n"
 "PO-Revision-Date: 2023-07-17 09:13+0200\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <(nothing)>\n"
@@ -2987,7 +2987,7 @@ msgstr ""
 "*sfdisk*(8)\n"
 
 #. Copyright 1993, 1994, 1995 by Theodore Ts'o.  All Rights Reserved.
-#. This file may be copied under the terms of the GNU Public License.
+#. This file may be copied under the terms of the GNU General Public License.
 #. type: Title =
 #: ../disk-utils/fsck.8.adoc:6
 #, no-wrap
@@ -8206,7 +8206,7 @@ msgstr ""
 "*partx*(8)\n"
 
 #. Copyright 2010 Jason Borden <jborden@bluehost.com>
-#. This file may be copied under the terms of the GNU Public License.
+#. This file may be copied under the terms of the GNU General Public License.
 #. type: Title =
 #: ../disk-utils/swaplabel.8.adoc:6
 #, no-wrap
@@ -9376,7 +9376,7 @@ msgstr "uuid_compare - упоређује да ли су два УУИД-а ис
 #: ../libuuid/man/uuid_compare.3.adoc:50
 #, fuzzy
 #| msgid "*int uuid_compare(uuid_t __uu1__, uuid_t __uu2__)*\n"
-msgid "*int uuid_compare(uuid_t __uu1__, uuid_t __uu2__)*"
+msgid "*int uuid_compare(const uuid_t __uu1__, const uuid_t __uu2__)*"
 msgstr "*int uuid_compare(uuid_t __uu1__, uuid_t __uu2__)*\n"
 
 #. type: Plain text
@@ -9473,7 +9473,7 @@ msgstr "uuid_copy - умножава УУИД врдност"
 #: ../libuuid/man/uuid_copy.3.adoc:50
 #, fuzzy
 #| msgid "*void uuid_copy(uuid_t __dst__, uuid_t __src__);*\n"
-msgid "*void uuid_copy(uuid_t __dst__, uuid_t __src__);*"
+msgid "*void uuid_copy(uuid_t __dst__, const uuid_t __src__);*"
 msgstr "*void uuid_copy(uuid_t __одр__, uuid_t __изв__);*\n"
 
 #. type: Plain text
@@ -9773,7 +9773,7 @@ msgstr "uuid_is_null - упоређује вредност УУИД-а са вр
 #: ../libuuid/man/uuid_is_null.3.adoc:50
 #, fuzzy
 #| msgid "*int uuid_is_null(uuid_t __uu__);*\n"
-msgid "*int uuid_is_null(uuid_t __uu__);*"
+msgid "*int uuid_is_null(const uuid_t __uu__);*"
 msgstr "*int uuid_is_null(uuid_t __uu__);*\n"
 
 #. type: Plain text
@@ -9859,8 +9859,8 @@ msgstr "uuid_parse - претвара улазну УУИД ниску у бин
 #| "*int uuid_parse(char *__in__, uuid_t __uu__);* +\n"
 #| "*int uuid_parse_range(char *__in_start__, char *__in_end__, uuid_t __uu__);*\n"
 msgid ""
-"*int uuid_parse(char *__in__, uuid_t __uu__);*\n"
-"*int uuid_parse_range(char *__in_start__, char *__in_end__, uuid_t __uu__);*"
+"*int uuid_parse(const char *__in__, uuid_t __uu__);*\n"
+"*int uuid_parse_range(const char *__in_start__, const char *__in_end__, uuid_t __uu__);*"
 msgstr ""
 "*int uuid_parse(знак *__улаз__, uuid_t __uu__);* +\n"
 "*int uuid_parse_range(знак *__улаз_почетак__, знак *__улаз_крај__, uuid_t __uu__);*\n"
@@ -9975,7 +9975,7 @@ msgstr "uuid_time - извлачи време када је УУИД створ�
 #: ../libuuid/man/uuid_time.3.adoc:50
 #, fuzzy
 #| msgid "*time_t uuid_time(uuid_t __uu__, struct timeval *__ret_tv__)*\n"
-msgid "*time_t uuid_time(uuid_t __uu__, struct timeval *__ret_tv__)*"
+msgid "*time_t uuid_time(const uuid_t __uu__, struct timeval *__ret_tv__)*"
 msgstr "*time_t uuid_time(uuid_t __uu__, структ вред_времена *__ret_tv__)*\n"
 
 #. type: Plain text
@@ -10081,9 +10081,9 @@ msgstr "uuid_unparse - претвара УУИД из бинарног пред�
 #| "*void uuid_unparse_upper(uuid_t __uu__, char *__out__);* +\n"
 #| "*void uuid_unparse_lower(uuid_t __uu__, char *__out__);*\n"
 msgid ""
-"*void uuid_unparse(uuid_t __uu__, char *__out__);*\n"
-"*void uuid_unparse_upper(uuid_t __uu__, char *__out__);*\n"
-"*void uuid_unparse_lower(uuid_t __uu__, char *__out__);*"
+"*void uuid_unparse(const uuid_t __uu__, char *__out__);*\n"
+"*void uuid_unparse_upper(const uuid_t __uu__, char *__out__);*\n"
+"*void uuid_unparse_lower(const uuid_t __uu__, char *__out__);*"
 msgstr ""
 "*void uuid_unparse(uuid_t __uu__, char *__out__);* +\n"
 "*void uuid_unparse_upper(uuid_t __uu__, char *__out__);* +\n"
@@ -13843,7 +13843,7 @@ msgstr ""
 "www.kernel.org/pub/linux/utils/util-linux/[Linux Kernel Archive]“"
 
 #.  Copyright 2000 Andreas Dilger (adilger@turbolinux.com)
-#.  This file may be copied under the terms of the GNU Public License.
+#.  This file may be copied under the terms of the GNU General Public License.
 #. type: Title =
 #: ../misc-utils/blkid.8.adoc:4
 #, no-wrap
@@ -15552,7 +15552,7 @@ msgstr "*posix_fadvise*(2)\n"
 
 #
 #. Copyright 2017 Red Hat, Inc.
-#. This file may be copied under the terms of the GNU Public License.
+#. This file may be copied under the terms of the GNU General Public License.
 #. type: Title =
 #: ../misc-utils/fincore.1.adoc:7
 #, no-wrap
@@ -15678,7 +15678,7 @@ msgstr ""
 "*getconf*(1p)\n"
 
 #.  Copyright 1993, 1994, 1995 by Theodore Ts'o.  All Rights Reserved.
-#.  This file may be copied under the terms of the GNU Public License.
+#.  This file may be copied under the terms of the GNU General Public License.
 #. type: Title =
 #: ../misc-utils/findfs.8.adoc:4
 #, no-wrap
@@ -20583,7 +20583,7 @@ msgid "*clock_getres*(2) *clock_gettime*(2)"
 msgstr ""
 
 #. Copyright 2021 Red Hat, Inc.
-#. This file may be copied under the terms of the GNU Public License.
+#. This file may be copied under the terms of the GNU General Public License.
 #. type: Title =
 #: ../misc-utils/lsfd.1.adoc:7
 #, no-wrap
@@ -24062,7 +24062,7 @@ msgid "*mv*(1)"
 msgstr "*mv*(1)\n"
 
 #. Copyright 2007 by Theodore Ts'o.  All Rights Reserved.
-#. This file may be copied under the terms of the GNU Public License.
+#. This file may be copied under the terms of the GNU General Public License.
 #. type: Title =
 #: ../misc-utils/uuidd.8.adoc:6
 #, no-wrap
@@ -24348,7 +24348,7 @@ msgstr ""
 "*uuidgen*(1)\n"
 
 #. Copyright 1999 Andreas Dilger (adilger@enel.ucalgary.ca)
-#. This file may be copied under the terms of the GNU Public License.
+#. This file may be copied under the terms of the GNU General Public License.
 #. type: Title =
 #: ../misc-utils/uuidgen.1.adoc:6
 #, no-wrap
@@ -25066,7 +25066,7 @@ msgstr ""
 "*whereis -u -ms -M /usr/man/man1 -S /usr/src -f **\n"
 
 #.  Copyright 2009 by Karel Zak.  All Rights Reserved.
-#.  This file may be copied under the terms of the GNU Public License.
+#.  This file may be copied under the terms of the GNU General Public License.
 #. type: Title =
 #: ../misc-utils/wipefs.8.adoc:4
 #, no-wrap
@@ -29193,7 +29193,7 @@ msgstr ""
 #
 #. Copyright (C) 1994-2005 Jeff Tranter (tranter@pobox.com)
 #. Copyright (C) 2012 Karel Zak <kzak@redhat.com>.
-#. It may be distributed under the GNU Public License, version 2, or
+#. It may be distributed under the GNU General Public License, version 2, or
 #. any higher version. See section COPYING of the GNU Public license
 #. for conditions under which this file may be redistributed.
 #. type: Title =
@@ -35061,13 +35061,10 @@ msgstr "*--direct-io*[**=on**|*off*]"
 #. type: Plain text
 #: ../sys-utils/losetup.8.adoc:97
 msgid ""
-"Enable or disable direct I/O for the backing file. The optional argument can "
-"be either *on* or *off*. If the optional argument is omitted, it defaults to "
-"*on*."
+"Enable or disable direct I/O for the backing file. The default is *off*. "
+"Specifying either *--direct-io* or *--direct-io=on* will enable it. But, *--"
+"direct-io=off* can be provided to explicitly turn it off."
 msgstr ""
-"Укључује или искључује директни У/И за прављење резерве датотеке. Опционални "
-"аргумент може бити или *on* или *off*. Ако је опционални аргумент "
-"изостављен, подразумева *on*."
 
 #. type: Plain text
 #: ../sys-utils/losetup.8.adoc:103
@@ -57244,6 +57241,15 @@ msgstr ""
 "*setenv*(3),\n"
 "*terminfo*(5)\n"
 
+#~ msgid ""
+#~ "Enable or disable direct I/O for the backing file. The optional argument "
+#~ "can be either *on* or *off*. If the optional argument is omitted, it "
+#~ "defaults to *on*."
+#~ msgstr ""
+#~ "Укључује или искључује директни У/И за прављење резерве датотеке. "
+#~ "Опционални аргумент може бити или *on* или *off*. Ако је опционални "
+#~ "аргумент изостављен, подразумева *on*."
+
 #, no-wrap
 #~ msgid ""
 #~ "*blkid*(8),\n"