[fc] Repository: plone.app.discussion

Branch: refs/heads/master
Date: 2015-04-29T17:27:40+09:00
Author: Takanori Suzuki () <takanory@beproud.jp>
Commit: plone/plone.app.discussion@b868b44

update japanese translation

Files changed:
M plone/app/discussion/locales/ja/LC_MESSAGES/plone.app.discussion.po
Repository: plone.app.discussion
Branch: refs/heads/master
Date: 2015-04-29T17:39:14+09:00
Author: Manabu TERADA (terapyon) <terada@cmscom.jp>
Commit: plone/plone.app.discussion@b235f74

Merge branch 'master' of github.com:plone/plone.app.discussion

Conflicts:
	plone/app/discussion/locales/ja/LC_MESSAGES/plone.app.discussion.po

Files changed:
A .travis.yml
A CHANGES.rst
A bootstrap-buildout.py
A buildout.cfg
A plone/app/discussion/contentrules.py
A plone/app/discussion/contentrules.zcml
A plone/app/discussion/events.py
A plone/app/discussion/locales/pt/LC_MESSAGES/plone.app.discussion.po
A plone/app/discussion/locales/ro/LC_MESSAGES/plone.app.discussion.po
A plone/app/discussion/subscribers.py
A plone/app/discussion/tests/collection-integration-test.txt
A plone/app/discussion/tests/robot/test_discussion.robot
A plone/app/discussion/tests/test_contentrules.py
A plone/app/discussion/tests/test_events.py
A plone/app/discussion/tests/test_robot.py
A travis.cfg
M .gitignore
M MANIFEST.in
M README.rst
M docs/README.txt
M docs/source/index.txt
M plone/app/discussion/browser/comment.py
M plone/app/discussion/browser/comments.pt
M plone/app/discussion/browser/comments.py
M plone/app/discussion/browser/configure.zcml
M plone/app/discussion/browser/controlpanel.pt
M plone/app/discussion/browser/controlpanel.py
M plone/app/discussion/browser/conversation.py
M plone/app/discussion/browser/javascripts/comments.js
M plone/app/discussion/browser/javascripts/controlpanel.js
M plone/app/discussion/browser/javascripts/javascripts.txt
M plone/app/discussion/browser/javascripts/moderation.js
M plone/app/discussion/browser/migration.py
M plone/app/discussion/browser/moderation.pt
M plone/app/discussion/browser/moderation.py
M plone/app/discussion/browser/stylesheets/discussion.css
M plone/app/discussion/browser/validator.py
M plone/app/discussion/catalog.py
M plone/app/discussion/comment.py
M plone/app/discussion/configure.zcml
M plone/app/discussion/conversation.py
M plone/app/discussion/i18n/plone-ca.po
M plone/app/discussion/i18n/plone-cs.po
M plone/app/discussion/i18n/plone-da.po
M plone/app/discussion/i18n/plone-de.po
M plone/app/discussion/i18n/plone-el.po
M plone/app/discussion/i18n/plone-es.po
M plone/app/discussion/i18n/plone-eu.po
M plone/app/discussion/i18n/plone-fr.po
M plone/app/discussion/i18n/plone-it.po
M plone/app/discussion/i18n/plone-ja.po
M plone/app/discussion/i18n/plone-nl.po
M plone/app/discussion/i18n/plone-no.po
M plone/app/discussion/i18n/plone-pt_BR.po
M plone/app/discussion/i18n/plone-sk.po
M plone/app/discussion/i18n/plone-uk.po
M plone/app/discussion/i18n/plone-zh_CN.po
M plone/app/discussion/i18n/plone-zh_TW.po
M plone/app/discussion/i18n/plone.pot
M plone/app/discussion/interfaces.py
M plone/app/discussion/locales/af/LC_MESSAGES/plone.app.discussion.po
M plone/app/discussion/locales/ca/LC_MESSAGES/plone.app.discussion.po
M plone/app/discussion/locales/cs/LC_MESSAGES/plone.app.discussion.po
M plone/app/discussion/locales/da/LC_MESSAGES/plone.app.discussion.po
M plone/app/discussion/locales/de/LC_MESSAGES/plone.app.discussion.po
M plone/app/discussion/locales/es/LC_MESSAGES/plone.app.discussion.po
M plone/app/discussion/locales/eu/LC_MESSAGES/plone.app.discussion.po
M plone/app/discussion/locales/fi/LC_MESSAGES/plone.app.discussion.po
M plone/app/discussion/locales/fr/LC_MESSAGES/plone.app.discussion.po
M plone/app/discussion/locales/it/LC_MESSAGES/plone.app.discussion.po
M plone/app/discussion/locales/ja/LC_MESSAGES/plone.app.discussion.po
M plone/app/discussion/locales/nl/LC_MESSAGES/plone.app.discussion.po
M plone/app/discussion/locales/no/LC_MESSAGES/plone.app.discussion.po
M plone/app/discussion/locales/plone.app.discussion.pot
M plone/app/discussion/locales/pt_BR/LC_MESSAGES/plone.app.discussion.po
M plone/app/discussion/locales/sk/LC_MESSAGES/plone.app.discussion.po
M plone/app/discussion/locales/sv/LC_MESSAGES/plone.app.discussion.po
M plone/app/discussion/locales/uk/LC_MESSAGES/plone.app.discussion.po
M plone/app/discussion/locales/zh_CN/LC_MESSAGES/plone.app.discussion.po
M plone/app/discussion/locales/zh_TW/LC_MESSAGES/plone.app.discussion.po
M plone/app/discussion/patches.py
M plone/app/discussion/permissions.zcml
M plone/app/discussion/profiles/default/controlpanel.xml
M plone/app/discussion/profiles/default/metadata.xml
M plone/app/discussion/profiles/default/registry.xml
M plone/app/discussion/profiles/default/rolemap.xml
M plone/app/discussion/profiles/default/workflows.xml
M plone/app/discussion/subscribers.zcml
M plone/app/discussion/testing.py
M plone/app/discussion/tests/functional_test_comment_review_workflow.txt
M plone/app/discussion/tests/functional_test_comments.txt
M plone/app/discussion/tests/test_catalog.py
M plone/app/discussion/tests/test_comment.py
M plone/app/discussion/tests/test_comments_viewlet.py
M plone/app/discussion/tests/test_controlpanel.py
M plone/app/discussion/tests/test_conversation.py
M plone/app/discussion/tests/test_functional.py
M plone/app/discussion/tests/test_indexers.py
M plone/app/discussion/tests/test_moderation_view.py
M plone/app/discussion/tests/test_notifications.py
M plone/app/discussion/tests/test_workflow.py
M plone/app/discussion/upgrades.py
M plone/app/discussion/vocabularies.py
M setup.cfg
M setup.py
D CHANGES.txt
D docs/source/changes.txt
D plone/app/discussion/bbb/__init__.py
D plone/app/discussion/bbb/discussiontool.py
D plone/app/discussion/bbb/migration.py
D plone/app/discussion/bbb/talkback.py
D plone/app/discussion/locales/de/LC_MESSAGES/.gitignore
D plone/app/discussion/profiles/default/componentregistry.xml
D plone/app/discussion/profiles/default/toolset.xml
D plone/app/discussion/tests/javascripts/README.txt
D plone/app/discussion/tests/javascripts/jquery.js
D plone/app/discussion/tests/javascripts/test_comments.html
D plone/app/discussion/tests/javascripts/test_comments.js
D plone/app/discussion/tests/javascripts/test_moderation.html.txt
D plone/app/discussion/tests/javascripts/test_moderation.js.txt
D plone/app/discussion/tests/jsTestDriver.conf
D plone/app/discussion/tests/jsTestDriver.txt
D plone/app/discussion/tests/qunit/QUnitAdapter.js
D plone/app/discussion/tests/qunit/equiv.js
D plone/app/discussion/tests/qunit/qunit.css
D plone/app/discussion/tests/qunit/qunit.js
D plone/app/discussion/tests/test_migration.py
D plone/app/discussion/tests/test_tool.py
Repository: plone.app.discussion
Branch: refs/heads/master
Date: 2015-04-29T17:57:23+09:00
Author: Takanori Suzuki () <takanory@beproud.jp>
Commit: plone/plone.app.discussion@acae47c

update japanese translation

Files changed:
M plone/app/discussion/locales/ja/LC_MESSAGES/plone.app.discussion.po
Repository: plone.app.discussion
Branch: refs/heads/master
Date: 2015-04-29T18:39:20+09:00
Author: Manabu TERADA (terapyon) <terada@cmscom.jp>
Commit: plone/plone.app.discussion@16a6090

added changes.rst

Files changed:
M CHANGES.rst
Repository: plone.app.discussion
Branch: refs/heads/master
Date: 2015-04-29T14:57:32+02:00
Author: Timo Stollenwerk (tisto) <tisto@plone.org>
Commit: plone/plone.app.discussion@ad5f8f6

Merge pull request #65 from plonejp/master

Please merge for this po files for Japanese

Files changed:
M CHANGES.rst
M plone/app/discussion/locales/ja/LC_MESSAGES/plone.app.discussion.po