summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Heinlein <sebastian.heinlein@web.de>2006-02-24 14:21:34 +0100
committerSebastian Heinlein <sebastian.heinlein@web.de>2006-02-24 14:21:34 +0100
commit8cfca4a5ed2b0fd1ef52b645eedbce3c64e03c6b (patch)
tree8060beaacea6b9bbe72f9ec1c35de3b4c9db43ca
parentdf122edca2edce0b25e5e7c52a094ffa2ca81fcb (diff)
parent5c5473d95a27f9cd2120e08c78618ab5e9ad4513 (diff)
downloadpython-apt-8cfca4a5ed2b0fd1ef52b645eedbce3c64e03c6b.tar.gz
* merged from mvo
-rw-r--r--data/gnome-software-properties.desktop.in1
-rw-r--r--data/update-manager.desktop.in3
-rw-r--r--debian/changelog15
3 files changed, 13 insertions, 6 deletions
diff --git a/data/gnome-software-properties.desktop.in b/data/gnome-software-properties.desktop.in
index bf570533..6a193a40 100644
--- a/data/gnome-software-properties.desktop.in
+++ b/data/gnome-software-properties.desktop.in
@@ -11,3 +11,4 @@ Encoding=UTF-8
MimeType=text/x-apt-sources-list
Categories=Application;System;Settings;
X-KDE-SubstituteUID=true
+X-Ubuntu-Gettext-Domain=update-manager \ No newline at end of file
diff --git a/data/update-manager.desktop.in b/data/update-manager.desktop.in
index 906a60e6..00287a2e 100644
--- a/data/update-manager.desktop.in
+++ b/data/update-manager.desktop.in
@@ -8,4 +8,5 @@ Terminal=false
Type=Application
Encoding=UTF-8
Categories=Application;System;Settings;
-X-KDE-SubstituteUID=true \ No newline at end of file
+X-KDE-SubstituteUID=true
+X-Ubuntu-Gettext-Domain=update-manager \ No newline at end of file
diff --git a/debian/changelog b/debian/changelog
index c5dd78ec..811bd52f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,16 +2,21 @@ update-manager (0.42.2ubuntu6) dapper; urgency=low
* SoftwareProperties/*: fix some UI problems (thanks to Sebastian Heinlein)
* debian/control: arch: all now
-
- -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 23 Feb 2006 16:16:30 +0100
-
-update-manager (0.42.2ubuntu5) dapper; urgency=low
-
* po/pt_BR.po: updated translation (thanks to
Carlos Eduardo Pedroza Santiviago)
+ * data/gnome-software-properties.desktop.in, update-manager.desktop.in:
+ * debian/rules: undo the detection in favour of the simpler update of
+ the desktop files
-- Michael Vogt <michael.vogt@ubuntu.com> Mon, 20 Feb 2006 15:58:09 +0100
+update-manager (0.42.2ubuntu5) dapper; urgency=low
+
+ * debian/rules: Add gettext domain to .server and .desktop files to get
+ language pack support for them. (Similarly to cdbs' gnome.mk)
+
+ -- Martin Pitt <martin.pitt@ubuntu.com> Thu, 23 Feb 2006 18:42:04 +0100
+
update-manager (0.42.2ubuntu4) dapper; urgency=low
* removed some of the gnome dependencies (gconf still in)