Il 14/01/2017 15:47, Stefan Sperling ha scritto: > On Sat, Jan 14, 2017 at 03:14:02PM +0100, Vincenzo Reale wrote: >> Il 14/01/2017 14:42, Stefan Sperling ha scritto: >>> Why are you changing the language team's email address? >>> >>> I think it would be better to leave the Last-Translator and >>> Language-Team lines unchanged. >> >> Same as above. >> Lokalize changed those lines. >> I apologize for that. >> Please, let me know if I have to send a new patch or if you can fix it. > > OK, no problem. I've fixed removed these lines before commit. > Now committed as https://svn.apache.org/r1778776 > > When I try to merge this revision to the Subversion 1.9.x branch, > I get conflicts: > > $ svn info --show-item=url > https://svn.apache.org/repos/asf/subversion/branches/1.9.x > $ svn merge -cr1778776 ^/subversion/trunk > --- Merging r1778776 into '.': > C subversion/po/it.po > --- Recording mergeinfo for merge of r1778776 into '.': > U . > Summary of conflicts: > Text conflicts: 1 > Merge conflict discovered in file 'subversion/po/it.po'. > Select: (p) Postpone, (df) Show diff, (e) Edit file, (m) Merge, > (s) Show all options: > > Would you be able to provide a working patch for 1.9.x as well? > Otherwise your translation updates won't be visible to end users until > we release 1.10.0 which has no pre-determined release date yet.
The attached patch should work with 1.9 branch. Best regards, Vincenzo
it_19.patch.gz
Description: GNU Zip compressed data
