Merge lp:~dpm/unity/bug-920529 into lp:unity

Proposed by David Planella
Status: Merged
Approved by: Tim Penhey
Approved revision: no longer in the source branch.
Merged at revision: 1865
Proposed branch: lp:~dpm/unity/bug-920529
Merge into: lp:unity
Diff against target: 25 lines (+2/-2)
2 files modified
plugins/unityshell/src/unityshell.cpp (+1/-1)
standalone-clients/TestShortcut.cpp (+1/-1)
To merge this branch: bzr merge lp:~dpm/unity/bug-920529
Reviewer Review Type Date Requested Status
John Lea (community) design review Approve
Tim Penhey (community) Approve
Review via email: mp+89725@code.launchpad.net

Description of the change

- Change 'Rubbish Bin' to 'Trash' in the Unity shortcuts hints overlay

From bug 920529:

In all the software we ship in Ubuntu we use American English (en-US) messages as the source for translations. These can then be translated to any language or variant, such as British English (en-GB).

In the Unity shortcuts hints overlay, the current message (for the want of a better name) for the place where discarded files go is "Rubbish Bin", which is the en-GB version.

In order to be consistent with the rest of the desktop and with the translations, the original message should refer to "Trash", which can then be translated to "Rubbish Bin" in en-GB and will allow the right translation to be shown in the user's desktop for their chosen locales.

It might seem a trivial issue, but those involved in bug 406626, its duplicates and follow-ups will remember that it's a sensitive topic...

To post a comment you must log in.
Revision history for this message
Tim Penhey (thumper) wrote :

Code looks fine, lets just get design to review to remind them :-)

review: Approve
Revision history for this message
John Lea (johnlea) wrote :

Good to see this being cleaned up at last ;-) ok'ed by design

review: Approve (design review)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/unityshell/src/unityshell.cpp'
2--- plugins/unityshell/src/unityshell.cpp 2012-01-20 06:47:42 +0000
3+++ plugins/unityshell/src/unityshell.cpp 2012-01-23 16:22:41 +0000
4@@ -2388,7 +2388,7 @@
5 hints_.push_back(new shortcut::Hint(launcher, "", "", _("Switch applications via Launcher."), shortcut::HARDCODED_OPTION, "Super + Tab"));
6 hints_.push_back(new shortcut::Hint(launcher, "", _(" + 1 to 9"), _("Same as clicking on a Launcher icon."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "show_launcher"));
7 hints_.push_back(new shortcut::Hint(launcher, "", _(" + Shift + 1 to 9"), _("Open new window of the app."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "show_launcher"));
8- hints_.push_back(new shortcut::Hint(launcher, "", " + T", _("Open the Rubbish Bin."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "show_launcher"));
9+ hints_.push_back(new shortcut::Hint(launcher, "", " + T", _("Open the Trash."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "show_launcher"));
10
11 // Dash...
12 std::string const dash = _("Dash");
13
14=== modified file 'standalone-clients/TestShortcut.cpp'
15--- standalone-clients/TestShortcut.cpp 2011-12-19 22:02:10 +0000
16+++ standalone-clients/TestShortcut.cpp 2012-01-23 16:22:41 +0000
17@@ -42,7 +42,7 @@
18 hints.push_back(new shortcut::MockHint(_("Launcher"), "", "", _("Switch application via Launcher."), shortcut::HARDCODED_OPTION, "Super + Tab"));
19 hints.push_back(new shortcut::MockHint(_("Launcher"), "", _(" + 1 to 9"), _("Same as clicking on a Launcher icon."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "show_launcher"));
20 hints.push_back(new shortcut::MockHint(_("Launcher"), "", _(" + Shift + 1 to 9"), _("Open a new window of the app."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "show_launcher"));
21- hints.push_back(new shortcut::MockHint(_("Launcher"), "", " + T", _("Open the Rubbish Bin."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "show_launcher"));
22+ hints.push_back(new shortcut::MockHint(_("Launcher"), "", " + T", _("Open the Trash."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "show_launcher"));
23
24 // Dash...
25 hints.push_back(new shortcut::MockHint(_("Dash"), "", _(" (Tap)"), _("Open the Dash Home."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "show_launcher"));