Merge lp:~nataliabidart/ubuntuone-control-panel/fix-732820 into lp:ubuntuone-control-panel
- fix-732820
- Merge into trunk
Proposed by
Natalia Bidart
| Status: | Merged | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Approved by: | Natalia Bidart | ||||||||
| Approved revision: | 107 | ||||||||
| Merged at revision: | 105 | ||||||||
| Proposed branch: | lp:~nataliabidart/ubuntuone-control-panel/fix-732820 | ||||||||
| Merge into: | lp:ubuntuone-control-panel | ||||||||
| Diff against target: |
749 lines (+329/-296) 3 files modified
data/install.ui (+13/-7) data/services.ui (+312/-285) ubuntuone/controlpanel/gtk/gui.py (+4/-4) |
||||||||
| To merge this branch: | bzr merge lp:~nataliabidart/ubuntuone-control-panel/fix-732820 | ||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| dobey (community) | Approve | ||
| Eric Casteleijn (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
To post a comment you must log in.
Revision history for this message
| dobey (dobey) wrote : | # |
Revision history for this message
| Eric Casteleijn (thisfred) wrote : | # |
Looks good to me now.
review:
Approve
Revision history for this message
| dobey (dobey) wrote : | # |
OK, so I was wrong about the title case, but it should still be plug-in and not plugin.
- 107. By Natalia Bidart
-
Spelled "plu-ing".
Revision history for this message
| dobey (dobey) : | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
| 1 | === modified file 'data/install.ui' | |||
| 2 | --- data/install.ui 2011-01-21 21:43:01 +0000 | |||
| 3 | +++ data/install.ui 2011-03-21 21:21:05 +0000 | |||
| 4 | @@ -2,34 +2,43 @@ | |||
| 5 | 2 | <interface> | 2 | <interface> |
| 6 | 3 | <requires lib="gtk+" version="2.22"/> | 3 | <requires lib="gtk+" version="2.22"/> |
| 7 | 4 | <!-- interface-naming-policy project-wide --> | 4 | <!-- interface-naming-policy project-wide --> |
| 8 | 5 | <object class="GtkImage" id="image1"> | ||
| 9 | 6 | <property name="visible">True</property> | ||
| 10 | 7 | <property name="can_focus">False</property> | ||
| 11 | 8 | <property name="stock">gtk-ok</property> | ||
| 12 | 9 | </object> | ||
| 13 | 5 | <object class="GtkVBox" id="itself"> | 10 | <object class="GtkVBox" id="itself"> |
| 14 | 6 | <property name="visible">True</property> | 11 | <property name="visible">True</property> |
| 15 | 12 | <property name="can_focus">False</property> | ||
| 16 | 7 | <property name="border_width">10</property> | 13 | <property name="border_width">10</property> |
| 17 | 8 | <property name="spacing">10</property> | 14 | <property name="spacing">10</property> |
| 18 | 9 | <child> | 15 | <child> |
| 19 | 10 | <object class="GtkLabel" id="install_label"> | 16 | <object class="GtkLabel" id="install_label"> |
| 20 | 11 | <property name="visible">True</property> | 17 | <property name="visible">True</property> |
| 22 | 12 | <property name="xalign">0</property> | 18 | <property name="can_focus">False</property> |
| 23 | 13 | <property name="label">label</property> | 19 | <property name="label">label</property> |
| 24 | 14 | <property name="wrap">True</property> | 20 | <property name="wrap">True</property> |
| 25 | 15 | </object> | 21 | </object> |
| 26 | 16 | <packing> | 22 | <packing> |
| 28 | 17 | <property name="expand">False</property> | 23 | <property name="expand">True</property> |
| 29 | 24 | <property name="fill">True</property> | ||
| 30 | 18 | <property name="position">0</property> | 25 | <property name="position">0</property> |
| 31 | 19 | </packing> | 26 | </packing> |
| 32 | 20 | </child> | 27 | </child> |
| 33 | 21 | <child> | 28 | <child> |
| 34 | 22 | <object class="GtkHButtonBox" id="install_button_box"> | 29 | <object class="GtkHButtonBox" id="install_button_box"> |
| 35 | 23 | <property name="visible">True</property> | 30 | <property name="visible">True</property> |
| 36 | 31 | <property name="can_focus">False</property> | ||
| 37 | 24 | <child> | 32 | <child> |
| 38 | 25 | <object class="GtkButton" id="install_button"> | 33 | <object class="GtkButton" id="install_button"> |
| 39 | 26 | <property name="label" translatable="yes">_Install now</property> | 34 | <property name="label" translatable="yes">_Install now</property> |
| 40 | 27 | <property name="visible">True</property> | 35 | <property name="visible">True</property> |
| 41 | 28 | <property name="can_focus">True</property> | 36 | <property name="can_focus">True</property> |
| 42 | 29 | <property name="receives_default">True</property> | 37 | <property name="receives_default">True</property> |
| 43 | 38 | <property name="use_action_appearance">False</property> | ||
| 44 | 30 | <property name="image">image1</property> | 39 | <property name="image">image1</property> |
| 45 | 31 | <property name="use_underline">True</property> | 40 | <property name="use_underline">True</property> |
| 47 | 32 | <signal name="clicked" handler="on_install_button_clicked"/> | 41 | <signal name="clicked" handler="on_install_button_clicked" swapped="no"/> |
| 48 | 33 | </object> | 42 | </object> |
| 49 | 34 | <packing> | 43 | <packing> |
| 50 | 35 | <property name="expand">False</property> | 44 | <property name="expand">False</property> |
| 51 | @@ -40,12 +49,9 @@ | |||
| 52 | 40 | </object> | 49 | </object> |
| 53 | 41 | <packing> | 50 | <packing> |
| 54 | 42 | <property name="expand">False</property> | 51 | <property name="expand">False</property> |
| 55 | 52 | <property name="fill">True</property> | ||
| 56 | 43 | <property name="position">1</property> | 53 | <property name="position">1</property> |
| 57 | 44 | </packing> | 54 | </packing> |
| 58 | 45 | </child> | 55 | </child> |
| 59 | 46 | </object> | 56 | </object> |
| 60 | 47 | <object class="GtkImage" id="image1"> | ||
| 61 | 48 | <property name="visible">True</property> | ||
| 62 | 49 | <property name="stock">gtk-ok</property> | ||
| 63 | 50 | </object> | ||
| 64 | 51 | </interface> | 57 | </interface> |
| 65 | 52 | 58 | ||
| 66 | === modified file 'data/services.ui' | |||
| 67 | --- data/services.ui 2011-03-04 21:43:19 +0000 | |||
| 68 | +++ data/services.ui 2011-03-21 21:21:05 +0000 | |||
| 69 | @@ -18,336 +18,363 @@ | |||
| 70 | 18 | <property name="resize_mode">queue</property> | 18 | <property name="resize_mode">queue</property> |
| 71 | 19 | <property name="shadow_type">none</property> | 19 | <property name="shadow_type">none</property> |
| 72 | 20 | <child> | 20 | <child> |
| 74 | 21 | <object class="GtkVBox" id="vbox1"> | 21 | <object class="GtkAlignment" id="alignment1"> |
| 75 | 22 | <property name="visible">True</property> | 22 | <property name="visible">True</property> |
| 76 | 23 | <property name="can_focus">False</property> | 23 | <property name="can_focus">False</property> |
| 78 | 24 | <property name="spacing">5</property> | 24 | <property name="left_padding">5</property> |
| 79 | 25 | <property name="right_padding">5</property> | ||
| 80 | 25 | <child> | 26 | <child> |
| 82 | 26 | <object class="GtkAspectFrame" id="files"> | 27 | <object class="GtkVBox" id="vbox1"> |
| 83 | 27 | <property name="visible">True</property> | 28 | <property name="visible">True</property> |
| 84 | 28 | <property name="can_focus">False</property> | 29 | <property name="can_focus">False</property> |
| 87 | 29 | <property name="label_xalign">0</property> | 30 | <property name="spacing">5</property> |
| 86 | 30 | <property name="shadow_type">out</property> | ||
| 88 | 31 | <child> | 31 | <child> |
| 90 | 32 | <object class="GtkHBox" id="hbox2"> | 32 | <object class="GtkFrame" id="files"> |
| 91 | 33 | <property name="visible">True</property> | 33 | <property name="visible">True</property> |
| 92 | 34 | <property name="can_focus">False</property> | 34 | <property name="can_focus">False</property> |
| 94 | 35 | <property name="border_width">5</property> | 35 | <property name="label_xalign">0</property> |
| 95 | 36 | <property name="shadow_type">out</property> | ||
| 96 | 36 | <child> | 37 | <child> |
| 98 | 37 | <object class="GtkTable" id="table1"> | 38 | <object class="GtkAlignment" id="alignment2"> |
| 99 | 38 | <property name="visible">True</property> | 39 | <property name="visible">True</property> |
| 100 | 39 | <property name="can_focus">False</property> | 40 | <property name="can_focus">False</property> |
| 144 | 40 | <property name="n_rows">3</property> | 41 | <child> |
| 145 | 41 | <property name="n_columns">3</property> | 42 | <object class="GtkHBox" id="hbox2"> |
| 146 | 42 | <property name="row_spacing">5</property> | 43 | <property name="visible">True</property> |
| 147 | 43 | <child> | 44 | <property name="can_focus">False</property> |
| 148 | 44 | <object class="GtkCheckButton" id="file_sync_check"> | 45 | <property name="border_width">5</property> |
| 149 | 45 | <property name="visible">True</property> | 46 | <child> |
| 150 | 46 | <property name="can_focus">True</property> | 47 | <object class="GtkTable" id="table1"> |
| 151 | 47 | <property name="receives_default">False</property> | 48 | <property name="visible">True</property> |
| 152 | 48 | <property name="use_action_appearance">False</property> | 49 | <property name="can_focus">False</property> |
| 153 | 49 | <property name="draw_indicator">True</property> | 50 | <property name="n_rows">3</property> |
| 154 | 50 | </object> | 51 | <property name="n_columns">3</property> |
| 155 | 51 | </child> | 52 | <property name="column_spacing">5</property> |
| 156 | 52 | <child> | 53 | <property name="row_spacing">5</property> |
| 157 | 53 | <object class="GtkImage" id="image2"> | 54 | <child> |
| 158 | 54 | <property name="visible">True</property> | 55 | <object class="GtkCheckButton" id="file_sync_check"> |
| 159 | 55 | <property name="can_focus">False</property> | 56 | <property name="visible">True</property> |
| 160 | 56 | <property name="xpad">5</property> | 57 | <property name="can_focus">True</property> |
| 161 | 57 | <property name="pixbuf">services-files.png</property> | 58 | <property name="receives_default">False</property> |
| 162 | 58 | </object> | 59 | <property name="use_action_appearance">False</property> |
| 163 | 59 | <packing> | 60 | <property name="draw_indicator">True</property> |
| 164 | 60 | <property name="left_attach">1</property> | 61 | </object> |
| 165 | 61 | <property name="right_attach">2</property> | 62 | </child> |
| 166 | 62 | </packing> | 63 | <child> |
| 167 | 63 | </child> | 64 | <object class="GtkImage" id="image2"> |
| 168 | 64 | <child> | 65 | <property name="visible">True</property> |
| 169 | 65 | <object class="GtkLabel" id="label1"> | 66 | <property name="can_focus">False</property> |
| 170 | 66 | <property name="visible">True</property> | 67 | <property name="xpad">5</property> |
| 171 | 67 | <property name="can_focus">False</property> | 68 | <property name="pixbuf">services-files.png</property> |
| 172 | 68 | <property name="xalign">0</property> | 69 | </object> |
| 173 | 69 | <property name="label" translatable="yes">Enable File Sync</property> | 70 | <packing> |
| 174 | 70 | </object> | 71 | <property name="left_attach">1</property> |
| 175 | 71 | <packing> | 72 | <property name="right_attach">2</property> |
| 176 | 72 | <property name="left_attach">2</property> | 73 | </packing> |
| 177 | 73 | <property name="right_attach">3</property> | 74 | </child> |
| 178 | 74 | </packing> | 75 | <child> |
| 179 | 75 | </child> | 76 | <object class="GtkLabel" id="label1"> |
| 180 | 76 | <child> | 77 | <property name="visible">True</property> |
| 181 | 77 | <object class="GtkLabel" id="label2"> | 78 | <property name="can_focus">False</property> |
| 182 | 78 | <property name="visible">True</property> | 79 | <property name="xalign">0</property> |
| 183 | 79 | <property name="can_focus">False</property> | 80 | <property name="label" translatable="yes">Enable File Sync</property> |
| 184 | 80 | <property name="xalign">0</property> | 81 | </object> |
| 185 | 81 | <property name="yalign">0</property> | 82 | <packing> |
| 186 | 82 | <property name="label" translatable="yes"><span font_size="small">Enable and then choose which folders you want to access from the Web or any device you connected to Ubuntu One | 83 | <property name="left_attach">2</property> |
| 187 | 84 | <property name="right_attach">3</property> | ||
| 188 | 85 | </packing> | ||
| 189 | 86 | </child> | ||
| 190 | 87 | <child> | ||
| 191 | 88 | <object class="GtkLabel" id="label2"> | ||
| 192 | 89 | <property name="visible">True</property> | ||
| 193 | 90 | <property name="can_focus">False</property> | ||
| 194 | 91 | <property name="xalign">0</property> | ||
| 195 | 92 | <property name="yalign">0</property> | ||
| 196 | 93 | <property name="label" translatable="yes"><span font_size="small">Enable and then choose which folders you want to access from the Web or any device you connected to Ubuntu One | ||
| 197 | 83 | 94 | ||
| 198 | 84 | Simply drag and drop any file or folder to your Ubuntu One folder on this computer</span></property> | 95 | Simply drag and drop any file or folder to your Ubuntu One folder on this computer</span></property> |
| 214 | 85 | <property name="use_markup">True</property> | 96 | <property name="use_markup">True</property> |
| 215 | 86 | <property name="wrap">True</property> | 97 | <property name="wrap">True</property> |
| 216 | 87 | <property name="width_chars">30</property> | 98 | <property name="width_chars">35</property> |
| 217 | 88 | </object> | 99 | </object> |
| 218 | 89 | <packing> | 100 | <packing> |
| 219 | 90 | <property name="left_attach">2</property> | 101 | <property name="left_attach">2</property> |
| 220 | 91 | <property name="right_attach">3</property> | 102 | <property name="right_attach">3</property> |
| 221 | 92 | <property name="top_attach">1</property> | 103 | <property name="top_attach">1</property> |
| 222 | 93 | <property name="bottom_attach">2</property> | 104 | <property name="bottom_attach">2</property> |
| 223 | 94 | </packing> | 105 | </packing> |
| 224 | 95 | </child> | 106 | </child> |
| 225 | 96 | <child> | 107 | <child> |
| 226 | 97 | <object class="GtkHButtonBox" id="hbuttonbox1"> | 108 | <object class="GtkHButtonBox" id="hbuttonbox1"> |
| 227 | 98 | <property name="visible">True</property> | 109 | <property name="visible">True</property> |
| 228 | 99 | <property name="can_focus">False</property> | 110 | <property name="can_focus">False</property> |
| 229 | 111 | <child> | ||
| 230 | 112 | <object class="GtkButton" id="file_sync_button"> | ||
| 231 | 113 | <property name="label" translatable="yes">_Show me my Ubuntu One folder</property> | ||
| 232 | 114 | <property name="visible">True</property> | ||
| 233 | 115 | <property name="can_focus">True</property> | ||
| 234 | 116 | <property name="receives_default">True</property> | ||
| 235 | 117 | <property name="use_action_appearance">False</property> | ||
| 236 | 118 | <property name="use_underline">True</property> | ||
| 237 | 119 | <signal name="clicked" handler="on_file_sync_button_clicked" swapped="no"/> | ||
| 238 | 120 | </object> | ||
| 239 | 121 | <packing> | ||
| 240 | 122 | <property name="expand">False</property> | ||
| 241 | 123 | <property name="fill">False</property> | ||
| 242 | 124 | <property name="position">0</property> | ||
| 243 | 125 | </packing> | ||
| 244 | 126 | </child> | ||
| 245 | 127 | </object> | ||
| 246 | 128 | <packing> | ||
| 247 | 129 | <property name="left_attach">2</property> | ||
| 248 | 130 | <property name="right_attach">3</property> | ||
| 249 | 131 | <property name="top_attach">2</property> | ||
| 250 | 132 | <property name="bottom_attach">3</property> | ||
| 251 | 133 | </packing> | ||
| 252 | 134 | </child> | ||
| 253 | 135 | <child> | ||
| 254 | 136 | <placeholder/> | ||
| 255 | 137 | </child> | ||
| 256 | 138 | <child> | ||
| 257 | 139 | <placeholder/> | ||
| 258 | 140 | </child> | ||
| 259 | 141 | <child> | ||
| 260 | 142 | <placeholder/> | ||
| 261 | 143 | </child> | ||
| 262 | 144 | <child> | ||
| 263 | 145 | <placeholder/> | ||
| 264 | 146 | </child> | ||
| 265 | 147 | </object> | ||
| 266 | 148 | <packing> | ||
| 267 | 149 | <property name="expand">False</property> | ||
| 268 | 150 | <property name="fill">True</property> | ||
| 269 | 151 | <property name="position">0</property> | ||
| 270 | 152 | </packing> | ||
| 271 | 153 | </child> | ||
| 272 | 100 | <child> | 154 | <child> |
| 275 | 101 | <object class="GtkButton" id="file_sync_button"> | 155 | <object class="GtkImage" id="image1"> |
| 274 | 102 | <property name="label" translatable="yes">_Show me my Ubuntu One folder</property> | ||
| 276 | 103 | <property name="visible">True</property> | 156 | <property name="visible">True</property> |
| 282 | 104 | <property name="can_focus">True</property> | 157 | <property name="can_focus">False</property> |
| 283 | 105 | <property name="receives_default">True</property> | 158 | <property name="xpad">5</property> |
| 284 | 106 | <property name="use_action_appearance">False</property> | 159 | <property name="ypad">5</property> |
| 285 | 107 | <property name="use_underline">True</property> | 160 | <property name="pixbuf">services-files-example.png</property> |
| 281 | 108 | <signal name="clicked" handler="on_file_sync_button_clicked" swapped="no"/> | ||
| 286 | 109 | </object> | 161 | </object> |
| 287 | 110 | <packing> | 162 | <packing> |
| 288 | 111 | <property name="expand">False</property> | 163 | <property name="expand">False</property> |
| 291 | 112 | <property name="fill">False</property> | 164 | <property name="fill">True</property> |
| 292 | 113 | <property name="position">0</property> | 165 | <property name="pack_type">end</property> |
| 293 | 166 | <property name="position">1</property> | ||
| 294 | 114 | </packing> | 167 | </packing> |
| 295 | 115 | </child> | 168 | </child> |
| 296 | 116 | </object> | 169 | </object> |
| 297 | 117 | <packing> | ||
| 298 | 118 | <property name="left_attach">2</property> | ||
| 299 | 119 | <property name="right_attach">3</property> | ||
| 300 | 120 | <property name="top_attach">2</property> | ||
| 301 | 121 | <property name="bottom_attach">3</property> | ||
| 302 | 122 | </packing> | ||
| 303 | 123 | </child> | ||
| 304 | 124 | <child> | ||
| 305 | 125 | <placeholder/> | ||
| 306 | 126 | </child> | ||
| 307 | 127 | <child> | ||
| 308 | 128 | <placeholder/> | ||
| 309 | 129 | </child> | ||
| 310 | 130 | <child> | ||
| 311 | 131 | <placeholder/> | ||
| 312 | 132 | </child> | ||
| 313 | 133 | <child> | ||
| 314 | 134 | <placeholder/> | ||
| 315 | 135 | </child> | 170 | </child> |
| 316 | 136 | </object> | 171 | </object> |
| 317 | 137 | <packing> | ||
| 318 | 138 | <property name="expand">False</property> | ||
| 319 | 139 | <property name="fill">True</property> | ||
| 320 | 140 | <property name="position">0</property> | ||
| 321 | 141 | </packing> | ||
| 322 | 142 | </child> | 172 | </child> |
| 337 | 143 | <child> | 173 | <child type="label_item"> |
| 338 | 144 | <object class="GtkImage" id="image1"> | 174 | <placeholder/> |
| 325 | 145 | <property name="visible">True</property> | ||
| 326 | 146 | <property name="can_focus">False</property> | ||
| 327 | 147 | <property name="xpad">5</property> | ||
| 328 | 148 | <property name="ypad">5</property> | ||
| 329 | 149 | <property name="pixbuf">services-files-example.png</property> | ||
| 330 | 150 | </object> | ||
| 331 | 151 | <packing> | ||
| 332 | 152 | <property name="expand">False</property> | ||
| 333 | 153 | <property name="fill">True</property> | ||
| 334 | 154 | <property name="pack_type">end</property> | ||
| 335 | 155 | <property name="position">1</property> | ||
| 336 | 156 | </packing> | ||
| 339 | 157 | </child> | 175 | </child> |
| 340 | 158 | </object> | 176 | </object> |
| 341 | 177 | <packing> | ||
| 342 | 178 | <property name="expand">False</property> | ||
| 343 | 179 | <property name="fill">True</property> | ||
| 344 | 180 | <property name="position">0</property> | ||
| 345 | 181 | </packing> | ||
| 346 | 159 | </child> | 182 | </child> |
| 347 | 160 | </object> | ||
| 348 | 161 | <packing> | ||
| 349 | 162 | <property name="expand">True</property> | ||
| 350 | 163 | <property name="fill">True</property> | ||
| 351 | 164 | <property name="position">0</property> | ||
| 352 | 165 | </packing> | ||
| 353 | 166 | </child> | ||
| 354 | 167 | <child> | ||
| 355 | 168 | <object class="GtkAspectFrame" id="replications"> | ||
| 356 | 169 | <property name="visible">True</property> | ||
| 357 | 170 | <property name="can_focus">False</property> | ||
| 358 | 171 | <property name="label_xalign">0</property> | ||
| 359 | 172 | <property name="shadow_type">out</property> | ||
| 360 | 173 | <child> | 183 | <child> |
| 362 | 174 | <object class="GtkHBox" id="hbox3"> | 184 | <object class="GtkFrame" id="replications"> |
| 363 | 175 | <property name="visible">True</property> | 185 | <property name="visible">True</property> |
| 364 | 176 | <property name="can_focus">False</property> | 186 | <property name="can_focus">False</property> |
| 366 | 177 | <property name="border_width">5</property> | 187 | <property name="label_xalign">0</property> |
| 367 | 188 | <property name="shadow_type">out</property> | ||
| 368 | 178 | <child> | 189 | <child> |
| 370 | 179 | <object class="GtkVBox" id="contacts"> | 190 | <object class="GtkAlignment" id="alignment3"> |
| 371 | 180 | <property name="visible">True</property> | 191 | <property name="visible">True</property> |
| 372 | 181 | <property name="can_focus">False</property> | 192 | <property name="can_focus">False</property> |
| 373 | 182 | <child> | 193 | <child> |
| 375 | 183 | <object class="GtkTable" id="contacts_sync"> | 194 | <object class="GtkHBox" id="hbox3"> |
| 376 | 184 | <property name="visible">True</property> | 195 | <property name="visible">True</property> |
| 377 | 185 | <property name="can_focus">False</property> | 196 | <property name="can_focus">False</property> |
| 437 | 186 | <property name="n_rows">2</property> | 197 | <property name="border_width">5</property> |
| 438 | 187 | <property name="n_columns">3</property> | 198 | <child> |
| 439 | 188 | <property name="row_spacing">5</property> | 199 | <object class="GtkVBox" id="contacts"> |
| 440 | 189 | <child> | 200 | <property name="visible">True</property> |
| 441 | 190 | <object class="GtkCheckButton" id="contacts_check"> | 201 | <property name="can_focus">False</property> |
| 442 | 191 | <property name="visible">True</property> | 202 | <child> |
| 443 | 192 | <property name="can_focus">True</property> | 203 | <object class="GtkTable" id="contacts_sync"> |
| 444 | 193 | <property name="receives_default">False</property> | 204 | <property name="visible">True</property> |
| 445 | 194 | <property name="use_action_appearance">False</property> | 205 | <property name="can_focus">False</property> |
| 446 | 195 | <property name="draw_indicator">True</property> | 206 | <property name="n_rows">2</property> |
| 447 | 196 | </object> | 207 | <property name="n_columns">3</property> |
| 448 | 197 | </child> | 208 | <property name="row_spacing">5</property> |
| 449 | 198 | <child> | 209 | <child> |
| 450 | 199 | <object class="GtkImage" id="image3"> | 210 | <object class="GtkCheckButton" id="contacts_check"> |
| 451 | 200 | <property name="visible">True</property> | 211 | <property name="visible">True</property> |
| 452 | 201 | <property name="can_focus">False</property> | 212 | <property name="can_focus">True</property> |
| 453 | 202 | <property name="xpad">5</property> | 213 | <property name="receives_default">False</property> |
| 454 | 203 | <property name="pixbuf">services-contacts.png</property> | 214 | <property name="use_action_appearance">False</property> |
| 455 | 204 | </object> | 215 | <property name="draw_indicator">True</property> |
| 456 | 205 | <packing> | 216 | </object> |
| 457 | 206 | <property name="left_attach">1</property> | 217 | </child> |
| 458 | 207 | <property name="right_attach">2</property> | 218 | <child> |
| 459 | 208 | </packing> | 219 | <object class="GtkImage" id="image3"> |
| 460 | 209 | </child> | 220 | <property name="visible">True</property> |
| 461 | 210 | <child> | 221 | <property name="can_focus">False</property> |
| 462 | 211 | <object class="GtkLabel" id="label4"> | 222 | <property name="xpad">5</property> |
| 463 | 212 | <property name="visible">True</property> | 223 | <property name="pixbuf">services-contacts.png</property> |
| 464 | 213 | <property name="can_focus">False</property> | 224 | </object> |
| 465 | 214 | <property name="xalign">0</property> | 225 | <packing> |
| 466 | 215 | <property name="label" translatable="yes">Enable Contacts Sync</property> | 226 | <property name="left_attach">1</property> |
| 467 | 216 | </object> | 227 | <property name="right_attach">2</property> |
| 468 | 217 | <packing> | 228 | </packing> |
| 469 | 218 | <property name="left_attach">2</property> | 229 | </child> |
| 470 | 219 | <property name="right_attach">3</property> | 230 | <child> |
| 471 | 220 | </packing> | 231 | <object class="GtkLabel" id="label4"> |
| 472 | 221 | </child> | 232 | <property name="visible">True</property> |
| 473 | 222 | <child> | 233 | <property name="can_focus">False</property> |
| 474 | 223 | <object class="GtkLabel" id="label5"> | 234 | <property name="xalign">0</property> |
| 475 | 224 | <property name="visible">True</property> | 235 | <property name="label" translatable="yes">Enable Contacts Sync</property> |
| 476 | 225 | <property name="can_focus">True</property> | 236 | </object> |
| 477 | 226 | <property name="xalign">0</property> | 237 | <packing> |
| 478 | 227 | <property name="yalign">0</property> | 238 | <property name="left_attach">2</property> |
| 479 | 228 | <property name="label" translatable="yes"><span font_size="small">Once enabled, visit the <a href="https://one.ubuntu.com">Ubuntu One website</a> to manage your contacts, including Gmail and Facebook import</span></property> | 239 | <property name="right_attach">3</property> |
| 480 | 229 | <property name="use_markup">True</property> | 240 | </packing> |
| 481 | 230 | <property name="wrap">True</property> | 241 | </child> |
| 482 | 231 | <property name="width_chars">30</property> | 242 | <child> |
| 483 | 232 | </object> | 243 | <object class="GtkLabel" id="label5"> |
| 484 | 233 | <packing> | 244 | <property name="visible">True</property> |
| 485 | 234 | <property name="left_attach">2</property> | 245 | <property name="can_focus">True</property> |
| 486 | 235 | <property name="right_attach">3</property> | 246 | <property name="xalign">0</property> |
| 487 | 236 | <property name="top_attach">1</property> | 247 | <property name="yalign">0</property> |
| 488 | 237 | <property name="bottom_attach">2</property> | 248 | <property name="label" translatable="yes"><span font_size="small">Once enabled, visit the <a href="https://one.ubuntu.com">Ubuntu One website</a> to manage your contacts, including Gmail and Facebook import</span></property> |
| 489 | 238 | </packing> | 249 | <property name="use_markup">True</property> |
| 490 | 239 | </child> | 250 | <property name="wrap">True</property> |
| 491 | 240 | <child> | 251 | <property name="width_chars">35</property> |
| 492 | 241 | <placeholder/> | 252 | </object> |
| 493 | 242 | </child> | 253 | <packing> |
| 494 | 243 | <child> | 254 | <property name="left_attach">2</property> |
| 495 | 244 | <placeholder/> | 255 | <property name="right_attach">3</property> |
| 496 | 256 | <property name="top_attach">1</property> | ||
| 497 | 257 | <property name="bottom_attach">2</property> | ||
| 498 | 258 | </packing> | ||
| 499 | 259 | </child> | ||
| 500 | 260 | <child> | ||
| 501 | 261 | <placeholder/> | ||
| 502 | 262 | </child> | ||
| 503 | 263 | <child> | ||
| 504 | 264 | <placeholder/> | ||
| 505 | 265 | </child> | ||
| 506 | 266 | </object> | ||
| 507 | 267 | <packing> | ||
| 508 | 268 | <property name="expand">False</property> | ||
| 509 | 269 | <property name="fill">True</property> | ||
| 510 | 270 | <property name="position">0</property> | ||
| 511 | 271 | </packing> | ||
| 512 | 272 | </child> | ||
| 513 | 273 | </object> | ||
| 514 | 274 | <packing> | ||
| 515 | 275 | <property name="expand">False</property> | ||
| 516 | 276 | <property name="fill">True</property> | ||
| 517 | 277 | <property name="position">0</property> | ||
| 518 | 278 | </packing> | ||
| 519 | 279 | </child> | ||
| 520 | 280 | <child> | ||
| 521 | 281 | <object class="GtkVBox" id="bookmarks"> | ||
| 522 | 282 | <property name="visible">True</property> | ||
| 523 | 283 | <property name="can_focus">False</property> | ||
| 524 | 284 | <child> | ||
| 525 | 285 | <object class="GtkTable" id="bookmarks_sync"> | ||
| 526 | 286 | <property name="visible">True</property> | ||
| 527 | 287 | <property name="can_focus">False</property> | ||
| 528 | 288 | <property name="n_rows">2</property> | ||
| 529 | 289 | <property name="n_columns">3</property> | ||
| 530 | 290 | <property name="row_spacing">5</property> | ||
| 531 | 291 | <child> | ||
| 532 | 292 | <object class="GtkCheckButton" id="bookmarks_check"> | ||
| 533 | 293 | <property name="visible">True</property> | ||
| 534 | 294 | <property name="can_focus">True</property> | ||
| 535 | 295 | <property name="receives_default">False</property> | ||
| 536 | 296 | <property name="use_action_appearance">False</property> | ||
| 537 | 297 | <property name="draw_indicator">True</property> | ||
| 538 | 298 | </object> | ||
| 539 | 299 | </child> | ||
| 540 | 300 | <child> | ||
| 541 | 301 | <object class="GtkImage" id="image4"> | ||
| 542 | 302 | <property name="visible">True</property> | ||
| 543 | 303 | <property name="can_focus">False</property> | ||
| 544 | 304 | <property name="xpad">5</property> | ||
| 545 | 305 | <property name="pixbuf">services-bookmarks.png</property> | ||
| 546 | 306 | </object> | ||
| 547 | 307 | <packing> | ||
| 548 | 308 | <property name="left_attach">1</property> | ||
| 549 | 309 | <property name="right_attach">2</property> | ||
| 550 | 310 | </packing> | ||
| 551 | 311 | </child> | ||
| 552 | 312 | <child> | ||
| 553 | 313 | <object class="GtkLabel" id="label6"> | ||
| 554 | 314 | <property name="visible">True</property> | ||
| 555 | 315 | <property name="can_focus">False</property> | ||
| 556 | 316 | <property name="xalign">0</property> | ||
| 557 | 317 | <property name="label" translatable="yes">Enable Bookmarks Sync</property> | ||
| 558 | 318 | </object> | ||
| 559 | 319 | <packing> | ||
| 560 | 320 | <property name="left_attach">2</property> | ||
| 561 | 321 | <property name="right_attach">3</property> | ||
| 562 | 322 | </packing> | ||
| 563 | 323 | </child> | ||
| 564 | 324 | <child> | ||
| 565 | 325 | <object class="GtkLabel" id="label7"> | ||
| 566 | 326 | <property name="visible">True</property> | ||
| 567 | 327 | <property name="can_focus">False</property> | ||
| 568 | 328 | <property name="xalign">0</property> | ||
| 569 | 329 | <property name="yalign">0</property> | ||
| 570 | 330 | <property name="label" translatable="yes"><span font_size="small">Bookmarks sync works with Firefox</span></property> | ||
| 571 | 331 | <property name="use_markup">True</property> | ||
| 572 | 332 | <property name="wrap">True</property> | ||
| 573 | 333 | <property name="width_chars">30</property> | ||
| 574 | 334 | </object> | ||
| 575 | 335 | <packing> | ||
| 576 | 336 | <property name="left_attach">2</property> | ||
| 577 | 337 | <property name="right_attach">3</property> | ||
| 578 | 338 | <property name="top_attach">1</property> | ||
| 579 | 339 | <property name="bottom_attach">2</property> | ||
| 580 | 340 | </packing> | ||
| 581 | 341 | </child> | ||
| 582 | 342 | <child> | ||
| 583 | 343 | <placeholder/> | ||
| 584 | 344 | </child> | ||
| 585 | 345 | <child> | ||
| 586 | 346 | <placeholder/> | ||
| 587 | 347 | </child> | ||
| 588 | 348 | </object> | ||
| 589 | 349 | <packing> | ||
| 590 | 350 | <property name="expand">False</property> | ||
| 591 | 351 | <property name="fill">True</property> | ||
| 592 | 352 | <property name="position">0</property> | ||
| 593 | 353 | </packing> | ||
| 594 | 354 | </child> | ||
| 595 | 355 | </object> | ||
| 596 | 356 | <packing> | ||
| 597 | 357 | <property name="expand">False</property> | ||
| 598 | 358 | <property name="fill">True</property> | ||
| 599 | 359 | <property name="pack_type">end</property> | ||
| 600 | 360 | <property name="position">1</property> | ||
| 601 | 361 | </packing> | ||
| 602 | 245 | </child> | 362 | </child> |
| 603 | 246 | </object> | 363 | </object> |
| 604 | 247 | <packing> | ||
| 605 | 248 | <property name="expand">False</property> | ||
| 606 | 249 | <property name="fill">True</property> | ||
| 607 | 250 | <property name="position">0</property> | ||
| 608 | 251 | </packing> | ||
| 609 | 252 | </child> | 364 | </child> |
| 610 | 253 | </object> | 365 | </object> |
| 611 | 254 | <packing> | ||
| 612 | 255 | <property name="expand">False</property> | ||
| 613 | 256 | <property name="fill">True</property> | ||
| 614 | 257 | <property name="position">0</property> | ||
| 615 | 258 | </packing> | ||
| 616 | 259 | </child> | 366 | </child> |
| 699 | 260 | <child> | 367 | <child type="label_item"> |
| 700 | 261 | <object class="GtkVBox" id="bookmarks"> | 368 | <placeholder/> |
| 619 | 262 | <property name="visible">True</property> | ||
| 620 | 263 | <property name="can_focus">False</property> | ||
| 621 | 264 | <child> | ||
| 622 | 265 | <object class="GtkTable" id="bookmarks_sync"> | ||
| 623 | 266 | <property name="visible">True</property> | ||
| 624 | 267 | <property name="can_focus">False</property> | ||
| 625 | 268 | <property name="n_rows">2</property> | ||
| 626 | 269 | <property name="n_columns">3</property> | ||
| 627 | 270 | <property name="row_spacing">5</property> | ||
| 628 | 271 | <child> | ||
| 629 | 272 | <object class="GtkCheckButton" id="bookmarks_check"> | ||
| 630 | 273 | <property name="visible">True</property> | ||
| 631 | 274 | <property name="can_focus">True</property> | ||
| 632 | 275 | <property name="receives_default">False</property> | ||
| 633 | 276 | <property name="use_action_appearance">False</property> | ||
| 634 | 277 | <property name="draw_indicator">True</property> | ||
| 635 | 278 | </object> | ||
| 636 | 279 | </child> | ||
| 637 | 280 | <child> | ||
| 638 | 281 | <object class="GtkImage" id="image4"> | ||
| 639 | 282 | <property name="visible">True</property> | ||
| 640 | 283 | <property name="can_focus">False</property> | ||
| 641 | 284 | <property name="xpad">5</property> | ||
| 642 | 285 | <property name="pixbuf">services-bookmarks.png</property> | ||
| 643 | 286 | </object> | ||
| 644 | 287 | <packing> | ||
| 645 | 288 | <property name="left_attach">1</property> | ||
| 646 | 289 | <property name="right_attach">2</property> | ||
| 647 | 290 | </packing> | ||
| 648 | 291 | </child> | ||
| 649 | 292 | <child> | ||
| 650 | 293 | <object class="GtkLabel" id="label6"> | ||
| 651 | 294 | <property name="visible">True</property> | ||
| 652 | 295 | <property name="can_focus">False</property> | ||
| 653 | 296 | <property name="xalign">0</property> | ||
| 654 | 297 | <property name="label" translatable="yes">Enable Bookmarks Sync</property> | ||
| 655 | 298 | </object> | ||
| 656 | 299 | <packing> | ||
| 657 | 300 | <property name="left_attach">2</property> | ||
| 658 | 301 | <property name="right_attach">3</property> | ||
| 659 | 302 | </packing> | ||
| 660 | 303 | </child> | ||
| 661 | 304 | <child> | ||
| 662 | 305 | <object class="GtkLabel" id="label7"> | ||
| 663 | 306 | <property name="visible">True</property> | ||
| 664 | 307 | <property name="can_focus">False</property> | ||
| 665 | 308 | <property name="xalign">0</property> | ||
| 666 | 309 | <property name="yalign">0</property> | ||
| 667 | 310 | <property name="label" translatable="yes"><span font_size="small">Bookmarks sync works with Firefox. Once enabled, you will need to install a plugin</span></property> | ||
| 668 | 311 | <property name="use_markup">True</property> | ||
| 669 | 312 | <property name="wrap">True</property> | ||
| 670 | 313 | <property name="width_chars">30</property> | ||
| 671 | 314 | </object> | ||
| 672 | 315 | <packing> | ||
| 673 | 316 | <property name="left_attach">2</property> | ||
| 674 | 317 | <property name="right_attach">3</property> | ||
| 675 | 318 | <property name="top_attach">1</property> | ||
| 676 | 319 | <property name="bottom_attach">2</property> | ||
| 677 | 320 | </packing> | ||
| 678 | 321 | </child> | ||
| 679 | 322 | <child> | ||
| 680 | 323 | <placeholder/> | ||
| 681 | 324 | </child> | ||
| 682 | 325 | <child> | ||
| 683 | 326 | <placeholder/> | ||
| 684 | 327 | </child> | ||
| 685 | 328 | </object> | ||
| 686 | 329 | <packing> | ||
| 687 | 330 | <property name="expand">False</property> | ||
| 688 | 331 | <property name="fill">True</property> | ||
| 689 | 332 | <property name="position">0</property> | ||
| 690 | 333 | </packing> | ||
| 691 | 334 | </child> | ||
| 692 | 335 | </object> | ||
| 693 | 336 | <packing> | ||
| 694 | 337 | <property name="expand">False</property> | ||
| 695 | 338 | <property name="fill">True</property> | ||
| 696 | 339 | <property name="pack_type">end</property> | ||
| 697 | 340 | <property name="position">1</property> | ||
| 698 | 341 | </packing> | ||
| 701 | 342 | </child> | 369 | </child> |
| 702 | 343 | </object> | 370 | </object> |
| 703 | 371 | <packing> | ||
| 704 | 372 | <property name="expand">False</property> | ||
| 705 | 373 | <property name="fill">True</property> | ||
| 706 | 374 | <property name="position">1</property> | ||
| 707 | 375 | </packing> | ||
| 708 | 344 | </child> | 376 | </child> |
| 709 | 345 | </object> | 377 | </object> |
| 710 | 346 | <packing> | ||
| 711 | 347 | <property name="expand">True</property> | ||
| 712 | 348 | <property name="fill">True</property> | ||
| 713 | 349 | <property name="position">1</property> | ||
| 714 | 350 | </packing> | ||
| 715 | 351 | </child> | 378 | </child> |
| 716 | 352 | </object> | 379 | </object> |
| 717 | 353 | </child> | 380 | </child> |
| 718 | 354 | 381 | ||
| 719 | === modified file 'ubuntuone/controlpanel/gtk/gui.py' | |||
| 720 | --- ubuntuone/controlpanel/gtk/gui.py 2011-03-21 20:16:16 +0000 | |||
| 721 | +++ ubuntuone/controlpanel/gtk/gui.py 2011-03-21 21:21:05 +0000 | |||
| 722 | @@ -855,7 +855,7 @@ | |||
| 723 | 855 | 855 | ||
| 724 | 856 | INSTALL_PACKAGE = _('You need to install the package <i>%(package_name)s' | 856 | INSTALL_PACKAGE = _('You need to install the package <i>%(package_name)s' |
| 725 | 857 | '</i> in order to enable more sync services.') | 857 | '</i> in order to enable more sync services.') |
| 727 | 858 | INSTALLING = _('installation of <i>%(package_name)s</i> in progress') | 858 | INSTALLING = _('Installation of <i>%(package_name)s</i> in progress') |
| 728 | 859 | FAILED_INSTALL = _('<i>%(package_name)s</i> could not be installed') | 859 | FAILED_INSTALL = _('<i>%(package_name)s</i> could not be installed') |
| 729 | 860 | SUCCESS_INSTALL = _('<i>%(package_name)s</i> was successfully installed') | 860 | SUCCESS_INSTALL = _('<i>%(package_name)s</i> was successfully installed') |
| 730 | 861 | 861 | ||
| 731 | @@ -1024,7 +1024,7 @@ | |||
| 732 | 1024 | class DesktopcouchService(Service): | 1024 | class DesktopcouchService(Service): |
| 733 | 1025 | """A desktopcouch service.""" | 1025 | """A desktopcouch service.""" |
| 734 | 1026 | 1026 | ||
| 736 | 1027 | INSTALL_PACKAGE = _('Install <i>%(plugin_name)s</i> plugin ' | 1027 | INSTALL_PACKAGE = _('Install the %(plugin_name)s ' |
| 737 | 1028 | 'for %(service_name)s sync') | 1028 | 'for %(service_name)s sync') |
| 738 | 1029 | 1029 | ||
| 739 | 1030 | def __init__(self, service_id, name, enabled, | 1030 | def __init__(self, service_id, name, enabled, |
| 740 | @@ -1092,8 +1092,8 @@ | |||
| 741 | 1092 | 1092 | ||
| 742 | 1093 | TITLE = _('Enable the sync services for this computer.') | 1093 | TITLE = _('Enable the sync services for this computer.') |
| 743 | 1094 | DESKTOPCOUCH_PKG = 'desktopcouch-ubuntuone' | 1094 | DESKTOPCOUCH_PKG = 'desktopcouch-ubuntuone' |
| 746 | 1095 | BOOKMARKS = 'Firefox' | 1095 | BOOKMARKS = _('Firefox extension') |
| 747 | 1096 | CONTACTS = 'Evolution' | 1096 | CONTACTS = _('Evolution plug-in') |
| 748 | 1097 | NO_PAIRING_RECORD = _('There is no Ubuntu One pairing record.') | 1097 | NO_PAIRING_RECORD = _('There is no Ubuntu One pairing record.') |
| 749 | 1098 | CONTACTS_LINK = 'https://one.ubuntu.com/' | 1098 | CONTACTS_LINK = 'https://one.ubuntu.com/' |
| 750 | 1099 | 1099 | ||
It looks like you've made the text into titles for the extensions. In that case, they should probably be "Firefox Extension" and "Evolution Plug-in" respectively. (Yes the hyphen should be there; it's proper English.)