# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: jesse_zhang_sbjesse_at_gmail_point_com-20100517194621-\ # kc6dhgkimw8wc7gb # target_branch: bzr+ssh://bazaar.launchpad.net/~ubuntu-\ # branches/ubuntu/maverick/m17n-contrib/maverick/ # testament_sha1: bece5b88678d0f8057e50272e8502a6b2e5d5390 # timestamp: 2010-05-18 04:00:25 +0800 # base_revision_id: james.westby@ubuntu.com-20090801235515-\ # 581ne7hbmptyuh8k # # Begin patch === modified file 'im/zh-zhuyin.mim' --- im/zh-zhuyin.mim 2009-08-01 23:55:15 +0000 +++ im/zh-zhuyin.mim 2010-05-17 19:46:21 +0000 @@ -29,7 +29,7 @@ ;; ㄇ ㄋ ㄎ ㄑ ㄕ ㄘ ㄨ ㄜ ㄠ ㄤ '" \| ;; ㄈ ㄌ ㄏ ㄒ ㄖ ㄙ ㄩ ㄝ ㄡ ㄥ -(input-method zh bopomofo) +(input-method zh zhuyin) (description "Bopomofo input method using this keyboard layout. # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWbQ3vyMAAc9fgCAQUGv/93// //C////wUASbvddTyrnDoDqRhopqabRDTQaDQBoAaABoADQAJUqf6lPaJiY0p+qeamCg0AeoAGho AAASiCZT0aCNDSjTzSjTanqA08o00ANDQ9QET0qaaGQA0A0ABoDQyDTTQ9QABJJAJ6mQMJoamAU1 PMiaZNR5CPUYTyZEBJzt0kuzqS29y5c8+1pz0wqsSuIgsJNIOY5tS1Nu62ggEwIT4hxCDMozM6/I XyzkbaIELAJ+nzVlzfI7glZBl2Sv++EpzOty8U5kb9DYvbb0e4QfBSLkUAGtwci8WbAAbkuis2iG ltT2QYK6Q0ZZmfim0mk0dFUJBGRmAMsF0Bd68oAIyFDV0gWNxEyBiwJY1eidPOpmB4FNUNlbGdDA KzfvN2LyqwUc/NmoQWLW3bs5O9PYQ5UuQ+hwDGPr2wFdoEb4Rvv/HlIZa8rEAdE1yzgGABon55qx zsL2U1am5S9iHj2SwJYqW3StDXcOJCQSpSlInccVr++6/vReZRqi6qUeMAhQmg+NZLl6ChCW9Llq GgJYJINxyKGR5FFD5GOByKF4R20qSmZzJ4oGQKQCB58eZOt2xY82RUg3EBK9tXStcmJAHmITMdOu IRXw9DLQKA5m05NCF2m8YFrVnGKnFljo5Jtp0ecP0CqIhFC0UDKyujRiG0TnmycyGFZFg2qCxqlx JO8V9yDnanjWAroMoIoQivA28MMk7FatGvy79qHr4djuSDG+HsTUcwDB7BLqpeeC6GFJT8Bn4qMr YAqzBG95KnBeO0ORdVSd6OIkc+cIpgdbzRlEV1nPzLQYC5yjvOZkFsST3q5c1dDQ/FZeDD155Dm3 lxV4d/dJm8pp+QHJAUOF4gaX9gEZEgzwo8C079fiejjEZPjAPko7Uc6Cw99Jj8kNHjQPxE4uiu/Y 3sA19uOD9GZKr51UV2GqMgO2X55kFYdlfUjMh4bh+MPpr5AeQGXjJ/hwn0brWNP1RqAdVr4amPqq sqvKpjKxTIQvkrsWLCWqOOF4C4tg76KC3T8txITZG7J/Zu6aQycJ6t8LM54E86HAZ+H2zlBDnIuf IzYdM8rZPNxjrLEwWV15IvbRKjRdeg2dSAvQdKGiRADseyX8GkxcLt0JcYT14c9zKZOKmAvAUC9N YEnQA/RtbiHNbC5HbEBfDBDUBmdpNsiVKfGa8/rFEVtoMiaWcnsQZ1zebEZwAt80ORR9upA3/a7Y qBWovu6nRI3oO5UYR0OrIaj6e/KBi5wihAzI8d+sPApRTAEIEuxyoswkhm1RjkMMB3N8dWJBGq/h fAdNW3ervSrZGJsCIHWKlAqKkFxK4vQ6Qexs1AVhgKAwMwVI+sARe7D109iC65JSi5RFqJgllgWD +X9dOCqHvcUVv5wJZu3JEOnhYZzSnU3l+LUMZxEqNxcW8Z5VkGlr3OVQ9VTUM/1jr4yAoaKoBXYp ttoda3FNLET1gZ6QrwprZXOKXXQAOAbcYEmJqF0j5Kn3ye8h4QsGBkSVhfR8ofZE1oX9pmRPNemu R+MlpTEsO8qRj/raB2gckaNxsh5TBoD9WIlRVWHHHjC8pzZQEHVmZ+ek/xdyRThQkLQ3vyM=