Rev 490: Merge trunk. in file:///data/jelmer/bzr-gtk/trunk/
Jelmer Vernooij
jelmer at samba.org
Wed May 21 17:38:16 BST 2008
At file:///data/jelmer/bzr-gtk/trunk/
------------------------------------------------------------
revno: 490
revision-id: jelmer at samba.org-20080521163815-pofppddp5v0a0f1e
parent: jelmer at samba.org-20080509235146-ahwky8unhs3llqf2
parent: v.ladeuil+lp at free.fr-20080520070400-4ny0vah1qji2249k
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Wed 2008-05-21 18:38:15 +0200
message:
Merge trunk.
modified:
NEWS news-20070325173539-3va57o99cz3o57xe-1
__init__.py __init__.py-20060519165329-a1fd52c8a829fcd5
branch.py branch.py-20060718221951-cc4ts04p4d84mjth-1
branchview/treeview.py treeview.py-20071020204704-vk1erblrjhbcgw94-1
checkout.py checkout.py-20060731181533-e0x1bgv7wum466kj-1
commit.py commit.py-20060721181724-0mfkrqwpsa09q1t3-3
conflicts.py conflicts.py-20070203171806-g5tuxmkf2suxgzvm-1
diff.py diffwin.py-20051017070234-cb5c6dc4960142f5
errors.py errors.py-20070129213417-8rr7unfjjdetfq83-1
genpot.sh genpot.sh-20060820124246-vi2tip5o5mcnyza1-2
initialize.py initialize.py-20070406171439-vi4hce9b12bdofts-1
merge.py merge.py-20061009195451-45vs0pe2nphnckxh-1
nautilus-bzr.py __init__.py-20060412205316-7a81eb8ae29ffc79
olive/__init__.py __init__.py-20060925014013-13wdvwl8vi8gfqi1-2
olive/add.py add.py-20060721181724-0mfkrqwpsa09q1t3-1
olive/bookmark.py bookmark.py-20060820164104-pmg886x25fj6hhyu-1
olive/guifiles.py gladefile.py-20061025081716-mc0e5w3fcin4rcgv-1
olive/info.py info.py-20060810114713-y0f7dshd8ohyr8oz-1
olive/menu.py menu.py-20060803101046-9idg5lu81o53za8y-1
olive/mkdir.py mkdir.py-20060809131310-mpu60gdw82hhkt0p-1
olive/move.py move.py-20060809140408-txw8f17jvqykh0iv-1
olive/remove.py remove.py-20060721181724-0mfkrqwpsa09q1t3-2
olive/rename.py rename.py-20060809143844-edgdedgalykd5zci-1
po/olive-gtk.pot olivegtk.pot-20060820124246-vi2tip5o5mcnyza1-3
push.py push.py-20060721181724-0mfkrqwpsa09q1t3-4
revbrowser.py revbrowser.py-20070201094155-v2139s0zp4mmolvq-1
status.py status.py-20060803143043-mmdp58hu3hauy0xh-1
tags.py tags.py-20070408210738-1c0lyfurp88v5c56-1
------------------------------------------------------------
revno: 487.1.1
revision-id: v.ladeuil+lp at free.fr-20080520070400-4ny0vah1qji2249k
parent: jelmer at samba.org-20080504202356-64wc0mcpsqd708xq
parent: v.ladeuil+lp at free.fr-20080505182232-opjz9orjvoi7r4np
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 news-20070325173539-3va57o99cz3o57xe-1
__init__.py __init__.py-20060519165329-a1fd52c8a829fcd5
branch.py branch.py-20060718221951-cc4ts04p4d84mjth-1
branchview/treeview.py treeview.py-20071020204704-vk1erblrjhbcgw94-1
checkout.py checkout.py-20060731181533-e0x1bgv7wum466kj-1
commit.py commit.py-20060721181724-0mfkrqwpsa09q1t3-3
conflicts.py conflicts.py-20070203171806-g5tuxmkf2suxgzvm-1
diff.py diffwin.py-20051017070234-cb5c6dc4960142f5
errors.py errors.py-20070129213417-8rr7unfjjdetfq83-1
genpot.sh genpot.sh-20060820124246-vi2tip5o5mcnyza1-2
initialize.py initialize.py-20070406171439-vi4hce9b12bdofts-1
merge.py merge.py-20061009195451-45vs0pe2nphnckxh-1
nautilus-bzr.py __init__.py-20060412205316-7a81eb8ae29ffc79
olive/__init__.py __init__.py-20060925014013-13wdvwl8vi8gfqi1-2
olive/add.py add.py-20060721181724-0mfkrqwpsa09q1t3-1
olive/bookmark.py bookmark.py-20060820164104-pmg886x25fj6hhyu-1
olive/guifiles.py gladefile.py-20061025081716-mc0e5w3fcin4rcgv-1
olive/info.py info.py-20060810114713-y0f7dshd8ohyr8oz-1
olive/menu.py menu.py-20060803101046-9idg5lu81o53za8y-1
olive/mkdir.py mkdir.py-20060809131310-mpu60gdw82hhkt0p-1
olive/move.py move.py-20060809140408-txw8f17jvqykh0iv-1
olive/remove.py remove.py-20060721181724-0mfkrqwpsa09q1t3-2
olive/rename.py rename.py-20060809143844-edgdedgalykd5zci-1
po/olive-gtk.pot olivegtk.pot-20060820124246-vi2tip5o5mcnyza1-3
push.py push.py-20060721181724-0mfkrqwpsa09q1t3-4
revbrowser.py revbrowser.py-20070201094155-v2139s0zp4mmolvq-1
status.py status.py-20060803143043-mmdp58hu3hauy0xh-1
tags.py tags.py-20070408210738-1c0lyfurp88v5c56-1
------------------------------------------------------------
revno: 475.1.4
revision-id: v.ladeuil+lp at free.fr-20080505182232-opjz9orjvoi7r4np
parent: v.ladeuil+lp at free.fr-20080505181808-ilh1cyl2v4crpc5i
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 news-20070325173539-3va57o99cz3o57xe-1
------------------------------------------------------------
revno: 475.1.3
revision-id: v.ladeuil+lp at free.fr-20080505181808-ilh1cyl2v4crpc5i
parent: v.ladeuil+lp at free.fr-20080505181646-n95l8ltw2u6jtr26
parent: jelmer at samba.org-20080504202356-64wc0mcpsqd708xq
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 news-20070325173539-3va57o99cz3o57xe-1
__init__.py __init__.py-20060519165329-a1fd52c8a829fcd5
annotate/gannotate.py xannotate.py-20051024072750-fe35acd6bb909bd3
branchview/graphcell.py graphcell.py-20051017001313-5b9651e6d3a578bc
branchview/linegraph.py graph.py-20051016214152-ebf565808c860cf7
bzr-handle-patch.desktop handlepatch.desktop-20080402181555-dnlazy184jst2ww1-1
bzr-notify.desktop bzrnotify.desktop-20070713215921-629u4nx1ymhrtl95-1
olive-gtk.desktop olivegtk.desktop-20060815170839-qylqcjkyiwcqysnr-1
olive/menu.py menu.py-20060803101046-9idg5lu81o53za8y-1
revisionview.py logview.py-20051024072750-4d5c28cb73611027
seahorse.py crypt.py-20080401000513-m7ksudqlvqbdfejf-1
setup.py setup.py-20060716162505-h2isrtlg8lmlg2o2-1
tests/test_commit.py test_commit.py-20070928204312-v6ffg8vz27644log-2
------------------------------------------------------------
revno: 475.1.2
revision-id: v.ladeuil+lp at free.fr-20080505181646-n95l8ltw2u6jtr26
parent: v.ladeuil+lp at free.fr-20080505160432-hrhie62i03vcu3cw
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 __init__.py-20060519165329-a1fd52c8a829fcd5
branch.py branch.py-20060718221951-cc4ts04p4d84mjth-1
branchview/treeview.py treeview.py-20071020204704-vk1erblrjhbcgw94-1
checkout.py checkout.py-20060731181533-e0x1bgv7wum466kj-1
commit.py commit.py-20060721181724-0mfkrqwpsa09q1t3-3
conflicts.py conflicts.py-20070203171806-g5tuxmkf2suxgzvm-1
diff.py diffwin.py-20051017070234-cb5c6dc4960142f5
errors.py errors.py-20070129213417-8rr7unfjjdetfq83-1
genpot.sh genpot.sh-20060820124246-vi2tip5o5mcnyza1-2
initialize.py initialize.py-20070406171439-vi4hce9b12bdofts-1
merge.py merge.py-20061009195451-45vs0pe2nphnckxh-1
nautilus-bzr.py __init__.py-20060412205316-7a81eb8ae29ffc79
olive/__init__.py __init__.py-20060925014013-13wdvwl8vi8gfqi1-2
olive/add.py add.py-20060721181724-0mfkrqwpsa09q1t3-1
olive/bookmark.py bookmark.py-20060820164104-pmg886x25fj6hhyu-1
olive/guifiles.py gladefile.py-20061025081716-mc0e5w3fcin4rcgv-1
olive/info.py info.py-20060810114713-y0f7dshd8ohyr8oz-1
olive/menu.py menu.py-20060803101046-9idg5lu81o53za8y-1
olive/mkdir.py mkdir.py-20060809131310-mpu60gdw82hhkt0p-1
olive/move.py move.py-20060809140408-txw8f17jvqykh0iv-1
olive/remove.py remove.py-20060721181724-0mfkrqwpsa09q1t3-2
olive/rename.py rename.py-20060809143844-edgdedgalykd5zci-1
po/olive-gtk.pot olivegtk.pot-20060820124246-vi2tip5o5mcnyza1-3
push.py push.py-20060721181724-0mfkrqwpsa09q1t3-4
revbrowser.py revbrowser.py-20070201094155-v2139s0zp4mmolvq-1
status.py status.py-20060803143043-mmdp58hu3hauy0xh-1
tags.py tags.py-20070408210738-1c0lyfurp88v5c56-1
------------------------------------------------------------
revno: 475.1.1
revision-id: v.ladeuil+lp at free.fr-20080505160432-hrhie62i03vcu3cw
parent: jelmer at samba.org-20080425213841-4569rcvea3yx09q5
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 genpot.sh-20060820124246-vi2tip5o5mcnyza1-2
olive/__init__.py __init__.py-20060925014013-13wdvwl8vi8gfqi1-2
po/olive-gtk.pot olivegtk.pot-20060820124246-vi2tip5o5mcnyza1-3
Diff too large for email (3549 lines, the limit is 1000).
More information about the bazaar-commits
mailing list