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
=== modified file 'data/software-center.menu.in'
--- data/software-center.menu.in 2010-03-03 21:31:35 +0000
+++ data/software-center.menu.in 2010-03-04 20:11:17 +0000
@@ -502,6 +502,12 @@
502 </Include>502 </Include>
503 </Menu> <!-- End Office -->503 </Menu> <!-- End Office -->
504504
505 <Menu>
506 <_Name>Themes &amp; Tweaks</_Name>
507 <SCIcon>preferences-other</SCIcon>
508 <Include><Category>Settings</Category></Include>
509 </Menu>
510
505 <!-- System -->511 <!-- System -->
506 <Menu>512 <Menu>
507 <_Name>System</_Name>513 <_Name>System</_Name>
508514
=== modified file 'po/software-center.pot'
--- po/software-center.pot 2010-03-04 20:01:14 +0000
+++ po/software-center.pot 2010-03-04 20:11:17 +0000
@@ -8,7 +8,11 @@
8msgstr ""8msgstr ""
9"Project-Id-Version: PACKAGE VERSION\n"9"Project-Id-Version: PACKAGE VERSION\n"
10"Report-Msgid-Bugs-To: \n"10"Report-Msgid-Bugs-To: \n"
11<<<<<<< TREE
11"POT-Creation-Date: 2010-03-04 20:51+0100\n"12"POT-Creation-Date: 2010-03-04 20:51+0100\n"
13=======
14"POT-Creation-Date: 2010-03-04 19:36+0000\n"
15>>>>>>> MERGE-SOURCE
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"16"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"17"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"18"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -310,22 +314,26 @@
310msgstr ""314msgstr ""
311315
312#: ../data/software-center.menu.in.h:52316#: ../data/software-center.menu.in.h:52
317msgid "Themes &amp; Tweaks"
318msgstr ""
319
320#: ../data/software-center.menu.in.h:53
313msgid "Universal Access"321msgid "Universal Access"
314msgstr ""322msgstr ""
315323
316#: ../data/software-center.menu.in.h:53324#: ../data/software-center.menu.in.h:54
317msgid "Version Control"325msgid "Version Control"
318msgstr ""326msgstr ""
319327
320#: ../data/software-center.menu.in.h:54328#: ../data/software-center.menu.in.h:55
321msgid "Viewers"329msgid "Viewers"
322msgstr ""330msgstr ""
323331
324#: ../data/software-center.menu.in.h:55332#: ../data/software-center.menu.in.h:56
325msgid "Web Browsers"333msgid "Web Browsers"
326msgstr ""334msgstr ""
327335
328#: ../data/software-center.menu.in.h:56336#: ../data/software-center.menu.in.h:57
329msgid "Web Development"337msgid "Web Development"
330msgstr ""338msgstr ""
331339