« back to all changes in this revision
Viewing changes to inc/lang/ja/conflict.txt
- Committer: Bazaar Package Importer
- Date: 2007-03-29 19:44:52 UTC
- mfrom: (2.1.6 feisty)
- Revision ID: james.westby@ubuntu.com-20070329194452-8r2w798oo21ago6l
* High-urgency upload for fixing RC bug.
* Make fr.po's translation of "global" consistent. (Closes: #416509)
* Remove /etc/apache*/conf.d/ on purge. (Closes: #387974)
* Make fr.po's translation of "global" consistent. (Closes: #416509)
* Remove /etc/apache*/conf.d/ on purge. (Closes: #387974)
- files added:
- bin
- data/attic
- data/cache
- data/locks
- data/media
- data/media/wiki
- data/meta
- data/pages
- data/pages/playground
- data/pages/wiki
- debian/add-ons
- debian/overrides
- debian/overrides/linda
- debian/overrides/lintian
- inc/auth
- inc/lang
- inc/lang/ar
- inc/lang/ca
- inc/lang/cs
- inc/lang/da
- inc/lang/de
- inc/lang/el
- inc/lang/en
- inc/lang/eo
- inc/lang/es
- inc/lang/et
- inc/lang/eu
- inc/lang/fi
- inc/lang/fo
- inc/lang/fr
- inc/lang/he
- inc/lang/hr
- inc/lang/hu
- inc/lang/id
- inc/lang/it
- inc/lang/ja
- inc/lang/ko
- inc/lang/lt
- inc/lang/lv
- inc/lang/nl
- inc/lang/no
- inc/lang/pl
- inc/lang/pt
- inc/lang/pt-br
- inc/lang/ro
- inc/lang/ru
- inc/lang/sk
- inc/lang/sl
- inc/lang/sr
- inc/lang/sv
- inc/lang/tr
- inc/lang/uk
- inc/lang/vi
- inc/lang/zh
- inc/lang/zh-tw
- inc/parser
- lib
- lib/exe
- lib/images
- lib/images/fileicons
- lib/images/interwiki
- lib/images/smileys
- lib/images/toolbar
- lib/plugins
- lib/plugins/acl
- lib/plugins/acl/lang
- lib/plugins/acl/lang/ar
- lib/plugins/acl/lang/ca
- lib/plugins/acl/lang/cs
- lib/plugins/acl/lang/da
- lib/plugins/acl/lang/de
- lib/plugins/acl/lang/el
- lib/plugins/acl/lang/en
- lib/plugins/acl/lang/es
- lib/plugins/acl/lang/et
- lib/plugins/acl/lang/eu
- lib/plugins/acl/lang/fi
- lib/plugins/acl/lang/fr
- lib/plugins/acl/lang/he
- lib/plugins/acl/lang/id
- lib/plugins/acl/lang/it
- lib/plugins/acl/lang/ja
- lib/plugins/acl/lang/lt
- lib/plugins/acl/lang/lv
- lib/plugins/acl/lang/nl
- lib/plugins/acl/lang/no
- lib/plugins/acl/lang/pl
- lib/plugins/acl/lang/pt
- lib/plugins/acl/lang/ru
- lib/plugins/acl/lang/sk
- lib/plugins/acl/lang/sr
- lib/plugins/acl/lang/tr
- lib/plugins/acl/lang/uk
- lib/plugins/acl/lang/vi
- lib/plugins/acl/lang/zh
- lib/plugins/acl/lang/zh-tw
- lib/plugins/config
- lib/plugins/config/lang
- lib/plugins/config/lang/cs
- lib/plugins/config/lang/da
- lib/plugins/config/lang/de
- lib/plugins/config/lang/el
- lib/plugins/config/lang/en
- lib/plugins/config/lang/es
- lib/plugins/config/lang/fr
- lib/plugins/config/lang/he
- lib/plugins/config/lang/it
- lib/plugins/config/lang/ja
- lib/plugins/config/lang/lt
- lib/plugins/config/lang/pl
- lib/plugins/config/lang/ru
- lib/plugins/config/lang/uk
- lib/plugins/config/lang/zh
- lib/plugins/config/settings
- lib/plugins/importoldchangelog
- lib/plugins/info
- lib/plugins/plugin
- lib/plugins/plugin/inc
- lib/plugins/plugin/lang
- lib/plugins/plugin/lang/cs
- lib/plugins/plugin/lang/da
- lib/plugins/plugin/lang/de
- lib/plugins/plugin/lang/el
- lib/plugins/plugin/lang/en
- lib/plugins/plugin/lang/es
- lib/plugins/plugin/lang/fr
- lib/plugins/plugin/lang/he
- lib/plugins/plugin/lang/it
- lib/plugins/plugin/lang/ja
- lib/plugins/plugin/lang/lt
- lib/plugins/plugin/lang/pl
- lib/plugins/plugin/lang/ru
- lib/plugins/plugin/lang/sk
- lib/plugins/plugin/lang/uk
- lib/plugins/plugin/lang/zh
- lib/plugins/usermanager
- lib/plugins/usermanager/images
- lib/plugins/usermanager/lang
- lib/plugins/usermanager/lang/cs
- lib/plugins/usermanager/lang/da
- lib/plugins/usermanager/lang/de
- lib/plugins/usermanager/lang/el
- lib/plugins/usermanager/lang/en
- lib/plugins/usermanager/lang/es
- lib/plugins/usermanager/lang/fr
- lib/plugins/usermanager/lang/he
- lib/plugins/usermanager/lang/it
- lib/plugins/usermanager/lang/ja
- lib/plugins/usermanager/lang/lt
- lib/plugins/usermanager/lang/lv
- lib/plugins/usermanager/lang/pl
- lib/plugins/usermanager/lang/ru
- lib/plugins/usermanager/lang/sk
- lib/plugins/usermanager/lang/uk
- lib/plugins/usermanager/lang/zh
- lib/plugins/usermanager/lang/zh-tw
- lib/scripts
- lib/styles
- lib/tpl
- lib/tpl/default
- lib/tpl/default/images
- files removed:
- attic
- data/wiki
- images
- inc/magpie
- inc/magpie/extlib
- includes
- interwiki
- lang
- lang/cs
- lang/da
- lang/de
- lang/en
- lang/es
- lang/eu
- lang/fi
- lang/fr
- lang/he
- lang/hu
- lang/it
- lang/nl
- lang/no
- lang/pl
- lang/pt
- lang/pt-br
- lang/ro
- lang/ru
- lang/sv
- lang/zh
- lang/zh-tw
- media
- media/wiki
- smileys
- files modified:
- .htaccess
added
removed
inc/lang/ja/conflict.txt
