[NVDA-dev] Branch nvda/main: Rev 3920: Merge 2010.2. Change sfrom the fi and pl gettext (.po) files have not been merged due to conflicts.

[NV A. b. c. <nor...@nv...>]

At http://bzr.nvaccess.org/nvda/main

------------------------------------------------------------
revno: 3920 [merge]
revision-id: ja...@ja...-20101031213139-ua472io5lgggzbqi
parent: ja...@ja...-20101027051851-7ky3ke1u86mr2o7t
parent: ja...@ja...-20101028060235-2hqobc4k8fiiijlm
committer: James Teh <ja...@ja...>
branch nick: main
timestamp: Mon 2010-11-01 07:31:39 +1000
message:
  Merge 2010.2. Change sfrom the fi and pl gettext (.po) files have not been merged due to conflicts.
removed:
  user_docs/de/key commands.txt  keycommands.txt-20100412124812-bg957082chu37x0y-1
  user_docs/it/whats new.txt     whatsnew.txt-20090805144722-wsnlrrcn4rt0ianp-1
  user_docs/pl/key commands.txt  keycommands.txt-20090128074731-zun4lxuer55muo08-1
  user_docs/pl/user guide.html   1190@dbe06fc7-9119-0410-a01d-9dbf589ecbba:trunk:user_docs%2Fpl%2Fuser%20guide.html
  user_docs/pt_PT/key commands.txt keycommands.txt-20081223163250-u0h0peoh853iyeca-2
  user_docs/ru/whats new.txt     whatsnew.txt-20090307140139-awyzkj8oblfvo60j-1
  user_docs/zh/key commands.txt  1833@dbe06fc7-9119-0410-a01d-9dbf589ecbba:trunk:user_docs%2Fzh%2Fkey%20commands.txt
  user_docs/zh/user guide.html   1505@dbe06fc7-9119-0410-a01d-9dbf589ecbba:trunk:user_docs%2Fzh%2Fuser%20guide.html
added:
  source/locale/zh_CN/           zh_cn-20101015161135-1nq8ki3zepo3dgus-1
  source/locale/zh_CN/LC_MESSAGES/ lc_messages-20101015161135-1nq8ki3zepo3dgus-2
  source/locale/zh_CN/LC_MESSAGES/nvda.po nvda.po-20101015161135-1nq8ki3zepo3dgus-3
  user_docs/it/changes.t2t       changes.t2t-20101020111334-q1363hzeuw6hyq4u-1
  user_docs/pl/userGuide.t2t     userguide.t2t-20101020063540-i72a26xhp5zb9ukz-1
  user_docs/ru/changes.t2t       changes.t2t-20101026205427-bgv83ezw9q1dv7tx-1
  user_docs/zh_CN/               zh_cn-20101015161852-y9euvos42mnopd9w-1
  user_docs/zh_CN/userGuide.t2t  userguide.t2t-20101015161852-y9euvos42mnopd9w-2
  user_docs/zh_TW/userGuide.t2t  userguide.t2t-20101013080004-eajvz24t7m571hnm-1
renamed:
  user_docs/zh/ => user_docs/zh_TW/ 1505@dbe06fc7-9119-0410-a01d-9dbf589ecbba:trunk:user_docs%2Fzh
modified:
  contributors.txt               198@dbe06fc7-9119-0410-a01d-9dbf589ecbba:trunk:contributers.txt
  installer/locale/pt_pt/langstrings.txt 1482@dbe06fc7-9119-0410-a01d-9dbf589ecbba:trunk:installer%2Flocale%2Fpt_pt%2Flangstrings.txt
  installer/locale/zh/langstrings.txt 1482@dbe06fc7-9119-0410-a01d-9dbf589ecbba:trunk:installer%2Flocale%2Fzh%2Flangstrings.txt
  installer/locale/zh_tw/langstrings.txt 1482@dbe06fc7-9119-0410-a01d-9dbf589ecbba:trunk:installer%2Flocale%2Fzh_tw%2Flangstrings.txt
  source/IAccessibleHandler.py   267@dbe06fc7-9119-0410-a01d-9dbf589ecbba:trunk:source%2FIAccessibleHandler.py
  source/locale/ar_sa/LC_MESSAGES/nvda.po nvda.po-20091023045728-87tox4o8e5eqlbyu-3
  source/locale/cs/LC_MESSAGES/nvda.po 792@dbe06fc7-9119-0410-a01d-9dbf589ecbba:trunk:source%2Flocale%2Fcs%2FLC_MESSAGES%2Fnvda.po
  source/locale/de/LC_MESSAGES/nvda.po nvda.po-20100726043230-urkmtltteq0tmv5a-1
  source/locale/hr/LC_MESSAGES/nvda.po 1620@dbe06fc7-9119-0410-a01d-9dbf589ecbba:trunk:source%2Flocale%2Fhr%2FLC_MESSAGES%2Fnvda.po
  source/locale/it/LC_MESSAGES/nvda.po 439@dbe06fc7-9119-0410-a01d-9dbf589ecbba:trunk:source%2Flocale%2Fit%2FLC_MESSAGES%2Fnvda.po
  source/locale/pt_PT/LC_MESSAGES/nvda.po 600@dbe06fc7-9119-0410-a01d-9dbf589ecbba:trunk:source%2Flocale%2Fpt_PT%2FLC_MESSAGES%2Fnvda.po
  source/locale/zh_TW/LC_MESSAGES/nvda.po 815@dbe06fc7-9119-0410-a01d-9dbf589ecbba:trunk:source%2Flocale%2Fzh%2FLC_MESSAGES%2Fnvda.po
  source/versionInfo.py          157@dbe06fc7-9119-0410-a01d-9dbf589ecbba:trunk:source%2FversionInfo.py
  user_docs/ar/changes.t2t       changes.t2t-20100719182707-quzt9dg7dxj3gupi-1
  user_docs/ar/locale.t2tconf    ar.conf.t2t-20100721180452-a17xtmuhxl2s1bp3-1
  user_docs/ar/userGuide.t2t     userguide.t2t-20100719182726-6e1ltn0q6dx0jk0y-1
  user_docs/de/changes.t2t       changes.t2t-20100412123542-dlkctgyd91caid3g-1
  user_docs/de/userGuide.t2t     userguide.t2t-20100412124659-px88iay1hzi5g2qi-1
  user_docs/fi/changes.t2t       changes.t2t-20100401044721-y9s39ylfn7cvejnk-1
  user_docs/hu/changes.t2t       changes.t2t-20100412123248-ol3uuhvvavjqlm7d-1
  user_docs/hu/userGuide.t2t     userguide.t2t-20100412123248-ol3uuhvvavjqlm7d-2
  user_docs/pt_PT/readme.txt     readme.txt-20081223163250-u0h0peoh853iyeca-3
  user_docs/pt_PT/userGuide.t2t  userguide.t2t-20100516084749-cu6guvcz2kt05la1-1