Rev 599: Merge trunk. in file:///data/jelmer/bzr-gtk/trunk/

[Jelmer Vernooij]

At file:///data/jelmer/bzr-gtk/trunk/

------------------------------------------------------------
revno: 599
revision-id: jelmer at samba.org-20080806143528-1kn6fcwg8mhaggrl
parent: jelmer at samba.org-20080805232116-uh4s76r1o5duxhdu
parent: colbrac at xs4all.nl-20080806142614-4z57k9sawbsdc0os
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Wed 2008-08-06 16:35:28 +0200
message:
  Merge trunk.
modified:
  olive-gtk.desktop              olivegtk.desktop-20060815170839-qylqcjkyiwcqysnr-1
    ------------------------------------------------------------
    revno: 597.2.1
    revision-id: colbrac at xs4all.nl-20080806142614-4z57k9sawbsdc0os
    parent: colbrac at xs4all.nl-20080804213955-61wkontqs0ae3lvy
    parent: colbrac at xs4all.nl-20080806142518-q0nl17asx0om341z
    committer: Jasper Groenewegen <colbrac at xs4all.nl>
    branch nick: trunk
    timestamp: Wed 2008-08-06 16:26:14 +0200
    message:
      Merge change to desktop file
    modified:
      olive-gtk.desktop              olivegtk.desktop-20060815170839-qylqcjkyiwcqysnr-1
    ------------------------------------------------------------
    revno: 597.1.1
    revision-id: colbrac at xs4all.nl-20080806142518-q0nl17asx0om341z
    parent: colbrac at xs4all.nl-20080804213955-61wkontqs0ae3lvy
    author: Didier Roche <didier.roche at ubuntu-fr.org>
    committer: Jasper Groenewegen <colbrac at xs4all.nl>
    branch nick: desktopfile
    timestamp: Wed 2008-08-06 16:25:18 +0200
    message:
      Change Olive desktop file details
    modified:
      olive-gtk.desktop              olivegtk.desktop-20060815170839-qylqcjkyiwcqysnr-1
=== modified file 'olive-gtk.desktop'
--- a/olive-gtk.desktop	2008-06-03 01:43:08 +0000
+++ b/olive-gtk.desktop	2008-08-06 14:25:18 +0000
@@ -1,12 +1,14 @@
 [Desktop Entry]
-Encoding=UTF-8
 Type=Application
 Version=1.0
-Name=Olive
+Name=Olive Bazaar Branch Manager
+Name[fr]=Gestionnaire de branche Bazaar Olive
 GenericName=Version Control GUI
 GenericName[pl]=Klient graficzny Bazaar
+GenericName[fr]=Client graphique Bazaar
 Comment=Graphical User Interface for the Bazaar Version Control System
 Comment[pl]=Graficzny interfejs dla systemu kontroli wersji Bazaar
-Icon=olive-gtk.png
+Comment[fr]=Interface graphique pour le gestionnaire de version Bazaar
+Icon=olive-gtk
 Exec=olive-gtk
-Categories=Application;Development;RevisionControl;GTK;GNOME;
+Categories=Development;RevisionControl;