Merge lp:~larsu/rhythmbox/rename-some-menuitems into lp:~ubuntu-desktop/rhythmbox/ubuntu

Proposed by Lars Karlitski on 2014-03-13
Status: Merged
Merged at revision: 221
Proposed branch: lp:~larsu/rhythmbox/rename-some-menuitems
Merge into: lp:~ubuntu-desktop/rhythmbox/ubuntu
Diff against target: 79 lines (+10/-14)
1 file modified
debian/patches/restore-traditional-menubar.patch (+10/-14)
To merge this branch: bzr merge lp:~larsu/rhythmbox/rename-some-menuitems
Reviewer Review Type Date Requested Status
Sebastien Bacher 2014-03-13 Approve on 2014-03-13
Review via email: mp+210807@code.launchpad.net

Commit message

traditional menubar patch: rename some menu items

Description of the change

traditional menubar patch: rename some menu items

To post a comment you must log in.
221. By Lars Karlitski on 2014-03-13

traditional menubar patch: rename some menu items

Sebastien Bacher (seb128) wrote :

thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/patches/restore-traditional-menubar.patch'
2--- debian/patches/restore-traditional-menubar.patch 2014-02-28 14:26:02 +0000
3+++ debian/patches/restore-traditional-menubar.patch 2014-03-13 14:54:46 +0000
4@@ -1,4 +1,4 @@
5-From 16b27bfe1f79cbe19b8f32e035ce4a71716e1610 Mon Sep 17 00:00:00 2001
6+From 66d99ce41f4e5dceb4d7db34f6162490d9209747 Mon Sep 17 00:00:00 2001
7 From: Lars Uebernickel <lars.uebernickel@canonical.com>
8 Date: Fri, 28 Feb 2014 14:42:36 +0100
9 Subject: [PATCH] Restore traditional menu bar for desktops that show it
10@@ -6,10 +6,10 @@
11 https://bugzilla.gnome.org/show_bug.cgi?id=712357
12 ---
13 data/ui/Makefile.am | 1 +
14- data/ui/menubar.ui | 241 +++++++++++++++++++++++++++++++++++++++++++++++++
15+ data/ui/menubar.ui | 235 +++++++++++++++++++++++++++++++++++++++++++++++++
16 po/POTFILES.in | 1 +
17- shell/rb-application.c | 15 ++-
18- 4 files changed, 257 insertions(+), 1 deletion(-)
19+ shell/rb-application.c | 15 +++-
20+ 4 files changed, 251 insertions(+), 1 deletion(-)
21 create mode 100644 data/ui/menubar.ui
22
23 diff --git a/data/ui/Makefile.am b/data/ui/Makefile.am
24@@ -26,25 +26,21 @@
25 display-page-add-menu.ui \
26 diff --git a/data/ui/menubar.ui b/data/ui/menubar.ui
27 new file mode 100644
28-index 0000000..3459503
29+index 0000000..d4e1a84
30 --- /dev/null
31 +++ b/data/ui/menubar.ui
32-@@ -0,0 +1,241 @@
33+@@ -0,0 +1,235 @@
34 +<?xml version="1.0"?>
35 +<interface>
36 + <menu id="menubar">
37 + <submenu>
38-+ <attribute name="label" translatable="yes">_Music</attribute>
39++ <attribute name="label" translatable="yes">_File</attribute>
40 + <item>
41 + <attribute name="label" translatable="yes">_Add Music…</attribute>
42 + <attribute name="action">app.library-import</attribute>
43 + <attribute name="accel">&lt;Ctrl&gt;O</attribute>
44 + </item>
45 + <item>
46-+ <attribute name="label" translatable="yes">_Check for New Devices</attribute>
47-+ <attribute name="action">app.check-devices</attribute>
48-+ </item>
49-+ <item>
50 + <attribute name="label" translatable="yes">_Playlist</attribute>
51 + <link name="submenu">
52 + <section>
53@@ -156,7 +152,7 @@
54 + <attribute name="label" translatable="yes">_View</attribute>
55 + <section>
56 + <item>
57-+ <attribute name="label" translatable="yes">Party _Mode</attribute>
58++ <attribute name="label" translatable="yes">_Fullscreen</attribute>
59 + <attribute name="action">win.party-mode</attribute>
60 + <attribute name="accel">F11</attribute>
61 + </item>
62@@ -272,7 +268,7 @@
63 +</interface>
64 +
65 diff --git a/po/POTFILES.in b/po/POTFILES.in
66-index 15d5d81..b6123c5 100644
67+index ec639aa..7f8fb82 100644
68 --- a/po/POTFILES.in
69 +++ b/po/POTFILES.in
70 @@ -7,6 +7,7 @@ data/playlists.xml.in
71@@ -284,7 +280,7 @@
72 [type: gettext/glade]data/ui/create-playlist.ui
73 [type: gettext/glade]data/ui/display-page-add-menu.ui
74 diff --git a/shell/rb-application.c b/shell/rb-application.c
75-index 11945ad..c57822c 100644
76+index 68e7a5e..6533087 100644
77 --- a/shell/rb-application.c
78 +++ b/shell/rb-application.c
79 @@ -332,6 +332,7 @@ impl_startup (GApplication *app)

Subscribers

People subscribed via source and target branches