Merge lp:~yeganeh/unity/fix-for-869873 into lp:unity

[Zaid Yeganeh]

[Neil J. Patel (njpatel)]

Hi, this isn't the right way to do this. We use g_dgettext with nautilus so we can "steal" the Desktop translation as we were in string freeze. You should replace that entire thing with _("Ubuntu Desktop"), so it can be translated fresh for the 12.04 cycle.

review: Needs Fixing

[Zaid Yeganeh (yeganeh)]

Thanks for the explanation - makes sense. Have made the update and tested it locally. I apparently need to send over an agreement doc for this and other changes I'm proposing, and hope to have that sent tomorrow sometime

[Neil J. Patel (njpatel)]

Excellent, approved.

review: Approve

=== modified file 'plugins/unityshell/src/PanelMenuView.cpp'
--- plugins/unityshell/src/PanelMenuView.cpp	2011-10-06 16:42:39 +0000
+++ plugins/unityshell/src/PanelMenuView.cpp	2011-10-10 19:37:25 +0000
@@ -38,6 +38,9 @@
 #include <gio/gdesktopappinfo.h>
 #include <gconf/gconf-client.h>
 
+#include <glib.h>
+#include <glib/gi18n-lib.h>
+
 #include "DashSettings.h"
 #include "ubus-server.h"
 #include "UBusMessages.h"
@@ -661,8 +664,7 @@
     if (BAMF_IS_WINDOW(window) &&
         bamf_window_get_window_type(window) == BAMF_WINDOW_DESKTOP)
     {
-      // Make the special 
-      label = g_strdup(g_dgettext("nautilus", "Desktop"));
+      label = g_strdup(_("Ubuntu Desktop"));
     }
     else if (!WindowManager::Default()->IsWindowOnCurrentDesktop(window_xid) ||
         WindowManager::Default()->IsWindowObscured(window_xid))

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2011-08-28 09:14:30 +0000
+++ po/POTFILES.in	2011-10-10 19:37:25 +0000
@@ -1,6 +1,7 @@
 plugins/unityshell/src/BamfLauncherIcon.cpp
 plugins/unityshell/src/DeviceLauncherIcon.cpp
 plugins/unityshell/src/LauncherController.cpp
+plugins/unityshell/src/PanelMenuView.cpp
 plugins/unityshell/src/PlacesGroup.cpp
 plugins/unityshell/src/PlacesHomeView.cpp
 plugins/unityshell/src/SpacerLauncherIcon.cpp