xfce4-session-logout : buttons not localized except "Restart" and "Cancel"

[Damien G.E.]

Original subject : xfce4-session-logout : Incomplete French locale

1) Release version: Xubuntu 8.04 with non-english locale selected
2) Version of the package: xfce4-session (4.4.2-2ubuntu2)
3) When clicking on "exit" button (or typing command "xfce4-session-logout"), the logout panel applet appears with 7 choice buttons (Switch user, Log out, Reboot, Shut Down, Suspend, Hibernate, Cancel). As my language session is set french by default, all of this 7 buttons should be labeled in French (Changer d'utilisateur, Se déconnecter, Redémarrer, Eteindre, Suspendre, Hiberner, Annuler).
4) Here is the problem: Among the 7 choices buttons of the logout panel, only two are translated in French language ("Cancel' and "Restart"), the others are labelled in english.

Additional note:
 * This problem is not specific to French locale. All translations are missing for these buttons.
 * It is annoying for all Xubuntu users (and potential users) except English native speakers.

[Lionel Le Folgoc (mrpouit)]

I'll try to fix it on intrepid. For hardy, someone will have to do a SRU.

[Lionel Le Folgoc (mrpouit)]

Fixed in xfce4-session 4.4.2-6ubuntu2 (intrepid).

[Lionel Le Folgoc (mrpouit)]

I don't know if it's ok for a SRU (it's not really a high-impact bug). Anyway, it's a regression from gutsy, so I'll prepare the packages, and we'll see.

[Lionel Le Folgoc (mrpouit)]

50 files changed, 32366 insertions(+)
This is too much changes for a SRU, and I don't have the time to get a minimal diff for each PO file, sorry. Maybe someone from the Xubuntu team will do it.

[Florent (florent.x)]

Here is a minimal patch for Hardy, against "4.4.2-2ubuntu2".

This SRU aims to fix a regression introduced with Hardy.
It has low risk, since there's only 3 files touched, no source code:
* debian/changelog
* debian/patches/series
* debian/patches/08_fix_xubuntu_translations.patch

The translation patch is minimal. For each PO file:
* it appends 7 new strings, specific for (x)ubuntu, with translations extracted from the last Intrepid tarball
* it changes case for 2 other strings
* it removes 1 obsolete string ("End Session", replaced with "Switch user")

[Florent (florent.x)]

debdiff changed:
* removed conflicting commented strings for languages: be, dz, gl, sk
* fix patch format (removed 1 directory level)

[Florent (florent.x)]

Built, installed and tested on PPA.
It works as expected.

[Lionel Le Folgoc (mrpouit)]

Thanks, I'll review the debdiff.

[Lionel Le Folgoc (mrpouit)]

I made some changes with Florent (drop uneeded parts of the patch, correct revision number...).
Waiting for Cody's ack. ;)

[Cody A.W. Somerville (cody-somerville)]

Could you please list the languages you fixed in the debdiff for the SRU?

[Florent (florent.x)]

Attached new debdiff.

All 49 languages are touched:
 * "Shut Down" -> "Shut down" and "Log Off -> "Log off" is changed for all languages
 * "Switch user" / "Suspend" / "Hibernate" are added only if available in Rosetta

[Cody A.W. Somerville (cody-somerville)]

ACK once you update the bug description to be accurate. :)

[Florent (florent.x)]

Changed description to highlight the fact that it is not specific to French locale.
IMHO 99% of non-English users see this bug at least once a day since April 2008...

[Cody A.W. Somerville (cody-somerville)]

ACK. Please upload to -proposed.

[Lionel Le Folgoc (mrpouit)]

It seems it was accepted into -proposed today. It needs some testing now.

[Florent (florent.x)]

it works.

[Steve Langasek (vorlon)]

Thanks for confirming. Copying to hardy-updates.