Merge lp:~chipaca/ubuntuone-client/fix-menu-items into lp:ubuntuone-client

Proposed by John Lenton on 2010-08-26
Status: Merged
Approved by: John Lenton on 2010-08-26
Approved revision: 662
Merged at revision: 659
Proposed branch: lp:~chipaca/ubuntuone-client/fix-menu-items
Merge into: lp:ubuntuone-client
Diff against target: 226 lines (+31/-30)
3 files modified
bin/ubuntuone-preferences (+5/-4)
nautilus/ubuntuone-nautilus.c (+25/-25)
tests/test_preferences.py (+1/-1)
To merge this branch: bzr merge lp:~chipaca/ubuntuone-client/fix-menu-items
Reviewer Review Type Date Requested Status
Vincenzo Di Somma (community) Approve on 2010-08-26
Rodrigo Moya (community) 2010-08-26 Approve on 2010-08-26
Review via email: mp+33769@code.launchpad.net

Commit message

* remove ellipsis from Ubuntu One submenu (LP: #621255).
* fix capitalization of some checkboxes in preferences (LP: #581882).
* capitalize and cleanup menu entries (LP: #621266).

Description of the change

* remove ellipsis from Ubuntu One submenu (LP: #621255).
* fix capitalization of some checkboxes in preferences (LP: #581882).
* capitalize and cleanup menu entries (LP: #621266).

To post a comment you must log in.
Rodrigo Moya (rodrigo-moya) wrote :

199 - _("Hide location bar"),
200 - _("Do not show the location bar"
201 + _("Hide ribbon"),
202 + _("Do not show the Ubuntu One ribbon"
203 " in selected folders"),
204 "ubuntuone");
205 } else {
206 item = nautilus_menu_item_new ("ubuntuone-location-show",
207 - _("Show location bar"),
208 - _("Show the location bar"
209 + _("Show ribbon (in some folders)"),
210 + _("Show the Ubuntu One ribbon"
211 " in selected folders"),
212 "ubuntuone");

Only one thing, those 'Hide ribbon'/'Show ribbon' should have 'Ribbon'

review: Approve
Vincenzo Di Somma (vds) :
review: Approve
dobey (dobey) wrote :
Download full text (251.2 KiB)

The attempt to merge lp:~chipaca/ubuntuone-client/fix-menu-items into lp:ubuntuone-client failed.Below is the output from the failed tests.

/usr/bin/gnome-autogen.sh
checking for autoconf >= 2.53...
  testing autoconf2.50... not found.
  testing autoconf... found 2.67
checking for automake >= 1.10...
  testing automake-1.11... found 1.11.1
checking for libtool >= 1.5...
  testing libtoolize... found 2.2.6b
checking for intltool >= 0.30...
  testing intltoolize... found 0.41.1
checking for pkg-config >= 0.14.0...
  testing pkg-config... found 0.25
Checking for required M4 macros...
Checking for forbidden M4 macros...
Processing ./configure.ac
Running libtoolize...
libtoolize: putting auxiliary files in `.'.
libtoolize: copying file `./ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
libtoolize: copying file `m4/libtool.m4'
libtoolize: copying file `m4/ltoptions.m4'
libtoolize: copying file `m4/ltsugar.m4'
libtoolize: copying file `m4/ltversion.m4'
libtoolize: copying file `m4/lt~obsolete.m4'
Running intltoolize...
Running aclocal-1.11...
Running autoconf...
Running autoheader...
Running automake-1.11...
Running ./configure --with-protocol=/var/cache/tarmac/ubuntuone-storage-protocol/trunk ...
checking for a BSD-compatible install... /usr/bin/install -c
checking whether build environment is sane... yes
checking for a thread-safe mkdir -p... /bin/mkdir -p
checking for gawk... gawk
checking whether make sets $(MAKE)... yes
checking for style of include used by make... GNU
checking for gcc... gcc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables...
checking whether we are cross compiling... no
checking for suffix of object files... o
checking whether we are using the GNU C compiler... yes
checking whether gcc accepts -g... yes
checking for gcc option to accept ISO C89... none needed
checking dependency style of gcc... gcc3
checking for library containing strerror... none required
checking for gcc... (cached) gcc
checking whether we are using the GNU C compiler... (cached) yes
checking whether gcc accepts -g... (cached) yes
checking for gcc option to accept ISO C89... (cached) none needed
checking dependency style of gcc... (cached) gcc3
checking build system type... i686-pc-linux-gnu
checking host system type... i686-pc-linux-gnu
checking for a sed that does not truncate output... /bin/sed
checking for grep that handles long lines and -e... /bin/grep
checking for egrep... /bin/grep -E
checking for fgrep... /bin/grep -F
checking for ld used by gcc... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
checking the name lister (/usr/bin/nm -B) interface... BSD nm
checking whether ln -s works... yes
checking the maximum length of command line arguments... 1572864
checking whether the shell understands some XSI constructs... yes
checking whether the shell understands "+="... yes
checking for /usr/bin/ld option to reload object files... -r
checking for objdump... objdump
checking how to recognize dependent libraries... pass_all
checking for ar... ar
checking for ...

661. By John Lenton on 2010-08-26

oops, broke a test

662. By John Lenton on 2010-08-26

merged with trunk

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/ubuntuone-preferences'
2--- bin/ubuntuone-preferences 2010-08-24 21:17:00 +0000
3+++ bin/ubuntuone-preferences 2010-08-26 18:42:46 +0000
4@@ -359,7 +359,7 @@
5 if ((oauth_token and row.get('token') == oauth_token.key or 'FAKE' in row)
6 and fsync_enabled):
7 self.bw_chk = ck_btn = gtk.CheckButton(
8- _("_Limit Bandwidth Usage"))
9+ _("_Limit bandwidth"))
10 ck_btn.set_active(self.bw_limited)
11 up_lbl = gtk.Label(_("Maximum _upload speed (KB/s):"))
12 up_lbl.set_alignment(0., .5)
13@@ -961,7 +961,7 @@
14 self.bw_inst_box.pack_start(self.bw_inst_btn, False, False)
15 self.bw_inst_btn.show()
16
17- self.gwib_check = gtk.CheckButton(_("Broadcast Messages _Archive"))
18+ self.gwib_check = gtk.CheckButton(_("Broadcast messages _archive"))
19 self.gwib_check.set_data('dbname', 'gwibber_messages')
20 self.gwib_check.connect('toggled', self.__db_check_toggled)
21 services.pack_start(self.gwib_check, False, False)
22@@ -977,7 +977,7 @@
23 services.pack_start(fbox, False, False)
24 fbox.show()
25
26- self.files_check = gtk.CheckButton(_("_File Synchronization"))
27+ self.files_check = gtk.CheckButton(_("_Files"))
28 self.files_check.set_active(False)
29 fbox.pack_start(self.files_check, False, False)
30 self.files_check.show()
31@@ -987,7 +987,8 @@
32 fbox.pack_start(alignment, False, False)
33 alignment.show()
34
35- self.music_check = gtk.CheckButton(_("_Music Download"))
36+ self.music_check = gtk.CheckButton(_("Ubuntu One _Music Store"
37+ " downloads"))
38 self.music_check.set_active(True)
39 self.music_check.set_sensitive(False)
40 alignment.add(self.music_check)
41
42=== modified file 'nautilus/ubuntuone-nautilus.c'
43--- nautilus/ubuntuone-nautilus.c 2010-08-25 18:20:50 +0000
44+++ nautilus/ubuntuone-nautilus.c 2010-08-26 18:42:46 +0000
45@@ -568,7 +568,7 @@
46 uon->cb_data = cb_data;
47
48 root_item = nautilus_menu_item_new ("ubuntuone",
49- _("Ubuntu One..."),
50+ _("_Ubuntu One"),
51 _("Ubuntu One options"),
52 "ubuntuone");
53 submenu = nautilus_menu_new ();
54@@ -583,7 +583,7 @@
55 if ((is_managed || is_udf) && !is_root && is_dir) {
56
57 item = nautilus_menu_item_new ("ubuntuone-share",
58- _("Share on Ubuntu One..."),
59+ _("_Share..."),
60 _("Share this folder on Ubuntu One"),
61 "ubuntuone");
62 if (is_pending)
63@@ -596,17 +596,17 @@
64 /* the different tooltips will probably do us no good */
65 if (is_root) {
66 item = nautilus_menu_item_new ("ubuntuone-noshare-root",
67- _("Share on Ubuntu One..."),
68+ _("_Share..."),
69 _("Sorry, you can't share the root of a Ubuntu One volume"),
70 "ubuntuone");
71 } else if (!(is_managed || is_udf)) {
72 item = nautilus_menu_item_new ("ubuntuone-noshare-unmanaged",
73- _("Share on Ubuntu One..."),
74+ _("_Share..."),
75 _("Sorry, you can't share folders not managed by Ubuntu One"),
76 "ubuntuone");
77 } else {
78 item = nautilus_menu_item_new ("ubuntuone-noshare-unmanaged",
79- _("Share on Ubuntu One..."),
80+ _("_Share..."),
81 _("Sorry, you can only share folders"),
82 "ubuntuone");
83 }
84@@ -620,7 +620,7 @@
85 NautilusMenuItem * item;
86
87 item = nautilus_menu_item_new ("ubuntuone-unshare",
88- _("Stop sharing on Ubuntu One..."),
89+ _("Stop _Sharing"),
90 _("Stop sharing this folder on Ubuntu One"),
91 "ubuntuone");
92 if (is_pending)
93@@ -645,7 +645,7 @@
94 if (strcmp (path, uon->managed) == 0) {
95 /* the Ubuntu One directory, no UDFs */
96 item = nautilus_menu_item_new ("ubuntuone-no-disable-u1",
97- _("Stop synchronizing this folder with Ubuntu One"),
98+ _("Stop Synchronizing This _Folder"),
99 _("Sorry, you can't stop synchronizing ~/Ubuntu One"),
100 "ubuntuone");
101 g_object_set (item, "sensitive", FALSE, NULL);
102@@ -653,7 +653,7 @@
103 /* the root of a UDF: disabling possible */
104
105 item = nautilus_menu_item_new ("ubuntuone-disable-udf",
106- _("Stop synchronizing this folder..."),
107+ _("Stop Synchronizing This _Folder"),
108 _("Stop synchronizing this folder with Ubuntu One"),
109 "ubuntuone");
110
111@@ -665,7 +665,7 @@
112 /* unmanaged */
113
114 item = nautilus_menu_item_new ("ubuntuone-enable-udf",
115- _("Synchronize this folder..."),
116+ _("Synchronize This _Folder"),
117 _("Start synchronizing this folder with Ubuntu One"),
118 "ubuntuone");
119
120@@ -676,12 +676,12 @@
121 } else {
122 if (is_dir) {
123 item = nautilus_menu_item_new ("ubuntuone-no-disable-u1",
124- _("Synchronize this folder..."),
125+ _("Synchronize This _Folder"),
126 _("Sorry, you can only synchronize folders within your home folder"),
127 "ubuntuone");
128 } else {
129 item = nautilus_menu_item_new ("ubuntuone-no-disable-u1",
130- _("Synchronize this folder..."),
131+ _("Synchronize This _Folder"),
132 _("Sorry, you can only synchronize folders"),
133 "ubuntuone");
134 }
135@@ -689,7 +689,7 @@
136 }
137 if (!item) {
138 item = nautilus_menu_item_new ("ubuntuone-no-udf-operation-possible",
139- _("Synchronize this folder..."),
140+ _("Synchronize This _Folder"),
141 _("Synchronization not possible for this folder"),
142 "ubuntuone");
143 g_object_set (item, "sensitive", FALSE, NULL);
144@@ -705,7 +705,7 @@
145
146 if (is_public) {
147 urlitem = nautilus_menu_item_new ("ubuntuone-geturl",
148- _("Copy Ubuntu One public URL"),
149+ _("Copy Web _Link"),
150 _("Copy the Ubuntu One public URL for this file to the clipboard."),
151 "ubuntuone");
152 if (is_pending)
153@@ -715,8 +715,8 @@
154 G_CALLBACK (ubuntuone_nautilus_copy_public_url),
155 cb_data);
156 item = nautilus_menu_item_new ("ubuntuone-unpublish",
157- _("Stop publishing via Ubuntu One"),
158- _("No longer share this file with everyone."),
159+ _("Stop _Publishing"),
160+ _("No longer share this file with everyone via Ubuntu One."),
161 "ubuntuone");
162 if (is_pending)
163 g_object_set (item, "sensitive", FALSE, NULL);
164@@ -724,8 +724,8 @@
165 cb_data->make_public = FALSE;
166 } else {
167 item = nautilus_menu_item_new ("ubuntuone-publish",
168- _("Publish this file via Ubuntu One"),
169- _("Make this file available to anyone."),
170+ _("_Publish"),
171+ _("Make this file available to anyone via Ubuntu One."),
172 "ubuntuone");
173 cb_data->make_public = TRUE;
174 }
175@@ -735,15 +735,15 @@
176 }
177 if (!urlitem) {
178 urlitem = nautilus_menu_item_new ("ubuntuone-geturl",
179- _("Copy Ubuntu One public URL"),
180- _("Sorry, no public URL for this file"),
181+ _("Copy Web _Link"),
182+ _("Sorry, no public URL for this file via Ubuntu One."),
183 "ubuntuone");
184 g_object_set (urlitem, "sensitive", FALSE, NULL);
185 }
186 if (!item) {
187 item = nautilus_menu_item_new ("ubuntuone-publish",
188- _("Publish via Ubuntu One"),
189- _("Sorry, unable to publish"),
190+ _("_Publish"),
191+ _("Sorry, unable to publish via Ubuntu One."),
192 "ubuntuone");
193 g_object_set (item, "sensitive", FALSE, NULL);
194 }
195@@ -757,14 +757,14 @@
196 NautilusMenuItem * item;
197 if (show_location()) {
198 item = nautilus_menu_item_new ("ubuntuone-location-hide",
199- _("Hide location bar"),
200- _("Do not show the location bar"
201+ _("Hide _Ribbon"),
202+ _("Do not show the Ubuntu One ribbon"
203 " in selected folders"),
204 "ubuntuone");
205 } else {
206 item = nautilus_menu_item_new ("ubuntuone-location-show",
207- _("Show location bar"),
208- _("Show the location bar"
209+ _("Show _Ribbon in Some Folders"),
210+ _("Show the Ubuntu One ribbon"
211 " in selected folders"),
212 "ubuntuone");
213 }
214
215=== modified file 'tests/test_preferences.py'
216--- tests/test_preferences.py 2010-08-25 22:37:44 +0000
217+++ tests/test_preferences.py 2010-08-26 18:42:46 +0000
218@@ -166,7 +166,7 @@
219 # check a placeholder for the local machine description is there
220 self.assertTrue(('Label', '<LOCAL MACHINE>') in interesting)
221 # check the bw limitation stuff is there
222- self.assertTrue(('CheckButton', '_Limit Bandwidth Usage')
223+ self.assertTrue(('CheckButton', '_Limit bandwidth')
224 in interesting)
225 self.assertTrue(('Label', 'Maximum _download speed (KB/s):')
226 in interesting)

Subscribers

People subscribed via source and target branches