Software Properties

Merge lp:~kelemeng/software-properties/bug853231-upstream into lp:software-properties

  1. bug853231-upstream
  2. Merge into main
Proposed by Gabor Kelemen
Status: Merged
Merged at revision: 719
Proposed branch: lp:~kelemeng/software-properties/bug853231-upstream
Merge into: lp:software-properties
Diff against target: 18 lines (+2/-0)
1 file modified
po/POTFILES.in (+2/-0)
To merge this branch: bzr merge lp:~kelemeng/software-properties/bug853231-upstream
Reviewer Review Type Date Requested Status
Ubuntu Core Development Team Pending
Review via email: mp+75904@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'po/POTFILES.in'
2--- po/POTFILES.in 2010-09-06 15:38:35 +0000
3+++ po/POTFILES.in 2011-09-18 15:36:23 +0000
4@@ -1,5 +1,6 @@
5 [encoding: UTF-8]
6 data/mime/apt.xml.in
7+data/com.ubuntu.softwareproperties.policy.in
8 data/software-properties-gtk.desktop.in
9 data/software-properties-kde.desktop.in
10 software-properties-gtk
11@@ -11,6 +12,7 @@
12 softwareproperties/kde/SoftwarePropertiesKDE.py
13 softwareproperties/kde/CdromProgress.py
14 softwareproperties/kde/__init__.py
15+softwareproperties/kde/DialogAdd.py
16 softwareproperties/kde/DialogEdit.py
17 softwareproperties/__init__.py
18 softwareproperties/SoftwareProperties.py

Subscribers

People subscribed via source and target branches

to status/vote changes: