[bug-gettext] Bug#680630: [gettext] msgmerge: merges distinct src comment lines (fwd)

[Santiago Vila]

Hello.

I received this report from the Debian bug system.

At first I was thinking about telling the submitter that it's not a
bug, because the resulting .po file is equivalent for all purposes
but then I realized that the only place where gettext documentation
justifies this behaviour (if it does at all) is in a paragraph like this
in the manual:

`-w NUMBER'
`--width=NUMBER'
    Set the output page width.  Long strings in the output files will
    be split across multiple lines in order to ensure that each line's
    width (= number of screen columns) is less or equal to the given
    NUMBER.

So, it says that long strings will be split, but it does not say that
short lines will be merged.

Do we really want to merge lines when they are source comment lines?

Thanks.

---------- Forwarded message ----------
From: Bastien Montagne <address@hidden>
To: address@hidden
Date: Sat, 07 Jul 2012 15:35:34 +0200
Subject: Bug#680630: [gettext] msgmerge: merges distinct src comment lines

Package: gettext
Version: 0.18.1.1-9
Severity: normal

--- Please enter the report below this line. ---
msgmerge merges source comment lines when their total length is shorter than the
width.

To reproduce, once unpacked the attach archive, run:

$ msgmerge test.po test.pot

You should get:

msgid ""
msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"

#: source/blender/nodes/shader/nodes/node_shader_tex_coord.c:40
#: bpy.types.Image.mapping:'REFLECTION' bpy.types.MaterialVolume.reflection
#: bpy.types.RenderLayer.use_pass_reflection
#: bpy.types.RenderPass.type:'REFLECTION'
msgid "Reflection"
msgstr "Réflexion"

…while the expected result is:

msgid ""
msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"

#: source/blender/nodes/shader/nodes/node_shader_tex_coord.c:40
#: bpy.types.Image.mapping:'REFLECTION'
#: bpy.types.MaterialVolume.reflection
#: bpy.types.RenderLayer.use_pass_reflection
#: bpy.types.RenderPass.type:'REFLECTION'
msgid "Reflection"
msgstr "Réflexion"

The only way to get expected result currently is to use that hack:

$ msgmerge -w 1 --no-wrap test.po test.pot

Best regards,
Bastien

--- System information. ---
Architecture: amd64
Kernel: Linux 3.2.0-2-amd64

Debian Release: wheezy/sid

--- Package information. ---
Depends (Version) | Installed
=================================-+-===============
libc6 (>= 2.11) | 2.13-33
libcroco3 (>= 0.6.2) | 0.6.5-1
libglib2.0-0 (>= 2.12.0) | 2.32.3-1
libgomp1 (>= 4.2.1) | 4.7.1-2
libncurses5 (>= 5.5-5~) | 5.9-9
libtinfo5 | 5.9-9
libunistring0 | 0.9.3-5
libxml2 (>= 2.7.4) | 2.8.0+dfsg1-4
libgettextpo0 (= 0.18.1.1-9) | 0.18.1.1-9
libasprintf0c2 (= 0.18.1.1-9) | 0.18.1.1-9
gettext-base | 0.18.1.1-9
dpkg (>= 1.15.4) | 1.16.4.3
OR install-info | 4.13a.dfsg.1-10


Recommends (Version) | Installed
=========================-+-===========
curl |
OR wget | 1.13.4-3
OR lynx-cur |
autopoint | 0.18.1.1-9


Suggests (Version) | Installed
==========================-+-===========
gettext-doc |

msgmerge_test.tar.bz2
Description: application/bzip