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

[Didier Roche]

Fix untranslated Workspace Switcher in the panel.
Got back to 12.04 string to not add any string break to Quantal.

Similar to rev 1062921 (LP: #1062921)

Fix untranslated Workspace Switcher in the panel.
Got back to 12.04 string to not add any string break to Quantal.

Similar to rev 1062921 (LP: #1062921)

[Nicolas Delvaux (malizor)]

I'm not sure I understand.
The "Workspace Switcher" string was used on Precise.
For example, in French: https://translations.launchpad.net/ubuntu/precise/+source/unity/+pots/unity/fr/+translate?batch=10&show=all&search=Workspace+Switcher

[Didier Roche (didrocks)]

Right, but the "Worspace Switcher" string is not exported anymore and not part of any Quantal langpack: https://translations.launchpad.net/ubuntu/quantal/+source/unity/+pots/unity/fr/+translate?batch=10&show=all&search=Workspace+Switcher

Taking it back seems to mean that we need to have it retranslated in every languages again, which is too short as the final freeze is tomorrow. So, I'm taking the "Workspaces" string after having checked with design for the quantal branch, which matches the needs and avoid asking for translators for an emergency fix.

For R (and 7.0), the branch you proposed will work :)

[Łukasz Zemczak (sil2100)]

LGTM. It's not exactly getting back to 12.04, but more to the previous translated string ;)

review: Approve

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

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2012-08-31 09:47:12 +0000
+++ po/POTFILES.in	2012-10-08 08:57:30 +0000
@@ -12,6 +12,7 @@
 launcher/BamfLauncherIcon.cpp
 launcher/DesktopLauncherIcon.cpp
 launcher/DeviceNotificationDisplayImp.cpp
+launcher/ExpoLauncherIcon.cpp
 launcher/LauncherController.cpp
 launcher/SoftwareCenterLauncherIcon.cpp
 launcher/SpacerLauncherIcon.cpp