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

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
=== modified file 'po/POTFILES.in'
--- po/POTFILES.in 2010-09-06 15:38:35 +0000
+++ po/POTFILES.in 2011-09-18 15:36:23 +0000
@@ -1,5 +1,6 @@
1[encoding: UTF-8]1[encoding: UTF-8]
2data/mime/apt.xml.in2data/mime/apt.xml.in
3data/com.ubuntu.softwareproperties.policy.in
3data/software-properties-gtk.desktop.in4data/software-properties-gtk.desktop.in
4data/software-properties-kde.desktop.in5data/software-properties-kde.desktop.in
5software-properties-gtk6software-properties-gtk
@@ -11,6 +12,7 @@
11softwareproperties/kde/SoftwarePropertiesKDE.py12softwareproperties/kde/SoftwarePropertiesKDE.py
12softwareproperties/kde/CdromProgress.py13softwareproperties/kde/CdromProgress.py
13softwareproperties/kde/__init__.py14softwareproperties/kde/__init__.py
15softwareproperties/kde/DialogAdd.py
14softwareproperties/kde/DialogEdit.py16softwareproperties/kde/DialogEdit.py
15softwareproperties/__init__.py17softwareproperties/__init__.py
16softwareproperties/SoftwareProperties.py18softwareproperties/SoftwareProperties.py

Subscribers

People subscribed via source and target branches

to status/vote changes: