U2T

Merge lp:~rewarp/u2t/spellingcheck-branch into lp:~josephjamesmills/u2t/spellingCheck

  1. spellingcheck-branch
  2. Merge into spellingCheck
Proposed by Chan Ju Ping
Status: Approved
Approved by: Joseph Mills
Approved revision: 6
Proposed branch: lp:~rewarp/u2t/spellingcheck-branch
Merge into: lp:~josephjamesmills/u2t/spellingCheck
Diff against target: 262 lines (+57/-57)
1 file modified
spelling.txt (+57/-57)
To merge this branch: bzr merge lp:~rewarp/u2t/spellingcheck-branch
Reviewer Review Type Date Requested Status
Joseph Mills Approve
Review via email: mp+146027@code.launchpad.net

Description of the change

Fixed grammatical and spelling errors. Edits to a few sentences for clarity. Standardized spelling and capitalization according to official names, e.g. LightDM in favour of lightdm or LightDm.

To post a comment you must log in.
Revision history for this message
Joseph Mills (josephjamesmills) wrote :

Great job !

review: Approve
Reply
Revision history for this message
Chan Ju Ping (rewarp) wrote :

Thanks! I actually have work committed into Ubuntu. This is undoubtedly one
of the happiest moments of my life. I think there are a few more
corrections to be made. I will submit another proposal soon.

On 1 February 2013 19:57, Joseph Mills <email address hidden> wrote:

> Review: Approve
>
> Great job !
> --
> https://code.launchpad.net/~rewarp/u2t/spellingcheck-branch/+merge/146027
> You are the owner of lp:~rewarp/u2t/spellingcheck-branch.
>

Reply
lp:~rewarp/u2t/spellingcheck-branch updated
4. By Chan Ju Ping

Capitalization fixes.

5. By Chan Ju Ping

Minor changes.

Revision history for this message
Joseph Mills (josephjamesmills) :
review: Needs Fixing
Reply
Revision history for this message
Joseph Mills (josephjamesmills) wrote :

So This is great that you are helping out There are a couple of things that need fixing

any time that you see a \t \n so on this is what that does

\t <-- make whitespace that is a tab(the button) length
\n <--- make a new line

so If you see things that are like

    u2d.tr(" King:\nThis is")
this would come out like
   King
This is

but if we do
u2d.tr(" King:\n This is") this would come out looking like this
   King
 This is

Notice the spacing.

^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Line 66

+ u2d.tr("Change the image that LightDM is using for the background. The image can be a file on your computer \n\n"

we need to let the end user know that they can use a file OR a color like #FFFFFF

***************************

Besides them 2 things Everything looks great

review: Needs Fixing
Reply
lp:~rewarp/u2t/spellingcheck-branch updated
6. By Chan Ju Ping

Two fixes made.

Revision history for this message
Chan Ju Ping (rewarp) wrote :

Thanks for providing the explanation. Hopefully this additional fix should fulfil the requirements.

Reply
Revision history for this message
Joseph Mills (josephjamesmills) wrote :

Great Job thanks again Hope to see you at the meeting today.

review: Approve
Reply

Unmerged revisions

6. By Chan Ju Ping

Two fixes made.

5. By Chan Ju Ping

Minor changes.

4. By Chan Ju Ping

Capitalization fixes.

3. By Chan Ju Ping

Grammatical and spelling fixes

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'spelling.txt'
2--- spelling.txt 2013-01-31 10:40:19 +0000
3+++ spelling.txt 2013-02-01 15:41:22 +0000
4@@ -15,7 +15,7 @@
5
6 u2d.tr("Maps")
7
8- u2d.tr("Unity 2d Settings")
9+ u2d.tr("Unity 2D Settings")
10
11 u2d.tr("System Settings")
12
13@@ -33,17 +33,17 @@
14
15 u2d.tr("Sound Settings") ;
16
17- u2d.tr("BlueTooth Settings") ;
18+ u2d.tr("Bluetooth Settings") ;
19
20 u2d.tr("Power Icon Policy: (\"present\", \"charge\", and \"never\")")
21
22- u2d.tr("Show Time By Icon:")
23+ u2d.tr("Show Time by Icon:")
24
25 u2d.tr("Show Bluetooth:")
26
27 u2d.tr("Show Sound Icon:")
28
29- u2d.tr("Show Sound Notifactions:")
30+ u2d.tr("Show Sound Notifications:")
31
32 u2d.tr("Global Mute:")
33
34@@ -69,11 +69,11 @@
35
36 button3Text: u2d.tr("Panel");
37
38- button4Text: u2d.tr("Lightdm");
39+ button4Text: u2d.tr("LightDM");
40
41 u2d.tr(" username")
42
43- u2d.tr("Users Name")
44+ u2d.tr("User's Name")
45
46 u2d.tr("Password")
47
48@@ -81,7 +81,7 @@
49
50 u2d.tr(" Change Background")
51
52-u2d.tr(" Remove The Dots")
53+u2d.tr(" Remove the Grid Dots")
54
55 u2d.tr(" Change Colors")
56
57@@ -89,11 +89,11 @@
58
59 u2d.tr(" Universal Access")
60
61- u2d.tr("Change the image that LightDm is using for a background. This Can either be a file on your computer \n\n"
62-
63- u2d.tr("Change The Background")
64-
65- u2d.tr("Would You Like to remove the Dots ?")
66+ u2d.tr("Change the image that LightDM is using for the background. The image can be a file on your computer or a specific color \n\n"
67+
68+ u2d.tr("Change the Background")
69+
70+ u2d.tr("Would You like to remove the Grid Dots ?")
71
72 u2d.tr("Remove the Grid Dots")
73
74@@ -101,15 +101,15 @@
75
76 u2d.tr("No")
77
78- u2d.tr("Change the color that LightDm use's for a sign in box and top panel.\n\n"
79-
80- u2d.tr("Change The Color")
81-
82- u2d.tr("Change the image that LightDm is using for its two icons.\n\n"
83-
84- u2d.tr("Change The Icons")
85-
86- u2d.tr("Sign In Icon: ")
87+ u2d.tr("Change the color that LightDM uses for the sign-in box and top panel.\n\n"
88+
89+ u2d.tr("Change the Color")
90+
91+ u2d.tr("Change the image that LightDM is using for its two icons.\n\n"
92+
93+ u2d.tr("Change the Icons")
94+
95+ u2d.tr("Sign-In Icon: ")
96
97 u2d.tr("Bottom Icon: ")
98
99@@ -117,7 +117,7 @@
100
101 u2d.tr("Use On-Screen Keyboard:")
102
103- u2d.tr("Play The Drums ?:")
104+ u2d.tr("Play the Drums ?:")
105
106 u2d.tr("Use the Screen Reader ?")
107
108@@ -125,9 +125,9 @@
109
110 u2d.tr("Play the Drums ? \n \n"
111
112-u2d.tr("\t \tTurn On Or Off The Screen Reader ?\n"
113+u2d.tr("\t \t Turn On or Turn Off the Screen Reader ?\n"
114
115-u2d.tr("Turn On Or Off High Contrast")
116+u2d.tr("Turn On or Turn Off High Contrast")
117
118 u2d.tr(" Decay rate of mouse pressure against barrier")
119
120@@ -143,13 +143,13 @@
121
122 u2d.tr(" Launcher Location")
123
124- u2d.tr(" Only One Launcher")
125+ u2d.tr(" Only one Launcher")
126
127- u2d.tr(" Reveal mode")
128+ u2d.tr(" Reveal Mode")
129
130 u2d.tr(" Super Key Enabled")
131
132- u2d.tr("The pressures against the monitor edge are continually added up, and when the sum hits a certain threshold the launcher reveals. To prevent a series of distinct gentle pushes of the pointer against the barrier from causing the launcher to reveal, we substract this parameter - the decay rate - at a steady rate")
133+ u2d.tr("The pressures against the monitor edge are continuously added up, and when the sum hits a certain threshold the launcher is revealed. To prevent a series of distinct gentle pushes of the pointer against the barrier from causing the launcher to be revealed, we subtract this parameter - the decay rate - at a steady rate")
134
135 u2d.tr("Barrier edge overcome pressure")
136
137@@ -157,11 +157,11 @@
138
139 u2d.tr("Barrier edge overcome pressure")
140
141- u2d.tr("How quickly the Launcher will reveal when you push the pointer against the monitor edge")
142+ u2d.tr("How quickly the Launcher will be revealed when you push the pointer against the monitor's edge")
143
144 u2d.tr("Responsiveness of the Launcher")
145
146- u2d.tr("The minimum pressure to press the pointer against the monitor edge to cause the launcher to reveal")
147+ u2d.tr("The minimum pressure required to press the pointer against the monitor's edge to cause the launcher to be revealed")
148
149 u2d.tr("Launcher reveal edge pressure")
150
151@@ -169,33 +169,33 @@
152
153 u2d.tr("Barrier edge stop velocity")
154
155- u2d.tr("Possible values: \n \n"
156+ u2d.tr("Possible Values: \n \n"
157
158 u2d.tr("Hide Mode")
159
160- u2d.tr("Possible values: \n \n"
161+ u2d.tr("Possible Values: \n \n"
162
163 u2d.tr("Launcher Location")
164
165 u2d.tr("Whether in a multi-monitor setup there should be just one launcher in the primary screen or one in each.")
166
167- u2d.tr("Show Only One Launcher")
168+ u2d.tr("Show only one Launcher")
169
170- u2d.tr("Possible values: \n \n"
171+ u2d.tr("Possible Values: \n \n"
172
173 u2d.tr("Reveal Mode")
174
175- u2d.tr("Whether or not the super (also called windows key) key is used.")
176+ u2d.tr("Whether or not the Super (also called the Windows) key is used.")
177
178 u2d.tr("Super Key Enabled")
179
180- u2d.tr("Use Interface For:")
181+ u2d.tr("Use Interface for:")
182
183 u2d.tr("Average Background Color:")
184
185 u2d.tr("Dash View:")
186
187- u2d.tr("Use Full Screen For Dash:")
188+ u2d.tr("Use Fullscreen for Dash:")
189
190 u2d.tr("Turn on Music Hinting:")
191
192@@ -203,9 +203,9 @@
193
194 u2d.tr(" Next:\nDash View")
195
196- u2d.tr("Play The Drums ?:")
197+ u2d.tr("Play the Drums ?:")
198
199- u2d.tr("Customize the current apperarance of the Unity 2d dash layout. In the Future Unity 2d will adapt its shape and form to the device it is running on.")
200+ u2d.tr("Customize the current appearance of the Unity 2D Dash layout. In the future Unity 2D will adapt its shape and form to the device it is running on.")
201
202 u2d.tr("Desktop Mode")
203
204@@ -213,7 +213,7 @@
205
206 u2d.tr("Tablet Mode")
207
208- u2d.tr("Use Sticky Edge's")
209+ u2d.tr("Use Sticky Edges")
210
211 u2d.tr("Change whether the edges in a multi-monitor setup should be sticky or not \(Edges with autohide launchers are always sticky\).")
212
213@@ -221,23 +221,23 @@
214
215 u2d.tr("No")
216
217- u2d.tr("Full Screen Dash")
218-
219- u2d.tr("Describe if the dash should be fullscreen or not. If the dash is already running this setting is applied immediately, otherwise it is applied as soon as the dash is activated again.")
220-
221- u2d.tr("Yes")
222-
223- u2d.tr("No")
224-
225- u2d.tr("Use OpenGL viewport. Chooose whether or not to render the graphics into an OpenGL viewport. When set to false, the raster engine is used.")
226-
227- u2d.tr("Yes")
228-
229- u2d.tr("No")
230-
231- u2d.tr("Change the average color derived from the currently set desktop-wallpaper.")
232-
233-u2d.tr("Customize the current apperarance of the Unity 2d dash layout. The default state is is tile vertical. If you would like to set the Unity 2d dash layout Back to default")
234+ u2d.tr("Fullscreen Dash")
235+
236+ u2d.tr("Describe if the Dash should be fullscreen or not. If the Dash is already running this setting is applied immediately, otherwise it is applied as soon as the Dash is activated again.")
237+
238+ u2d.tr("Yes")
239+
240+ u2d.tr("No")
241+
242+ u2d.tr("Use OpenGL viewport. Choose whether or not to render the graphics into an OpenGL viewport. When set to false, the raster engine is used.")
243+
244+ u2d.tr("Yes")
245+
246+ u2d.tr("No")
247+
248+ u2d.tr("Change the average color derived from the currently set desktop wallpaper.")
249+
250+u2d.tr("Customize the current appearance of the Unity 2D Dash layout. The default state is tile vertical. If you would like to set the Unity 2D Dash layout back to default")
251
252 u2d.tr("Tile Horizontal")
253
254@@ -286,7 +286,7 @@
255
256 u2d.tr("Back")
257
258- u2d.tr(" Directed By")+ "\n" + director
259+ u2d.tr(" Directed by")+ "\n" + director
260
261 u2d.tr("Back")
262 Accessible.name: "%1 %2 %3".arg(title.text).arg(label.text).arg(folded ? u2d.tr("not expanded") : u2d.tr("expanded"))

Subscribers

People subscribed via source and target branches

to all changes: