Closed Bug 792717 Opened 7 years ago Closed 7 years ago
MPL 2 upgrade: l10n for ca
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 ------- -------- ----------- 840 85.28% mpl2 110 11.17% <none found> 17 1.73% <unknown license> 16 1.62% mpl/gpl/lgpl (standard block) 1 0.10% pd 1 0.10% mpl ---------------------------- 985 files processed I have a script which can do the relicensing automatically. I will provide a patch here. Once a patch has been provided, please commit it as soon as possible. The aim is to have the relicensing finished by the end of September. Thanks :-) Gerv
Assignee: gerv → toniher
Hi Gerv, because of our translation workflow (via Pootle: http://pootle.softcatala.org/ca/mozilla/) I cannot easily commit this change right now without affecting our workflow. I can propose a solution: * Either you rerun your script when I commit the new strings (but this can be by the beginning of October, before the merge) * You pass me the script and I try to perform the change myself. Let me know!
Hi Toni: I'm happy to rerun the script at a later time, or even on a different repo. Just tell me what to do when you are ready :-) Ideally, it would be done by end September, but if that's not possible, it's not possible. Gerv
Also, this patch is wrong - some of the files are incorrectly marked as Incompatible With Secondary Licenses. I will fix that when I recreate it. Gerv
Turns out it's only one file - extensions/venkman/chrome/venkman.dtd . I'll need to fix that one up by hand before uploading another patch. Gerv
Hi Gerv, you can provide another patch. We just updated Aurora (http://hg.mozilla.org/releases/l10n/mozilla-aurora/ca/) and Eduard will take care of applying it.
Assignee: toniher → egamonal
Here is a patch against the latest aurora, as requested. Gerv
Fixed - thank you :-) Gerv
Status: ASSIGNED → RESOLVED
Closed: 7 years ago
Resolution: --- → FIXED
Some of this was regressed, sadly. Some changes in http://hg.mozilla.org/releases/l10n/mozilla-aurora/ca/rev/3b0b37ceb8b0 have wrong line endings, and some revert to triple license.
Status: RESOLVED → REOPENED
Resolution: FIXED → ---
Here's a new patch which fixes things. Gerv
Attachment #688967 - Flags: review?(egamonal)
Attachment #688967 - Flags: review?(egamonal) → review+
Eduard: can you commit this, please? I don't have the necessary rights. Gerv
I can't do it before Dec 18. is it ok?
That's fine. Gerv
I applied the patch. it failed for one file: [edu@fedora-laptop l10n2]$ hg patch -p1 ca2.diff applying ca2.diff patching file extensions/irc/chrome/channels.dtd Hunk #1 FAILED at 0 1 out of 1 hunks FAILED -- saving rejects to file extensions/irc/chrome/channels.dtd.rej abort: patch failed to apply [edu@fedora-laptop l10n2]$ These files were changed: [edu@fedora-laptop l10n2]$ hg st M browser/firefox-l10n.js M browser/profile/chrome/userChrome-example.css M browser/profile/chrome/userContent-example.css M calendar/extra-jar.mn M calendar/lightning-l10n.js M calendar/sunbird-l10n.js M extensions/irc/chrome/about.dtd M extensions/irc/chrome/browserOverlay.dtd M extensions/irc/chrome/ceip.dtd M extensions/irc/chrome/chatzilla.dtd M extensions/irc/chrome/chatzilla.properties M extensions/irc/chrome/chatzillaOverlay.dtd M extensions/irc/chrome/config.dtd M extensions/irc/chrome/install-plugin.dtd M extensions/irc/chrome/pref-irc.dtd M extensions/venkman/chrome/venkman-output-locale.css M extensions/venkman/chrome/venkman-overlay.dtd M extensions/venkman/chrome/venkman.dtd M extensions/venkman/chrome/venkman.properties M mail/all-l10n.js M mobile/android/mobile-l10n.js M mobile/xul/mobile-l10n.js M other-licenses/branding/sunbird/brand.dtd M other-licenses/branding/sunbird/brand.properties M suite/chrome/common/help/certs_help.xhtml M suite/chrome/common/help/certs_prefs_help.xhtml M suite/chrome/common/help/cs_nav_prefs_advanced.xhtml M suite/chrome/common/help/cs_nav_prefs_appearance.xhtml M suite/chrome/common/help/cs_nav_prefs_navigator.xhtml M suite/chrome/common/help/cs_priv_prefs_popup.xhtml M suite/chrome/common/help/customize_help.xhtml M suite/chrome/common/help/developer_tools.xhtml M suite/chrome/common/help/forieusers.xhtml M suite/chrome/common/help/glossary.xhtml M suite/chrome/common/help/help-glossary.rdf M suite/chrome/common/help/help-index1.rdf M suite/chrome/common/help/help-indexAZ.rdf M suite/chrome/common/help/help-win.rdf M suite/chrome/common/help/helpFileLayout.css M suite/chrome/common/help/help_help.xhtml M suite/chrome/common/help/mailnews_account_settings.xhtml M suite/chrome/common/help/mailnews_addressbooks.xhtml M suite/chrome/common/help/mailnews_blogs_and_feeds.xhtml M suite/chrome/common/help/mailnews_getting_started.xhtml M suite/chrome/common/help/mailnews_newsgroups.xhtml M suite/chrome/common/help/mailnews_offline.xhtml M suite/chrome/common/help/mailnews_organizing.xhtml M suite/chrome/common/help/mailnews_preferences.xhtml M suite/chrome/common/help/mailnews_security.xhtml M suite/chrome/common/help/mailnews_using_mail.xhtml M suite/chrome/common/help/nav_help.xhtml M suite/chrome/common/help/passwords_help.xhtml M suite/chrome/common/help/privacy_help.xhtml M suite/chrome/common/help/privsec_help.xhtml M suite/chrome/common/help/profiles_help.xhtml M suite/chrome/common/help/shortcuts.xhtml M suite/chrome/common/help/shortcuts_composer.xhtml M suite/chrome/common/help/shortcuts_mailnews.xhtml M suite/chrome/common/help/shortcuts_navigator.xhtml M suite/chrome/common/help/ssl_help.xhtml M suite/chrome/common/help/suite-toc.rdf M suite/chrome/common/help/suitehelp.rdf M suite/chrome/common/help/using_priv_help.xhtml M suite/chrome/common/help/validation_help.xhtml M suite/chrome/common/help/welcome_help.xhtml M suite/extra-jar.mn M suite/profile/chrome/userChrome-example.css M suite/profile/chrome/userContent-example.css M suite/suite-l10n.js M toolkit/chrome/global/intl.css M toolkit/chrome/mozapps/help/help-toc.rdf ? ca2.diff ? extensions/irc/chrome/channels.dtd.rej [edu@fedora-laptop l10n2]$ big changes in http://hg.mozilla.org/releases/l10n/mozilla-aurora/ca/rev/dd2aa517a909 channels.dtd still had the old license box. I fixed it manually in http://hg.mozilla.org/releases/l10n/mozilla-aurora/ca/rev/6207dbd2a60b
Looks good now - thanks :-) Gerv
Status: REOPENED → RESOLVED
Closed: 7 years ago → 7 years ago
Resolution: --- → FIXED
You need to log in before you can comment on or make changes to this bug.