[Pkg-bazaar-commits] ./bzr-gtk/unstable r490: Merge trunk.

[Jelmer Vernooij]

------------------------------------------------------------
revno: 490
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Wed 2008-05-21 18:38:15 +0200
message:
  Merge trunk.
modified:
  NEWS
  __init__.py
  branch.py
  branchview/treeview.py
  checkout.py
  commit.py
  conflicts.py
  diff.py
  errors.py
  genpot.sh
  initialize.py
  merge.py
  nautilus-bzr.py
  olive/__init__.py
  olive/add.py
  olive/bookmark.py
  olive/guifiles.py
  olive/info.py
  olive/menu.py
  olive/mkdir.py
  olive/move.py
  olive/remove.py
  olive/rename.py
  po/olive-gtk.pot
  push.py
  revbrowser.py
  status.py
  tags.py
    ------------------------------------------------------------
    revno: 475.1.1
    committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
    branch nick: gtk
    timestamp: Mon 2008-05-05 18:04:32 +0200
    message:
      Fix genpot.sh and prepare for bug #187283 fixing.
      
      * po/olive-gtk.pot: 
      Regenerated so that we can test for regressions in the "'_'
      replaced by '_i18n'" modification.
      
      * genpot.sh: 
      Handle all python files.
      
      * olive/__init__.py:
      Delete coding line. It looks like an emacs coding line, it smells
      like an emacs coding line, but emacs doesn't like it and it's
      useless anyway.
    modified:
      genpot.sh
      olive/__init__.py
      po/olive-gtk.pot
    ------------------------------------------------------------
    revno: 475.1.2
    committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
    branch nick: gtk
    timestamp: Mon 2008-05-05 20:16:46 +0200
    message:
      Fix bug #187283 fix replacing _() by _i18n().
      
      * genpot.sh 
      Remove duplication. Add the ability to specify the genrated pot
      file on command-line for debugging purposes.
      
      * po/olive-gtk.pot:
      Regenerated.
      
      * __init__.py, branch.py, branchview/treeview.py, checkout.py,
      commit.py, conflicts.py, diff.py, errors.py, initialize.py,
      merge.py, nautilus-bzr.py, olive/__init__.py, olive/add.py,
      olive/bookmark.py, olive/guifiles.py, olive/info.py,
      olive/menu.py, olive/mkdir.py, olive/move.py, olive/remove.py,
      olive/rename.py, push.py, revbrowser.py, status.py, tags.py:
      Replace all calls to _() by calls to _i18n(), the latter being
      defined in __init__.py and imported in the other modules from
      there. This fix the problem encountered countless times when
      running bzr selftest and getting silly error messages about
      boolean not being callables.
    modified:
      __init__.py
      branch.py
      branchview/treeview.py
      checkout.py
      commit.py
      conflicts.py
      diff.py
      errors.py
      genpot.sh
      initialize.py
      merge.py
      nautilus-bzr.py
      olive/__init__.py
      olive/add.py
      olive/bookmark.py
      olive/guifiles.py
      olive/info.py
      olive/menu.py
      olive/mkdir.py
      olive/move.py
      olive/remove.py
      olive/rename.py
      po/olive-gtk.pot
      push.py
      revbrowser.py
      status.py
      tags.py
    ------------------------------------------------------------
    revno: 475.1.3
    committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
    branch nick: gtk
    timestamp: Mon 2008-05-05 20:18:08 +0200
    message:
      merge bzr-gtk trunk
    modified:
      NEWS
      __init__.py
      annotate/gannotate.py
      branchview/graphcell.py
      branchview/linegraph.py
      bzr-handle-patch.desktop
      bzr-notify.desktop
      olive-gtk.desktop
      olive/menu.py
      revisionview.py
      seahorse.py
      setup.py
      tests/test_commit.py
    ------------------------------------------------------------
    revno: 475.1.4
    committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
    branch nick: gtk
    timestamp: Mon 2008-05-05 20:22:32 +0200
    message:
      Update NEWS.
    modified:
      NEWS
    ------------------------------------------------------------
    revno: 487.1.1
    committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
    branch nick: gtk
    timestamp: Tue 2008-05-20 09:04:00 +0200
    message:
      (vila) Replace _() calls by _i18n() calls. (#187283)
    modified:
      NEWS
      __init__.py
      branch.py
      branchview/treeview.py
      checkout.py
      commit.py
      conflicts.py
      diff.py
      errors.py
      genpot.sh
      initialize.py
      merge.py
      nautilus-bzr.py
      olive/__init__.py
      olive/add.py
      olive/bookmark.py
      olive/guifiles.py
      olive/info.py
      olive/menu.py
      olive/mkdir.py
      olive/move.py
      olive/remove.py
      olive/rename.py
      po/olive-gtk.pot
      push.py
      revbrowser.py
      status.py
      tags.py
-------------- next part --------------
Diff too large for email (3549 lines, the limit is 1000).