forked from pool/e2fsprogs
118 lines
4.7 KiB
Diff
118 lines
4.7 KiB
Diff
|
From aa773f808379cd0167281217bdcd7f3d87ae3201 Mon Sep 17 00:00:00 2001
|
|||
|
|
From: Theodore Ts'o <tytso@mit.edu>
|
|||
|
|
Date: Sat, 13 Jul 2019 12:49:26 -0400
|
|||
|
|
Subject: [PATCH] po: remove unnecessary/buggy positional parameter specifiers
|
|||
|
|
References: bsc#1170964
|
|||
|
|
|
|||
|
|
The strings in e2fsck/problem.c use a special %-expansion scheme,
|
|||
|
|
where %b gets expanded to a block number, %i gets expanded to an inode
|
|||
|
|
number, etc., where these values are in a problem context data
|
|||
|
|
structure. As such, there is no need to use a printf style positional
|
|||
|
|
indicator (e.g., %2$s). Indeed, the use of things like %1$i or %2$b
|
|||
|
|
will cause the %-expansion code to just print %1$i or %2$b, instead of
|
|||
|
|
the inode or block number, respectively.
|
|||
|
|
|
|||
|
|
Addresses-Debian-Bug: #892173
|
|||
|
|
|
|||
|
|
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
|
|||
|
|
Cc: Philipp Thomas <pth@suse.de>
|
|||
|
|
Cc: Benno Schulenberg <vertaling@coevern.nl>
|
|||
|
|
Cc: Trần Ngọc Quân <vnwildman@gmail.com>
|
|||
|
|
Cc: Petr Pisar <petr.pisar@atlas.cz>
|
|||
|
|
Acked-by: Jan Kara <jack@suse.cz>
|
|||
|
|
---
|
|||
|
|
po/cs.po | 6 +++---
|
|||
|
|
po/de.po | 6 +++---
|
|||
|
|
po/nl.po | 2 +-
|
|||
|
|
po/vi.po | 3 +--
|
|||
|
|
4 files changed, 8 insertions(+), 9 deletions(-)
|
|||
|
|
|
|||
|
|
Index: e2fsprogs-1.43.8/po/cs.po
|
|||
|
|
===================================================================
|
|||
|
|
--- e2fsprogs-1.43.8.orig/po/cs.po
|
|||
|
|
+++ e2fsprogs-1.43.8/po/cs.po
|
|||
|
|
@@ -1953,7 +1953,7 @@ msgstr ""
|
|||
|
|
#: e2fsck/problem.c:1035
|
|||
|
|
msgid "@i %i @a @b %b passes checks, but checksum does not match @b. "
|
|||
|
|
msgstr ""
|
|||
|
|
-"Block %2$b rozšířeného atributu iuzlu %1$i projde kontrolami, ale kontrolní "
|
|||
|
|
+"Block %b rozšířeného atributu iuzlu %i projde kontrolami, ale kontrolní "
|
|||
|
|
"součet bloku neodpovídá. "
|
|||
|
|
|
|||
|
|
# ??? WTF
|
|||
|
|
@@ -1996,7 +1996,7 @@ msgstr ""
|
|||
|
|
msgid ""
|
|||
|
|
"@i %i block %b conflicts with critical metadata, skipping block checks.\n"
|
|||
|
|
msgstr ""
|
|||
|
|
-"Blok %2$b iuzlu %1$i se neslučuje s kritickými metadaty, kontrola bloku se "
|
|||
|
|
+"Blok %b iuzlu %i se neslučuje s kritickými metadaty, kontrola bloku se "
|
|||
|
|
"vynechá.\n"
|
|||
|
|
|
|||
|
|
#. @-expanded: directory inode %i block %b should be at block %c.
|
|||
|
|
@@ -2640,7 +2640,7 @@ msgstr ""
|
|||
|
|
#: e2fsck/problem.c:1644
|
|||
|
|
msgid "Inline @d @i %i size (%N) must be a multiple of 4.\n"
|
|||
|
|
msgstr ""
|
|||
|
|
-"Velikost (%2$N) iuzlu %1$i vestavěného adresáře musí být násobek čtyř.\n"
|
|||
|
|
+"Velikost (%N) iuzlu %i vestavěného adresáře musí být násobek čtyř.\n"
|
|||
|
|
|
|||
|
|
#. @-expanded: Fixing size of inline directory inode %i failed.\n
|
|||
|
|
#: e2fsck/problem.c:1649
|
|||
|
|
Index: e2fsprogs-1.43.8/po/de.po
|
|||
|
|
===================================================================
|
|||
|
|
--- e2fsprogs-1.43.8.orig/po/de.po
|
|||
|
|
+++ e2fsprogs-1.43.8/po/de.po
|
|||
|
|
@@ -2039,7 +2039,7 @@ msgstr ""
|
|||
|
|
msgid ""
|
|||
|
|
"@i %i block %b conflicts with critical metadata, skipping block checks.\n"
|
|||
|
|
msgstr ""
|
|||
|
|
-"Block %2$b von Inode %1$i steht in Konflikt mit kritischen Metadaten, "
|
|||
|
|
+"Block %b von Inode %i steht in Konflikt mit kritischen Metadaten, "
|
|||
|
|
"Blockprüfungen werden übersprungen.\n"
|
|||
|
|
|
|||
|
|
#. @-expanded: directory inode %i block %b should be at block %c.
|
|||
|
|
@@ -2302,13 +2302,13 @@ msgstr ""
|
|||
|
|
#: e2fsck/problem.c:1284
|
|||
|
|
msgid "@i %i @x tree (at level %b) could be shorter. "
|
|||
|
|
msgstr ""
|
|||
|
|
-"Der Erweiterungsbaum von Inode %1$i (auf Ebene %2$b) könnte kürzer sein. "
|
|||
|
|
+"Der Erweiterungsbaum von Inode %i (auf Ebene %b) könnte kürzer sein. "
|
|||
|
|
|
|||
|
|
#. @-expanded: inode %i extent tree (at level %b) could be narrower.
|
|||
|
|
#: e2fsck/problem.c:1289
|
|||
|
|
msgid "@i %i @x tree (at level %b) could be narrower. "
|
|||
|
|
msgstr ""
|
|||
|
|
-"Der Erweiterungsbaum von Inode %1$i (auf Ebene %2$b) könnte schmaler sein. "
|
|||
|
|
+"Der Erweiterungsbaum von Inode %i (auf Ebene %b) könnte schmaler sein. "
|
|||
|
|
|
|||
|
|
#. @-expanded: Pass 2: Checking directory structure\n
|
|||
|
|
#: e2fsck/problem.c:1296
|
|||
|
|
Index: e2fsprogs-1.43.8/po/nl.po
|
|||
|
|
===================================================================
|
|||
|
|
--- e2fsprogs-1.43.8.orig/po/nl.po
|
|||
|
|
+++ e2fsprogs-1.43.8/po/nl.po
|
|||
|
|
@@ -2034,7 +2034,7 @@ msgstr ""
|
|||
|
|
msgid ""
|
|||
|
|
"@i %i block %b conflicts with critical metadata, skipping block checks.\n"
|
|||
|
|
msgstr ""
|
|||
|
|
-"Blok %2$b van inode %1$i conflicteert met kritieke metadata; blokcontroles "
|
|||
|
|
+"Blok %b van inode %i conflicteert met kritieke metadata; blokcontroles "
|
|||
|
|
"worden overgeslagen.\n"
|
|||
|
|
|
|||
|
|
#. @-expanded: directory inode %i block %b should be at block %c.
|
|||
|
|
Index: e2fsprogs-1.43.8/po/vi.po
|
|||
|
|
===================================================================
|
|||
|
|
--- e2fsprogs-1.43.8.orig/po/vi.po
|
|||
|
|
+++ e2fsprogs-1.43.8/po/vi.po
|
|||
|
|
@@ -1501,9 +1501,8 @@ msgstr "Đang định vị lại %s củ
|
|||
|
|
|
|||
|
|
#. @-expanded: Relocating group %g's %s to %c...\n
|
|||
|
|
#: e2fsck/problem.c:671
|
|||
|
|
-#, c-format
|
|||
|
|
msgid "Relocating @g %g's %s to %c...\n"
|
|||
|
|
-msgstr "Đang định vị lại %2$s của @g %1$g sang %3$c…\n"
|
|||
|
|
+msgstr "Đang định vị lại %s của @g %g sang %c…\n"
|
|||
|
|
|
|||
|
|
#. @-expanded: Warning: could not read block %b of %s: %m\n
|
|||
|
|
#: e2fsck/problem.c:676
|