Merge lp:~dpm/ubuntu/lucid/ubuntuone-client/desktop-entry-i18n into lp:ubuntu/lucid/ubuntuone-client

[David Planella]

Make the desktop entry translatable.

I haven't marked the other "Name" field, since I'm not too sure what "[U1 Shortcut Group]" is for.

[lp:~dpm/ubuntu/lucid/ubuntuone-client/desktop-entry-i18n]

24. By David Planella on 2010-03-10

Marked the indicator shortcut for translation as well

[David Planella (dpm)]

After having talked to ted, it seems that translations for the [U1 Shortcut Group] in the app indicator will "just happen" as well, thus marking the other Name key for translation as well.

[James Westby (james-w)]

review: Abstain

[dobey (dobey)]

This needs to be done as a branch from the upstream ubuntuone-client tree (lp:ubuntuone-client), and not the packaging branch, unless you're wanting to ship a patch in the tree, in which case it should be a patch.

Also, "Name" is intentionally left untranslated, because it's a proper noun brand name, which should not be translated. Comment should be translated (though Ubuntu One should always be Ubuntu One in all translations), so I'm not sure why it wasn't marked for translation. And X-Ubuntu-Gettext-Domain is I believe automatically added by the packaging. I removed it previously, because of lint complaints from dpkg-buildpackage.

review: Disapprove

[David Planella (dpm)]

Thanks for the review Rodney, I've now only marked the Comment key for translation against the ubuntuone-client branch and submitted a new merge proposal there (https://code.launchpad.net/~dpm/ubuntuone-client/bug-538217/+merge/21278)

[dobey (dobey)]

Can someone please change this proposal's status to "Rejected" so that it is out of sight? Thanks.

Unmerged revisions

24. By David Planella on 2010-03-10

Marked the indicator shortcut for translation as well

23. By David Planella on 2010-03-10

Make desktop entry translatable

=== modified file 'data/ubuntuone-preferences.desktop.in'
--- data/ubuntuone-preferences.desktop.in	2010-02-17 23:51:29 +0000
+++ data/ubuntuone-preferences.desktop.in	2010-03-10 16:59:21 +0000
@@ -1,6 +1,6 @@
 [Desktop Entry]
-Name=Ubuntu One
-Comment=Configure and manage your Ubuntu One account
+_Name=Ubuntu One
+_Comment=Configure and manage your Ubuntu One account
 Exec=ubuntuone-preferences
 Icon=ubuntuone
 Terminal=false
@@ -8,7 +8,8 @@
 StartupNotify=true
 Categories=GNOME;GTK;Settings;
 X-Ayatana-Desktop-Shortcuts=U1
+X-Ubuntu-Gettext-Domain=ubuntuone-client
 
 [U1 Shortcut Group]
-Name=Ubuntu One…
+_Name=Ubuntu One…
 Exec=ubuntuone-preferences