server/apps/files/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
..
ar.php revert changes to fbbc76f281 because master is very unstable right now 2013-05-01 01:38:06 +02:00
bg_BG.php revert changes to fbbc76f281 because master is very unstable right now 2013-05-01 01:38:06 +02:00
bn_BD.php revert changes to fbbc76f281 because master is very unstable right now 2013-05-01 01:38:06 +02:00
ca.php revert changes to fbbc76f281 because master is very unstable right now 2013-05-01 01:38:06 +02:00
cs_CZ.php revert changes to fbbc76f281 because master is very unstable right now 2013-05-01 01:38:06 +02:00
cy_GB.php [tx-robot] updated from transifex 2013-04-24 18:31:36 +02:00
da.php revert changes to fbbc76f281 because master is very unstable right now 2013-05-01 01:38:06 +02:00
de.php revert changes to fbbc76f281 because master is very unstable right now 2013-05-01 01:38:06 +02:00
de_DE.php revert changes to fbbc76f281 because master is very unstable right now 2013-05-01 01:38:06 +02:00
el.php revert changes to fbbc76f281 because master is very unstable right now 2013-05-01 01:38:06 +02:00
eo.php revert changes to fbbc76f281 because master is very unstable right now 2013-05-01 01:38:06 +02:00
es.php revert changes to fbbc76f281 because master is very unstable right now 2013-05-01 01:38:06 +02:00
es_AR.php revert changes to fbbc76f281 because master is very unstable right now 2013-05-01 01:38:06 +02:00
et_EE.php Merge branch 'master' into files_encryption 2013-05-01 09:31:26 +02:00
eu.php revert changes to fbbc76f281 because master is very unstable right now 2013-05-01 01:38:06 +02:00
fa.php revert changes to fbbc76f281 because master is very unstable right now 2013-05-01 01:38:06 +02:00
fi.php [tx-robot] updated from transifex 2013-03-27 00:11:05 +01:00
fi_FI.php revert changes to fbbc76f281 because master is very unstable right now 2013-05-01 01:38:06 +02:00
fr.php revert changes to fbbc76f281 because master is very unstable right now 2013-05-01 01:38:06 +02:00
gl.php revert changes to fbbc76f281 because master is very unstable right now 2013-05-01 01:38:06 +02:00
he.php revert changes to fbbc76f281 because master is very unstable right now 2013-05-01 01:38:06 +02:00
hr.php revert changes to fbbc76f281 because master is very unstable right now 2013-05-01 01:38:06 +02:00
hu_HU.php revert changes to fbbc76f281 because master is very unstable right now 2013-05-01 01:38:06 +02:00
hy.php [tx-robot] updated from transifex 2013-04-08 02:18:28 +02:00
ia.php revert changes to fbbc76f281 because master is very unstable right now 2013-05-01 01:38:06 +02:00
id.php revert changes to fbbc76f281 because master is very unstable right now 2013-05-01 01:38:06 +02:00
is.php [tx-robot] updated from transifex 2013-04-24 18:31:36 +02:00
it.php revert changes to fbbc76f281 because master is very unstable right now 2013-05-01 01:38:06 +02:00
ja_JP.php revert changes to fbbc76f281 because master is very unstable right now 2013-05-01 01:38:06 +02:00
ka.php [tx-robot] updated from transifex 2013-02-27 14:37:12 +01:00
ka_GE.php revert changes to fbbc76f281 because master is very unstable right now 2013-05-01 01:38:06 +02:00
ko.php revert changes to fbbc76f281 because master is very unstable right now 2013-05-01 01:38:06 +02:00
ku_IQ.php [tx-robot] updated from transifex 2013-04-09 02:14:02 +02:00
lb.php revert changes to fbbc76f281 because master is very unstable right now 2013-05-01 01:38:06 +02:00
lt_LT.php revert changes to fbbc76f281 because master is very unstable right now 2013-05-01 01:38:06 +02:00
lv.php revert changes to fbbc76f281 because master is very unstable right now 2013-05-01 01:38:06 +02:00
mk.php revert changes to fbbc76f281 because master is very unstable right now 2013-05-01 01:38:06 +02:00
ms_MY.php revert changes to fbbc76f281 because master is very unstable right now 2013-05-01 01:38:06 +02:00
my_MM.php [tx-robot] updated from transifex 2013-02-27 14:37:12 +01:00
nb_NO.php revert changes to fbbc76f281 because master is very unstable right now 2013-05-01 01:38:06 +02:00
nl.php revert changes to fbbc76f281 because master is very unstable right now 2013-05-01 01:38:06 +02:00
nn_NO.php revert changes to fbbc76f281 because master is very unstable right now 2013-05-01 01:38:06 +02:00
oc.php revert changes to fbbc76f281 because master is very unstable right now 2013-05-01 01:38:06 +02:00
pl.php revert changes to fbbc76f281 because master is very unstable right now 2013-05-01 01:38:06 +02:00
pl_PL.php [tx-robot] updated from transifex 2012-11-03 00:02:24 +01:00
pt_BR.php revert changes to fbbc76f281 because master is very unstable right now 2013-05-01 01:38:06 +02:00
pt_PT.php revert changes to fbbc76f281 because master is very unstable right now 2013-05-01 01:38:06 +02:00
ro.php revert changes to fbbc76f281 because master is very unstable right now 2013-05-01 01:38:06 +02:00
ru.php revert changes to fbbc76f281 because master is very unstable right now 2013-05-01 01:38:06 +02:00
ru_RU.php [tx-robot] updated from transifex 2013-04-24 18:31:36 +02:00
si_LK.php revert changes to fbbc76f281 because master is very unstable right now 2013-05-01 01:38:06 +02:00
sk_SK.php revert changes to fbbc76f281 because master is very unstable right now 2013-05-01 01:38:06 +02:00
sl.php revert changes to fbbc76f281 because master is very unstable right now 2013-05-01 01:38:06 +02:00
sq.php [tx-robot] updated from transifex 2013-04-24 18:31:36 +02:00
sr.php revert changes to fbbc76f281 because master is very unstable right now 2013-05-01 01:38:06 +02:00
sr@latin.php [tx-robot] updated from transifex 2013-04-08 02:18:28 +02:00
sv.php revert changes to fbbc76f281 because master is very unstable right now 2013-05-01 01:38:06 +02:00
ta_LK.php revert changes to fbbc76f281 because master is very unstable right now 2013-05-01 01:38:06 +02:00
te.php [tx-robot] updated from transifex 2013-04-09 02:14:02 +02:00
th_TH.php revert changes to fbbc76f281 because master is very unstable right now 2013-05-01 01:38:06 +02:00
tr.php revert changes to fbbc76f281 because master is very unstable right now 2013-05-01 01:38:06 +02:00
uk.php revert changes to fbbc76f281 because master is very unstable right now 2013-05-01 01:38:06 +02:00
ur_PK.php revert changes to fbbc76f281 because master is very unstable right now 2013-05-01 01:38:06 +02:00
vi.php revert changes to fbbc76f281 because master is very unstable right now 2013-05-01 01:38:06 +02:00
xgettextfiles move files to app folder 2012-04-18 17:27:34 +02:00
zh_CN.GB2312.php revert changes to fbbc76f281 because master is very unstable right now 2013-05-01 01:38:06 +02:00
zh_CN.php revert changes to fbbc76f281 because master is very unstable right now 2013-05-01 01:38:06 +02:00
zh_HK.php [tx-robot] updated from transifex 2013-04-24 18:31:36 +02:00
zh_TW.php [tx-robot] updated from transifex 2013-04-24 18:31:36 +02:00