On Mon, May 20, 2019 at 10:14:32AM +0100, Daniel P. Berrangé wrote: > On Sat, May 18, 2019 at 10:56:01AM -0500, Marty E. Plummer wrote: > > If you pass --for-msgfmt to msgmerge it will automatically do most of > > what you had the perl script doing. > > What msgmerge are you using as that option doesn't exist on Fedora 30 > at least ? > sys-deve/gettext-0.20.1 from gentoo. Didn't realize an update snuck in on me while doing this testing. > $ msgmerge --for-msgfmt --sort-output uk.po uk.mini.po > msgmerge: unrecognized option '--for-msgfmt' > Try 'msgmerge --help' for more information. > > $ rpm -qf /usr/bin/msgmerge > gettext-0.19.8.1-18.fc30.x86_64 > > > > > > Signed-off-by: Marty E. Plummer <hanetzer@xxxxxxxxxxxxx> > > --- > > The only downside I can see is the loss of the comment headers with the > > copyright year and such. A global note in the README.md or so may be an > > acceptable change. > > Removal of copyright strings is a no-go, as that is a violation of > licensing terms unless it is your own copyright notice you are > removing. > > Here's an idea I came up with to avoid this: move the copyright stuff out of a comment and add it to a translatable string, like so: diff --git a/po/en_GB.mini.po b/po/en_GB.mini.po index bbc61fe4c4..a1a14a0b53 100644 --- a/po/en_GB.mini.po +++ b/po/en_GB.mini.po @@ -1,17 +1,8 @@ -# Libvirt package strings. -# Copyright (C) 2019 Red Hat, Inc. -# This file is distributed under the same license as the PACKAGE package. -# -# Translators: -# Abigail Brady <morwen@xxxxxxxxxxxxx>, Bastien Nocera <hadess@xxxxxxxxxx>, 2007 -# Daniel <veillard@xxxxxxxxxx>, 2011 -# Daniel <veillard@xxxxxxxxxx>, 2011 -# readmanr <robert_readman@xxxxxxxxxxx>, 2013 msgid "" msgstr "" "Project-Id-Version: libvirt 4.10.0\n" "Report-Msgid-Bugs-To: https://libvirt.org/bugs.html\n"; -"POT-Creation-Date: 2019-01-14 16:56+0000\n" +"POT-Creation-Date: 2019-05-19 06:29-0500\n" "PO-Revision-Date: 2015-02-24 06:05+0000\n" "Last-Translator: Copied by Zanata <copied-by-zanata@xxxxxxxxxx>\n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/"; @@ -23,6 +14,14 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Zanata 4.6.2\n" +msgid "0Translators:" +msgstr "" +"Translators:\n" +"Abigail Brady <morwen@xxxxxxxxxxxxx>, Bastien Nocera <hadess@xxxxxxxxxx>, 2007\n" +"Daniel <veillard@xxxxxxxxxx>, 2011\n" +"Daniel <veillard@xxxxxxxxxx>, 2011\n" +"readmanr <robert_readman@xxxxxxxxxxx>, 2013\n" + msgid "" "\n" " (specify help <command> for details about the command)\n" I'm not too sure if there is some form of command like `virtsh --copyright` one coudl use, but if so, adding that to there would be a great idea, I think. Regards, Marty. > Regards, > Daniel > -- > |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| > |: https://libvirt.org -o- https://fstop138.berrange.com :| > |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :| -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list
