[Pkg-bazaar-commits] ./bzr-gtk/unstable r274: Merge some fixes from matkor.

[Jelmer Vernooij]

------------------------------------------------------------
revno: 274
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Sun 2007-09-02 18:42:18 +0200
message:
  Merge some fixes from matkor.
modified:
  .bzrignore
  olive-gtk.desktop
  olive/menu.py
  push.py
    ------------------------------------------------------------
    revno: 272.1.1
    committer: Mateusz Korniak <matkor at laptop-hp>
    branch nick: trunk-matkor
    timestamp: Wed 2007-08-29 23:10:44 +0200
    message:
      gtk.REPONSE_OK typo fix.
    modified:
      push.py
    ------------------------------------------------------------
    revno: 272.1.2
    committer: Mateusz Korniak <matkor at laptop-hp>
    branch nick: trunk-matkor
    timestamp: Sun 2007-09-02 17:26:42 +0200
    message:
      Added RevisionControl;Qt;KDE to Categories, pl descriptions
    modified:
      olive-gtk.desktop
    ------------------------------------------------------------
    revno: 272.1.3
    committer: Mateusz Korniak <matkor at laptop-hp>
    branch nick: trunk-matkor
    timestamp: Sun 2007-09-02 17:41:26 +0200
    message:
      Proper import of question_dialog in context menu invocation.
    modified:
      olive/menu.py
    ------------------------------------------------------------
    revno: 272.1.4
    committer: Mateusz Korniak <matkor at laptop-hp>
    branch nick: trunk-matkor
    timestamp: Sun 2007-09-02 17:42:18 +0200
    message:
      Ignoring eric3 project files.
    modified:
      .bzrignore
    ------------------------------------------------------------
    revno: 272.1.5
    committer: Mateusz Korniak <matkor at laptop-hp>
    branch nick: trunk-matkor
    timestamp: Sun 2007-09-02 17:59:45 +0200
    message:
      Merged with trunk
    modified:
      annotate/gannotate.py
-------------- next part --------------
=== modified file '.bzrignore'
--- a/.bzrignore	2007-08-10 10:45:06 +0000
+++ b/.bzrignore	2007-09-02 15:42:18 +0000
@@ -6,3 +6,7 @@
 *.kpf
 dist
 tags
+bzr-gtk-trunk-matkor.e3p
+bzr-gtk.trunk-matkor.e3p
+bzr-gtk.trunk-matkor.e3s
+bzr-gtk.trunk-matkor.e3t

=== modified file 'olive-gtk.desktop'
--- a/olive-gtk.desktop	2007-07-15 15:13:34 +0000
+++ b/olive-gtk.desktop	2007-09-02 15:26:42 +0000
@@ -4,7 +4,9 @@
 Version=1.0
 Name=Olive
 GenericName=Version Control GUI
+GenericName[pl]=Klient graficzny Bazaar
 Comment=Graphical User Interface for the Bazaar Version Control System
+Comment[pl]=Graficzny interfejs dla systemu kontroli wersji Bazaar
 Icon=olive-gtk.png
 Exec=olive-gtk
-Categories=Application;Development;
+Categories=Application;Development;Qt;KDE;RevisionControl;

=== modified file 'olive/menu.py'
--- a/olive/menu.py	2007-07-21 13:16:33 +0000
+++ b/olive/menu.py	2007-09-02 15:41:26 +0000
@@ -26,12 +26,11 @@
     pass
 
 import gtk
-from dialog import question_dialog
 
 import bzrlib.errors as errors
 from bzrlib.workingtree import WorkingTree
 
-from bzrlib.plugins.gtk.dialog import error_dialog, info_dialog, warning_dialog
+from bzrlib.plugins.gtk.dialog import error_dialog, info_dialog, question_dialog, warning_dialog
 from bzrlib.plugins.gtk.errors import show_bzr_error
 from bzrlib.plugins.gtk.annotate.gannotate import GAnnotateWindow
 from bzrlib.plugins.gtk.annotate.config import GAnnotateConfig

=== modified file 'push.py'
--- a/push.py	2007-07-15 22:14:09 +0000
+++ b/push.py	2007-08-29 21:10:44 +0000
@@ -96,7 +96,7 @@
         if self.branch is not None and self.branch.get_push_location() is None:
             response = question_dialog(_('Set default push location'),
                                        _('There is no default push location set.\nSet %r as default now?') % location)
-            if response == gtk.REPONSE_OK:
+            if response == gtk.RESPONSE_OK:
                 self.branch.set_push_location(location)
 
         try: