Ubuntu Desktop Accomplishments

Merge lp:~smartboyhw/ubuntu-desktop-accomplishments/bug-1080346-new into lp:ubuntu-desktop-accomplishments

  1. bug-1080346-new
  2. Merge into trunk
Proposed by Howard Chan
Status: Merged
Merged at revision: 79
Proposed branch: lp:~smartboyhw/ubuntu-desktop-accomplishments/bug-1080346-new
Merge into: lp:ubuntu-desktop-accomplishments
Diff against target: 32 lines (+5/-2)
3 files modified
Changelog (+3/-0)
accomplishments/ubuntu-desktop/en/accessories/accomplishments-shared-with-validation-server.accomplishment (+1/-1)
accomplishments/ubuntu-desktop/en/multimedia/multimedia-added-music.accomplishment (+1/-1)
To merge this branch: bzr merge lp:~smartboyhw/ubuntu-desktop-accomplishments/bug-1080346-new
Reviewer Review Type Date Requested Status
Matt Fischer Approve
Review via email: mp+135112@code.launchpad.net

Description of the change

Really fix bug 1080346 to avoid duplicates.

To post a comment you must log in.
Revision history for this message
Matt Fischer (mfisch) wrote :

looks good

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Changelog'
2--- Changelog 2012-11-18 23:38:01 +0000
3+++ Changelog 2012-11-20 11:00:26 +0000
4@@ -27,5 +27,8 @@
5
6 [Joel Pickett]
7 * Added a new accomplishment: Created a LibreOffice Document
8+
9+ [Howard Chan]
10+ * Changed accomplishment authors to avoid duplicates (LP: #1080346)
11
12 -------------------------------------------------------------------------
13
14=== modified file 'accomplishments/ubuntu-desktop/en/accessories/accomplishments-shared-with-validation-server.accomplishment'
15--- accomplishments/ubuntu-desktop/en/accessories/accomplishments-shared-with-validation-server.accomplishment 2012-08-15 22:07:00 +0000
16+++ accomplishments/ubuntu-desktop/en/accessories/accomplishments-shared-with-validation-server.accomplishment 2012-11-20 11:00:26 +0000
17@@ -6,4 +6,4 @@
18 icon = default.png
19 summary = Many of the different opportunities that are available in <i>Ubuntu Accomplishments</i> require validation through the Accomplishments Service. The Accomplishments Service uses Ubuntu One to validate and store trophies you've earned.
20 steps = Authorize your Ubuntu One account in the Accomplishments Viewer.
21-author = Silver Fox <silver-fox@ubuntu.com>
22+author = s.fox <silver-fox@ubuntu.com>
23
24=== modified file 'accomplishments/ubuntu-desktop/en/multimedia/multimedia-added-music.accomplishment'
25--- accomplishments/ubuntu-desktop/en/multimedia/multimedia-added-music.accomplishment 2012-05-22 16:41:31 +0000
26+++ accomplishments/ubuntu-desktop/en/multimedia/multimedia-added-music.accomplishment 2012-11-20 11:00:26 +0000
27@@ -9,4 +9,4 @@
28 <li>Right click on the CD's name, and select Extract to Library</li></ul>
29 The CD's track names and other basic information should be automatically entered if there is an Internet connection present. If the track information is not automatically entered, manually enter the information by selecting the desired track or tracks, then right click and select Properties. Enter the desired information, then select Close.
30 help = https://help.ubuntu.com/community/Rhythmbox
31-author = Silver Fox <silver-fox@ubuntu.com>
32+author = s.fox <silver-fox@ubuntu.com>

Subscribers

People subscribed via source and target branches