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

[Didier Roche-Tolomelli]

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

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

[Łukasz Zemczak (sil2100)]

Oook. Well, this looks alright then.

review: Approve

[Unity Merger (unity-merger)]

No commit message specified.

=== modified file 'launcher/ExpoLauncherIcon.cpp'
--- launcher/ExpoLauncherIcon.cpp	2012-10-08 08:47:17 +0000
+++ launcher/ExpoLauncherIcon.cpp	2012-10-08 10:12:23 +0000
@@ -31,7 +31,7 @@
 ExpoLauncherIcon::ExpoLauncherIcon()
   : SimpleLauncherIcon(IconType::EXPO)
 {
-  tooltip_text = _("Workspaces");
+  tooltip_text = _("Workspace Switcher");
   icon_name = "workspace-switcher";
   SetQuirk(Quirk::VISIBLE, false);
   SetQuirk(Quirk::RUNNING, false);