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
=== modified file 'debian/patches/restore-traditional-menubar.patch'
--- debian/patches/restore-traditional-menubar.patch 2014-02-28 14:26:02 +0000
+++ debian/patches/restore-traditional-menubar.patch 2014-03-13 14:54:46 +0000
@@ -1,4 +1,4 @@
1From 16b27bfe1f79cbe19b8f32e035ce4a71716e1610 Mon Sep 17 00:00:00 20011From 66d99ce41f4e5dceb4d7db34f6162490d9209747 Mon Sep 17 00:00:00 2001
2From: Lars Uebernickel <lars.uebernickel@canonical.com>2From: Lars Uebernickel <lars.uebernickel@canonical.com>
3Date: Fri, 28 Feb 2014 14:42:36 +01003Date: Fri, 28 Feb 2014 14:42:36 +0100
4Subject: [PATCH] Restore traditional menu bar for desktops that show it4Subject: [PATCH] Restore traditional menu bar for desktops that show it
@@ -6,10 +6,10 @@
6https://bugzilla.gnome.org/show_bug.cgi?id=7123576https://bugzilla.gnome.org/show_bug.cgi?id=712357
7---7---
8 data/ui/Makefile.am | 1 +8 data/ui/Makefile.am | 1 +
9 data/ui/menubar.ui | 241 +++++++++++++++++++++++++++++++++++++++++++++++++9 data/ui/menubar.ui | 235 +++++++++++++++++++++++++++++++++++++++++++++++++
10 po/POTFILES.in | 1 +10 po/POTFILES.in | 1 +
11 shell/rb-application.c | 15 ++-11 shell/rb-application.c | 15 +++-
12 4 files changed, 257 insertions(+), 1 deletion(-)12 4 files changed, 251 insertions(+), 1 deletion(-)
13 create mode 100644 data/ui/menubar.ui13 create mode 100644 data/ui/menubar.ui
1414
15diff --git a/data/ui/Makefile.am b/data/ui/Makefile.am15diff --git a/data/ui/Makefile.am b/data/ui/Makefile.am
@@ -26,25 +26,21 @@
26 display-page-add-menu.ui \26 display-page-add-menu.ui \
27diff --git a/data/ui/menubar.ui b/data/ui/menubar.ui27diff --git a/data/ui/menubar.ui b/data/ui/menubar.ui
28new file mode 10064428new file mode 100644
29index 0000000..345950329index 0000000..d4e1a84
30--- /dev/null30--- /dev/null
31+++ b/data/ui/menubar.ui31+++ b/data/ui/menubar.ui
32@@ -0,0 +1,241 @@32@@ -0,0 +1,235 @@
33+<?xml version="1.0"?>33+<?xml version="1.0"?>
34+<interface>34+<interface>
35+ <menu id="menubar">35+ <menu id="menubar">
36+ <submenu>36+ <submenu>
37+ <attribute name="label" translatable="yes">_Music</attribute>37+ <attribute name="label" translatable="yes">_File</attribute>
38+ <item>38+ <item>
39+ <attribute name="label" translatable="yes">_Add Music…</attribute>39+ <attribute name="label" translatable="yes">_Add Music…</attribute>
40+ <attribute name="action">app.library-import</attribute>40+ <attribute name="action">app.library-import</attribute>
41+ <attribute name="accel">&lt;Ctrl&gt;O</attribute>41+ <attribute name="accel">&lt;Ctrl&gt;O</attribute>
42+ </item>42+ </item>
43+ <item>43+ <item>
44+ <attribute name="label" translatable="yes">_Check for New Devices</attribute>
45+ <attribute name="action">app.check-devices</attribute>
46+ </item>
47+ <item>
48+ <attribute name="label" translatable="yes">_Playlist</attribute>44+ <attribute name="label" translatable="yes">_Playlist</attribute>
49+ <link name="submenu">45+ <link name="submenu">
50+ <section>46+ <section>
@@ -156,7 +152,7 @@
156+ <attribute name="label" translatable="yes">_View</attribute>152+ <attribute name="label" translatable="yes">_View</attribute>
157+ <section>153+ <section>
158+ <item>154+ <item>
159+ <attribute name="label" translatable="yes">Party _Mode</attribute>155+ <attribute name="label" translatable="yes">_Fullscreen</attribute>
160+ <attribute name="action">win.party-mode</attribute>156+ <attribute name="action">win.party-mode</attribute>
161+ <attribute name="accel">F11</attribute>157+ <attribute name="accel">F11</attribute>
162+ </item>158+ </item>
@@ -272,7 +268,7 @@
272+</interface>268+</interface>
273+269+
274diff --git a/po/POTFILES.in b/po/POTFILES.in270diff --git a/po/POTFILES.in b/po/POTFILES.in
275index 15d5d81..b6123c5 100644271index ec639aa..7f8fb82 100644
276--- a/po/POTFILES.in272--- a/po/POTFILES.in
277+++ b/po/POTFILES.in273+++ b/po/POTFILES.in
278@@ -7,6 +7,7 @@ data/playlists.xml.in274@@ -7,6 +7,7 @@ data/playlists.xml.in
@@ -284,7 +280,7 @@
284 [type: gettext/glade]data/ui/create-playlist.ui280 [type: gettext/glade]data/ui/create-playlist.ui
285 [type: gettext/glade]data/ui/display-page-add-menu.ui281 [type: gettext/glade]data/ui/display-page-add-menu.ui
286diff --git a/shell/rb-application.c b/shell/rb-application.c282diff --git a/shell/rb-application.c b/shell/rb-application.c
287index 11945ad..c57822c 100644283index 68e7a5e..6533087 100644
288--- a/shell/rb-application.c284--- a/shell/rb-application.c
289+++ b/shell/rb-application.c285+++ b/shell/rb-application.c
290@@ -332,6 +332,7 @@ impl_startup (GApplication *app)286@@ -332,6 +332,7 @@ impl_startup (GApplication *app)

Subscribers

People subscribed via source and target branches