Florin Peter 01f1153b08 Merge branch 'files_encryption' of https://github.com/owncloud/core into files_encryption ... Conflicts: apps/files/l10n/ar.php apps/files/l10n/bn_BD.php apps/files/l10n/de.php apps/files/l10n/de_DE.php apps/files/l10n/el.php apps/files/l10n/es.php apps/files/l10n/fa.php apps/files/l10n/fr.php apps/files/l10n/gl.php apps/files/l10n/id.php apps/files/l10n/ko.php apps/files/l10n/nl.php apps/files/l10n/nn_NO.php apps/files/l10n/pl.php apps/files/l10n/pt_BR.php apps/files/l10n/pt_PT.php apps/files/l10n/ro.php apps/files/l10n/ru.php apps/files/l10n/sl.php apps/files/l10n/uk.php apps/files/l10n/vi.php apps/files_encryption/l10n/ca.php apps/files_sharing/lib/cache.php apps/files_sharing/lib/sharedstorage.php apps/user_ldap/l10n/tr.php core/l10n/cs_CZ.php core/l10n/de.php core/l10n/de_DE.php core/l10n/ru.php core/l10n/sk_SK.php core/l10n/tr.php core/l10n/vi.php core/l10n/zh_CN.php l10n/af_ZA/files.po l10n/ar/files.po l10n/be/files.po l10n/bg_BG/files.po l10n/bn_BD/files.po l10n/ca/files.po l10n/ca/files_encryption.po l10n/cs_CZ/core.po l10n/cs_CZ/files.po l10n/da/files.po l10n/da/settings.po l10n/de/core.po l10n/de/files.po l10n/de/files_encryption.po l10n/de/files_external.po l10n/de/files_sharing.po l10n/de/files_trashbin.po l10n/de/files_versions.po l10n/de/lib.po l10n/de/settings.po l10n/de/user_ldap.po l10n/de_DE/files.po l10n/de_DE/files_encryption.po l10n/de_DE/files_external.po l10n/de_DE/files_sharing.po l10n/de_DE/files_trashbin.po l10n/de_DE/lib.po l10n/de_DE/settings.po l10n/de_DE/user_ldap.po l10n/el/files.po l10n/eo/files.po l10n/es/files.po l10n/es/lib.po l10n/es/settings.po l10n/es_AR/files.po l10n/eu/files.po l10n/fa/files.po l10n/fi/files.po l10n/fi_FI/files.po l10n/fr/core.po l10n/fr/files.po l10n/gl/files.po l10n/gl/settings.po l10n/he/core.po l10n/he/files.po l10n/he/user_ldap.po l10n/hi/files.po l10n/hr/files.po l10n/hu_HU/core.po l10n/hu_HU/files.po l10n/hu_HU/files_external.po l10n/hu_HU/settings.po l10n/hy/files.po l10n/ia/core.po l10n/ia/files.po l10n/ia/files_trashbin.po l10n/ia/settings.po l10n/id/files.po l10n/is/files.po l10n/it/files.po l10n/ja_JP/files.po l10n/ja_JP/user_ldap.po l10n/ka/files.po l10n/ka_GE/files.po l10n/kn/files.po l10n/ko/files.po l10n/ko/files_trashbin.po l10n/ko/settings.po l10n/ku_IQ/files.po l10n/lb/files.po l10n/lt_LT/core.po l10n/lt_LT/files.po l10n/lv/files.po l10n/mk/files.po l10n/ms_MY/files.po l10n/my_MM/files.po l10n/nb_NO/files.po l10n/ne/files.po l10n/nl/core.po l10n/nl/files.po l10n/nn_NO/files.po l10n/oc/files.po l10n/pl/files.po l10n/pl_PL/files.po l10n/pt_BR/files.po l10n/pt_PT/core.po l10n/pt_PT/files.po l10n/pt_PT/files_external.po l10n/pt_PT/settings.po l10n/ro/files.po l10n/ru/core.po l10n/ru/files.po l10n/si_LK/files.po l10n/sk/files.po l10n/sk_SK/core.po l10n/sk_SK/files.po l10n/sl/core.po l10n/sl/files.po l10n/sq/files.po l10n/sr/files.po l10n/sr@latin/files.po l10n/sv/files.po l10n/sw_KE/files.po l10n/ta_LK/files.po l10n/te/files.po l10n/th_TH/files.po l10n/tr/core.po l10n/tr/files.po l10n/tr/lib.po l10n/tr/settings.po l10n/tr/user_ldap.po l10n/uk/files.po l10n/ur_PK/files.po l10n/vi/core.po l10n/vi/files.po l10n/vi/files_external.po l10n/zh_CN.GB2312/files.po l10n/zh_CN/core.po l10n/zh_CN/files.po l10n/zh_CN/settings.po l10n/zh_HK/files.po l10n/zh_TW/core.po l10n/zh_TW/files.po l10n/zh_TW/files_versions.po l10n/zh_TW/settings.po l10n/zh_TW/user_ldap.po lib/base.php lib/files/filesystem.php lib/files/view.php lib/public/share.php settings/l10n/es.php settings/l10n/pt_PT.php settings/l10n/tr.php settings/l10n/zh_CN.php settings/personal.php		2013-05-15 10:18:25 +02:00
..
.gitkeep	adding l10n support to files_trashbin	2013-01-31 16:48:41 +01:00
ar.php	[tx-robot] updated from transifex	2013-04-09 02:14:02 +02:00
bg_BG.php	[tx-robot] updated from transifex	2013-04-24 02:01:20 +02:00
bn_BD.php	[tx-robot] updated from transifex	2013-04-09 02:14:02 +02:00
ca.php	[tx-robot] updated from transifex	2013-04-09 02:14:02 +02:00
cs_CZ.php	[tx-robot] updated from transifex	2013-04-09 02:14:02 +02:00
cy_GB.php	[tx-robot] updated from transifex	2013-04-23 02:00:31 +02:00
da.php	[tx-robot] updated from transifex	2013-04-09 02:14:02 +02:00
de.php	[tx-robot] updated from transifex	2013-04-09 02:14:02 +02:00
de_DE.php	[tx-robot] updated from transifex	2013-04-09 02:14:02 +02:00
el.php	[tx-robot] updated from transifex	2013-04-09 02:14:02 +02:00
eo.php	[tx-robot] updated from transifex	2013-04-09 02:14:02 +02:00
es.php	[tx-robot] updated from transifex	2013-04-09 02:14:02 +02:00
es_AR.php	[tx-robot] updated from transifex	2013-04-09 02:14:02 +02:00
et_EE.php	[tx-robot] updated from transifex	2013-04-10 02:09:39 +02:00
eu.php	[tx-robot] updated from transifex	2013-04-09 02:14:02 +02:00
fa.php	[tx-robot] updated from transifex	2013-04-09 02:14:02 +02:00
fi_FI.php	[tx-robot] updated from transifex	2013-04-09 02:14:02 +02:00
fr.php	[tx-robot] updated from transifex	2013-04-09 02:14:02 +02:00
gl.php	[tx-robot] updated from transifex	2013-04-09 02:14:02 +02:00
he.php	[tx-robot] updated from transifex	2013-04-09 02:14:02 +02:00
hr.php	[tx-robot] updated from transifex	2013-04-09 02:14:02 +02:00
hu_HU.php	[tx-robot] updated from transifex	2013-04-09 02:14:02 +02:00
hy.php	[tx-robot] updated from transifex	2013-02-22 00:08:47 +01:00
ia.php	[tx-robot] updated from transifex	2013-05-04 02:00:54 +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-09 02:14:02 +02:00
it.php	[tx-robot] updated from transifex	2013-04-09 02:14:02 +02:00
ja_JP.php	[tx-robot] updated from transifex	2013-04-09 02:14:02 +02: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-05-12 02:05:29 +02:00
ku_IQ.php	[tx-robot] updated from transifex	2013-04-09 02:14:02 +02:00
lb.php	[tx-robot] updated from transifex	2013-04-09 02:14:02 +02:00
lt_LT.php	[tx-robot] updated from transifex	2013-04-09 02:14:02 +02:00
lv.php	[tx-robot] updated from transifex	2013-04-09 02:14:02 +02:00
mk.php	[tx-robot] updated from transifex	2013-04-09 02:14:02 +02:00
ms_MY.php	[tx-robot] updated from transifex	2013-04-09 02:14:02 +02:00
nb_NO.php	[tx-robot] updated from transifex	2013-04-09 02:14:02 +02:00
nl.php	[tx-robot] updated from transifex	2013-04-09 02:14:02 +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	[tx-robot] updated from transifex	2013-04-09 02:14:02 +02: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	[tx-robot] updated from transifex	2013-04-09 02:14:02 +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	[tx-robot] updated from transifex	2013-04-09 02:14:02 +02:00
ru_RU.php	[tx-robot] updated from transifex	2013-04-09 02:14:02 +02:00
si_LK.php	[tx-robot] updated from transifex	2013-04-09 02:14:02 +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	[tx-robot] updated from transifex	2013-04-09 02:14:02 +02:00
sq.php	[tx-robot] updated from transifex	2013-04-11 02:10:41 +02:00
sr.php	[tx-robot] updated from transifex	2013-04-17 02:29:17 +02:00
sr@latin.php	[tx-robot] updated from transifex	2013-02-22 00:08:47 +01:00
sv.php	[tx-robot] updated from transifex	2013-04-09 02:14:02 +02:00
ta_LK.php	[tx-robot] updated from transifex	2013-04-09 02:14:02 +02:00
te.php	[tx-robot] updated from transifex	2013-04-09 02:14:02 +02:00
th_TH.php	[tx-robot] updated from transifex	2013-04-09 02:14:02 +02:00
tr.php	[tx-robot] updated from transifex	2013-04-09 02:14:02 +02:00
ug.php	[tx-robot] updated from transifex	2013-05-12 02:05:29 +02:00
uk.php	[tx-robot] updated from transifex	2013-04-09 02:14:02 +02:00
ur_PK.php	[tx-robot] updated from transifex	2013-04-09 02:14:02 +02:00
vi.php	[tx-robot] updated from transifex	2013-04-09 02:14:02 +02:00
zh_CN.GB2312.php	[tx-robot] updated from transifex	2013-04-09 02:14:02 +02:00
zh_CN.php	[tx-robot] updated from transifex	2013-04-09 02:14:02 +02:00
zh_HK.php	[tx-robot] updated from transifex	2013-04-09 02:14:02 +02:00
zh_TW.php	[tx-robot] updated from transifex	2013-04-20 02:02:09 +02:00