Unity

Merge lp:~didrocks/unity/fix-ubuntu-desktop-translation into lp:unity

  1. fix-ubuntu-desktop-translation
  2. Merge into trunk
Proposed by Didier Roche-Tolomelli
Status: Merged
Approved by: Sam Spilsbury
Approved revision: no longer in the source branch.
Merged at revision: 2254
Proposed branch: lp:~didrocks/unity/fix-ubuntu-desktop-translation
Merge into: lp:unity
Diff against target: 81 lines (+10/-9)
3 files modified
plugins/unityshell/src/PanelMenuView.cpp (+6/-7)
plugins/unityshell/src/PanelMenuView.h (+2/-0)
plugins/unityshell/src/unityshell.cpp (+2/-2)
To merge this branch: bzr merge lp:~didrocks/unity/fix-ubuntu-desktop-translation
Reviewer Review Type Date Requested Status
Sam Spilsbury (community) Approve
Review via email: mp+101236@code.launchpad.net

Commit message

Make Ubuntu Desktop string translated again. We can't use a namespaced version as the gettext domain isn't setup yet.
Pick already translated Alt and Press string (LP: #975815)

Description of the change

Some translations improvments

Make Ubuntu Desktop string translated again. We can't use a namespaced version as the gettext domain isn't setup yet
Pick already translated Alt and Press string (LP: #975815)

UNBLOCK

To post a comment you must log in.
Revision history for this message
Sam Spilsbury (smspillaz) :
review: Approve
Revision history for this message
Sam Spilsbury (smspillaz) :
review: Approve
Revision history for this message
Sam Spilsbury (smspillaz) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'plugins/unityshell/src/PanelMenuView.cpp'
--- plugins/unityshell/src/PanelMenuView.cpp 2012-04-06 13:20:25 +0000
+++ plugins/unityshell/src/PanelMenuView.cpp 2012-04-09 13:17:19 +0000
@@ -47,8 +47,6 @@
47 const int DEFAULT_MENUS_DISCOVERY = 2;47 const int DEFAULT_MENUS_DISCOVERY = 2;
48 const int DEFAULT_DISCOVERY_FADEIN = 200;48 const int DEFAULT_DISCOVERY_FADEIN = 200;
49 const int DEFAULT_DISCOVERY_FADEOUT = 300;49 const int DEFAULT_DISCOVERY_FADEOUT = 300;
50
51 const std::string DESKTOP_NAME(_("Ubuntu Desktop"));
52}50}
5351
54PanelMenuView::PanelMenuView()52PanelMenuView::PanelMenuView()
@@ -76,7 +74,8 @@
76 _menus_discovery_fadein(DEFAULT_DISCOVERY_FADEIN),74 _menus_discovery_fadein(DEFAULT_DISCOVERY_FADEIN),
77 _menus_discovery_fadeout(DEFAULT_DISCOVERY_FADEOUT),75 _menus_discovery_fadeout(DEFAULT_DISCOVERY_FADEOUT),
78 _fade_in_animator(_menus_fadein),76 _fade_in_animator(_menus_fadein),
79 _fade_out_animator(_menus_fadeout)77 _fade_out_animator(_menus_fadeout),
78 _desktop_name(_("Ubuntu Desktop"))
80{79{
81 layout_->SetContentDistribution(nux::eStackLeft);80 layout_->SetContentDistribution(nux::eStackLeft);
8281
@@ -671,7 +670,7 @@
671670
672 if (bamf_window_get_window_type(window) == BAMF_WINDOW_DESKTOP)671 if (bamf_window_get_window_type(window) == BAMF_WINDOW_DESKTOP)
673 {672 {
674 label = DESKTOP_NAME;673 label = _desktop_name;
675 }674 }
676 else if (!IsValidWindow(window_xid))675 else if (!IsValidWindow(window_xid))
677 {676 {
@@ -813,11 +812,11 @@
813 if (win_manager->IsScaleActiveForGroup())812 if (win_manager->IsScaleActiveForGroup())
814 new_title = GetActiveViewName(true);813 new_title = GetActiveViewName(true);
815 else if (_we_control_active)814 else if (_we_control_active)
816 new_title = DESKTOP_NAME;815 new_title = _desktop_name;
817 }816 }
818 else if (win_manager->IsExpoActive())817 else if (win_manager->IsExpoActive())
819 {818 {
820 new_title = DESKTOP_NAME;819 new_title = _desktop_name;
821 }820 }
822 else if (!_we_control_active)821 else if (!_we_control_active)
823 {822 {
@@ -1536,7 +1535,7 @@
1536 .add("grabbed", _is_grabbed)1535 .add("grabbed", _is_grabbed)
1537 .add("active_win_maximized", _is_maximized)1536 .add("active_win_maximized", _is_maximized)
1538 .add("panel_title", _panel_title)1537 .add("panel_title", _panel_title)
1539 .add("desktop_active", (_panel_title == DESKTOP_NAME))1538 .add("desktop_active", (_panel_title == _desktop_name))
1540 .add("monitor", _monitor)1539 .add("monitor", _monitor)
1541 .add("active_window", _active_xid)1540 .add("active_window", _active_xid)
1542 .add("draw_menus", DrawMenus())1541 .add("draw_menus", DrawMenus())
15431542
=== modified file 'plugins/unityshell/src/PanelMenuView.h'
--- plugins/unityshell/src/PanelMenuView.h 2012-04-04 20:24:14 +0000
+++ plugins/unityshell/src/PanelMenuView.h 2012-04-09 13:17:19 +0000
@@ -189,6 +189,8 @@
189189
190 Animator _fade_in_animator;190 Animator _fade_in_animator;
191 Animator _fade_out_animator;191 Animator _fade_out_animator;
192
193 const std::string _desktop_name;
192};194};
193195
194}196}
195197
=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp 2012-04-06 15:29:23 +0000
+++ plugins/unityshell/src/unityshell.cpp 2012-04-09 13:17:19 +0000
@@ -2891,8 +2891,8 @@
2891 // Menu Bar2891 // Menu Bar
2892 std::string const menubar(_("HUD & Menu Bar"));2892 std::string const menubar(_("HUD & Menu Bar"));
28932893
2894 hints_.push_back(std::make_shared<shortcut::Hint>(menubar, "", " (Tap)", _("Open the HUD."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "show_hud"));2894 hints_.push_back(std::make_shared<shortcut::Hint>(menubar, "", _(" (Tap)"), _("Open the HUD."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "show_hud"));
2895 hints_.push_back(std::make_shared<shortcut::Hint>(menubar, "", " (Press)", _("Reveals application menu."), shortcut::HARDCODED_OPTION, "Alt"));2895 hints_.push_back(std::make_shared<shortcut::Hint>(menubar, "", _(" (Press)"), _("Reveals application menu."), shortcut::HARDCODED_OPTION, "Alt"));
2896 hints_.push_back(std::make_shared<shortcut::Hint>(menubar, "", "", _("Opens the indicator menu."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "panel_first_menu"));2896 hints_.push_back(std::make_shared<shortcut::Hint>(menubar, "", "", _("Opens the indicator menu."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "panel_first_menu"));
2897 hints_.push_back(std::make_shared<shortcut::Hint>(menubar, "", "", _("Moves focus between indicators."), shortcut::HARDCODED_OPTION, _("Cursor Left or Right")));2897 hints_.push_back(std::make_shared<shortcut::Hint>(menubar, "", "", _("Moves focus between indicators."), shortcut::HARDCODED_OPTION, _("Cursor Left or Right")));
28982898