server/apps/files_encryption/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
..
.gitkeep Merged branch 'master' 2012-10-16 16:57:07 +01:00
ar.php [tx-robot] updated from transifex 2013-03-19 00:05:52 +01:00
bg_BG.php [tx-robot] updated from transifex 2013-02-06 00:06:28 +01:00
bn_BD.php [tx-robot] updated from transifex 2013-02-06 00:06:28 +01: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 [tx-robot] updated from transifex 2013-02-10 00:10:29 +01:00
cy_GB.php [tx-robot] updated from transifex 2013-05-01 02:02:59 +02:00
da.php [tx-robot] updated from transifex 2013-02-12 00:21:45 +01: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 [tx-robot] updated from transifex 2013-02-06 00:06:28 +01:00
es.php [tx-robot] updated from transifex 2013-02-10 00:10:29 +01:00
es_AR.php [tx-robot] updated from transifex 2013-02-12 00:21:45 +01:00
et_EE.php [tx-robot] updated from transifex 2013-02-13 00:05:40 +01:00
eu.php revert changes to fbbc76f281 because master is very unstable right now 2013-05-01 01:38:06 +02:00
fa.php [tx-robot] updated from transifex 2013-03-19 00:05:52 +01:00
fi_FI.php [tx-robot] updated from transifex 2013-02-15 00:06:50 +01:00
fr.php [tx-robot] updated from transifex 2013-02-10 00:10:29 +01:00
gl.php [tx-robot] updated from transifex 2013-02-11 15:42:41 +01:00
he.php [tx-robot] updated from transifex 2013-02-06 00:06:28 +01:00
hu_HU.php [tx-robot] updated from transifex 2013-02-14 00:06:51 +01:00
id.php [tx-robot] updated from transifex 2013-02-21 00:15:58 +01:00
is.php [tx-robot] updated from transifex 2013-02-06 00:06:28 +01: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 [tx-robot] updated from transifex 2013-02-10 00:10:29 +01:00
ka_GE.php [tx-robot] updated from transifex 2013-04-13 02:15:54 +02:00
ko.php [tx-robot] updated from transifex 2013-02-10 00:10:29 +01:00
ku_IQ.php [tx-robot] updated from transifex 2013-02-06 00:06:28 +01:00
lt_LT.php [tx-robot] updated from transifex 2013-02-06 00:06:28 +01:00
lv.php [tx-robot] updated from transifex 2013-02-10 00:10:29 +01:00
mk.php [tx-robot] updated from transifex 2013-02-06 00:06:28 +01:00
nb_NO.php [tx-robot] updated from transifex 2013-03-07 00:16:59 +01:00
nl.php [tx-robot] updated from transifex 2013-02-10 00:10:29 +01:00
pl.php revert changes to fbbc76f281 because master is very unstable right now 2013-05-01 01:38:06 +02: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 [tx-robot] updated from transifex 2013-02-11 00:04:49 +01:00
ro.php [tx-robot] updated from transifex 2013-02-10 00:10:29 +01: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-02-10 00:10:29 +01:00
si_LK.php [tx-robot] updated from transifex 2013-02-06 00:06:28 +01: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 [tx-robot] updated from transifex 2013-03-13 00:06:21 +01:00
sr.php [tx-robot] updated from transifex 2013-02-06 00:06:28 +01:00
sv.php [tx-robot] updated from transifex 2013-02-10 00:10:29 +01:00
ta_LK.php [tx-robot] updated from transifex 2013-02-06 00:06:28 +01: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 [tx-robot] updated from transifex 2013-02-19 00:06:51 +01:00
uk.php [tx-robot] updated from transifex 2013-02-19 00:06:51 +01:00
vi.php revert changes to fbbc76f281 because master is very unstable right now 2013-05-01 01:38:06 +02:00
zh_CN.GB2312.php [tx-robot] updated from transifex 2013-02-06 00:06:28 +01:00
zh_CN.php [tx-robot] updated from transifex 2013-03-15 00:06:36 +01:00
zh_HK.php [tx-robot] updated from transifex 2013-03-15 00:06:36 +01:00
zh_TW.php [tx-robot] updated from transifex 2013-03-20 00:02:44 +01:00