Merge debian/po-up/patches.pot templates into the main template

I'll take the gnome-session task. The fix will be a combination of removing "include /usr/share/gnome-pkg-tools/1/rules/patch-translations.mk" from debian/rules and ensuring that any extra translatable files introduced in the debian directory are listed in po/POTFILES.in (although I'm not sure this applies for gnome-session, as the only extra translatable strings are in 10_session_save.patch which only touches an already translatable file).

I may as well take gnome-panel too, although I thought I'd already fixed this there.

I'm closing these tasks now, based on discussion on #ubuntu-desktop:

chrisccoulson seb128 - i took a look at bug 410241 at the weekend, and also one other bug raised by the translations team.
chrisccoulson for the gnome-panel task, pkgstriptranslations is just stripping the contents of debian/po-up, which isn't used
seb128 chrisccoulson, I talked to david at the airport saturday they can filter those on the rosetta side easily
chrisccoulson so we can just delete it
chrisccoulson ah, ok
seb128 chrisccoulson, we just need to make sure that patch strings are in the po templates
chrisccoulson i was actually wondering if we could filter them out in pkgstriptranslations? it seems to strip any folder containing translations (including the hidden .pc/ folder used by quilt)
seb128 should work too I guess
seb128 that's rather a question for pitti though
chrisccoulson yeah, i'll ask him when he comes back. so, i can close that bug report if they're going to be filtered out on the rosetta side can i?
seb128 yes, just make sure we have those string in the po template
chrisccoulson seb128 - in the gnome-session case, those strings are merged in the main po template. the extra folders (po.saved and debian/po-up) just contain the original template and the new merged-in strings, which aren't needed
chrisccoulson in the gnome-panel case, those strings in po-up aren't used in ubuntu, and aren't merged in (but are still there in the source)
dpm seb128: chrisccoulson, I've just read it, thanks for having a look at the po-up templates thing. I'll paste the conversation in an e-mail from the thread in the ubuntu-translations-coordinators list where this is also being discussed.

Is this still a valid bug for Ubuntu Translations ?

As per [1], it seems that the main templates already contain the strings from the patches.pot templates. As it is a small number of packages, we can block them in the imports queue.

[1] https://lists.launchpad.net/ubuntu-translations-coordinators/msg00138.html