po: remove unnecessary/buggy positional parameter specifiers
PATCH 1/1 po: remove unnecessary/buggy positional parameter specifiers
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
--- po/cs.po | 6 +++--- po/de.po | 6 +++--- po/nl.po | 2 +- po/vi.po | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-)
po/cs.po +3 -3
@@ -1939,7 +1939,7 @@ msgstr "" #. @-expanded: inode %i extended attribute block %b passes checks, but checksum does not match block. #: e2fsck/problem.c:1052 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í součet bloku neodpovídá. " +msgstr "Block %b rozšířeného atributu iuzlu %i projde kontrolami, ale kontrolní součet bloku neodpovídá. " # ??? WTF #. @-expanded: Interior extent node level %N of inode %i:\n
@@ -1977,7 +1977,7 @@ msgstr "Iuzel %i má nastaven příznak INLINE_DATA_FL na systému souborů bez #. @-expanded: inode %i block %b conflicts with critical metadata, skipping block checks.\n #: e2fsck/problem.c:1080 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 vynechá.\n" +msgstr "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. #: e2fsck/problem.c:1085
@@ -2613,7 +2613,7 @@ msgstr "Iuzel adresáře %i, %B: adresář prošel kontrolami, ale součet nesou #. @-expanded: Inline directory inode %i size (%N) must be a multiple of 4.\n #: e2fsck/problem.c:1679 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" +msgstr "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:1684
po/de.po +3 -3
@@ -2064,7 +2064,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.
@@ -2349,13 +2349,13 @@ msgstr "" #: e2fsck/problem.c:1314 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:1319 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:1326
po/nl.po +1 -1
@@ -2068,7 +2068,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.
po/vi.po +1 -1
@@ -1528,7 +1528,7 @@ msgstr "Đang định vị lại %s của @g %g từ %b sang %c…\n" #: e2fsck/problem.c:684 #, 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:689
Signature · 1 line
2.22.0
Op 13-07-19 om 18:57 schreef Theodore Ts'o:
Quoted 9 lines
The strings in
e2fsck/problem.cuse 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
The proposed corrections have been applied by the translators to the Czech, Dutch and German PO files, and manually by myself to the Vietnamese PO file .
Attached is a small patch to remove a superfluous no-c-format tag.
Benno
From eaf3e708719d60942cfadfb64c8f73e8bb54a2a5 Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <[email protected]>
Date: Thu, 1 Aug 2019 12:03:31 +0200
Subject: [PATCH] e2fsck: remove an ineffective (because trailing)
xgettext:no-c-format tag
--- e2fsck/problem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
e2fsck/problem.c +1 -1
@@ -705,7 +705,7 @@ static struct e2fsck_problem problem_table[] = {/* Relocating group number's information to X */ {PR_1_RELOC_TO ,/* xgettext:no-c-format */ -N_ ("Relocating @g %g's %s to %c...\n" ),/* xgettext:no-c-format */ +N_ ("Relocating @g %g's %s to %c...\n" ), PROMPT_NONE, PR_PREEN_OK, 0, 0, 0 }, /* Warning: could not read block number of relocation process */
Signature · 1 line
2.22.0