1207945 - [pa-IN] Merge mozilla-aurora and l10n-central

Status: RESOLVED FIXED

(Mozilla Localizations :: pa-IN / Punjabi, defect)

Description

[Francesco Lodolo [:flod]]

l10n-central and mozilla-aurora are currently in a non mergeable state

http://hg.mozilla.org/l10n-central/pa-IN/
Excluding my own landings for productization purposes, l10n-central has very old landings (2014).

http://hg.mozilla.org/releases/l10n/mozilla-aurora/pa-IN/
Is up to date.

It seems that you're working directly on mozilla-aurora, and it would make sense to merge the state of these two repositories.

Comment 1

[Francesco Lodolo [:flod]]

(I think the team page needs some updates).

Any thoughts? I would take care of the merge, on your side the only important thing would be to not make landings directly in l10n-central.

Comment 2

[A S Alam]

1. I only work on mozilla-Aurora and mozilla-beta (if get late to complete translation) repos, not on mozilla-central.

2. All changes from my side are committed to repos

So feel free to merge. I will be on hold for this bug.

thanks

Comment 3

[Francesco Lodolo [:flod]]

Thanks! The repo is now merged, content in mozilla-aurora is unchanged.
Please make sure you update your local clones before doing any commit.

I will updated l10n-central periodically when I land productization changes. If you want, you can also run a script like this one to pull your updates from aurora, the important thing is to not commit changes directly in l10n-central
Linux/OS X: https://gist.github.com/flodolo/3bf48f1d1dff5d9a6586
Windows: https://gist.github.com/flodolo/b8f84fb4a645495fe502