PROPOSAL: Merging Kleopatra Enterprise Branch into Trunk for 4.1

[Allen Winter]

On Monday 16 June 2008 18:57:24 Marc Mutz wrote:
> On Tuesday 17 June 2008 00:14, Allen Winter wrote:
> > On Monday 16 June 2008 11:17:34 Aaron J. Seigo wrote:
> > > On Monday 16 June 2008, Allen Winter wrote:
> > > > Dear Translators and Release Team,
> > > >
> > Regarding the feature freeze.. looking closer it seems that at least one of
> > the two new features (openPGP support) was already in progress since before
> > the feature freeze.  Not sure when the plugin for Konqueror and Dolphin was
> > started.
> 
> It wasn't, and it will not be part of the merge.
> 
Ah, so we aren't breaking the feature freeze at all then.
Most excellent.

> > Mostly, this an issue of accepting the new strings.
> 
1 translator has already written back that he isn't happy with
all the new work, but won't object to the merge.