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

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
1=== modified file 'plugins/unityshell/src/PanelMenuView.cpp'
2--- plugins/unityshell/src/PanelMenuView.cpp 2012-04-06 13:20:25 +0000
3+++ plugins/unityshell/src/PanelMenuView.cpp 2012-04-09 13:17:19 +0000
4@@ -47,8 +47,6 @@
5 const int DEFAULT_MENUS_DISCOVERY = 2;
6 const int DEFAULT_DISCOVERY_FADEIN = 200;
7 const int DEFAULT_DISCOVERY_FADEOUT = 300;
8-
9- const std::string DESKTOP_NAME(_("Ubuntu Desktop"));
10 }
11
12 PanelMenuView::PanelMenuView()
13@@ -76,7 +74,8 @@
14 _menus_discovery_fadein(DEFAULT_DISCOVERY_FADEIN),
15 _menus_discovery_fadeout(DEFAULT_DISCOVERY_FADEOUT),
16 _fade_in_animator(_menus_fadein),
17- _fade_out_animator(_menus_fadeout)
18+ _fade_out_animator(_menus_fadeout),
19+ _desktop_name(_("Ubuntu Desktop"))
20 {
21 layout_->SetContentDistribution(nux::eStackLeft);
22
23@@ -671,7 +670,7 @@
24
25 if (bamf_window_get_window_type(window) == BAMF_WINDOW_DESKTOP)
26 {
27- label = DESKTOP_NAME;
28+ label = _desktop_name;
29 }
30 else if (!IsValidWindow(window_xid))
31 {
32@@ -813,11 +812,11 @@
33 if (win_manager->IsScaleActiveForGroup())
34 new_title = GetActiveViewName(true);
35 else if (_we_control_active)
36- new_title = DESKTOP_NAME;
37+ new_title = _desktop_name;
38 }
39 else if (win_manager->IsExpoActive())
40 {
41- new_title = DESKTOP_NAME;
42+ new_title = _desktop_name;
43 }
44 else if (!_we_control_active)
45 {
46@@ -1536,7 +1535,7 @@
47 .add("grabbed", _is_grabbed)
48 .add("active_win_maximized", _is_maximized)
49 .add("panel_title", _panel_title)
50- .add("desktop_active", (_panel_title == DESKTOP_NAME))
51+ .add("desktop_active", (_panel_title == _desktop_name))
52 .add("monitor", _monitor)
53 .add("active_window", _active_xid)
54 .add("draw_menus", DrawMenus())
55
56=== modified file 'plugins/unityshell/src/PanelMenuView.h'
57--- plugins/unityshell/src/PanelMenuView.h 2012-04-04 20:24:14 +0000
58+++ plugins/unityshell/src/PanelMenuView.h 2012-04-09 13:17:19 +0000
59@@ -189,6 +189,8 @@
60
61 Animator _fade_in_animator;
62 Animator _fade_out_animator;
63+
64+ const std::string _desktop_name;
65 };
66
67 }
68
69=== modified file 'plugins/unityshell/src/unityshell.cpp'
70--- plugins/unityshell/src/unityshell.cpp 2012-04-06 15:29:23 +0000
71+++ plugins/unityshell/src/unityshell.cpp 2012-04-09 13:17:19 +0000
72@@ -2891,8 +2891,8 @@
73 // Menu Bar
74 std::string const menubar(_("HUD & Menu Bar"));
75
76- hints_.push_back(std::make_shared<shortcut::Hint>(menubar, "", " (Tap)", _("Open the HUD."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "show_hud"));
77- hints_.push_back(std::make_shared<shortcut::Hint>(menubar, "", " (Press)", _("Reveals application menu."), shortcut::HARDCODED_OPTION, "Alt"));
78+ hints_.push_back(std::make_shared<shortcut::Hint>(menubar, "", _(" (Tap)"), _("Open the HUD."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "show_hud"));
79+ hints_.push_back(std::make_shared<shortcut::Hint>(menubar, "", _(" (Press)"), _("Reveals application menu."), shortcut::HARDCODED_OPTION, "Alt"));
80 hints_.push_back(std::make_shared<shortcut::Hint>(menubar, "", "", _("Opens the indicator menu."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "panel_first_menu"));
81 hints_.push_back(std::make_shared<shortcut::Hint>(menubar, "", "", _("Moves focus between indicators."), shortcut::HARDCODED_OPTION, _("Cursor Left or Right")));
82