Remove inline translations from .desktop files

thank you for your bug report but that's not a bug, the preference order has been reversed on purpose on jaunty, the desktop should be cleaned during the build though

letting the bug open and assigning to pitti for now since he worked on those changes

revelant glib change

" * 01_gettext-desktopfiles.patch: Merge OpenSUSE's and our patch:
    - Now prefers inline translations over gettext translations, which
      fixes a few corner cases (like renaming .desktop files on the
      user's desktop), is more in line with the recent gconf patch,
      and more palatable for upstream inclusion.
    - Use X-GNOME-Gettext-Domain, for preparing upstream inclusion.
    - Forwarded upstream now.
  * Add 02_gettext-desktopfiles-ubuntu.patch: Provide backwards
    compatibility for 01_gettext-desktopfiles.patch for
    X-{Debian,Ubuntu}-Gettext-Domain. The latter was changed to use
    X-GNOME-, so this is necessary until all our .desktop files are
    converted."

Indeed it's not sufficient any more to clean the translations in cdbs, we need to do it in pkgstriptranslations. I'll move the code there.

Then we need to rebuild a couple of packages which still have their translations in the .desktop.

Uploaded, will be accepted after beta release.

To actually fix this for system-config-printer, we'll need a rebuild of the package.

Martin, thank you for taking care of this issue.

system-config-printer isn't the only package affected. Synaptic is also showing the wrong translation in its menu entry, and maybe there are some others.

Opening a synaptic task as a placeholder to do the rebuilds once the new pkgstriptranslations is in.

This bug was fixed in the package pkgbinarymangler - 56

---------------
pkgbinarymangler (56) jaunty; urgency=low

  * pkgstriptranslations: Remove translations from .desktop files if they have
    a gettext domain. Not every package with .desktop files uses cdbs with
    langpack.mk (where this stripping has happened so far), and we are now
    preferring the language pack translations over the static upstream
    translations in .desktop files. (LP: #348225)
  * debian/copyright: Update GPL stanza (previously had old FSF address),
    thanks lintian.
  * debian/control: Bump Standards-Version (no changes required).

 -- Martin Pitt <email address hidden> Wed, 25 Mar 2009 10:28:45 +0100

This bug was fixed in the package synaptic - 0.62.5ubuntu2

---------------
synaptic (0.62.5ubuntu2) jaunty; urgency=low

  * No-change upload to strip translations from .desktop files. (LP: #348225)

 -- Martin Pitt <email address hidden> Mon, 30 Mar 2009 12:57:47 +0200

This bug was fixed in the package system-config-printer - 1.1.3+git20090218-0ubuntu15

---------------
system-config-printer (1.1.3+git20090218-0ubuntu15) jaunty; urgency=low

  * No-change upload to strip translations from .desktop files. (LP: #348225)

 -- Martin Pitt <email address hidden> Mon, 30 Mar 2009 12:59:03 +0200

Martin, I have:

$ dpkg -s synaptic | grep Version:
Version: 0.62.5ubuntu2

$ dpkg -s system-config-printer-gnome | grep Version:
Version: 1.1.3+git20090218-0ubuntu15

However, translations are still inside /usr/share/applications/synaptic.desktop and /usr/share/applications/system-config-printer.desktop. The bug is still NOT fixed.

I can help you with any information you could need in order to fix it.

These work on a local build, so I can only assume that our buildds have an outdated version of pkgbinarymangler (I thought they'd auto-upgrade). Adam, can you please check this, and upgrade them to version 57? Thank you!

Ah, for some reason pkgbinarymangler moved to universe. I moved it back, and added it to the seeds.

This bug was fixed in the package system-config-printer - 1.1.3+git20090218-0ubuntu16

---------------
system-config-printer (1.1.3+git20090218-0ubuntu16) jaunty; urgency=low

   * Yet another no-change upload to _really_ build against current
     pkgbinarymangler. (LP: #348225)

 -- Martin Pitt <email address hidden> Tue, 31 Mar 2009 12:23:52 +0200

Fixed for me for system-config-printer. Good job!

Thanks a lot, waiting for synaptic :).

This bug was fixed in the package synaptic - 0.62.5ubuntu2.1

---------------
synaptic (0.62.5ubuntu2.1) jaunty; urgency=low

  * Yet another no-change upload to _really_ build against current
    pkgbinarymangler. (LP: #348225)

 -- Martin Pitt <email address hidden> Tue, 31 Mar 2009 12:13:39 +0200

Martin, thanks for the fix.

Additionally, I can see that computer-janitor-gtk.desktop file from computer-janitor package has inline translations, too, which should be removed. However, besides that, and due to bug #352770, its Ubuntu gettext domain should be changed from "computerjanitorapp" to "computerjanitor".