792780 - MPL 2 upgrade: l10n for sv-SE

Status: RESOLVED FIXED

(Mozilla Localizations :: sv-SE / Swedish, defect)

Description

[Gervase Markham [:gerv]]

Attachment: Patch v.1

This language needs some or all of its l10n files to be upgraded to the MPL 2 licence. The current status in the aurora repo http://hg.mozilla.org/releases/l10n/mozilla-aurora/ is:

Summary of Licenses in Files
============================
 Number  Percent License
------- -------- -----------
    335   35.34% mpl2
    330   34.81% <none found>
    215   22.68% mpl/gpl/lgpl (standard block)
     55    5.80% mpl
     11    1.16% <unknown license>
      1    0.11% pd
      1    0.11% gpl/lgpl
----------------------------
    948 files processed

I have a script which can do the relicensing automatically. Please find a patch attached. Please review it and commit it as soon as possible. (The aim is to have the relicensing finished by the end of September.) If there are any problems, please let me know.

Thanks :-)

Gerv

Comment 1

[u60234]

Comment on attachment 662899 [details] [diff] [review]
Patch v.1

>diff --git a/editor/ui/chrome/composer/editor.properties b/editor/ui/chrome/composer/editor.properties
>--- a/editor/ui/chrome/composer/editor.properties
>+++ b/editor/ui/chrome/composer/editor.properties
>@@ -1,37 +1,14 @@
>-# The contents of this file are subject to the Mozilla Public
>-# License Version 1.1 (the "License"); you may not use this file
>-# except in compliance with the License. You may obtain a copy of
>-# the License at http://www.mozilla.org/MPL/
>-# 
>-# Software distributed under the License is distributed on an "AS
>-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
>-# implied. See the License for the specific language governing
>-# rights and limitations under the License.
>-# 
>-# Alternatively, the contents of this file may be used under the terms of
>-# either the GNU General Public License Version 2 or later (the "GPL"), or
>-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
>-# in which case the provisions of the GPL or the LGPL are applicable instead
>-# of those above. If you wish to allow use of your version of this file only
>-# under the terms of either the GPL or the LGPL, and not to allow others to
>-# use your version of this file under the terms of the MPL, indicate your
>-# decision by deleting the provisions above and replace them with the notice
>-# and other provisions required by the LGPL or the GPL. If you do not delete
>-# the provisions above, a recipient may use your version of this file under
>-# the terms of any one of the MPL, the GPL or the LGPL.
>-# 
>-# The Original Code is the Mozilla Swedish translation for Mozilla 1.0.
>-# 
>-# The Initial Developer of the Original Code is Niklas Lundström.
>-# 
>-# Contributor(s):
>-# - Niklas Lundström <[e-mail]>
>-# - Hasse Wallanger <[e-mail]>
>+# This Source Code Form is subject to the terms of the Mozilla Public
>+# License, v. 2.0. If a copy of the MPL was not distributed with this
>+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
>+#
>+# This Source Code Form is "Incompatible With Secondary Licenses", as
>+# defined by the Mozilla Public License, v. 2.0.
> 

In this and some other files, the “Incompatible With Secondary Licenses” notice is attached. Why is that? Was the license notice that we localizers added years ago not a valid tri-license notice?

Comment 2

[Gervase Markham [:gerv]]

That is not supposed to happen; it's not that your old notice was invalid, it just seems that the script hasn't recognised it properly. Perhaps the boilerplate has a typo, or perhaps one of my regexps is wrong. 

I have found five diffs where this is a problem, including this one. Let me work on it and get back to you.

Gerv

Comment 3

[Gervase Markham [:gerv]]

OK, I've looked into this. It seems that your localization just has a lot of headers which are slightly variant, and the script doesn't recognize them properly. There are 55 in sv-SE; the next most problematic localization only had 7 such errors.

Given that, it seems easier to fix this up manually than to try and update the script (whose detection logic is complex) to cope. I will supply a new patch soon.

Gerv

Comment 4

[u60234]

No need for a new patch. I can fix this myself now that I know it's OK to remove the "Incompatible With Secondary Licenses" notice.

Comment 5

[u60234]

Fixed on central and aurora
http://hg.mozilla.org/l10n-central/sv-SE/rev/63b1e9f67f48
http://hg.mozilla.org/releases/l10n/mozilla-aurora/sv-SE/rev/165287e18c4c

Thanks for the patch!

Comment 6

[Gervase Markham [:gerv]]

It seems either you or I missed two files:
    ./suite/chrome/mailnews/pref/replicationProgress.properties
    ./extensions/spellcheck/hunspell/README_sv.txt

Can you fix those too? (The latter one might need to be not fixed, if it's actually the license of some software imported from outside Mozilla.)

Thanks,

Gerv

Comment 7

[u60234]

I have fixed replicationProgress.properties. The spellchecking dictionary comes from another project, so it's their license. So I should probably leave that alone and also revert the change to the .aff file that is covered by the same license.

http://hg.mozilla.org/l10n-central/sv-SE/rev/dd3e55b3187b
http://hg.mozilla.org/releases/l10n/mozilla-aurora/sv-SE/rev/00670ded614c

Comment 8

[Gervase Markham [:gerv]]

Yep, all looks good.

Gerv