nextcloud/l10n/ja_JP
Florin Peter 3579ba1e41 Merge branch 'master' into files_encryption
Conflicts:
	apps/user_ldap/l10n/nn_NO.php
	core/l10n/es.php
	core/l10n/et_EE.php
	core/l10n/ja_JP.php
	core/l10n/nn_NO.php
	l10n/ca/core.po
	l10n/ca/files_external.po
	l10n/ca/settings.po
	l10n/cy_GB/core.po
	l10n/cy_GB/files.po
	l10n/cy_GB/files_encryption.po
	l10n/cy_GB/files_external.po
	l10n/cy_GB/files_sharing.po
	l10n/cy_GB/files_trashbin.po
	l10n/cy_GB/lib.po
	l10n/cy_GB/settings.po
	l10n/de_DE/core.po
	l10n/es/core.po
	l10n/et_EE/core.po
	l10n/et_EE/files.po
	l10n/et_EE/settings.po
	l10n/et_EE/user_ldap.po
	l10n/gl/core.po
	l10n/it/core.po
	l10n/ja_JP/core.po
	l10n/ja_JP/settings.po
	l10n/nn_NO/core.po
	l10n/nn_NO/user_ldap.po
	l10n/pt_BR/core.po
	l10n/templates/core.pot
	l10n/templates/files.pot
	l10n/templates/files_encryption.pot
	l10n/templates/files_external.pot
	l10n/templates/files_sharing.pot
	l10n/templates/files_trashbin.pot
	l10n/templates/files_versions.pot
	l10n/templates/lib.pot
	l10n/templates/settings.pot
	l10n/templates/user_ldap.pot
	l10n/templates/user_webdavauth.pot
	l10n/zh_TW/files_sharing.po
	settings/l10n/et_EE.php
2013-05-01 09:31:26 +02:00
..
core.po [tx-robot] updated from transifex 2013-05-01 02:02:59 +02:00
files.po revert changes to fbbc76f281 because master is very unstable right now 2013-05-01 01:38:06 +02:00
files_encryption.po revert changes to fbbc76f281 because master is very unstable right now 2013-05-01 01:38:06 +02:00
files_external.po revert changes to fbbc76f281 because master is very unstable right now 2013-05-01 01:38:06 +02:00
files_sharing.po revert changes to fbbc76f281 because master is very unstable right now 2013-05-01 01:38:06 +02:00
files_trashbin.po revert changes to fbbc76f281 because master is very unstable right now 2013-05-01 01:38:06 +02:00
files_versions.po revert changes to fbbc76f281 because master is very unstable right now 2013-05-01 01:38:06 +02:00
lib.po revert changes to fbbc76f281 because master is very unstable right now 2013-05-01 01:38:06 +02:00
settings.po [tx-robot] updated from transifex 2013-05-01 02:02:59 +02:00
user_ldap.po revert changes to fbbc76f281 because master is very unstable right now 2013-05-01 01:38:06 +02:00
user_webdavauth.po [tx-robot] updated from transifex 2013-04-17 02:29:17 +02:00