Merge lp:~dpm/unity/bug-920529 into lp:unity
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 |
Related bugs: |
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...
Code looks fine, lets just get design to review to remind them :-)