Merge lp:~didrocks/unity/workspace-switch-translation into lp:unity/6.0

Proposed by Didier Roche on 2012-10-08
Status: Merged
Approved by: Didier Roche on 2012-10-08
Approved revision: 2767
Merged at revision: 2767
Proposed branch: lp:~didrocks/unity/workspace-switch-translation
Merge into: lp:unity/6.0
Diff against target: 12 lines (+1/-1)
1 file modified
launcher/ExpoLauncherIcon.cpp (+1/-1)
To merge this branch: bzr merge lp:~didrocks/unity/workspace-switch-translation
Reviewer Review Type Date Requested Status
Łukasz Zemczak 2012-10-08 Approve on 2012-10-08
Review via email: mp+128457@code.launchpad.net

Commit Message

Ok, no need for the changed strings after all, Seb reuploaded the template file with the additional string and launchpad kept the 12.04 string, so we can revert it to that one.
The incoming langpack export will then repick the previous 12.04 translation.

The POTFILES.in addition from the previous merge is still needed for next upload to not remove the string from the template and so export. So only revert the string change here

Description of the Change

Ok, no need for the changed strings after all, Seb reuploaded the template file with the additional string and launchpad kept the 12.04 string, so we can revert it to that one.
The incoming langpack export will then repick the previous 12.04 translation.

The POTFILES.in addition from the previous merge is still needed for next upload to not remove the string from the template and so export. So only revert the string change here

To post a comment you must log in.
Łukasz Zemczak (sil2100) wrote :

Oook. Well, this looks alright then.

review: Approve
Unity Merger (unity-merger) wrote :

No commit message specified.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'launcher/ExpoLauncherIcon.cpp'
2--- launcher/ExpoLauncherIcon.cpp 2012-10-08 08:47:17 +0000
3+++ launcher/ExpoLauncherIcon.cpp 2012-10-08 10:12:23 +0000
4@@ -31,7 +31,7 @@
5 ExpoLauncherIcon::ExpoLauncherIcon()
6 : SimpleLauncherIcon(IconType::EXPO)
7 {
8- tooltip_text = _("Workspaces");
9+ tooltip_text = _("Workspace Switcher");
10 icon_name = "workspace-switcher";
11 SetQuirk(Quirk::VISIBLE, false);
12 SetQuirk(Quirk::RUNNING, false);

Subscribers

People subscribed via source and target branches