After an evaluation, GNOME has moved from Bugzilla to GitLab. Learn more about GitLab.
No new issues can be reported in GNOME Bugzilla anymore.
To report an issue in a GNOME project, go to GNOME GitLab.
Do not go to GNOME Gitlab for: Bluefish, Doxygen, GnuCash, GStreamer, java-gnome, LDTP, NetworkManager, Tomboy.
Bug 785732 - Remove markup from strings in .po files
Remove markup from strings in .po files
Status: RESOLVED FIXED
Product: NetworkManager
Classification: Platform
Component: VPN: pptp
git master
Other Linux
: Normal normal
: ---
Assigned To: NetworkManager maintainer(s)
NetworkManager maintainer(s)
Depends on:
Blocks:
 
 
Reported: 2017-08-02 13:34 UTC by Douglas Kosovic
Modified: 2017-08-03 13:55 UTC
See Also:
GNOME target: ---
GNOME version: ---


Attachments
remove markup tags patch (72.62 KB, patch)
2017-08-02 13:34 UTC, Douglas Kosovic
none Details | Review
remove duplicate strings patch (4.93 KB, patch)
2017-08-02 13:37 UTC, Douglas Kosovic
none Details | Review
remove redundant markup comments (4.30 KB, patch)
2017-08-03 10:58 UTC, Douglas Kosovic
none Details | Review

Description Douglas Kosovic 2017-08-02 13:34:12 UTC
Created attachment 356780 [details] [review]
remove markup tags patch

See https://wiki.gnome.org/Initiatives/GnomeGoals/RemoveMarkupInMessages

Markup was removed from strings in the NetworkManager-pptp UI file, but wasn't removed from .po files.

Please find attached a patch that removes the markup in the .po files.
Comment 1 Douglas Kosovic 2017-08-02 13:37:06 UTC
Created attachment 356781 [details] [review]
remove duplicate strings patch

Follow up patch to remove the duplicate strings, the following errors are from msgcat

da.po:487: duplicate message definition...
da.po:382: ...this is the location of the first definition
msgcat: found 1 fatal error
de.po:466: duplicate message definition...
de.po:374: ...this is the location of the first definition
de.po:469: duplicate message definition...
de.po:391: ...this is the location of the first definition
msgcat: found 2 fatal errors
es.po:472: duplicate message definition...
es.po:379: ...this is the location of the first definition
es.po:475: duplicate message definition...
es.po:395: ...this is the location of the first definition
msgcat: found 2 fatal errors
hr.po:448: duplicate message definition...
hr.po:360: ...this is the location of the first definition
hr.po:451: duplicate message definition...
hr.po:376: ...this is the location of the first definition
msgcat: found 2 fatal errors
hu.po:455: duplicate message definition...
hu.po:366: ...this is the location of the first definition
hu.po:458: duplicate message definition...
hu.po:382: ...this is the location of the first definition
msgcat: found 2 fatal errors
it.po:457: duplicate message definition...
it.po:367: ...this is the location of the first definition
it.po:460: duplicate message definition...
it.po:383: ...this is the location of the first definition
msgcat: found 2 fatal errors
lt.po:453: duplicate message definition...
lt.po:364: ...this is the location of the first definition
lt.po:456: duplicate message definition...
lt.po:380: ...this is the location of the first definition
msgcat: found 2 fatal errors
pt_BR.po:476: duplicate message definition...
pt_BR.po:384: ...this is the location of the first definition
pt_BR.po:479: duplicate message definition...
pt_BR.po:400: ...this is the location of the first definition
msgcat: found 2 fatal errors
sr@latin.po:466: duplicate message definition...
sr@latin.po:374: ...this is the location of the first definition
sr@latin.po:469: duplicate message definition...
sr@latin.po:390: ...this is the location of the first definition
msgcat: found 2 fatal errors
sr.po:466: duplicate message definition...
sr.po:374: ...this is the location of the first definition
sr.po:469: duplicate message definition...
sr.po:390: ...this is the location of the first definition
msgcat: found 2 fatal errors
sv.po:469: duplicate message definition...
sv.po:364: ...this is the location of the first definition
sv.po:472: duplicate message definition...
sv.po:380: ...this is the location of the first definition
msgcat: found 2 fatal errors
Comment 2 Douglas Kosovic 2017-08-03 10:58:13 UTC
Created attachment 356840 [details] [review]
remove redundant markup comments

Another follow up patch, the first patch removed markup tags from a few comments that followed strings that already had the markup removed, e.g:

    #| msgid "<b>Optional</b>"
    msgid "Optional"
    msgstr "Opcional"

got converted to the following with the first patch:

    #| msgid "Optional"
    msgid "Optional"
    msgstr "Opcional"

This patch just removes those comments.

Unlike the first two patches, this one is not important, but thought I would include it for completeness.
Comment 3 Lubomir Rintel 2017-08-03 13:55:44 UTC
Thank you.

This problem has been fixed in the unstable development version. The fix will be available in the next major software release. You may need to upgrade your Linux distribution to obtain that newer version.