Ubuntu Software Center

Merge lp:~mpt/software-center/categorization into lp:software-center

  1. categorization
  2. Merge into trunk
Proposed by Matthew Paul Thomas
Status: Merged
Merged at revision: not available
Proposed branch: lp:~mpt/software-center/categorization
Merge into: lp:software-center
Diff against target: 62 lines (+18/-4) (has conflicts)
2 files modified
data/software-center.menu.in (+6/-0)
po/software-center.pot (+12/-4)
Text conflict in po/software-center.pot
To merge this branch: bzr merge lp:~mpt/software-center/categorization
Reviewer Review Type Date Requested Status
Michael Vogt Approve
Review via email: mp+20693@code.launchpad.net

Description of the change

Fixes bug 532150 ("Themes & Tweaks" department missing).

To post a comment you must log in.
Revision history for this message
Michael Vogt (mvo) wrote :

Merged, thanks

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/software-center.menu.in'
2--- data/software-center.menu.in 2010-03-03 21:31:35 +0000
3+++ data/software-center.menu.in 2010-03-04 20:11:17 +0000
4@@ -502,6 +502,12 @@
5 </Include>
6 </Menu> <!-- End Office -->
7
8+ <Menu>
9+ <_Name>Themes &amp; Tweaks</_Name>
10+ <SCIcon>preferences-other</SCIcon>
11+ <Include><Category>Settings</Category></Include>
12+ </Menu>
13+
14 <!-- System -->
15 <Menu>
16 <_Name>System</_Name>
17
18=== modified file 'po/software-center.pot'
19--- po/software-center.pot 2010-03-04 20:01:14 +0000
20+++ po/software-center.pot 2010-03-04 20:11:17 +0000
21@@ -8,7 +8,11 @@
22 msgstr ""
23 "Project-Id-Version: PACKAGE VERSION\n"
24 "Report-Msgid-Bugs-To: \n"
25+<<<<<<< TREE
26 "POT-Creation-Date: 2010-03-04 20:51+0100\n"
27+=======
28+"POT-Creation-Date: 2010-03-04 19:36+0000\n"
29+>>>>>>> MERGE-SOURCE
30 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
31 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
32 "Language-Team: LANGUAGE <LL@li.org>\n"
33@@ -310,22 +314,26 @@
34 msgstr ""
35
36 #: ../data/software-center.menu.in.h:52
37+msgid "Themes &amp; Tweaks"
38+msgstr ""
39+
40+#: ../data/software-center.menu.in.h:53
41 msgid "Universal Access"
42 msgstr ""
43
44-#: ../data/software-center.menu.in.h:53
45+#: ../data/software-center.menu.in.h:54
46 msgid "Version Control"
47 msgstr ""
48
49-#: ../data/software-center.menu.in.h:54
50+#: ../data/software-center.menu.in.h:55
51 msgid "Viewers"
52 msgstr ""
53
54-#: ../data/software-center.menu.in.h:55
55+#: ../data/software-center.menu.in.h:56
56 msgid "Web Browsers"
57 msgstr ""
58
59-#: ../data/software-center.menu.in.h:56
60+#: ../data/software-center.menu.in.h:57
61 msgid "Web Development"
62 msgstr ""
63