nextcloud/settings/l10n
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
..
af_ZA.php
ar.php
bg_BG.php
bn_BD.php
ca.php Merge branch 'master' into files_encryption 2013-05-01 09:31:26 +02:00
cs_CZ.php
cy_GB.php Merge branch 'master' into files_encryption 2013-05-01 09:31:26 +02:00
da.php
de.php
de_DE.php
el.php
eo.php
es.php
es_AR.php
et_EE.php
eu.php
fa.php
fi_FI.php
fr.php
gl.php
he.php
hi.php
hr.php
hu_HU.php
hy.php
ia.php
id.php
is.php
it.php
ja_JP.php Merge branch 'master' into files_encryption 2013-05-01 09:31:26 +02:00
ka.php
ka_GE.php
ko.php
ku_IQ.php
lb.php
lt_LT.php
lv.php
mk.php
ms_MY.php
my_MM.php
nb_NO.php
nl.php
nn_NO.php
oc.php
pl.php
pl_PL.php
pt_BR.php
pt_PT.php
ro.php
ru.php
ru_RU.php
si_LK.php
sk_SK.php
sl.php
sq.php
sr.php
sr@latin.php
sv.php
ta_LK.php
te.php
th_TH.php
tr.php
uk.php
ur_PK.php
vi.php
zh_CN.GB2312.php
zh_CN.php
zh_HK.php
zh_TW.php