Extracted the changes from Didier Roches debdiff Jasper
# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: [EMAIL PROTECTED] # target_branch: https://code.launchpad.net/~bzr-gtk/bzr-gtk/trunk # testament_sha1: e8f757dc1a932e2fc3a730c98b17d6496e5d6718 # timestamp: 2008-08-05 00:05:33 +0200 # source_branch: https://code.launchpad.net/~bzr-gtk/bzr-gtk/trunk # base_revision_id: [EMAIL PROTECTED] # # Begin patch === modified file 'olive-gtk.desktop' --- olive-gtk.desktop 2008-06-03 01:43:08 +0000 +++ olive-gtk.desktop 2008-08-04 22:05:29 +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 OliveGenericName=Version Control GUI 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;
# Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWWKBYNwAAXVfgAAQUWP//16z kwq////wUAPe52LZXNdXCS4SVT1M01R+qfqnpqepo9TT1Mmmno9U0eo0NNqAeoBJJBT9MQ0UzQ9V PKHqAD1B5QA9EASgiBE2yiPUMg0MgGgNDIBoOYBNMAmQwABMEwAAASSBMlPRqep4mim02qPRkjIN GmhkNDTmwvy78/J/4/ZfrgnDLkZuXKGqLqPaSeyWnJz4rXs2eMcTwgKJD1B6vpmpYgV3Qg4pY7vp rUtbW2pb8SKp8LjlsehdUKotjeL61EbJRxSntVPZvq3Qg2KTiGLKXTLx1sQQVkRZGjiTWyTCImmb /VNgfajNgg1ELhPVmdBcgkJplTkDhEjaVjEx3mt2/jpEM0TOg/PZuvv7S9eRzXkhiZH3UPWQmEis YNC0ItbG4FYLFRYUitJ4Z/kuuarAgXlRrtGcpkR5sIlxkoOHjIGyePvkOl4SBQR2mUJs20nJcsSM xWU1JEmXClCOXJhJqk6DDKkiXrCUIJTQ94RBSRoKiAOdqLaVYkloJCYa11pZiMPVhsmW1DHNIsKp DW4rlT5mkI4cFlxNLC62OESBta3LpYc93lWw5Hg0Geh4sRVn4uEQwQBTIHirdStW7vFnfU+KFkYU Gg/t73PoYYKxPQ1vvukODqPWZFXoisR7fVZmpkBoOjgNecQwuDFdMqLGGVE6O26C3UitRqKTSVHM RiI0ZrNCWUkoYUiKx4zZ3C6CV7Lxsml7zWMi91enYWyzEzsJJukUa0IlJYSW+nblPK7ZnwY8xBih sshJ6W5ydM27Vz1u8Koh+FUS3FKOaGOI4x6jZSVdV96lLoeDHixXarkO4b9cTnoP7+wHxVyIq+vr eHewPgpuTlPIbvCyECz2jRhhgVYr1MLNWKeDHO/hXtwn30KiS3gxHA4zFsxDD+hxqrOA8Uc9EWGT ewJfza6M0iRxKG9ButS7Cp2JNhlz3hxUkeh15CJUERUEh5ayx8fSKZi5I+XRIVxnZwU+3hmuQVde XhtuH1lW88KSiCaOoxHJ4QinP6u8RE1kgowPVTDkanrppcG4RZ5917Q2tRDMLuY4qBTeDA21gpgq VLNzBunjSirNlqNRIVcRVwhrjEZ5JZG41F5sZmuahUsF0EYh+nGoiea5E/TnmyqlYytiGXNh+ARC LDLxXxEPUhm1mxTOznLkD6kVLiaXomjUJ+Ri3O8dpNLPrhgSutHkJlA3IcD0iLLloJ0BVkRzBy1G NIYMKKWcVi5BNVjvsrxfAQ6WvoZlYwloTQrKf8XckU4UJBigWDcA
signature.asc
Description: OpenPGP digital signature
-- bzr-gtk mailing list [email protected] Modify settings or unsubscribe at: https://lists.canonical.com/mailman/listinfo/bzr-gtk
