Merge lp:~elopio/ubuntuone-control-panel/add-periods into lp:ubuntuone-control-panel

Proposed by Leo Arias
Status: Rejected
Rejected by: Leo Arias
Proposed branch: lp:~elopio/ubuntuone-control-panel/add-periods
Merge into: lp:ubuntuone-control-panel
Diff against target: 37 lines (+4/-4)
2 files modified
data/gtk/services.ui (+3/-3)
ubuntuone/controlpanel/gui/__init__.py (+1/-1)
To merge this branch: bzr merge lp:~elopio/ubuntuone-control-panel/add-periods
Reviewer Review Type Date Requested Status
Leo Arias (community) Disapprove
Review via email: mp+81493@code.launchpad.net

Commit message

Add periods for consistency and to end sentences. (Fixes LP: #887300 and LP: #887301)

Description of the change

Add periods for consistency and to end sentences.
Fixes LP: #887300 and #887301

To post a comment you must log in.
Revision history for this message
Leo Arias (elopio) wrote :

From P and beyond we will just maintain the QT version of the control panel.

review: Disapprove

Unmerged revisions

239. By Leo Arias

Added periods to the sentences in the Services tab.

238. By Leo Arias

Added a period to the Cloud Folders title.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'data/gtk/services.ui'
--- data/gtk/services.ui 2011-09-14 19:08:52 +0000
+++ data/gtk/services.ui 2011-11-07 20:35:40 +0000
@@ -94,9 +94,9 @@
94 <property name="can_focus">False</property>94 <property name="can_focus">False</property>
95 <property name="xalign">0</property>95 <property name="xalign">0</property>
96 <property name="yalign">0</property>96 <property name="yalign">0</property>
97 <property name="label" translatable="yes">&lt;span font_size="small"&gt;Enable and then choose which folders you want to access from the Web or any device you connected to Ubuntu One97 <property name="label" translatable="yes">&lt;span font_size="small"&gt;Enable and then choose which folders you want to access from the Web or any device you connected to Ubuntu One.
9898
99Simply drag and drop any file or folder to your Ubuntu One folder on this computer&lt;/span&gt;</property>99Simply drag and drop any file or folder to your Ubuntu One folder on this computer.&lt;/span&gt;</property>
100 <property name="use_markup">True</property>100 <property name="use_markup">True</property>
101 <property name="wrap">True</property>101 <property name="wrap">True</property>
102 <property name="width_chars">35</property>102 <property name="width_chars">35</property>
@@ -252,7 +252,7 @@
252 <property name="can_focus">True</property>252 <property name="can_focus">True</property>
253 <property name="xalign">0</property>253 <property name="xalign">0</property>
254 <property name="yalign">0</property>254 <property name="yalign">0</property>
255 <property name="label" translatable="yes">&lt;span font_size="small"&gt;Once enabled, visit the &lt;a href="https://one.ubuntu.com"&gt;Ubuntu One website&lt;/a&gt; to manage your contacts, including Gmail and Facebook import&lt;/span&gt;</property>255 <property name="label" translatable="yes">&lt;span font_size="small"&gt;Once enabled, visit the &lt;a href="https://one.ubuntu.com"&gt;Ubuntu One website&lt;/a&gt; to manage your contacts, including Gmail and Facebook import.&lt;/span&gt;</property>
256 <property name="use_markup">True</property>256 <property name="use_markup">True</property>
257 <property name="wrap">True</property>257 <property name="wrap">True</property>
258 </object>258 </object>
259259
=== modified file 'ubuntuone/controlpanel/gui/__init__.py'
--- ubuntuone/controlpanel/gui/__init__.py 2011-10-06 20:38:39 +0000
+++ ubuntuone/controlpanel/gui/__init__.py 2011-11-07 20:35:40 +0000
@@ -109,7 +109,7 @@
109FOLDERS_BUTTON_TOOLTIP = VOLUMES_BUTTON_TOOLTIP = _('Manage your cloud '109FOLDERS_BUTTON_TOOLTIP = VOLUMES_BUTTON_TOOLTIP = _('Manage your cloud '
110 'folders')110 'folders')
111FOLDERS_TITLE = _('Select which folders from your cloud you want to sync with '111FOLDERS_TITLE = _('Select which folders from your cloud you want to sync with '
112 'this computer')112 'this computer.')
113FILE_SYNC_CONNECT = _('Connect')113FILE_SYNC_CONNECT = _('Connect')
114FILE_SYNC_CONNECT_TOOLTIP = _('Connect the file sync service with '114FILE_SYNC_CONNECT_TOOLTIP = _('Connect the file sync service with '
115 'your personal cloud')115 'your personal cloud')

Subscribers

People subscribed via source and target branches

to all changes: