Rev 274: Merge some fixes from matkor. in file:///data/jelmer/bzr-gtk/trunk/

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 274
revision-id: jelmer at samba.org-20070902164218-0qtk4yo9dja6440x
parent: aaron.bentley at utoronto.ca-20070830231632-gp843oy45sgyjl9z
parent: matkor at laptop-hp-20070902155945-5v2g56x1d4a9unyi
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                     bzrignore-20060929115259-l3024hqm4xkyl444-1
  olive-gtk.desktop              olivegtk.desktop-20060815170839-qylqcjkyiwcqysnr-1
  olive/menu.py                  menu.py-20060803101046-9idg5lu81o53za8y-1
  push.py                        push.py-20060721181724-0mfkrqwpsa09q1t3-4
    ------------------------------------------------------------
    revno: 272.1.5
    revision-id: matkor at laptop-hp-20070902155945-5v2g56x1d4a9unyi
    parent: matkor at laptop-hp-20070902154218-nba0woaqjsn20f9n
    parent: aaron.bentley at utoronto.ca-20070830231632-gp843oy45sgyjl9z
    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          xannotate.py-20051024072750-fe35acd6bb909bd3
    ------------------------------------------------------------
    revno: 272.1.4
    revision-id: matkor at laptop-hp-20070902154218-nba0woaqjsn20f9n
    parent: matkor at laptop-hp-20070902154126-0zdi9vr4vvny0ayx
    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                     bzrignore-20060929115259-l3024hqm4xkyl444-1
    ------------------------------------------------------------
    revno: 272.1.3
    revision-id: matkor at laptop-hp-20070902154126-0zdi9vr4vvny0ayx
    parent: matkor at laptop-hp-20070902152642-kkzpolnsn8hr7upv
    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                  menu.py-20060803101046-9idg5lu81o53za8y-1
    ------------------------------------------------------------
    revno: 272.1.2
    revision-id: matkor at laptop-hp-20070902152642-kkzpolnsn8hr7upv
    parent: matkor at laptop-hp-20070829211044-xrn2xmiae39e1w8n
    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              olivegtk.desktop-20060815170839-qylqcjkyiwcqysnr-1
    ------------------------------------------------------------
    revno: 272.1.1
    revision-id: matkor at laptop-hp-20070829211044-xrn2xmiae39e1w8n
    parent: jelmer at samba.org-20070827124141-rsvtyw1bf4bd7wt3
    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                        push.py-20060721181724-0mfkrqwpsa09q1t3-4
=== 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: