summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam Tuke <samtuke@owncloud.com>2013-01-23 12:52:53 +0000
committerSam Tuke <samtuke@owncloud.com>2013-01-23 12:52:53 +0000
commit14d0903a287cd534cb778e0411c1883dcc63a22b (patch)
tree59cec9fe4c7d0de0ca8703d78f64a9a156f1c726
parentde0ed634f2fb1bb9fbb93f6c0a66882dea42e288 (diff)
parentc986dbe5739347f3fd40fa17132169de9fd9494c (diff)
downloadnextcloud-server-14d0903a287cd534cb778e0411c1883dcc63a22b.tar.gz
nextcloud-server-14d0903a287cd534cb778e0411c1883dcc63a22b.zip
Merge branch 'master' of github.com:owncloud/core
-rw-r--r--apps/files/ajax/autocomplete.php54
-rw-r--r--apps/files/ajax/delete.php16
-rw-r--r--apps/files/ajax/getstoragestats.php16
-rw-r--r--apps/files/ajax/scan.php3
-rw-r--r--apps/files/ajax/upload.php35
-rw-r--r--apps/files/css/files.css4
-rw-r--r--apps/files/index.php55
-rw-r--r--apps/files/js/fileactions.js14
-rw-r--r--apps/files/js/files.js55
-rw-r--r--apps/files/js/jquery-visibility.js32
-rw-r--r--apps/files/l10n/ar.php2
-rw-r--r--apps/files/l10n/bg_BG.php2
-rw-r--r--apps/files/l10n/bn_BD.php3
-rw-r--r--apps/files/l10n/ca.php4
-rw-r--r--apps/files/l10n/cs_CZ.php4
-rw-r--r--apps/files/l10n/da.php3
-rw-r--r--apps/files/l10n/de.php4
-rw-r--r--apps/files/l10n/de_DE.php4
-rw-r--r--apps/files/l10n/el.php12
-rw-r--r--apps/files/l10n/eo.php12
-rw-r--r--apps/files/l10n/es.php5
-rw-r--r--apps/files/l10n/es_AR.php10
-rw-r--r--apps/files/l10n/et_EE.php3
-rw-r--r--apps/files/l10n/eu.php11
-rw-r--r--apps/files/l10n/fa.php4
-rw-r--r--apps/files/l10n/fi_FI.php4
-rw-r--r--apps/files/l10n/fr.php3
-rw-r--r--apps/files/l10n/gl.php3
-rw-r--r--apps/files/l10n/he.php3
-rw-r--r--apps/files/l10n/hr.php3
-rw-r--r--apps/files/l10n/hu_HU.php7
-rw-r--r--apps/files/l10n/ia.php2
-rw-r--r--apps/files/l10n/id.php3
-rw-r--r--apps/files/l10n/is.php3
-rw-r--r--apps/files/l10n/it.php4
-rw-r--r--apps/files/l10n/ja_JP.php4
-rw-r--r--apps/files/l10n/ka_GE.php3
-rw-r--r--apps/files/l10n/ko.php3
-rw-r--r--apps/files/l10n/ku_IQ.php2
-rw-r--r--apps/files/l10n/lb.php3
-rw-r--r--apps/files/l10n/lt_LT.php3
-rw-r--r--apps/files/l10n/lv.php3
-rw-r--r--apps/files/l10n/mk.php3
-rw-r--r--apps/files/l10n/ms_MY.php3
-rw-r--r--apps/files/l10n/nb_NO.php3
-rw-r--r--apps/files/l10n/nl.php8
-rw-r--r--apps/files/l10n/nn_NO.php2
-rw-r--r--apps/files/l10n/oc.php3
-rw-r--r--apps/files/l10n/pl.php6
-rw-r--r--apps/files/l10n/pt_BR.php3
-rw-r--r--apps/files/l10n/pt_PT.php4
-rw-r--r--apps/files/l10n/ro.php4
-rw-r--r--apps/files/l10n/ru.php3
-rw-r--r--apps/files/l10n/ru_RU.php3
-rw-r--r--apps/files/l10n/si_LK.php3
-rw-r--r--apps/files/l10n/sk_SK.php3
-rw-r--r--apps/files/l10n/sl.php3
-rw-r--r--apps/files/l10n/sr.php3
-rw-r--r--apps/files/l10n/sr@latin.php2
-rw-r--r--apps/files/l10n/sv.php7
-rw-r--r--apps/files/l10n/ta_LK.php3
-rw-r--r--apps/files/l10n/th_TH.php12
-rw-r--r--apps/files/l10n/tr.php12
-rw-r--r--apps/files/l10n/uk.php3
-rw-r--r--apps/files/l10n/vi.php3
-rw-r--r--apps/files/l10n/zh_CN.GB2312.php3
-rw-r--r--apps/files/l10n/zh_CN.php12
-rw-r--r--apps/files/l10n/zh_TW.php3
-rw-r--r--apps/files/templates/part.breadcrumb.php20
-rw-r--r--apps/files/templates/part.list.php136
-rw-r--r--apps/files_encryption/ajax/mode.php38
-rw-r--r--apps/files_encryption/appinfo/app.php38
-rw-r--r--apps/files_encryption/appinfo/database.xml24
-rw-r--r--apps/files_encryption/appinfo/info.xml6
-rw-r--r--apps/files_encryption/appinfo/version2
-rw-r--r--apps/files_encryption/hooks/hooks.php143
-rw-r--r--apps/files_encryption/js/settings-personal.js38
-rw-r--r--apps/files_encryption/js/settings.js34
-rw-r--r--apps/files_encryption/l10n/ar.php3
-rw-r--r--apps/files_encryption/l10n/bg_BG.php5
-rw-r--r--apps/files_encryption/l10n/bn_BD.php5
-rw-r--r--apps/files_encryption/l10n/ca.php3
-rw-r--r--apps/files_encryption/l10n/cs_CZ.php3
-rw-r--r--apps/files_encryption/l10n/da.php3
-rw-r--r--apps/files_encryption/l10n/de.php3
-rw-r--r--apps/files_encryption/l10n/de_DE.php3
-rw-r--r--apps/files_encryption/l10n/el.php3
-rw-r--r--apps/files_encryption/l10n/eo.php3
-rw-r--r--apps/files_encryption/l10n/es.php3
-rw-r--r--apps/files_encryption/l10n/es_AR.php3
-rw-r--r--apps/files_encryption/l10n/et_EE.php3
-rw-r--r--apps/files_encryption/l10n/eu.php3
-rw-r--r--apps/files_encryption/l10n/fa.php3
-rw-r--r--apps/files_encryption/l10n/fi_FI.php3
-rw-r--r--apps/files_encryption/l10n/fr.php3
-rw-r--r--apps/files_encryption/l10n/gl.php3
-rw-r--r--apps/files_encryption/l10n/he.php5
-rw-r--r--apps/files_encryption/l10n/hu_HU.php5
-rw-r--r--apps/files_encryption/l10n/id.php3
-rw-r--r--apps/files_encryption/l10n/is.php5
-rw-r--r--apps/files_encryption/l10n/it.php3
-rw-r--r--apps/files_encryption/l10n/ja_JP.php3
-rw-r--r--apps/files_encryption/l10n/ko.php3
-rw-r--r--apps/files_encryption/l10n/ku_IQ.php3
-rw-r--r--apps/files_encryption/l10n/lt_LT.php3
-rw-r--r--apps/files_encryption/l10n/mk.php3
-rw-r--r--apps/files_encryption/l10n/nb_NO.php3
-rw-r--r--apps/files_encryption/l10n/nl.php3
-rw-r--r--apps/files_encryption/l10n/pl.php3
-rw-r--r--apps/files_encryption/l10n/pt_BR.php3
-rw-r--r--apps/files_encryption/l10n/pt_PT.php3
-rw-r--r--apps/files_encryption/l10n/ro.php3
-rw-r--r--apps/files_encryption/l10n/ru.php3
-rw-r--r--apps/files_encryption/l10n/ru_RU.php3
-rw-r--r--apps/files_encryption/l10n/si_LK.php3
-rw-r--r--apps/files_encryption/l10n/sk_SK.php3
-rw-r--r--apps/files_encryption/l10n/sl.php3
-rw-r--r--apps/files_encryption/l10n/sr.php3
-rw-r--r--apps/files_encryption/l10n/sv.php3
-rw-r--r--apps/files_encryption/l10n/ta_LK.php3
-rw-r--r--apps/files_encryption/l10n/th_TH.php3
-rw-r--r--apps/files_encryption/l10n/tr.php5
-rw-r--r--apps/files_encryption/l10n/uk.php3
-rw-r--r--apps/files_encryption/l10n/vi.php3
-rw-r--r--apps/files_encryption/l10n/zh_CN.GB2312.php3
-rw-r--r--apps/files_encryption/l10n/zh_CN.php3
-rw-r--r--apps/files_encryption/l10n/zh_TW.php3
-rwxr-xr-x[-rw-r--r--]apps/files_encryption/lib/crypt.php952
-rw-r--r--apps/files_encryption/lib/cryptstream.php177
-rwxr-xr-xapps/files_encryption/lib/keymanager.php365
-rw-r--r--apps/files_encryption/lib/proxy.php295
-rw-r--r--apps/files_encryption/lib/session.php66
-rw-r--r--apps/files_encryption/lib/stream.php464
-rw-r--r--apps/files_encryption/lib/util.php330
-rw-r--r--apps/files_encryption/settings-personal.php29
-rw-r--r--apps/files_encryption/settings.php19
-rw-r--r--apps/files_encryption/templates/settings-personal.php45
-rw-r--r--apps/files_encryption/templates/settings.php85
-rw-r--r--apps/files_encryption/test/binary (renamed from apps/files_encryption/tests/binary)bin9734 -> 9734 bytes
-rwxr-xr-xapps/files_encryption/test/crypt.php667
-rw-r--r--apps/files_encryption/test/keymanager.php132
-rw-r--r--apps/files_encryption/test/legacy-encrypted-text.txtbin0 -> 3360 bytes
-rw-r--r--apps/files_encryption/test/proxy.php220
-rw-r--r--apps/files_encryption/test/stream.php226
-rwxr-xr-xapps/files_encryption/test/util.php210
-rw-r--r--apps/files_encryption/test/zeros (renamed from apps/files_encryption/tests/zeros)bin10238 -> 10238 bytes
-rw-r--r--apps/files_encryption/tests/encryption.php72
-rw-r--r--apps/files_encryption/tests/proxy.php117
-rw-r--r--apps/files_encryption/tests/stream.php85
-rw-r--r--apps/files_external/l10n/th_TH.php2
-rw-r--r--apps/files_external/lib/amazons3.php2
-rwxr-xr-xapps/files_external/lib/config.php14
-rw-r--r--apps/files_external/lib/webdav.php6
-rw-r--r--apps/files_external/templates/settings.php6
-rw-r--r--apps/files_sharing/js/share.js2
-rw-r--r--apps/files_sharing/public.php12
-rw-r--r--apps/files_versions/history.php1
-rw-r--r--apps/files_versions/l10n/ar.php3
-rw-r--r--apps/files_versions/l10n/bg_BG.php2
-rw-r--r--apps/files_versions/l10n/bn_BD.php3
-rw-r--r--apps/files_versions/l10n/ca.php3
-rw-r--r--apps/files_versions/l10n/cs_CZ.php3
-rw-r--r--apps/files_versions/l10n/da.php3
-rw-r--r--apps/files_versions/l10n/de.php3
-rw-r--r--apps/files_versions/l10n/de_DE.php3
-rw-r--r--apps/files_versions/l10n/el.php3
-rw-r--r--apps/files_versions/l10n/eo.php3
-rw-r--r--apps/files_versions/l10n/es.php3
-rw-r--r--apps/files_versions/l10n/es_AR.php3
-rw-r--r--apps/files_versions/l10n/et_EE.php3
-rw-r--r--apps/files_versions/l10n/eu.php3
-rw-r--r--apps/files_versions/l10n/fi_FI.php3
-rw-r--r--apps/files_versions/l10n/fr.php3
-rw-r--r--apps/files_versions/l10n/gl.php3
-rw-r--r--apps/files_versions/l10n/he.php3
-rw-r--r--apps/files_versions/l10n/hu_HU.php3
-rw-r--r--apps/files_versions/l10n/id.php3
-rw-r--r--apps/files_versions/l10n/is.php3
-rw-r--r--apps/files_versions/l10n/it.php3
-rw-r--r--apps/files_versions/l10n/ja_JP.php3
-rw-r--r--apps/files_versions/l10n/ko.php3
-rw-r--r--apps/files_versions/l10n/ku_IQ.php3
-rw-r--r--apps/files_versions/l10n/lt_LT.php3
-rw-r--r--apps/files_versions/l10n/mk.php3
-rw-r--r--apps/files_versions/l10n/nb_NO.php2
-rw-r--r--apps/files_versions/l10n/nl.php3
-rw-r--r--apps/files_versions/l10n/pl.php3
-rw-r--r--apps/files_versions/l10n/pt_BR.php3
-rw-r--r--apps/files_versions/l10n/pt_PT.php3
-rw-r--r--apps/files_versions/l10n/ro.php3
-rw-r--r--apps/files_versions/l10n/ru.php3
-rw-r--r--apps/files_versions/l10n/ru_RU.php3
-rw-r--r--apps/files_versions/l10n/si_LK.php3
-rw-r--r--apps/files_versions/l10n/sk_SK.php3
-rw-r--r--apps/files_versions/l10n/sl.php3
-rw-r--r--apps/files_versions/l10n/sv.php3
-rw-r--r--apps/files_versions/l10n/ta_LK.php3
-rw-r--r--apps/files_versions/l10n/th_TH.php3
-rw-r--r--apps/files_versions/l10n/tr.php3
-rw-r--r--apps/files_versions/l10n/uk.php3
-rw-r--r--apps/files_versions/l10n/vi.php3
-rw-r--r--apps/files_versions/l10n/zh_CN.GB2312.php3
-rw-r--r--apps/files_versions/l10n/zh_CN.php3
-rw-r--r--apps/files_versions/l10n/zh_TW.php2
-rw-r--r--apps/files_versions/lib/versions.php7
-rw-r--r--apps/files_versions/templates/settings.php8
-rw-r--r--apps/user_ldap/css/settings.css4
-rw-r--r--apps/user_ldap/l10n/ar.php3
-rw-r--r--apps/user_ldap/l10n/ca.php5
-rw-r--r--apps/user_ldap/l10n/cs_CZ.php5
-rw-r--r--apps/user_ldap/l10n/de.php1
-rw-r--r--apps/user_ldap/l10n/de_DE.php5
-rw-r--r--apps/user_ldap/l10n/el.php1
-rw-r--r--apps/user_ldap/l10n/eo.php2
-rw-r--r--apps/user_ldap/l10n/es.php1
-rw-r--r--apps/user_ldap/l10n/es_AR.php1
-rw-r--r--apps/user_ldap/l10n/eu.php5
-rw-r--r--apps/user_ldap/l10n/fr.php1
-rw-r--r--apps/user_ldap/l10n/gl.php1
-rw-r--r--apps/user_ldap/l10n/hr.php3
-rw-r--r--apps/user_ldap/l10n/hu_HU.php6
-rw-r--r--apps/user_ldap/l10n/ia.php3
-rw-r--r--apps/user_ldap/l10n/it.php5
-rw-r--r--apps/user_ldap/l10n/ja_JP.php5
-rw-r--r--apps/user_ldap/l10n/ka_GE.php3
-rw-r--r--apps/user_ldap/l10n/ko.php1
-rw-r--r--apps/user_ldap/l10n/ku_IQ.php3
-rw-r--r--apps/user_ldap/l10n/lb.php3
-rw-r--r--apps/user_ldap/l10n/lv.php3
-rw-r--r--apps/user_ldap/l10n/mk.php3
-rw-r--r--apps/user_ldap/l10n/ms_MY.php3
-rw-r--r--apps/user_ldap/l10n/nl.php11
-rw-r--r--apps/user_ldap/l10n/nn_NO.php3
-rw-r--r--apps/user_ldap/l10n/oc.php3
-rw-r--r--apps/user_ldap/l10n/pl.php1
-rw-r--r--apps/user_ldap/l10n/pt_PT.php5
-rw-r--r--apps/user_ldap/l10n/ro.php1
-rw-r--r--apps/user_ldap/l10n/ru.php1
-rw-r--r--apps/user_ldap/l10n/ru_RU.php1
-rw-r--r--apps/user_ldap/l10n/sl.php1
-rw-r--r--apps/user_ldap/l10n/sr.php3
-rw-r--r--apps/user_ldap/l10n/sr@latin.php3
-rw-r--r--apps/user_ldap/l10n/sv.php5
-rw-r--r--apps/user_ldap/l10n/th_TH.php5
-rw-r--r--apps/user_ldap/l10n/uk.php1
-rw-r--r--apps/user_ldap/l10n/zh_CN.php2
-rw-r--r--apps/user_ldap/l10n/zh_TW.php2
-rw-r--r--apps/user_ldap/lib/access.php132
-rw-r--r--apps/user_ldap/lib/connection.php6
-rw-r--r--apps/user_ldap/templates/settings.php8
-rw-r--r--apps/user_webdavauth/l10n/bn_BD.php3
-rw-r--r--apps/user_webdavauth/l10n/ca.php3
-rw-r--r--apps/user_webdavauth/l10n/cs_CZ.php3
-rw-r--r--apps/user_webdavauth/l10n/da.php3
-rw-r--r--apps/user_webdavauth/l10n/de.php3
-rw-r--r--apps/user_webdavauth/l10n/de_DE.php3
-rw-r--r--apps/user_webdavauth/l10n/el.php3
-rw-r--r--apps/user_webdavauth/l10n/eo.php1
-rw-r--r--apps/user_webdavauth/l10n/es.php3
-rw-r--r--apps/user_webdavauth/l10n/es_AR.php3
-rw-r--r--apps/user_webdavauth/l10n/eu.php3
-rw-r--r--apps/user_webdavauth/l10n/fr.php3
-rw-r--r--apps/user_webdavauth/l10n/gl.php3
-rw-r--r--apps/user_webdavauth/l10n/hu_HU.php3
-rw-r--r--apps/user_webdavauth/l10n/is.php3
-rw-r--r--apps/user_webdavauth/l10n/it.php3
-rw-r--r--apps/user_webdavauth/l10n/ja_JP.php3
-rw-r--r--apps/user_webdavauth/l10n/ko.php3
-rw-r--r--apps/user_webdavauth/l10n/nl.php3
-rw-r--r--apps/user_webdavauth/l10n/pl.php4
-rw-r--r--apps/user_webdavauth/l10n/pt_PT.php3
-rw-r--r--apps/user_webdavauth/l10n/ro.php3
-rw-r--r--apps/user_webdavauth/l10n/sl.php3
-rw-r--r--apps/user_webdavauth/l10n/sv.php3
-rw-r--r--apps/user_webdavauth/l10n/th_TH.php4
-rw-r--r--apps/user_webdavauth/l10n/uk.php3
-rw-r--r--apps/user_webdavauth/l10n/zh_CN.php4
-rwxr-xr-xapps/user_webdavauth/templates/settings.php4
-rw-r--r--config/config.sample.php22
-rw-r--r--core/ajax/share.php2
-rw-r--r--core/css/styles.css5
-rw-r--r--core/js/js.js11
-rw-r--r--core/l10n/ar.php5
-rw-r--r--core/l10n/bn_BD.php4
-rw-r--r--core/l10n/ca.php5
-rw-r--r--core/l10n/cs_CZ.php5
-rw-r--r--core/l10n/da.php5
-rw-r--r--core/l10n/de.php5
-rw-r--r--core/l10n/de_DE.php5
-rw-r--r--core/l10n/el.php4
-rw-r--r--core/l10n/eo.php5
-rw-r--r--core/l10n/es.php5
-rw-r--r--core/l10n/es_AR.php4
-rw-r--r--core/l10n/et_EE.php4
-rw-r--r--core/l10n/eu.php4
-rw-r--r--core/l10n/fa.php1
-rw-r--r--core/l10n/fi_FI.php10
-rw-r--r--core/l10n/fr.php5
-rw-r--r--core/l10n/gl.php5
-rw-r--r--core/l10n/he.php5
-rw-r--r--core/l10n/hu_HU.php4
-rw-r--r--core/l10n/id.php5
-rw-r--r--core/l10n/is.php5
-rw-r--r--core/l10n/it.php5
-rw-r--r--core/l10n/ja_JP.php5
-rw-r--r--core/l10n/ka_GE.php4
-rw-r--r--core/l10n/ko.php5
-rw-r--r--core/l10n/lt_LT.php5
-rw-r--r--core/l10n/mk.php5
-rw-r--r--core/l10n/nb_NO.php4
-rw-r--r--core/l10n/nl.php5
-rw-r--r--core/l10n/pl.php5
-rw-r--r--core/l10n/pt_BR.php5
-rw-r--r--core/l10n/pt_PT.php5
-rw-r--r--core/l10n/ro.php5
-rw-r--r--core/l10n/ru.php5
-rw-r--r--core/l10n/ru_RU.php5
-rw-r--r--core/l10n/sk_SK.php12
-rw-r--r--core/l10n/sl.php5
-rw-r--r--core/l10n/sr.php5
-rw-r--r--core/l10n/sv.php5
-rw-r--r--core/l10n/ta_LK.php5
-rw-r--r--core/l10n/th_TH.php12
-rw-r--r--core/l10n/tr.php24
-rw-r--r--core/l10n/uk.php4
-rw-r--r--core/l10n/vi.php5
-rw-r--r--core/l10n/zh_CN.GB2312.php5
-rw-r--r--core/l10n/zh_CN.php5
-rw-r--r--core/l10n/zh_TW.php5
-rw-r--r--core/templates/installation.php8
-rw-r--r--core/templates/layout.base.php1
-rw-r--r--core/templates/layout.guest.php1
-rw-r--r--core/templates/layout.user.php6
-rw-r--r--core/templates/login.php86
-rw-r--r--core/templates/verify.php18
-rw-r--r--l10n/ar/core.po19
-rw-r--r--l10n/ar/files.po83
-rw-r--r--l10n/ar/files_encryption.po68
-rw-r--r--l10n/ar/files_versions.po18
-rw-r--r--l10n/ar/lib.po46
-rw-r--r--l10n/ar/user_ldap.po22
-rw-r--r--l10n/ar/user_webdavauth.po16
-rw-r--r--l10n/bg_BG/core.po19
-rw-r--r--l10n/bg_BG/files.po83
-rw-r--r--l10n/bg_BG/files_encryption.po72
-rw-r--r--l10n/bg_BG/files_versions.po18
-rw-r--r--l10n/bg_BG/lib.po36
-rw-r--r--l10n/bg_BG/settings.po6
-rw-r--r--l10n/bg_BG/user_ldap.po22
-rw-r--r--l10n/bg_BG/user_webdavauth.po16
-rw-r--r--l10n/bn_BD/core.po19
-rw-r--r--l10n/bn_BD/files.po87
-rw-r--r--l10n/bn_BD/files_encryption.po72
-rw-r--r--l10n/bn_BD/files_versions.po18
-rw-r--r--l10n/bn_BD/lib.po36
-rw-r--r--l10n/bn_BD/user_ldap.po22
-rw-r--r--l10n/bn_BD/user_webdavauth.po18
-rw-r--r--l10n/ca/core.po19
-rw-r--r--l10n/ca/files.po86
-rw-r--r--l10n/ca/files_encryption.po70
-rw-r--r--l10n/ca/files_versions.po18
-rw-r--r--l10n/ca/lib.po56
-rw-r--r--l10n/ca/user_ldap.po24
-rw-r--r--l10n/ca/user_webdavauth.po18
-rw-r--r--l10n/cs_CZ/core.po19
-rw-r--r--l10n/cs_CZ/files.po85
-rw-r--r--l10n/cs_CZ/files_encryption.po68
-rw-r--r--l10n/cs_CZ/files_versions.po18
-rw-r--r--l10n/cs_CZ/lib.po56
-rw-r--r--l10n/cs_CZ/user_ldap.po22
-rw-r--r--l10n/cs_CZ/user_webdavauth.po18
-rw-r--r--l10n/da/core.po19
-rw-r--r--l10n/da/files.po85
-rw-r--r--l10n/da/files_encryption.po68
-rw-r--r--l10n/da/files_versions.po18
-rw-r--r--l10n/da/lib.po48
-rw-r--r--l10n/da/user_ldap.po22
-rw-r--r--l10n/da/user_webdavauth.po18
-rw-r--r--l10n/de/core.po19
-rw-r--r--l10n/de/files.po89
-rw-r--r--l10n/de/files_encryption.po68
-rw-r--r--l10n/de/files_versions.po18
-rw-r--r--l10n/de/lib.po58
-rw-r--r--l10n/de/user_ldap.po24
-rw-r--r--l10n/de/user_webdavauth.po19
-rw-r--r--l10n/de_DE/core.po47
-rw-r--r--l10n/de_DE/files.po89
-rw-r--r--l10n/de_DE/files_encryption.po68
-rw-r--r--l10n/de_DE/files_versions.po18
-rw-r--r--l10n/de_DE/lib.po57
-rw-r--r--l10n/de_DE/user_ldap.po25
-rw-r--r--l10n/de_DE/user_webdavauth.po18
-rw-r--r--l10n/el/core.po50
-rw-r--r--l10n/el/files.po106
-rw-r--r--l10n/el/files_encryption.po70
-rw-r--r--l10n/el/files_versions.po18
-rw-r--r--l10n/el/lib.po57
-rw-r--r--l10n/el/settings.po15
-rw-r--r--l10n/el/user_ldap.po24
-rw-r--r--l10n/el/user_webdavauth.po19
-rw-r--r--l10n/eo/core.po19
-rw-r--r--l10n/eo/files.po104
-rw-r--r--l10n/eo/files_encryption.po70
-rw-r--r--l10n/eo/files_versions.po18
-rw-r--r--l10n/eo/lib.po56
-rw-r--r--l10n/eo/settings.po39
-rw-r--r--l10n/eo/user_ldap.po25
-rw-r--r--l10n/eo/user_webdavauth.po15
-rw-r--r--l10n/es/core.po19
-rw-r--r--l10n/es/files.po89
-rw-r--r--l10n/es/files_encryption.po70
-rw-r--r--l10n/es/files_versions.po18
-rw-r--r--l10n/es/lib.po57
-rw-r--r--l10n/es/user_ldap.po24
-rw-r--r--l10n/es/user_webdavauth.po19
-rw-r--r--l10n/es_AR/core.po23
-rw-r--r--l10n/es_AR/files.po101
-rw-r--r--l10n/es_AR/files_encryption.po68
-rw-r--r--l10n/es_AR/files_versions.po18
-rw-r--r--l10n/es_AR/lib.po57
-rw-r--r--l10n/es_AR/user_ldap.po24
-rw-r--r--l10n/es_AR/user_webdavauth.po18
-rw-r--r--l10n/et_EE/core.po19
-rw-r--r--l10n/et_EE/files.po85
-rw-r--r--l10n/et_EE/files_encryption.po70
-rw-r--r--l10n/et_EE/files_versions.po18
-rw-r--r--l10n/et_EE/lib.po54
-rw-r--r--l10n/et_EE/user_ldap.po20
-rw-r--r--l10n/et_EE/user_webdavauth.po14
-rw-r--r--l10n/eu/core.po50
-rw-r--r--l10n/eu/files.po102
-rw-r--r--l10n/eu/files_encryption.po70
-rw-r--r--l10n/eu/files_versions.po18
-rw-r--r--l10n/eu/lib.po55
-rw-r--r--l10n/eu/settings.po15
-rw-r--r--l10n/eu/user_ldap.po21
-rw-r--r--l10n/eu/user_webdavauth.po17
-rw-r--r--l10n/fa/core.po87
-rw-r--r--l10n/fa/files.po87
-rw-r--r--l10n/fa/files_encryption.po68
-rw-r--r--l10n/fa/files_versions.po18
-rw-r--r--l10n/fa/lib.po54
-rw-r--r--l10n/fa/user_ldap.po20
-rw-r--r--l10n/fa/user_webdavauth.po14
-rw-r--r--l10n/fi_FI/core.po29
-rw-r--r--l10n/fi_FI/files.po85
-rw-r--r--l10n/fi_FI/files_encryption.po70
-rw-r--r--l10n/fi_FI/files_versions.po18
-rw-r--r--l10n/fi_FI/lib.po56
-rw-r--r--l10n/fi_FI/user_ldap.po20
-rw-r--r--l10n/fi_FI/user_webdavauth.po14
-rw-r--r--l10n/fr/core.po19
-rw-r--r--l10n/fr/files.po87
-rw-r--r--l10n/fr/files_encryption.po70
-rw-r--r--l10n/fr/files_versions.po18
-rw-r--r--l10n/fr/lib.po56
-rw-r--r--l10n/fr/user_ldap.po24
-rw-r--r--l10n/fr/user_webdavauth.po18
-rw-r--r--l10n/gl/core.po21
-rw-r--r--l10n/gl/files.po87
-rw-r--r--l10n/gl/files_encryption.po68
-rw-r--r--l10n/gl/files_versions.po18
-rw-r--r--l10n/gl/lib.po58
-rw-r--r--l10n/gl/user_ldap.po24
-rw-r--r--l10n/gl/user_webdavauth.po19
-rw-r--r--l10n/he/core.po19
-rw-r--r--l10n/he/files.po85
-rw-r--r--l10n/he/files_encryption.po72
-rw-r--r--l10n/he/files_versions.po18
-rw-r--r--l10n/he/lib.po56
-rw-r--r--l10n/he/user_ldap.po22
-rw-r--r--l10n/he/user_webdavauth.po14
-rw-r--r--l10n/hi/core.po19
-rw-r--r--l10n/hi/files.po83
-rw-r--r--l10n/hi/files_encryption.po70
-rw-r--r--l10n/hi/files_versions.po18
-rw-r--r--l10n/hi/lib.po54
-rw-r--r--l10n/hi/user_ldap.po20
-rw-r--r--l10n/hi/user_webdavauth.po14
-rw-r--r--l10n/hr/core.po19
-rw-r--r--l10n/hr/files.po85
-rw-r--r--l10n/hr/files_encryption.po70
-rw-r--r--l10n/hr/files_versions.po18
-rw-r--r--l10n/hr/lib.po54
-rw-r--r--l10n/hr/user_ldap.po22
-rw-r--r--l10n/hr/user_webdavauth.po14
-rw-r--r--l10n/hu/core.po19
-rw-r--r--l10n/hu/files.po83
-rw-r--r--l10n/hu/files_versions.po18
-rw-r--r--l10n/hu/lib.po48
-rw-r--r--l10n/hu/user_ldap.po22
-rw-r--r--l10n/hu/user_webdavauth.po16
-rw-r--r--l10n/hu_HU/core.po50
-rw-r--r--l10n/hu_HU/files.po94
-rw-r--r--l10n/hu_HU/files_encryption.po72
-rw-r--r--l10n/hu_HU/files_versions.po18
-rw-r--r--l10n/hu_HU/lib.po50
-rw-r--r--l10n/hu_HU/user_ldap.po27
-rw-r--r--l10n/hu_HU/user_webdavauth.po18
-rw-r--r--l10n/ia/core.po19
-rw-r--r--l10n/ia/files.po83
-rw-r--r--l10n/ia/files_encryption.po70
-rw-r--r--l10n/ia/files_versions.po18
-rw-r--r--l10n/ia/lib.po54
-rw-r--r--l10n/ia/user_ldap.po22
-rw-r--r--l10n/ia/user_webdavauth.po14
-rw-r--r--l10n/id/core.po19
-rw-r--r--l10n/id/files.po85
-rw-r--r--l10n/id/files_encryption.po68
-rw-r--r--l10n/id/files_versions.po18
-rw-r--r--l10n/id/lib.po36
-rw-r--r--l10n/id/user_ldap.po20
-rw-r--r--l10n/id/user_webdavauth.po14
-rw-r--r--l10n/is/core.po19
-rw-r--r--l10n/is/files.po87
-rw-r--r--l10n/is/files_encryption.po72
-rw-r--r--l10n/is/files_versions.po18
-rw-r--r--l10n/is/lib.po48
-rw-r--r--l10n/is/user_ldap.po22
-rw-r--r--l10n/is/user_webdavauth.po18
-rw-r--r--l10n/it/core.po19
-rw-r--r--l10n/it/files.po85
-rw-r--r--l10n/it/files_encryption.po70
-rw-r--r--l10n/it/files_versions.po18
-rw-r--r--l10n/it/lib.po56
-rw-r--r--l10n/it/settings.po10
-rw-r--r--l10n/it/user_ldap.po24
-rw-r--r--l10n/it/user_webdavauth.po18
-rw-r--r--l10n/ja_JP/core.po19
-rw-r--r--l10n/ja_JP/files.po85
-rw-r--r--l10n/ja_JP/files_encryption.po70
-rw-r--r--l10n/ja_JP/files_versions.po18
-rw-r--r--l10n/ja_JP/lib.po57
-rw-r--r--l10n/ja_JP/user_ldap.po24
-rw-r--r--l10n/ja_JP/user_webdavauth.po18
-rw-r--r--l10n/ka_GE/core.po19
-rw-r--r--l10n/ka_GE/files.po85
-rw-r--r--l10n/ka_GE/files_encryption.po68
-rw-r--r--l10n/ka_GE/files_versions.po18
-rw-r--r--l10n/ka_GE/lib.po54
-rw-r--r--l10n/ka_GE/user_ldap.po22
-rw-r--r--l10n/ka_GE/user_webdavauth.po14
-rw-r--r--l10n/ko/core.po19
-rw-r--r--l10n/ko/files.po87
-rw-r--r--l10n/ko/files_encryption.po68
-rw-r--r--l10n/ko/files_versions.po18
-rw-r--r--l10n/ko/lib.po56
-rw-r--r--l10n/ko/user_ldap.po24
-rw-r--r--l10n/ko/user_webdavauth.po18
-rw-r--r--l10n/ku_IQ/core.po19
-rw-r--r--l10n/ku_IQ/files.po83
-rw-r--r--l10n/ku_IQ/files_encryption.po68
-rw-r--r--l10n/ku_IQ/files_versions.po18
-rw-r--r--l10n/ku_IQ/lib.po54
-rw-r--r--l10n/ku_IQ/user_ldap.po22
-rw-r--r--l10n/ku_IQ/user_webdavauth.po14
-rw-r--r--l10n/lb/core.po19
-rw-r--r--l10n/lb/files.po85
-rw-r--r--l10n/lb/files_encryption.po70
-rw-r--r--l10n/lb/files_versions.po18
-rw-r--r--l10n/lb/lib.po58
-rw-r--r--l10n/lb/user_ldap.po22
-rw-r--r--l10n/lb/user_webdavauth.po14
-rw-r--r--l10n/lt_LT/core.po19
-rw-r--r--l10n/lt_LT/files.po85
-rw-r--r--l10n/lt_LT/files_encryption.po70
-rw-r--r--l10n/lt_LT/files_versions.po18
-rw-r--r--l10n/lt_LT/lib.po54
-rw-r--r--l10n/lt_LT/user_ldap.po20
-rw-r--r--l10n/lt_LT/user_webdavauth.po14
-rw-r--r--l10n/lv/core.po19
-rw-r--r--l10n/lv/files.po85
-rw-r--r--l10n/lv/files_encryption.po70
-rw-r--r--l10n/lv/files_versions.po18
-rw-r--r--l10n/lv/lib.po54
-rw-r--r--l10n/lv/user_ldap.po22
-rw-r--r--l10n/lv/user_webdavauth.po14
-rw-r--r--l10n/mk/core.po19
-rw-r--r--l10n/mk/files.po85
-rw-r--r--l10n/mk/files_encryption.po68
-rw-r--r--l10n/mk/files_versions.po18
-rw-r--r--l10n/mk/lib.po56
-rw-r--r--l10n/mk/user_ldap.po24
-rw-r--r--l10n/mk/user_webdavauth.po16
-rw-r--r--l10n/ms_MY/core.po19
-rw-r--r--l10n/ms_MY/files.po85
-rw-r--r--l10n/ms_MY/files_encryption.po70
-rw-r--r--l10n/ms_MY/files_versions.po18
-rw-r--r--l10n/ms_MY/lib.po56
-rw-r--r--l10n/ms_MY/user_ldap.po22
-rw-r--r--l10n/ms_MY/user_webdavauth.po14
-rw-r--r--l10n/nb_NO/core.po19
-rw-r--r--l10n/nb_NO/files.po85
-rw-r--r--l10n/nb_NO/files_encryption.po70
-rw-r--r--l10n/nb_NO/files_versions.po18
-rw-r--r--l10n/nb_NO/lib.po48
-rw-r--r--l10n/nb_NO/user_ldap.po20
-rw-r--r--l10n/nb_NO/user_webdavauth.po16
-rw-r--r--l10n/nl/core.po19
-rw-r--r--l10n/nl/files.po96
-rw-r--r--l10n/nl/files_encryption.po70
-rw-r--r--l10n/nl/files_versions.po18
-rw-r--r--l10n/nl/lib.po57
-rw-r--r--l10n/nl/user_ldap.po31
-rw-r--r--l10n/nl/user_webdavauth.po18
-rw-r--r--l10n/nn_NO/core.po19
-rw-r--r--l10n/nn_NO/files.po83
-rw-r--r--l10n/nn_NO/files_encryption.po70
-rw-r--r--l10n/nn_NO/files_versions.po18
-rw-r--r--l10n/nn_NO/lib.po54
-rw-r--r--l10n/nn_NO/user_ldap.po22
-rw-r--r--l10n/nn_NO/user_webdavauth.po14
-rw-r--r--l10n/oc/core.po19
-rw-r--r--l10n/oc/files.po85
-rw-r--r--l10n/oc/files_encryption.po68
-rw-r--r--l10n/oc/files_versions.po18
-rw-r--r--l10n/oc/lib.po54
-rw-r--r--l10n/oc/user_ldap.po22
-rw-r--r--l10n/oc/user_webdavauth.po14
-rw-r--r--l10n/pl/core.po19
-rw-r--r--l10n/pl/files.po92
-rw-r--r--l10n/pl/files_encryption.po70
-rw-r--r--l10n/pl/files_versions.po18
-rw-r--r--l10n/pl/lib.po56
-rw-r--r--l10n/pl/settings.po9
-rw-r--r--l10n/pl/user_ldap.po24
-rw-r--r--l10n/pl/user_webdavauth.po19
-rw-r--r--l10n/pl_PL/core.po19
-rw-r--r--l10n/pl_PL/files.po83
-rw-r--r--l10n/pl_PL/files_encryption.po70
-rw-r--r--l10n/pl_PL/files_versions.po18
-rw-r--r--l10n/pl_PL/lib.po54
-rw-r--r--l10n/pl_PL/user_ldap.po20
-rw-r--r--l10n/pl_PL/user_webdavauth.po14
-rw-r--r--l10n/pt_BR/core.po19
-rw-r--r--l10n/pt_BR/files.po85
-rw-r--r--l10n/pt_BR/files_encryption.po68
-rw-r--r--l10n/pt_BR/files_versions.po18
-rw-r--r--l10n/pt_BR/lib.po56
-rw-r--r--l10n/pt_BR/settings.po9
-rw-r--r--l10n/pt_BR/user_ldap.po20
-rw-r--r--l10n/pt_BR/user_webdavauth.po14
-rw-r--r--l10n/pt_PT/core.po19
-rw-r--r--l10n/pt_PT/files.po86
-rw-r--r--l10n/pt_PT/files_encryption.po68
-rw-r--r--l10n/pt_PT/files_versions.po18
-rw-r--r--l10n/pt_PT/lib.po56
-rw-r--r--l10n/pt_PT/user_ldap.po24
-rw-r--r--l10n/pt_PT/user_webdavauth.po18
-rw-r--r--l10n/ro/core.po19
-rw-r--r--l10n/ro/files.po91
-rw-r--r--l10n/ro/files_encryption.po68
-rw-r--r--l10n/ro/files_versions.po18
-rw-r--r--l10n/ro/lib.po48
-rw-r--r--l10n/ro/user_ldap.po24
-rw-r--r--l10n/ro/user_webdavauth.po18
-rw-r--r--l10n/ru/core.po21
-rw-r--r--l10n/ru/files.po87
-rw-r--r--l10n/ru/files_encryption.po70
-rw-r--r--l10n/ru/files_versions.po18
-rw-r--r--l10n/ru/lib.po56
-rw-r--r--l10n/ru/user_ldap.po24
-rw-r--r--l10n/ru/user_webdavauth.po16
-rw-r--r--l10n/ru_RU/core.po19
-rw-r--r--l10n/ru_RU/files.po85
-rw-r--r--l10n/ru_RU/files_encryption.po68
-rw-r--r--l10n/ru_RU/files_versions.po18
-rw-r--r--l10n/ru_RU/lib.po56
-rw-r--r--l10n/ru_RU/user_ldap.po24
-rw-r--r--l10n/ru_RU/user_webdavauth.po16
-rw-r--r--l10n/si_LK/core.po19
-rw-r--r--l10n/si_LK/files.po85
-rw-r--r--l10n/si_LK/files_encryption.po68
-rw-r--r--l10n/si_LK/files_versions.po18
-rw-r--r--l10n/si_LK/lib.po54
-rw-r--r--l10n/si_LK/user_ldap.po20
-rw-r--r--l10n/si_LK/user_webdavauth.po14
-rw-r--r--l10n/sk_SK/core.po40
-rw-r--r--l10n/sk_SK/files.po85
-rw-r--r--l10n/sk_SK/files_encryption.po68
-rw-r--r--l10n/sk_SK/files_versions.po18
-rw-r--r--l10n/sk_SK/lib.po56
-rw-r--r--l10n/sk_SK/user_ldap.po20
-rw-r--r--l10n/sk_SK/user_webdavauth.po14
-rw-r--r--l10n/sl/core.po19
-rw-r--r--l10n/sl/files.po85
-rw-r--r--l10n/sl/files_encryption.po68
-rw-r--r--l10n/sl/files_versions.po18
-rw-r--r--l10n/sl/lib.po56
-rw-r--r--l10n/sl/user_ldap.po24
-rw-r--r--l10n/sl/user_webdavauth.po18
-rw-r--r--l10n/sq/core.po19
-rw-r--r--l10n/sq/files.po83
-rw-r--r--l10n/sq/files_versions.po18
-rw-r--r--l10n/sq/lib.po56
-rw-r--r--l10n/sq/user_ldap.po20
-rw-r--r--l10n/sq/user_webdavauth.po14
-rw-r--r--l10n/sr/core.po19
-rw-r--r--l10n/sr/files.po85
-rw-r--r--l10n/sr/files_encryption.po68
-rw-r--r--l10n/sr/files_versions.po18
-rw-r--r--l10n/sr/lib.po56
-rw-r--r--l10n/sr/user_ldap.po22
-rw-r--r--l10n/sr/user_webdavauth.po14
-rw-r--r--l10n/sr@latin/core.po19
-rw-r--r--l10n/sr@latin/files.po83
-rw-r--r--l10n/sr@latin/files_encryption.po70
-rw-r--r--l10n/sr@latin/files_versions.po18
-rw-r--r--l10n/sr@latin/lib.po54
-rw-r--r--l10n/sr@latin/user_ldap.po22
-rw-r--r--l10n/sr@latin/user_webdavauth.po14
-rw-r--r--l10n/sv/core.po19
-rw-r--r--l10n/sv/files.po93
-rw-r--r--l10n/sv/files_encryption.po70
-rw-r--r--l10n/sv/files_versions.po18
-rw-r--r--l10n/sv/lib.po56
-rw-r--r--l10n/sv/user_ldap.po24
-rw-r--r--l10n/sv/user_webdavauth.po18
-rw-r--r--l10n/ta_LK/core.po19
-rw-r--r--l10n/ta_LK/files.po85
-rw-r--r--l10n/ta_LK/files_encryption.po68
-rw-r--r--l10n/ta_LK/files_versions.po18
-rw-r--r--l10n/ta_LK/lib.po56
-rw-r--r--l10n/ta_LK/user_ldap.po20
-rw-r--r--l10n/ta_LK/user_webdavauth.po14
-rw-r--r--l10n/templates/core.pot83
-rw-r--r--l10n/templates/files.pot81
-rw-r--r--l10n/templates/files_encryption.pot64
-rw-r--r--l10n/templates/files_external.pot2
-rw-r--r--l10n/templates/files_sharing.pot2
-rw-r--r--l10n/templates/files_versions.pot14
-rw-r--r--l10n/templates/lib.pot32
-rw-r--r--l10n/templates/settings.pot2
-rw-r--r--l10n/templates/user_ldap.pot18
-rw-r--r--l10n/templates/user_webdavauth.pot11
-rw-r--r--l10n/th_TH/core.po107
-rw-r--r--l10n/th_TH/files.po105
-rw-r--r--l10n/th_TH/files_encryption.po70
-rw-r--r--l10n/th_TH/files_external.po18
-rw-r--r--l10n/th_TH/files_versions.po18
-rw-r--r--l10n/th_TH/lib.po56
-rw-r--r--l10n/th_TH/settings.po42
-rw-r--r--l10n/th_TH/user_ldap.po28
-rw-r--r--l10n/th_TH/user_webdavauth.po22
-rw-r--r--l10n/tr/core.po132
-rw-r--r--l10n/tr/files.po104
-rw-r--r--l10n/tr/files_encryption.po72
-rw-r--r--l10n/tr/files_versions.po18
-rw-r--r--l10n/tr/lib.po49
-rw-r--r--l10n/tr/user_ldap.po22
-rw-r--r--l10n/tr/user_webdavauth.po16
-rw-r--r--l10n/uk/core.po50
-rw-r--r--l10n/uk/files.po85
-rw-r--r--l10n/uk/files_encryption.po68
-rw-r--r--l10n/uk/files_versions.po18
-rw-r--r--l10n/uk/lib.po57
-rw-r--r--l10n/uk/settings.po16
-rw-r--r--l10n/uk/user_ldap.po24
-rw-r--r--l10n/uk/user_webdavauth.po18
-rw-r--r--l10n/vi/core.po19
-rw-r--r--l10n/vi/files.po85
-rw-r--r--l10n/vi/files_encryption.po68
-rw-r--r--l10n/vi/files_versions.po18
-rw-r--r--l10n/vi/lib.po56
-rw-r--r--l10n/vi/user_ldap.po20
-rw-r--r--l10n/vi/user_webdavauth.po14
-rw-r--r--l10n/zh_CN.GB2312/core.po19
-rw-r--r--l10n/zh_CN.GB2312/files.po85
-rw-r--r--l10n/zh_CN.GB2312/files_encryption.po68
-rw-r--r--l10n/zh_CN.GB2312/files_versions.po18
-rw-r--r--l10n/zh_CN.GB2312/lib.po54
-rw-r--r--l10n/zh_CN.GB2312/user_ldap.po20
-rw-r--r--l10n/zh_CN.GB2312/user_webdavauth.po14
-rw-r--r--l10n/zh_CN/core.po52
-rw-r--r--l10n/zh_CN/files.po105
-rw-r--r--l10n/zh_CN/files_encryption.po68
-rw-r--r--l10n/zh_CN/files_versions.po18
-rw-r--r--l10n/zh_CN/lib.po56
-rw-r--r--l10n/zh_CN/settings.po16
-rw-r--r--l10n/zh_CN/user_ldap.po25
-rw-r--r--l10n/zh_CN/user_webdavauth.po20
-rw-r--r--l10n/zh_HK/core.po19
-rw-r--r--l10n/zh_HK/files.po83
-rw-r--r--l10n/zh_HK/files_encryption.po68
-rw-r--r--l10n/zh_HK/files_versions.po18
-rw-r--r--l10n/zh_HK/lib.po56
-rw-r--r--l10n/zh_HK/user_ldap.po20
-rw-r--r--l10n/zh_HK/user_webdavauth.po14
-rw-r--r--l10n/zh_TW/core.po19
-rw-r--r--l10n/zh_TW/files.po87
-rw-r--r--l10n/zh_TW/files_encryption.po70
-rw-r--r--l10n/zh_TW/files_versions.po18
-rw-r--r--l10n/zh_TW/lib.po56
-rw-r--r--l10n/zh_TW/user_ldap.po24
-rw-r--r--l10n/zh_TW/user_webdavauth.po14
-rw-r--r--l10n/zu_ZA/core.po19
-rw-r--r--l10n/zu_ZA/files.po83
-rw-r--r--l10n/zu_ZA/files_versions.po18
-rw-r--r--l10n/zu_ZA/lib.po54
-rw-r--r--l10n/zu_ZA/user_ldap.po20
-rw-r--r--l10n/zu_ZA/user_webdavauth.po14
-rw-r--r--lib/MDB2/Driver/sqlite3.php2
-rw-r--r--lib/api.php29
-rw-r--r--lib/app.php8
-rw-r--r--lib/backgroundjob.php2
-rw-r--r--lib/base.php1375
-rw-r--r--lib/cache/apc.php2
-rw-r--r--lib/connector/sabre/node.php6
-rw-r--r--lib/db.php36
-rw-r--r--lib/filecache.php15
-rw-r--r--lib/fileproxy/quota.php2
-rw-r--r--lib/files.php2
-rw-r--r--lib/filestorage/local.php2
-rw-r--r--lib/filesystem.php14
-rw-r--r--lib/filesystemview.php44
-rw-r--r--lib/helper.php58
-rw-r--r--lib/image.php2
-rw-r--r--lib/json.php21
-rw-r--r--lib/l10n.php18
-rw-r--r--lib/l10n/ca.php1
-rw-r--r--lib/l10n/cs_CZ.php1
-rw-r--r--lib/l10n/de.php1
-rw-r--r--lib/l10n/de_DE.php1
-rw-r--r--lib/l10n/el.php1
-rw-r--r--lib/l10n/es.php1
-rw-r--r--lib/l10n/es_AR.php1
-rw-r--r--lib/l10n/eu.php1
-rw-r--r--lib/l10n/fi_FI.php1
-rw-r--r--lib/l10n/gl.php1
-rw-r--r--lib/l10n/hu_HU.php3
-rw-r--r--lib/l10n/it.php1
-rw-r--r--lib/l10n/ja_JP.php1
-rw-r--r--lib/l10n/lb.php2
-rw-r--r--lib/l10n/ms_MY.php1
-rw-r--r--lib/l10n/nl.php1
-rw-r--r--lib/l10n/pt_PT.php1
-rw-r--r--lib/l10n/sv.php1
-rw-r--r--lib/l10n/th_TH.php1
-rw-r--r--lib/l10n/tr.php1
-rw-r--r--lib/l10n/uk.php1
-rw-r--r--lib/log.php4
-rw-r--r--lib/migrate.php4
-rw-r--r--lib/migration/content.php2
-rw-r--r--lib/mimetypes.list.php2
-rw-r--r--lib/ocs/cloud.php14
-rw-r--r--lib/ocs/config.php4
-rw-r--r--lib/ocs/person.php2
-rw-r--r--lib/ocs/privatedata.php4
-rw-r--r--lib/ocs/result.php14
-rw-r--r--lib/ocsclient.php14
-rw-r--r--lib/public/api.php4
-rw-r--r--lib/public/app.php7
-rw-r--r--lib/public/constants.php1
-rw-r--r--lib/public/db.php6
-rw-r--r--lib/public/files.php3
-rw-r--r--lib/public/response.php14
-rw-r--r--lib/public/share.php10
-rw-r--r--lib/public/user.php6
-rw-r--r--lib/public/util.php14
-rwxr-xr-xlib/request.php4
-rw-r--r--lib/router.php22
-rw-r--r--lib/setup.php46
-rw-r--r--lib/subadmin.php7
-rw-r--r--lib/template.php22
-rw-r--r--lib/templatelayout.php17
-rw-r--r--lib/user.php18
-rwxr-xr-xlib/util.php52
-rw-r--r--lib/vcategories.php1
-rw-r--r--ocs/routes.php2
-rw-r--r--settings/ajax/changepassword.php6
-rw-r--r--settings/ajax/createuser.php4
-rw-r--r--settings/ajax/removeuser.php2
-rw-r--r--settings/ajax/setquota.php2
-rw-r--r--settings/ajax/togglegroups.php8
-rw-r--r--settings/ajax/userlist.php2
-rw-r--r--settings/help.php2
-rw-r--r--settings/l10n/bg_BG.php1
-rw-r--r--settings/l10n/el.php4
-rw-r--r--settings/l10n/eo.php16
-rw-r--r--settings/l10n/eu.php4
-rw-r--r--settings/l10n/it.php2
-rw-r--r--settings/l10n/pl.php2
-rw-r--r--settings/l10n/pt_BR.php2
-rw-r--r--settings/l10n/th_TH.php17
-rw-r--r--settings/l10n/uk.php4
-rw-r--r--settings/l10n/zh_CN.php4
-rw-r--r--settings/settings.php1
-rw-r--r--settings/templates/admin.php282
-rw-r--r--settings/templates/apps.php2
-rw-r--r--settings/templates/help.php22
-rw-r--r--settings/templates/personal.php2
-rw-r--r--settings/templates/users.php30
-rw-r--r--settings/users.php13
-rw-r--r--tests/enable_all.php3
-rw-r--r--tests/lib/filestorage/commontest.php1
-rw-r--r--tests/lib/filestorage/local.php1
-rw-r--r--tests/lib/template.php4
-rw-r--r--tests/phpunit.xml3
898 files changed, 17202 insertions, 11054 deletions
diff --git a/apps/files/ajax/autocomplete.php b/apps/files/ajax/autocomplete.php
deleted file mode 100644
index b32ba7c3d5b..00000000000
--- a/apps/files/ajax/autocomplete.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-//provide auto completion of paths for use with jquer ui autocomplete
-
-
-// Init owncloud
-
-
-OCP\JSON::checkLoggedIn();
-
-// Get data
-$query = $_GET['term'];
-$dirOnly=(isset($_GET['dironly']))?($_GET['dironly']=='true'):false;
-
-if($query[0]!='/') {
- $query='/'.$query;
-}
-
-if(substr($query, -1, 1)=='/') {
- $base=$query;
-} else {
- $base=dirname($query);
-}
-
-$query=substr($query, strlen($base));
-
-if($base!='/') {
- $query=substr($query, 1);
-}
-$queryLen=strlen($query);
-$query=strtolower($query);
-
-// echo "$base - $query";
-
-$files=array();
-
-if(OC_Filesystem::file_exists($base) and OC_Filesystem::is_dir($base)) {
- $dh = OC_Filesystem::opendir($base);
- if($dh) {
- if(substr($base, -1, 1)!='/') {
- $base=$base.'/';
- }
- while (($file = readdir($dh)) !== false) {
- if ($file != "." && $file != "..") {
- if(substr(strtolower($file), 0, $queryLen)==$query) {
- $item=$base.$file;
- if((!$dirOnly or OC_Filesystem::is_dir($item))) {
- $files[]=(object)array('id'=>$item, 'label'=>$item, 'name'=>$item);
- }
- }
- }
- }
- }
-}
-OCP\JSON::encodedPrint($files);
diff --git a/apps/files/ajax/delete.php b/apps/files/ajax/delete.php
index 6532b76df21..293543c547f 100644
--- a/apps/files/ajax/delete.php
+++ b/apps/files/ajax/delete.php
@@ -21,8 +21,20 @@ foreach($files as $file) {
}
}
+// updated max file size after upload
+$l=new OC_L10N('files');
+$maxUploadFilesize=OCP\Util::maxUploadFilesize($dir);
+$maxHumanFilesize=OCP\Util::humanFileSize($maxUploadFilesize);
+$maxHumanFilesize=$l->t('Upload') . ' max. '.$maxHumanFilesize;
+
if($success) {
- OCP\JSON::success(array("data" => array( "dir" => $dir, "files" => $files )));
+ OCP\JSON::success(array("data" => array( "dir" => $dir, "files" => $files,
+ 'uploadMaxFilesize'=>$maxUploadFilesize,
+ 'maxHumanFilesize'=>$maxHumanFilesize
+ )));
} else {
- OCP\JSON::error(array("data" => array( "message" => "Could not delete:\n" . $filesWithError )));
+ OCP\JSON::error(array("data" => array( "message" => "Could not delete:\n" . $filesWithError,
+ 'uploadMaxFilesize'=>$maxUploadFilesize,
+ 'maxHumanFilesize'=>$maxHumanFilesize
+ )));
}
diff --git a/apps/files/ajax/getstoragestats.php b/apps/files/ajax/getstoragestats.php
new file mode 100644
index 00000000000..e55e346ed67
--- /dev/null
+++ b/apps/files/ajax/getstoragestats.php
@@ -0,0 +1,16 @@
+<?php
+
+// only need filesystem apps
+$RUNTIME_APPTYPES = array('filesystem');
+
+OCP\JSON::checkLoggedIn();
+
+$l=new OC_L10N('files');
+$maxUploadFilesize = OCP\Util::maxUploadFilesize($dir);
+$maxHumanFilesize = OCP\Util::humanFileSize($maxUploadFilesize);
+$maxHumanFilesize = $l->t('Upload') . ' max. ' . $maxHumanFilesize;
+
+// send back json
+OCP\JSON::success(array('data' => array('uploadMaxFilesize' => $maxUploadFilesize,
+ 'maxHumanFilesize' => $maxHumanFilesize
+)));
diff --git a/apps/files/ajax/scan.php b/apps/files/ajax/scan.php
index 5cd9572d7f9..a819578e309 100644
--- a/apps/files/ajax/scan.php
+++ b/apps/files/ajax/scan.php
@@ -6,13 +6,14 @@ $force=isset($_GET['force']) and $_GET['force']=='true';
$dir=isset($_GET['dir'])?$_GET['dir']:'';
$checkOnly=isset($_GET['checkonly']) and $_GET['checkonly']=='true';
+$eventSource=false;
if(!$checkOnly) {
$eventSource=new OC_EventSource();
}
session_write_close();
-//create the file cache if necesary
+//create the file cache if necessary
if($force or !OC_FileCache::inCache('')) {
if(!$checkOnly) {
OCP\DB::beginTransaction();
diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php
index 2a2d935da6c..93398019608 100644
--- a/apps/files/ajax/upload.php
+++ b/apps/files/ajax/upload.php
@@ -10,8 +10,17 @@ OCP\JSON::checkLoggedIn();
OCP\JSON::callCheck();
$l=OC_L10N::get('files');
+// current max upload size
+$l=new OC_L10N('files');
+$maxUploadFilesize=OCP\Util::maxUploadFilesize($dir);
+$maxHumanFilesize=OCP\Util::humanFileSize($maxUploadFilesize);
+$maxHumanFilesize=$l->t('Upload') . ' max. '.$maxHumanFilesize;
+
if (!isset($_FILES['files'])) {
- OCP\JSON::error(array('data' => array( 'message' => $l->t( 'No file was uploaded. Unknown error' ))));
+ OCP\JSON::error(array('data' => array( 'message' => $l->t( 'No file was uploaded. Unknown error' ),
+ 'uploadMaxFilesize'=>$maxUploadFilesize,
+ 'maxHumanFilesize'=>$maxHumanFilesize
+ )));
exit();
}
@@ -28,7 +37,10 @@ foreach ($_FILES['files']['error'] as $error) {
UPLOAD_ERR_NO_TMP_DIR=>$l->t('Missing a temporary folder'),
UPLOAD_ERR_CANT_WRITE=>$l->t('Failed to write to disk'),
);
- OCP\JSON::error(array('data' => array( 'message' => $errors[$error] )));
+ OCP\JSON::error(array('data' => array( 'message' => $errors[$error],
+ 'uploadMaxFilesize'=>$maxUploadFilesize,
+ 'maxHumanFilesize'=>$maxHumanFilesize
+ )));
exit();
}
}
@@ -42,7 +54,9 @@ foreach($files['size'] as $size) {
$totalSize+=$size;
}
if($totalSize>OC_Filesystem::free_space($dir)) {
- OCP\JSON::error(array('data' => array( 'message' => $l->t( 'Not enough space available' ))));
+ OCP\JSON::error(array('data' => array( 'message' => $l->t( 'Not enough space available' ),
+ 'uploadMaxFilesize'=>$maxUploadFilesize,
+ 'maxHumanFilesize'=>$maxHumanFilesize)));
exit();
}
@@ -56,11 +70,19 @@ if(strpos($dir, '..') === false) {
if(is_uploaded_file($files['tmp_name'][$i]) and OC_Filesystem::fromTmpFile($files['tmp_name'][$i], $target)) {
$meta = OC_FileCache::get($target);
$id = OC_FileCache::getId($target);
+ // updated max file size after upload
+ $maxUploadFilesize=OCP\Util::maxUploadFilesize($dir);
+ $maxHumanFilesize=OCP\Util::humanFileSize($maxUploadFilesize);
+ $maxHumanFilesize=$l->t('Upload') . ' max. '.$maxHumanFilesize;
+
$result[]=array( 'status' => 'success',
'mime'=>$meta['mimetype'],
'size'=>$meta['size'],
'id'=>$id,
- 'name'=>basename($target));
+ 'name'=>basename($target),
+ 'uploadMaxFilesize'=>$maxUploadFilesize,
+ 'maxHumanFilesize'=>$maxHumanFilesize
+ );
}
}
OCP\JSON::encodedPrint($result);
@@ -69,4 +91,7 @@ if(strpos($dir, '..') === false) {
$error=$l->t( 'Invalid directory.' );
}
-OCP\JSON::error(array('data' => array('message' => $error )));
+OCP\JSON::error(array('data' => array('message' => $error,
+ 'uploadMaxFilesize'=>$maxUploadFilesize,
+ 'maxHumanFilesize'=>$maxHumanFilesize
+)));
diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index 36a1e5c954b..0c97b009b88 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -23,7 +23,7 @@
#new>ul>li>p { cursor:pointer; }
#new>ul>li>form>input { padding:0.3em; margin:-0.3em; }
-#upload {
+#upload {
height:27px; padding:0; margin-left:0.2em; overflow:hidden;
}
#upload a {
@@ -35,7 +35,7 @@
}
.file_upload_target { display:none; }
.file_upload_form { display:inline; float:left; margin:0; padding:0; cursor:pointer; overflow:visible; }
-#file_upload_start {
+#file_upload_start {
left:0; top:0; width:28px; height:27px; padding:0;
font-size:1em;
-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter:alpha(opacity=0); opacity:0;
diff --git a/apps/files/index.php b/apps/files/index.php
index b64bde44cc0..1c4b7fbd497 100644
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@ -28,6 +28,7 @@ OCP\User::checkLoggedIn();
OCP\Util::addStyle('files', 'files');
OCP\Util::addscript('files', 'jquery.iframe-transport');
OCP\Util::addscript('files', 'jquery.fileupload');
+OCP\Util::addscript('files', 'jquery-visibility');
OCP\Util::addscript('files', 'files');
OCP\Util::addscript('files', 'filelist');
OCP\Util::addscript('files', 'fileactions');
@@ -38,36 +39,36 @@ OCP\App::setActiveNavigationEntry('files_index');
$dir = isset($_GET['dir']) ? stripslashes($_GET['dir']) : '';
// Redirect if directory does not exist
if (!OC_Filesystem::is_dir($dir . '/')) {
- header('Location: ' . $_SERVER['SCRIPT_NAME'] . '');
- exit();
+ header('Location: ' . $_SERVER['SCRIPT_NAME'] . '');
+ exit();
}
$files = array();
foreach (OC_Files::getdirectorycontent($dir) as $i) {
- $i['date'] = OCP\Util::formatDate($i['mtime']);
- if ($i['type'] == 'file') {
- $fileinfo = pathinfo($i['name']);
- $i['basename'] = $fileinfo['filename'];
- if (!empty($fileinfo['extension'])) {
- $i['extension'] = '.' . $fileinfo['extension'];
- } else {
- $i['extension'] = '';
- }
- }
- if ($i['directory'] == '/') {
- $i['directory'] = '';
- }
- $files[] = $i;
+ $i['date'] = OCP\Util::formatDate($i['mtime']);
+ if ($i['type'] == 'file') {
+ $fileinfo = pathinfo($i['name']);
+ $i['basename'] = $fileinfo['filename'];
+ if (!empty($fileinfo['extension'])) {
+ $i['extension'] = '.' . $fileinfo['extension'];
+ } else {
+ $i['extension'] = '';
+ }
+ }
+ if ($i['directory'] == '/') {
+ $i['directory'] = '';
+ }
+ $files[] = $i;
}
// Make breadcrumb
$breadcrumb = array();
$pathtohere = '';
foreach (explode('/', $dir) as $i) {
- if ($i != '') {
- $pathtohere .= '/' . $i;
- $breadcrumb[] = array('dir' => $pathtohere, 'name' => $i);
- }
+ if ($i != '') {
+ $pathtohere .= '/' . $i;
+ $breadcrumb[] = array('dir' => $pathtohere, 'name' => $i);
+ }
}
// make breadcrumb und filelist markup
@@ -79,23 +80,17 @@ $breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', '');
$breadcrumbNav->assign('breadcrumb', $breadcrumb, false);
$breadcrumbNav->assign('baseURL', OCP\Util::linkTo('files', 'index.php') . '?dir=', false);
-$upload_max_filesize = OCP\Util::computerFileSize(ini_get('upload_max_filesize'));
-$post_max_size = OCP\Util::computerFileSize(ini_get('post_max_size'));
-$maxUploadFilesize = min($upload_max_filesize, $post_max_size);
-
-$freeSpace = OC_Filesystem::free_space($dir);
-$freeSpace = max($freeSpace, 0);
-$maxUploadFilesize = min($maxUploadFilesize, $freeSpace);
+$maxUploadFilesize=OCP\Util::maxUploadFilesize($dir);
$permissions = OCP\PERMISSION_READ;
if (OC_Filesystem::isUpdatable($dir . '/')) {
- $permissions |= OCP\PERMISSION_UPDATE;
+ $permissions |= OCP\PERMISSION_UPDATE;
}
if (OC_Filesystem::isDeletable($dir . '/')) {
- $permissions |= OCP\PERMISSION_DELETE;
+ $permissions |= OCP\PERMISSION_DELETE;
}
if (OC_Filesystem::isSharable($dir . '/')) {
- $permissions |= OCP\PERMISSION_SHARE;
+ $permissions |= OCP\PERMISSION_SHARE;
}
$tmpl = new OCP\Template('files', 'index', 'user');
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index 80b9c01f838..f5ee363a4c8 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -70,23 +70,23 @@ var FileActions = {
}
parent.children('a.name').append('<span class="fileactions" />');
var defaultAction = FileActions.getDefault(FileActions.getCurrentMimeType(), FileActions.getCurrentType(), FileActions.getCurrentPermissions());
-
+
var actionHandler = function (event) {
event.stopPropagation();
event.preventDefault();
FileActions.currentFile = event.data.elem;
var file = FileActions.getCurrentFile();
-
+
event.data.actionFunc(file);
};
-
+
$.each(actions, function (name, action) {
// NOTE: Temporary fix to prevent rename action in root of Shared directory
if (name === 'Rename' && $('#dir').val() === '/Shared') {
return true;
}
-
+
if ((name === 'Download' || action !== defaultAction) && name !== 'Delete') {
var img = FileActions.icons[name];
if (img.call) {
@@ -97,16 +97,16 @@ var FileActions = {
html += '<img class ="svg" src="' + img + '" /> ';
}
html += t('files', name) + '</a>';
-
+
var element = $(html);
element.data('action', name);
//alert(element);
element.on('click',{a:null, elem:parent, actionFunc:actions[name]},actionHandler);
parent.find('a.name>span.fileactions').append(element);
}
-
+
});
-
+
if (actions['Delete']) {
var img = FileActions.icons['Delete'];
if (img.call) {
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index bb298431e84..c1abe205151 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -26,6 +26,23 @@ Files={
});
procesSelection();
},
+ updateMaxUploadFilesize:function(response) {
+ if(response == undefined) {
+ return;
+ }
+ if(response.data !== undefined && response.data.uploadMaxFilesize !== undefined) {
+ $('#max_upload').val(response.data.uploadMaxFilesize);
+ $('#data-upload-form a').attr('original-title', response.data.maxHumanFilesize);
+ }
+ if(response[0] == undefined) {
+ return;
+ }
+ if(response[0].uploadMaxFilesize !== undefined) {
+ $('#max_upload').val(response[0].uploadMaxFilesize);
+ $('#data-upload-form a').attr('original-title', response[0].maxHumanFilesize);
+ }
+
+ },
isFileNameValid:function (name) {
if (name === '.') {
$('#notification').text(t('files', '\'.\' is an invalid file name.'));
@@ -52,7 +69,7 @@ Files={
}
};
$(document).ready(function() {
- Files.bindKeyboardShortcuts(document, jQuery);
+ Files.bindKeyboardShortcuts(document, jQuery);
$('#fileList tr').each(function(){
//little hack to set unescape filenames in attribute
$(this).attr('data-file',decodeURIComponent($(this).attr('data-file')));
@@ -87,8 +104,8 @@ $(document).ready(function() {
// Sets the file link behaviour :
$('td.filename a').live('click',function(event) {
- event.preventDefault();
if (event.ctrlKey || event.shiftKey) {
+ event.preventDefault();
if (event.shiftKey) {
var last = $(lastChecked).parent().parent().prevAll().length;
var first = $(this).parent().parent().prevAll().length;
@@ -130,6 +147,7 @@ $(document).ready(function() {
var permissions = $(this).parent().parent().data('permissions');
var action=FileActions.getDefault(mime,type, permissions);
if(action){
+ event.preventDefault();
action(filename);
}
}
@@ -183,7 +201,7 @@ $(document).ready(function() {
$('.download').click('click',function(event) {
var files=getSelectedFiles('name').join(';');
var dir=$('#dir').val()||'/';
- $('#notification').text(t('files','generating ZIP-file, it may take some time.'));
+ $('#notification').text(t('files','Your download is being prepared. This might take some time if the files are big.'));
$('#notification').fadeIn();
// use special download URL if provided, e.g. for public shared files
if ( (downloadURL = document.getElementById("downloadURL")) ) {
@@ -316,6 +334,7 @@ $(document).ready(function() {
$('#notification').text(t('files', response.data.message));
$('#notification').fadeIn();
}
+ Files.updateMaxUploadFilesize(response);
var file=response[0];
// TODO: this doesn't work if the file name has been changed server side
delete uploadingFiles[dirName][file.name];
@@ -368,6 +387,8 @@ $(document).ready(function() {
.success(function(result, textStatus, jqXHR) {
var response;
response=jQuery.parseJSON(result);
+ Files.updateMaxUploadFilesize(response);
+
if(response[0] != undefined && response[0].status == 'success') {
var file=response[0];
delete uploadingFiles[file.name];
@@ -401,6 +422,7 @@ $(document).ready(function() {
data.submit().success(function(data, status) {
// in safari data is a string
response = jQuery.parseJSON(typeof data === 'string' ? data : data[0].body.innerText);
+ Files.updateMaxUploadFilesize(response);
if(response[0] != undefined && response[0].status == 'success') {
var file=response[0];
delete uploadingFiles[file.name];
@@ -711,6 +733,32 @@ $(document).ready(function() {
});
resizeBreadcrumbs(true);
+
+ // file space size sync
+ function update_storage_statistics() {
+ $.getJSON(OC.filePath('files','ajax','getstoragestats.php'),function(response) {
+ Files.updateMaxUploadFilesize(response);
+ });
+ }
+
+ // start on load - we ask the server every 5 minutes
+ var update_storage_statistics_interval = 5*60*1000;
+ var update_storage_statistics_interval_id = setInterval(update_storage_statistics, update_storage_statistics_interval);
+
+ // Use jquery-visibility to de-/re-activate file stats sync
+ if ($.support.pageVisibility) {
+ $(document).on({
+ 'show.visibility': function() {
+ if (!update_storage_statistics_interval_id) {
+ update_storage_statistics_interval_id = setInterval(update_storage_statistics, update_storage_statistics_interval);
+ }
+ },
+ 'hide.visibility': function() {
+ clearInterval(update_storage_statistics_interval_id);
+ update_storage_statistics_interval_id = 0;
+ }
+ });
+ }
});
function scanFiles(force,dir){
@@ -740,6 +788,7 @@ scanFiles.scanning=false;
function boolOperationFinished(data, callback) {
result = jQuery.parseJSON(data.responseText);
+ Files.updateMaxUploadFilesize(result);
if(result.status == 'success'){
callback.call();
} else {
diff --git a/apps/files/js/jquery-visibility.js b/apps/files/js/jquery-visibility.js
new file mode 100644
index 00000000000..a824bf68730
--- /dev/null
+++ b/apps/files/js/jquery-visibility.js
@@ -0,0 +1,32 @@
+/*! http://mths.be/visibility v1.0.5 by @mathias */
+(function (window, document, $, undefined) {
+
+ var prefix,
+ property,
+// In Opera, `'onfocusin' in document == true`, hence the extra `hasFocus` check to detect IE-like behavior
+ eventName = 'onfocusin' in document && 'hasFocus' in document ? 'focusin focusout' : 'focus blur',
+ prefixes = ['', 'moz', 'ms', 'o', 'webkit'],
+ $support = $.support,
+ $event = $.event;
+
+ while ((property = prefix = prefixes.pop()) != undefined) {
+ property = (prefix ? prefix + 'H' : 'h') + 'idden';
+ if ($support.pageVisibility = typeof document[property] == 'boolean') {
+ eventName = prefix + 'visibilitychange';
+ break;
+ }
+ }
+
+ $(/blur$/.test(eventName) ? window : document).on(eventName, function (event) {
+ var type = event.type,
+ originalEvent = event.originalEvent,
+ toElement = originalEvent.toElement;
+// If it’s a `{focusin,focusout}` event (IE), `fromElement` and `toElement` should both be `null` or `undefined`;
+// else, the page visibility hasn’t changed, but the user just clicked somewhere in the doc.
+// In IE9, we need to check the `relatedTarget` property instead.
+ if (!/^focus./.test(type) || (toElement == undefined && originalEvent.fromElement == undefined && originalEvent.relatedTarget == undefined)) {
+ $event.trigger((property && document[property] || /^(?:blur|focusout)$/.test(type) ? 'hide' : 'show') + '.visibility');
+ }
+ });
+
+}(this, document, jQuery));
diff --git a/apps/files/l10n/ar.php b/apps/files/l10n/ar.php
index 5740d54f8b1..d468b102875 100644
--- a/apps/files/l10n/ar.php
+++ b/apps/files/l10n/ar.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Upload" => "إرفع",
"There is no error, the file uploaded with success" => "تم ترفيع الملفات بنجاح.",
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "حجم الملف الذي تريد ترفيعه أعلى مما MAX_FILE_SIZE يسمح به في واجهة ال HTML.",
"The uploaded file was only partially uploaded" => "تم ترفيع جزء من الملفات الذي تريد ترفيعها فقط",
@@ -16,7 +17,6 @@
"New" => "جديد",
"Text file" => "ملف",
"Folder" => "مجلد",
-"Upload" => "إرفع",
"Nothing in here. Upload something!" => "لا يوجد شيء هنا. إرفع بعض الملفات!",
"Download" => "تحميل",
"Upload too large" => "حجم الترفيع أعلى من المسموح",
diff --git a/apps/files/l10n/bg_BG.php b/apps/files/l10n/bg_BG.php
index bc10979611b..a8c2dc97e00 100644
--- a/apps/files/l10n/bg_BG.php
+++ b/apps/files/l10n/bg_BG.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Upload" => "Качване",
"Missing a temporary folder" => "Липсва временна папка",
"Files" => "Файлове",
"Delete" => "Изтриване",
@@ -15,7 +16,6 @@
"Save" => "Запис",
"New" => "Ново",
"Folder" => "Папка",
-"Upload" => "Качване",
"Nothing in here. Upload something!" => "Няма нищо тук. Качете нещо.",
"Download" => "Изтегляне",
"Upload too large" => "Файлът който сте избрали за качване е прекалено голям"
diff --git a/apps/files/l10n/bn_BD.php b/apps/files/l10n/bn_BD.php
index e55c8811393..e8e19c6898f 100644
--- a/apps/files/l10n/bn_BD.php
+++ b/apps/files/l10n/bn_BD.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Upload" => "আপলোড",
"Could not move %s - File with this name already exists" => "%s কে স্থানান্তর করা সম্ভব হলো না - এই নামের ফাইল বিদ্যমান",
"Could not move %s" => "%s কে স্থানান্তর করা সম্ভব হলো না",
"Unable to rename file" => "ফাইলের নাম পরিবর্তন করা সম্ভব হলো না",
@@ -28,7 +29,6 @@
"'.' is an invalid file name." => "টি একটি অননুমোদিত নাম।",
"File name cannot be empty." => "ফাইলের নামটি ফাঁকা রাখা যাবে না।",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "নামটি সঠিক নয়, '\\', '/', '<', '>', ':', '\"', '|', '?' এবং '*' অনুমোদিত নয়।",
-"generating ZIP-file, it may take some time." => "ZIP- ফাইল তৈরী করা হচ্ছে, এজন্য কিছু সময় আবশ্যক।",
"Unable to upload your file as it is a directory or has 0 bytes" => "আপনার ফাইলটি আপলোড করা সম্ভব হলো না, কেননা এটি হয় একটি ফোল্ডার কিংবা এর আকার ০ বাইট",
"Upload Error" => "আপলোড করতে সমস্যা ",
"Close" => "বন্ধ",
@@ -60,7 +60,6 @@
"Text file" => "টেক্সট ফাইল",
"Folder" => "ফোল্ডার",
"From link" => " লিংক থেকে",
-"Upload" => "আপলোড",
"Cancel upload" => "আপলোড বাতিল কর",
"Nothing in here. Upload something!" => "এখানে কিছুই নেই। কিছু আপলোড করুন !",
"Download" => "ডাউনলোড",
diff --git a/apps/files/l10n/ca.php b/apps/files/l10n/ca.php
index f6ddbcd8e18..b35a9299de0 100644
--- a/apps/files/l10n/ca.php
+++ b/apps/files/l10n/ca.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Upload" => "Puja",
"Could not move %s - File with this name already exists" => "No s'ha pogut moure %s - Ja hi ha un fitxer amb aquest nom",
"Could not move %s" => " No s'ha pogut moure %s",
"Unable to rename file" => "No es pot canviar el nom del fitxer",
@@ -28,7 +29,7 @@
"'.' is an invalid file name." => "'.' és un nom no vàlid per un fitxer.",
"File name cannot be empty." => "El nom del fitxer no pot ser buit.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "El nóm no és vàlid, '\\', '/', '<', '>', ':', '\"', '|', '?' i '*' no estan permesos.",
-"generating ZIP-file, it may take some time." => "s'estan generant fitxers ZIP, pot trigar una estona.",
+"Your download is being prepared. This might take some time if the files are big." => "S'està preparant la baixada. Pot trigar una estona si els fitxers són grans.",
"Unable to upload your file as it is a directory or has 0 bytes" => "No es pot pujar el fitxer perquè és una carpeta o té 0 bytes",
"Upload Error" => "Error en la pujada",
"Close" => "Tanca",
@@ -60,7 +61,6 @@
"Text file" => "Fitxer de text",
"Folder" => "Carpeta",
"From link" => "Des d'enllaç",
-"Upload" => "Puja",
"Cancel upload" => "Cancel·la la pujada",
"Nothing in here. Upload something!" => "Res per aquí. Pugeu alguna cosa!",
"Download" => "Baixa",
diff --git a/apps/files/l10n/cs_CZ.php b/apps/files/l10n/cs_CZ.php
index 65ac4b04931..a8d82ba5111 100644
--- a/apps/files/l10n/cs_CZ.php
+++ b/apps/files/l10n/cs_CZ.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Upload" => "Odeslat",
"Could not move %s - File with this name already exists" => "Nelze přesunout %s - existuje soubor se stejným názvem",
"Could not move %s" => "Nelze přesunout %s",
"Unable to rename file" => "Nelze přejmenovat soubor",
@@ -28,7 +29,7 @@
"'.' is an invalid file name." => "'.' je neplatným názvem souboru.",
"File name cannot be empty." => "Název souboru nemůže být prázdný řetězec.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Neplatný název, znaky '\\', '/', '<', '>', ':', '\"', '|', '?' a '*' nejsou povoleny.",
-"generating ZIP-file, it may take some time." => "generuji ZIP soubor, může to nějakou dobu trvat.",
+"Your download is being prepared. This might take some time if the files are big." => "Vaše soubory ke stažení se připravují. Pokud jsou velké může to chvíli trvat.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Nelze odeslat Váš soubor, protože je to adresář nebo má velikost 0 bajtů",
"Upload Error" => "Chyba odesílání",
"Close" => "Zavřít",
@@ -60,7 +61,6 @@
"Text file" => "Textový soubor",
"Folder" => "Složka",
"From link" => "Z odkazu",
-"Upload" => "Odeslat",
"Cancel upload" => "Zrušit odesílání",
"Nothing in here. Upload something!" => "Žádný obsah. Nahrajte něco.",
"Download" => "Stáhnout",
diff --git a/apps/files/l10n/da.php b/apps/files/l10n/da.php
index 02c177a2f1c..010af12e960 100644
--- a/apps/files/l10n/da.php
+++ b/apps/files/l10n/da.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Upload" => "Upload",
"No file was uploaded. Unknown error" => "Ingen fil blev uploadet. Ukendt fejl.",
"There is no error, the file uploaded with success" => "Der er ingen fejl, filen blev uploadet med success",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Den uploadede fil overstiger upload_max_filesize direktivet i php.ini",
@@ -21,7 +22,6 @@
"unshared {files}" => "ikke delte {files}",
"deleted {files}" => "slettede {files}",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ugyldigt navn, '\\', '/', '<', '>', ':' | '?', '\"', '', og '*' er ikke tilladt.",
-"generating ZIP-file, it may take some time." => "genererer ZIP-fil, det kan tage lidt tid.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Kunne ikke uploade din fil, da det enten er en mappe eller er tom",
"Upload Error" => "Fejl ved upload",
"Close" => "Luk",
@@ -52,7 +52,6 @@
"Text file" => "Tekstfil",
"Folder" => "Mappe",
"From link" => "Fra link",
-"Upload" => "Upload",
"Cancel upload" => "Fortryd upload",
"Nothing in here. Upload something!" => "Her er tomt. Upload noget!",
"Download" => "Download",
diff --git a/apps/files/l10n/de.php b/apps/files/l10n/de.php
index 089ce1c0a26..c851f7df2a7 100644
--- a/apps/files/l10n/de.php
+++ b/apps/files/l10n/de.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Upload" => "Hochladen",
"Could not move %s - File with this name already exists" => "Konnte %s nicht verschieben - Datei mit diesem Namen existiert bereits.",
"Could not move %s" => "Konnte %s nicht verschieben",
"Unable to rename file" => "Konnte Datei nicht umbenennen",
@@ -28,7 +29,7 @@
"'.' is an invalid file name." => "'.' ist kein gültiger Dateiname",
"File name cannot be empty." => "Der Dateiname darf nicht leer sein",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ungültiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig.",
-"generating ZIP-file, it may take some time." => "Erstelle ZIP-Datei. Dies kann eine Weile dauern.",
+"Your download is being prepared. This might take some time if the files are big." => "Dein Download wird vorbereitet. Dies kann bei größeren Dateien etwas dauern.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Deine Datei kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist.",
"Upload Error" => "Fehler beim Upload",
"Close" => "Schließen",
@@ -60,7 +61,6 @@
"Text file" => "Textdatei",
"Folder" => "Ordner",
"From link" => "Von einem Link",
-"Upload" => "Hochladen",
"Cancel upload" => "Upload abbrechen",
"Nothing in here. Upload something!" => "Alles leer. Lade etwas hoch!",
"Download" => "Herunterladen",
diff --git a/apps/files/l10n/de_DE.php b/apps/files/l10n/de_DE.php
index 5cd4ef70425..281685b78df 100644
--- a/apps/files/l10n/de_DE.php
+++ b/apps/files/l10n/de_DE.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Upload" => "Hochladen",
"Could not move %s - File with this name already exists" => "Konnte %s nicht verschieben - Datei mit diesem Namen existiert bereits",
"Could not move %s" => "Konnte %s nicht verschieben",
"Unable to rename file" => "Konnte Datei nicht umbenennen",
@@ -28,7 +29,7 @@
"'.' is an invalid file name." => "'.' ist kein gültiger Dateiname.",
"File name cannot be empty." => "Der Dateiname darf nicht leer sein.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ungültiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig.",
-"generating ZIP-file, it may take some time." => "Erstelle ZIP-Datei. Dies kann eine Weile dauern.",
+"Your download is being prepared. This might take some time if the files are big." => "Ihr Download wird vorbereitet. Dies kann bei größeren Dateien einen Moment dauern.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Ihre Datei kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist.",
"Upload Error" => "Fehler beim Upload",
"Close" => "Schließen",
@@ -60,7 +61,6 @@
"Text file" => "Textdatei",
"Folder" => "Ordner",
"From link" => "Von einem Link",
-"Upload" => "Hochladen",
"Cancel upload" => "Upload abbrechen",
"Nothing in here. Upload something!" => "Alles leer. Bitte laden Sie etwas hoch!",
"Download" => "Herunterladen",
diff --git a/apps/files/l10n/el.php b/apps/files/l10n/el.php
index 3c1ac538091..cc93943d286 100644
--- a/apps/files/l10n/el.php
+++ b/apps/files/l10n/el.php
@@ -1,4 +1,8 @@
<?php $TRANSLATIONS = array(
+"Upload" => "Αποστολή",
+"Could not move %s - File with this name already exists" => "Αδυναμία μετακίνησης του %s - υπάρχει ήδη αρχείο με αυτό το όνομα",
+"Could not move %s" => "Αδυναμία μετακίνησης του %s",
+"Unable to rename file" => "Αδυναμία μετονομασίας αρχείου",
"No file was uploaded. Unknown error" => "Δεν ανέβηκε κάποιο αρχείο. Άγνωστο σφάλμα",
"There is no error, the file uploaded with success" => "Δεν υπάρχει σφάλμα, το αρχείο εστάλει επιτυχώς",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Το απεσταλμένο αρχείο ξεπερνά την οδηγία upload_max_filesize στο php.ini:",
@@ -7,6 +11,8 @@
"No file was uploaded" => "Κανένα αρχείο δεν στάλθηκε",
"Missing a temporary folder" => "Λείπει ο προσωρινός φάκελος",
"Failed to write to disk" => "Αποτυχία εγγραφής στο δίσκο",
+"Not enough space available" => "Δεν υπάρχει αρκετός διαθέσιμος χώρος",
+"Invalid directory." => "Μη έγκυρος φάκελος.",
"Files" => "Αρχεία",
"Unshare" => "Διακοπή κοινής χρήσης",
"Delete" => "Διαγραφή",
@@ -20,8 +26,10 @@
"replaced {new_name} with {old_name}" => "αντικαταστάθηκε το {new_name} με {old_name}",
"unshared {files}" => "μη διαμοιρασμένα {files}",
"deleted {files}" => "διαγραμμένα {files}",
+"'.' is an invalid file name." => "'.' είναι μη έγκυρο όνομα αρχείου.",
+"File name cannot be empty." => "Το όνομα αρχείου δεν πρέπει να είναι κενό.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Μη έγκυρο όνομα, '\\', '/', '<', '>', ':', '\"', '|', '?' και '*' δεν επιτρέπονται.",
-"generating ZIP-file, it may take some time." => "παραγωγή αρχείου ZIP, ίσως διαρκέσει αρκετά.",
+"Your download is being prepared. This might take some time if the files are big." => "Η λήψη προετοιμάζεται. Αυτό μπορεί να πάρει ώρα εάν τα αρχεία έχουν μεγάλο μέγεθος.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Αδυναμία στην αποστολή του αρχείου σας αφού είναι φάκελος ή έχει 0 bytes",
"Upload Error" => "Σφάλμα Αποστολής",
"Close" => "Κλείσιμο",
@@ -31,6 +39,7 @@
"Upload cancelled." => "Η αποστολή ακυρώθηκε.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Η αποστολή του αρχείου βρίσκεται σε εξέλιξη. Το κλείσιμο της σελίδας θα ακυρώσει την αποστολή.",
"URL cannot be empty." => "Η URL δεν πρέπει να είναι κενή.",
+"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Μη έγκυρο όνομα φακέλου. Η χρήση του 'Κοινόχρηστος' χρησιμοποιείται από ο Owncloud",
"{count} files scanned" => "{count} αρχεία ανιχνεύτηκαν",
"error while scanning" => "σφάλμα κατά την ανίχνευση",
"Name" => "Όνομα",
@@ -52,7 +61,6 @@
"Text file" => "Αρχείο κειμένου",
"Folder" => "Φάκελος",
"From link" => "Από σύνδεσμο",
-"Upload" => "Αποστολή",
"Cancel upload" => "Ακύρωση αποστολής",
"Nothing in here. Upload something!" => "Δεν υπάρχει τίποτα εδώ. Ανέβασε κάτι!",
"Download" => "Λήψη",
diff --git a/apps/files/l10n/eo.php b/apps/files/l10n/eo.php
index 92c03ee8826..0aebf9c034e 100644
--- a/apps/files/l10n/eo.php
+++ b/apps/files/l10n/eo.php
@@ -1,4 +1,8 @@
<?php $TRANSLATIONS = array(
+"Upload" => "Alŝuti",
+"Could not move %s - File with this name already exists" => "Ne eblis movi %s: dosiero kun ĉi tiu nomo jam ekzistas",
+"Could not move %s" => "Ne eblis movi %s",
+"Unable to rename file" => "Ne eblis alinomigi dosieron",
"No file was uploaded. Unknown error" => "Neniu dosiero alŝutiĝis. Nekonata eraro.",
"There is no error, the file uploaded with success" => "Ne estas eraro, la dosiero alŝutiĝis sukcese",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "La dosiero alŝutita superas la regulon upload_max_filesize el php.ini: ",
@@ -7,6 +11,8 @@
"No file was uploaded" => "Neniu dosiero estas alŝutita",
"Missing a temporary folder" => "Mankas tempa dosierujo",
"Failed to write to disk" => "Malsukcesis skribo al disko",
+"Not enough space available" => "Ne haveblas sufiĉa spaco",
+"Invalid directory." => "Nevalida dosierujo.",
"Files" => "Dosieroj",
"Unshare" => "Malkunhavigi",
"Delete" => "Forigi",
@@ -20,8 +26,10 @@
"replaced {new_name} with {old_name}" => "anstataŭiĝis {new_name} per {old_name}",
"unshared {files}" => "malkunhaviĝis {files}",
"deleted {files}" => "foriĝis {files}",
+"'.' is an invalid file name." => "'.' ne estas valida dosiernomo.",
+"File name cannot be empty." => "Dosiernomo devas ne malpleni.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nevalida nomo: “\\”, “/”, “<”, “>”, “:”, “\"”, “|”, “?” kaj “*” ne permesatas.",
-"generating ZIP-file, it may take some time." => "generanta ZIP-dosiero, ĝi povas daŭri iom da tempo",
+"Your download is being prepared. This might take some time if the files are big." => "Via elŝuto pretiĝatas. Ĉi tio povas daŭri iom da tempo se la dosieroj grandas.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Ne eblis alŝuti vian dosieron ĉar ĝi estas dosierujo aŭ havas 0 duumokojn",
"Upload Error" => "Alŝuta eraro",
"Close" => "Fermi",
@@ -31,6 +39,7 @@
"Upload cancelled." => "La alŝuto nuliĝis.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Dosieralŝuto plenumiĝas. Lasi la paĝon nun nuligus la alŝuton.",
"URL cannot be empty." => "URL ne povas esti malplena.",
+"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Nevalida dosierujnomo. Uzo de “Shared” rezervatas de Owncloud.",
"{count} files scanned" => "{count} dosieroj skaniĝis",
"error while scanning" => "eraro dum skano",
"Name" => "Nomo",
@@ -52,7 +61,6 @@
"Text file" => "Tekstodosiero",
"Folder" => "Dosierujo",
"From link" => "El ligilo",
-"Upload" => "Alŝuti",
"Cancel upload" => "Nuligi alŝuton",
"Nothing in here. Upload something!" => "Nenio estas ĉi tie. Alŝutu ion!",
"Download" => "Elŝuti",
diff --git a/apps/files/l10n/es.php b/apps/files/l10n/es.php
index 885ed3770e9..c76431ef383 100644
--- a/apps/files/l10n/es.php
+++ b/apps/files/l10n/es.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Upload" => "Subir",
"Could not move %s - File with this name already exists" => "No se puede mover %s - Ya existe un archivo con ese nombre",
"Could not move %s" => "No se puede mover %s",
"Unable to rename file" => "No se puede renombrar el archivo",
@@ -28,7 +29,7 @@
"'.' is an invalid file name." => "'.' es un nombre de archivo inválido.",
"File name cannot be empty." => "El nombre de archivo no puede estar vacío.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nombre Invalido, \"\\\", \"/\", \"<\", \">\", \":\", \"\", \"|\" \"?\" y \"*\" no están permitidos ",
-"generating ZIP-file, it may take some time." => "generando un fichero ZIP, puede llevar un tiempo.",
+"Your download is being prepared. This might take some time if the files are big." => "Tu descarga esta siendo preparada. Esto puede tardar algun tiempo si los archivos son muy grandes.",
"Unable to upload your file as it is a directory or has 0 bytes" => "No ha sido posible subir tu archivo porque es un directorio o tiene 0 bytes",
"Upload Error" => "Error al subir el archivo",
"Close" => "cerrrar",
@@ -38,6 +39,7 @@
"Upload cancelled." => "Subida cancelada.",
"File upload is in progress. Leaving the page now will cancel the upload." => "La subida del archivo está en proceso. Salir de la página ahora cancelará la subida.",
"URL cannot be empty." => "La URL no puede estar vacía.",
+"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Nombre de carpeta invalido. El uso de \"Shared\" esta reservado para Owncloud",
"{count} files scanned" => "{count} archivos escaneados",
"error while scanning" => "error escaneando",
"Name" => "Nombre",
@@ -59,7 +61,6 @@
"Text file" => "Archivo de texto",
"Folder" => "Carpeta",
"From link" => "Desde el enlace",
-"Upload" => "Subir",
"Cancel upload" => "Cancelar subida",
"Nothing in here. Upload something!" => "Aquí no hay nada. ¡Sube algo!",
"Download" => "Descargar",
diff --git a/apps/files/l10n/es_AR.php b/apps/files/l10n/es_AR.php
index 6863f701e65..418844007b2 100644
--- a/apps/files/l10n/es_AR.php
+++ b/apps/files/l10n/es_AR.php
@@ -1,4 +1,8 @@
<?php $TRANSLATIONS = array(
+"Upload" => "Subir",
+"Could not move %s - File with this name already exists" => "No se pudo mover %s - Un archivo con este nombre ya existe",
+"Could not move %s" => "No se pudo mover %s ",
+"Unable to rename file" => "No fue posible cambiar el nombre al archivo",
"No file was uploaded. Unknown error" => "El archivo no fue subido. Error desconocido",
"There is no error, the file uploaded with success" => "No se han producido errores, el archivo se ha subido con éxito",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "El archivo que intentás subir excede el tamaño definido por upload_max_filesize en el php.ini:",
@@ -22,8 +26,10 @@
"replaced {new_name} with {old_name}" => "reemplazado {new_name} con {old_name}",
"unshared {files}" => "{files} se dejaron de compartir",
"deleted {files}" => "{files} borrados",
+"'.' is an invalid file name." => "'.' es un nombre de archivo inválido.",
+"File name cannot be empty." => "El nombre del archivo no puede quedar vacío.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nombre invalido, '\\', '/', '<', '>', ':', '\"', '|', '?' y '*' no están permitidos.",
-"generating ZIP-file, it may take some time." => "generando un archivo ZIP, puede llevar un tiempo.",
+"Your download is being prepared. This might take some time if the files are big." => "Tu descarga esta siendo preparada. Esto puede tardar algun tiempo si los archivos son muy grandes.",
"Unable to upload your file as it is a directory or has 0 bytes" => "No fue posible subir el archivo porque es un directorio o porque su tamaño es 0 bytes",
"Upload Error" => "Error al subir el archivo",
"Close" => "Cerrar",
@@ -33,6 +39,7 @@
"Upload cancelled." => "La subida fue cancelada",
"File upload is in progress. Leaving the page now will cancel the upload." => "La subida del archivo está en proceso. Si salís de la página ahora, la subida se cancelará.",
"URL cannot be empty." => "La URL no puede estar vacía",
+"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Nombre de carpeta inválido. El uso de 'Shared' está reservado por ownCloud",
"{count} files scanned" => "{count} archivos escaneados",
"error while scanning" => "error mientras se escaneaba",
"Name" => "Nombre",
@@ -54,7 +61,6 @@
"Text file" => "Archivo de texto",
"Folder" => "Carpeta",
"From link" => "Desde enlace",
-"Upload" => "Subir",
"Cancel upload" => "Cancelar subida",
"Nothing in here. Upload something!" => "No hay nada. ¡Subí contenido!",
"Download" => "Descargar",
diff --git a/apps/files/l10n/et_EE.php b/apps/files/l10n/et_EE.php
index 6996b0a7918..8305cf0edea 100644
--- a/apps/files/l10n/et_EE.php
+++ b/apps/files/l10n/et_EE.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Upload" => "Lae üles",
"No file was uploaded. Unknown error" => "Ühtegi faili ei laetud üles. Tundmatu viga",
"There is no error, the file uploaded with success" => "Ühtegi viga pole, fail on üles laetud",
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Üles laetud faili suurus ületab HTML vormis määratud upload_max_filesize suuruse",
@@ -20,7 +21,6 @@
"unshared {files}" => "jagamata {files}",
"deleted {files}" => "kustutatud {files}",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Vigane nimi, '\\', '/', '<', '>', ':', '\"', '|', '?' ja '*' pole lubatud.",
-"generating ZIP-file, it may take some time." => "ZIP-faili loomine, see võib veidi aega võtta.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Sinu faili üleslaadimine ebaõnnestus, kuna see on kaust või selle suurus on 0 baiti",
"Upload Error" => "Üleslaadimise viga",
"Close" => "Sulge",
@@ -51,7 +51,6 @@
"Text file" => "Tekstifail",
"Folder" => "Kaust",
"From link" => "Allikast",
-"Upload" => "Lae üles",
"Cancel upload" => "Tühista üleslaadimine",
"Nothing in here. Upload something!" => "Siin pole midagi. Lae midagi üles!",
"Download" => "Lae alla",
diff --git a/apps/files/l10n/eu.php b/apps/files/l10n/eu.php
index 96f59a668e9..a1cb5632121 100644
--- a/apps/files/l10n/eu.php
+++ b/apps/files/l10n/eu.php
@@ -1,4 +1,8 @@
<?php $TRANSLATIONS = array(
+"Upload" => "Igo",
+"Could not move %s - File with this name already exists" => "Ezin da %s mugitu - Izen hau duen fitxategia dagoeneko existitzen da",
+"Could not move %s" => "Ezin dira fitxategiak mugitu %s",
+"Unable to rename file" => "Ezin izan da fitxategia berrizendatu",
"No file was uploaded. Unknown error" => "Ez da fitxategirik igo. Errore ezezaguna",
"There is no error, the file uploaded with success" => "Ez da arazorik izan, fitxategia ongi igo da",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Igotako fitxategiak php.ini fitxategian ezarritako upload_max_filesize muga gainditu du:",
@@ -7,6 +11,8 @@
"No file was uploaded" => "Ez da fitxategirik igo",
"Missing a temporary folder" => "Aldi baterako karpeta falta da",
"Failed to write to disk" => "Errore bat izan da diskoan idazterakoan",
+"Not enough space available" => "Ez dago leku nahikorik.",
+"Invalid directory." => "Baliogabeko karpeta.",
"Files" => "Fitxategiak",
"Unshare" => "Ez elkarbanatu",
"Delete" => "Ezabatu",
@@ -20,8 +26,9 @@
"replaced {new_name} with {old_name}" => " {new_name}-k {old_name} ordezkatu du",
"unshared {files}" => "elkarbanaketa utzita {files}",
"deleted {files}" => "ezabatuta {files}",
+"'.' is an invalid file name." => "'.' ez da fitxategi izen baliogarria.",
+"File name cannot be empty." => "Fitxategi izena ezin da hutsa izan.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "IZen aliogabea, '\\', '/', '<', '>', ':', '\"', '|', '?' eta '*' ez daude baimenduta.",
-"generating ZIP-file, it may take some time." => "ZIP-fitxategia sortzen ari da, denbora har dezake",
"Unable to upload your file as it is a directory or has 0 bytes" => "Ezin da zure fitxategia igo, karpeta bat da edo 0 byt ditu",
"Upload Error" => "Igotzean errore bat suertatu da",
"Close" => "Itxi",
@@ -31,6 +38,7 @@
"Upload cancelled." => "Igoera ezeztatuta",
"File upload is in progress. Leaving the page now will cancel the upload." => "Fitxategien igoera martxan da. Orria orain uzteak igoera ezeztatutko du.",
"URL cannot be empty." => "URLa ezin da hutsik egon.",
+"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Baliogabeako karpeta izena. 'Shared' izena Owncloudek erreserbatzen du",
"{count} files scanned" => "{count} fitxategi eskaneatuta",
"error while scanning" => "errore bat egon da eskaneatzen zen bitartean",
"Name" => "Izena",
@@ -52,7 +60,6 @@
"Text file" => "Testu fitxategia",
"Folder" => "Karpeta",
"From link" => "Estekatik",
-"Upload" => "Igo",
"Cancel upload" => "Ezeztatu igoera",
"Nothing in here. Upload something!" => "Ez dago ezer. Igo zerbait!",
"Download" => "Deskargatu",
diff --git a/apps/files/l10n/fa.php b/apps/files/l10n/fa.php
index 062df6a56b3..ec8b5cdec4e 100644
--- a/apps/files/l10n/fa.php
+++ b/apps/files/l10n/fa.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Upload" => "بارگذاری",
"No file was uploaded. Unknown error" => "هیچ فایلی آپلود نشد.خطای ناشناس",
"There is no error, the file uploaded with success" => "هیچ خطایی وجود ندارد فایل با موفقیت بار گذاری شد",
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "حداکثر حجم مجاز برای بارگذاری از طریق HTML \nMAX_FILE_SIZE",
@@ -7,12 +8,12 @@
"Missing a temporary folder" => "یک پوشه موقت گم شده است",
"Failed to write to disk" => "نوشتن بر روی دیسک سخت ناموفق بود",
"Files" => "فایل ها",
+"Unshare" => "لغو اشتراک",
"Delete" => "پاک کردن",
"Rename" => "تغییرنام",
"replace" => "جایگزین",
"cancel" => "لغو",
"undo" => "بازگشت",
-"generating ZIP-file, it may take some time." => "در حال ساخت فایل فشرده ممکن است زمان زیادی به طول بیانجامد",
"Unable to upload your file as it is a directory or has 0 bytes" => "ناتوان در بارگذاری یا فایل یک پوشه است یا 0بایت دارد",
"Upload Error" => "خطا در بار گذاری",
"Close" => "بستن",
@@ -32,7 +33,6 @@
"New" => "جدید",
"Text file" => "فایل متنی",
"Folder" => "پوشه",
-"Upload" => "بارگذاری",
"Cancel upload" => "متوقف کردن بار گذاری",
"Nothing in here. Upload something!" => "اینجا هیچ چیز نیست.",
"Download" => "بارگیری",
diff --git a/apps/files/l10n/fi_FI.php b/apps/files/l10n/fi_FI.php
index e7e4b044372..fac93b1246b 100644
--- a/apps/files/l10n/fi_FI.php
+++ b/apps/files/l10n/fi_FI.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Upload" => "Lähetä",
"Could not move %s - File with this name already exists" => "Kohteen %s siirto ei onnistunut - Tiedosto samalla nimellä on jo olemassa",
"Could not move %s" => "Kohteen %s siirto ei onnistunut",
"Unable to rename file" => "Tiedoston nimeäminen uudelleen ei onnistunut",
@@ -23,7 +24,7 @@
"'.' is an invalid file name." => "'.' on virheellinen nimi tiedostolle.",
"File name cannot be empty." => "Tiedoston nimi ei voi olla tyhjä.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Virheellinen nimi, merkit '\\', '/', '<', '>', ':', '\"', '|', '?' ja '*' eivät ole sallittuja.",
-"generating ZIP-file, it may take some time." => "luodaan ZIP-tiedostoa, tämä saattaa kestää hetken.",
+"Your download is being prepared. This might take some time if the files are big." => "Lataustasi valmistellaan. Tämä saattaa kestää hetken, jos tiedostot ovat suuria kooltaan.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Tiedoston lähetys epäonnistui, koska sen koko on 0 tavua tai kyseessä on kansio",
"Upload Error" => "Lähetysvirhe.",
"Close" => "Sulje",
@@ -50,7 +51,6 @@
"Text file" => "Tekstitiedosto",
"Folder" => "Kansio",
"From link" => "Linkistä",
-"Upload" => "Lähetä",
"Cancel upload" => "Peru lähetys",
"Nothing in here. Upload something!" => "Täällä ei ole mitään. Lähetä tänne jotakin!",
"Download" => "Lataa",
diff --git a/apps/files/l10n/fr.php b/apps/files/l10n/fr.php
index f14759ff8f0..162c2e2dfda 100644
--- a/apps/files/l10n/fr.php
+++ b/apps/files/l10n/fr.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Upload" => "Envoyer",
"Could not move %s - File with this name already exists" => "Impossible de déplacer %s - Un fichier possédant ce nom existe déjà",
"Could not move %s" => "Impossible de déplacer %s",
"Unable to rename file" => "Impossible de renommer le fichier",
@@ -28,7 +29,6 @@
"'.' is an invalid file name." => "'.' n'est pas un nom de fichier valide.",
"File name cannot be empty." => "Le nom de fichier ne peut être vide.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nom invalide, les caractères '\\', '/', '<', '>', ':', '\"', '|', '?' et '*' ne sont pas autorisés.",
-"generating ZIP-file, it may take some time." => "Fichier ZIP en cours d'assemblage ; cela peut prendre du temps.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Impossible de charger vos fichiers car il s'agit d'un dossier ou le fichier fait 0 octet.",
"Upload Error" => "Erreur de chargement",
"Close" => "Fermer",
@@ -60,7 +60,6 @@
"Text file" => "Fichier texte",
"Folder" => "Dossier",
"From link" => "Depuis le lien",
-"Upload" => "Envoyer",
"Cancel upload" => "Annuler l'envoi",
"Nothing in here. Upload something!" => "Il n'y a rien ici ! Envoyez donc quelque chose :)",
"Download" => "Télécharger",
diff --git a/apps/files/l10n/gl.php b/apps/files/l10n/gl.php
index c15066163cf..d24680eaa86 100644
--- a/apps/files/l10n/gl.php
+++ b/apps/files/l10n/gl.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Upload" => "Enviar",
"Could not move %s - File with this name already exists" => "Non se moveu %s - Xa existe un ficheiro con ese nome.",
"Could not move %s" => "Non se puido mover %s",
"Unable to rename file" => "Non se pode renomear o ficheiro",
@@ -28,7 +29,6 @@
"'.' is an invalid file name." => "'.' é un nonme de ficheiro non válido",
"File name cannot be empty." => "O nome de ficheiro non pode estar baldeiro",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nome non válido, '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' non se permiten.",
-"generating ZIP-file, it may take some time." => "xerando un ficheiro ZIP, o que pode levar un anaco.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Non se puido subir o ficheiro pois ou é un directorio ou ten 0 bytes",
"Upload Error" => "Erro na subida",
"Close" => "Pechar",
@@ -60,7 +60,6 @@
"Text file" => "Ficheiro de texto",
"Folder" => "Cartafol",
"From link" => "Dende a ligazón",
-"Upload" => "Enviar",
"Cancel upload" => "Cancelar a subida",
"Nothing in here. Upload something!" => "Nada por aquí. Envía algo.",
"Download" => "Descargar",
diff --git a/apps/files/l10n/he.php b/apps/files/l10n/he.php
index bac9a8a6a53..8acc544cf5f 100644
--- a/apps/files/l10n/he.php
+++ b/apps/files/l10n/he.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Upload" => "העלאה",
"No file was uploaded. Unknown error" => "לא הועלה קובץ. טעות בלתי מזוהה.",
"There is no error, the file uploaded with success" => "לא אירעה תקלה, הקבצים הועלו בהצלחה",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "הקבצים שנשלחו חורגים מהגודל שצוין בהגדרה upload_max_filesize שבקובץ php.ini:",
@@ -21,7 +22,6 @@
"unshared {files}" => "בוטל שיתופם של {files}",
"deleted {files}" => "{files} נמחקו",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "השם שגוי, אסור להשתמש בתווים '\\', '/', '<', '>', ':', '\"', '|', '?' ו־'*'.",
-"generating ZIP-file, it may take some time." => "יוצר קובץ ZIP, אנא המתן.",
"Unable to upload your file as it is a directory or has 0 bytes" => "לא יכול להעלות את הקובץ מכיוון שזו תקיה או שמשקל הקובץ 0 בתים",
"Upload Error" => "שגיאת העלאה",
"Close" => "סגירה",
@@ -52,7 +52,6 @@
"Text file" => "קובץ טקסט",
"Folder" => "תיקייה",
"From link" => "מקישור",
-"Upload" => "העלאה",
"Cancel upload" => "ביטול ההעלאה",
"Nothing in here. Upload something!" => "אין כאן שום דבר. אולי ברצונך להעלות משהו?",
"Download" => "הורדה",
diff --git a/apps/files/l10n/hr.php b/apps/files/l10n/hr.php
index 4db4ac3f3e3..a9a7354d1d6 100644
--- a/apps/files/l10n/hr.php
+++ b/apps/files/l10n/hr.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Upload" => "Pošalji",
"There is no error, the file uploaded with success" => "Datoteka je poslana uspješno i bez pogrešaka",
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Poslana datoteka izlazi iz okvira MAX_FILE_SIZE direktive postavljene u HTML obrascu",
"The uploaded file was only partially uploaded" => "Datoteka je poslana samo djelomično",
@@ -13,7 +14,6 @@
"suggest name" => "predloži ime",
"cancel" => "odustani",
"undo" => "vrati",
-"generating ZIP-file, it may take some time." => "generiranje ZIP datoteke, ovo može potrajati.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Nemoguće poslati datoteku jer je prazna ili je direktorij",
"Upload Error" => "Pogreška pri slanju",
"Close" => "Zatvori",
@@ -36,7 +36,6 @@
"New" => "novo",
"Text file" => "tekstualna datoteka",
"Folder" => "mapa",
-"Upload" => "Pošalji",
"Cancel upload" => "Prekini upload",
"Nothing in here. Upload something!" => "Nema ničega u ovoj mapi. Pošalji nešto!",
"Download" => "Preuzmi",
diff --git a/apps/files/l10n/hu_HU.php b/apps/files/l10n/hu_HU.php
index b0d46ee7a2c..57cc0a86302 100644
--- a/apps/files/l10n/hu_HU.php
+++ b/apps/files/l10n/hu_HU.php
@@ -1,4 +1,8 @@
<?php $TRANSLATIONS = array(
+"Upload" => "Feltöltés",
+"Could not move %s - File with this name already exists" => "%s áthelyezése nem sikerült - már létezik másik fájl ezzel a névvel",
+"Could not move %s" => "Nem sikerült %s áthelyezése",
+"Unable to rename file" => "Nem lehet átnevezni a fájlt",
"No file was uploaded. Unknown error" => "Nem történt feltöltés. Ismeretlen hiba",
"There is no error, the file uploaded with success" => "A fájlt sikerült feltölteni",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "A feltöltött fájl mérete meghaladja a php.ini állományban megadott upload_max_filesize paraméter értékét.",
@@ -25,7 +29,6 @@
"'.' is an invalid file name." => "'.' fájlnév érvénytelen.",
"File name cannot be empty." => "A fájlnév nem lehet semmi.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Érvénytelen elnevezés. Ezek a karakterek nem használhatók: '\\', '/', '<', '>', ':', '\"', '|', '?' és '*'",
-"generating ZIP-file, it may take some time." => "ZIP-fájl generálása, ez eltarthat egy ideig.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Nem tölthető fel, mert mappa volt, vagy 0 byte méretű",
"Upload Error" => "Feltöltési hiba",
"Close" => "Bezárás",
@@ -35,6 +38,7 @@
"Upload cancelled." => "A feltöltést megszakítottuk.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Fájlfeltöltés van folyamatban. Az oldal elhagyása megszakítja a feltöltést.",
"URL cannot be empty." => "Az URL nem lehet semmi.",
+"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Érvénytelen mappanév. A név használata csak a Owncloud számára lehetséges.",
"{count} files scanned" => "{count} fájlt találtunk",
"error while scanning" => "Hiba a fájllista-ellenőrzés során",
"Name" => "Név",
@@ -56,7 +60,6 @@
"Text file" => "Szövegfájl",
"Folder" => "Mappa",
"From link" => "Feltöltés linkről",
-"Upload" => "Feltöltés",
"Cancel upload" => "A feltöltés megszakítása",
"Nothing in here. Upload something!" => "Itt nincs semmi. Töltsön fel valamit!",
"Download" => "Letöltés",
diff --git a/apps/files/l10n/ia.php b/apps/files/l10n/ia.php
index ada64cd7574..a7babb27d9e 100644
--- a/apps/files/l10n/ia.php
+++ b/apps/files/l10n/ia.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Upload" => "Incargar",
"The uploaded file was only partially uploaded" => "Le file incargate solmente esseva incargate partialmente",
"No file was uploaded" => "Nulle file esseva incargate",
"Missing a temporary folder" => "Manca un dossier temporari",
@@ -13,7 +14,6 @@
"New" => "Nove",
"Text file" => "File de texto",
"Folder" => "Dossier",
-"Upload" => "Incargar",
"Nothing in here. Upload something!" => "Nihil hic. Incarga alcun cosa!",
"Download" => "Discargar",
"Upload too large" => "Incargamento troppo longe"
diff --git a/apps/files/l10n/id.php b/apps/files/l10n/id.php
index 5d934e97e7b..46d9ad1a75a 100644
--- a/apps/files/l10n/id.php
+++ b/apps/files/l10n/id.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Upload" => "Unggah",
"There is no error, the file uploaded with success" => "Tidak ada galat, berkas sukses diunggah",
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "File yang diunggah melampaui directive MAX_FILE_SIZE yang disebutan dalam form HTML.",
"The uploaded file was only partially uploaded" => "Berkas hanya diunggah sebagian",
@@ -11,7 +12,6 @@
"replace" => "mengganti",
"cancel" => "batalkan",
"undo" => "batal dikerjakan",
-"generating ZIP-file, it may take some time." => "membuat berkas ZIP, ini mungkin memakan waktu.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Gagal mengunggah berkas anda karena berupa direktori atau mempunyai ukuran 0 byte",
"Upload Error" => "Terjadi Galat Pengunggahan",
"Close" => "tutup",
@@ -32,7 +32,6 @@
"New" => "Baru",
"Text file" => "Berkas teks",
"Folder" => "Folder",
-"Upload" => "Unggah",
"Cancel upload" => "Batal mengunggah",
"Nothing in here. Upload something!" => "Tidak ada apa-apa di sini. Unggah sesuatu!",
"Download" => "Unduh",
diff --git a/apps/files/l10n/is.php b/apps/files/l10n/is.php
index 2eff686611a..c3adf0984e5 100644
--- a/apps/files/l10n/is.php
+++ b/apps/files/l10n/is.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Upload" => "Senda inn",
"Could not move %s - File with this name already exists" => "Gat ekki fært %s - Skrá með þessu nafni er þegar til",
"Could not move %s" => "Gat ekki fært %s",
"Unable to rename file" => "Gat ekki endurskýrt skrá",
@@ -28,7 +29,6 @@
"'.' is an invalid file name." => "'.' er ekki leyfilegt nafn.",
"File name cannot be empty." => "Nafn skráar má ekki vera tómt",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ógilt nafn, táknin '\\', '/', '<', '>', ':', '\"', '|', '?' og '*' eru ekki leyfð.",
-"generating ZIP-file, it may take some time." => "bý til ZIP skrá, það gæti tekið smá stund.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Innsending á skrá mistókst, hugsanlega sendir þú möppu eða skráin er 0 bæti.",
"Upload Error" => "Villa við innsendingu",
"Close" => "Loka",
@@ -60,7 +60,6 @@
"Text file" => "Texta skrá",
"Folder" => "Mappa",
"From link" => "Af tengli",
-"Upload" => "Senda inn",
"Cancel upload" => "Hætta við innsendingu",
"Nothing in here. Upload something!" => "Ekkert hér. Settu eitthvað inn!",
"Download" => "Niðurhal",
diff --git a/apps/files/l10n/it.php b/apps/files/l10n/it.php
index a54e424694f..9e211ae21ac 100644
--- a/apps/files/l10n/it.php
+++ b/apps/files/l10n/it.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Upload" => "Carica",
"Could not move %s - File with this name already exists" => "Impossibile spostare %s - un file con questo nome esiste già",
"Could not move %s" => "Impossibile spostare %s",
"Unable to rename file" => "Impossibile rinominare il file",
@@ -28,7 +29,7 @@
"'.' is an invalid file name." => "'.' non è un nome file valido.",
"File name cannot be empty." => "Il nome del file non può essere vuoto.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nome non valido, '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' non sono consentiti.",
-"generating ZIP-file, it may take some time." => "creazione file ZIP, potrebbe richiedere del tempo.",
+"Your download is being prepared. This might take some time if the files are big." => "Il tuo scaricamento è in fase di preparazione. Ciò potrebbe richiedere del tempo se i file sono grandi.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Impossibile inviare il file poiché è una cartella o ha dimensione 0 byte",
"Upload Error" => "Errore di invio",
"Close" => "Chiudi",
@@ -60,7 +61,6 @@
"Text file" => "File di testo",
"Folder" => "Cartella",
"From link" => "Da collegamento",
-"Upload" => "Carica",
"Cancel upload" => "Annulla invio",
"Nothing in here. Upload something!" => "Non c'è niente qui. Carica qualcosa!",
"Download" => "Scarica",
diff --git a/apps/files/l10n/ja_JP.php b/apps/files/l10n/ja_JP.php
index 4621cc5d4ea..548263f54a3 100644
--- a/apps/files/l10n/ja_JP.php
+++ b/apps/files/l10n/ja_JP.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Upload" => "アップロード",
"Could not move %s - File with this name already exists" => "%s を移動できませんでした ― この名前のファイルはすでに存在します",
"Could not move %s" => "%s を移動できませんでした",
"Unable to rename file" => "ファイル名の変更ができません",
@@ -28,7 +29,7 @@
"'.' is an invalid file name." => "'.' は無効なファイル名です。",
"File name cannot be empty." => "ファイル名を空にすることはできません。",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "無効な名前、'\\', '/', '<', '>', ':', '\"', '|', '?', '*' は使用できません。",
-"generating ZIP-file, it may take some time." => "ZIPファイルを生成中です、しばらくお待ちください。",
+"Your download is being prepared. This might take some time if the files are big." => "ダウンロードの準備中です。ファイルサイズが大きい場合は少し時間がかかるかもしれません。",
"Unable to upload your file as it is a directory or has 0 bytes" => "ディレクトリもしくは0バイトのファイルはアップロードできません",
"Upload Error" => "アップロードエラー",
"Close" => "閉じる",
@@ -60,7 +61,6 @@
"Text file" => "テキストファイル",
"Folder" => "フォルダ",
"From link" => "リンク",
-"Upload" => "アップロード",
"Cancel upload" => "アップロードをキャンセル",
"Nothing in here. Upload something!" => "ここには何もありません。何かアップロードしてください。",
"Download" => "ダウンロード",
diff --git a/apps/files/l10n/ka_GE.php b/apps/files/l10n/ka_GE.php
index 9a73abfbe3b..3f5a532f6bd 100644
--- a/apps/files/l10n/ka_GE.php
+++ b/apps/files/l10n/ka_GE.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Upload" => "ატვირთვა",
"There is no error, the file uploaded with success" => "ჭოცდომა არ დაფიქსირდა, ფაილი წარმატებით აიტვირთა",
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "ატვირთული ფაილი აჭარბებს MAX_FILE_SIZE დირექტივას, რომელიც მითითებულია HTML ფორმაში",
"The uploaded file was only partially uploaded" => "ატვირთული ფაილი მხოლოდ ნაწილობრივ აიტვირთა",
@@ -18,7 +19,6 @@
"replaced {new_name} with {old_name}" => "{new_name} შეცვლილია {old_name}–ით",
"unshared {files}" => "გაზიარება მოხსნილი {files}",
"deleted {files}" => "წაშლილი {files}",
-"generating ZIP-file, it may take some time." => "ZIP-ფაილის გენერირება, ამას ჭირდება გარკვეული დრო.",
"Unable to upload your file as it is a directory or has 0 bytes" => "თქვენი ფაილის ატვირთვა ვერ მოხერხდა. ის არის საქაღალდე და შეიცავს 0 ბაიტს",
"Upload Error" => "შეცდომა ატვირთვისას",
"Close" => "დახურვა",
@@ -47,7 +47,6 @@
"New" => "ახალი",
"Text file" => "ტექსტური ფაილი",
"Folder" => "საქაღალდე",
-"Upload" => "ატვირთვა",
"Cancel upload" => "ატვირთვის გაუქმება",
"Nothing in here. Upload something!" => "აქ არაფერი არ არის. ატვირთე რამე!",
"Download" => "ჩამოტვირთვა",
diff --git a/apps/files/l10n/ko.php b/apps/files/l10n/ko.php
index 928b7cbb7e4..891b036761d 100644
--- a/apps/files/l10n/ko.php
+++ b/apps/files/l10n/ko.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Upload" => "업로드",
"Could not move %s - File with this name already exists" => "%s 항목을 이동시키지 못하였음 - 파일 이름이 이미 존재함",
"Could not move %s" => "%s 항목을 이딩시키지 못하였음",
"Unable to rename file" => "파일 이름바꾸기 할 수 없음",
@@ -28,7 +29,6 @@
"'.' is an invalid file name." => "'.' 는 올바르지 않은 파일 이름 입니다.",
"File name cannot be empty." => "파일이름은 공란이 될 수 없습니다.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "폴더 이름이 올바르지 않습니다. 이름에 문자 '\\', '/', '<', '>', ':', '\"', '|', '? ', '*'는 사용할 수 없습니다.",
-"generating ZIP-file, it may take some time." => "ZIP 파일을 생성하고 있습니다. 시간이 걸릴 수도 있습니다.",
"Unable to upload your file as it is a directory or has 0 bytes" => "이 파일은 디렉터리이거나 비어 있기 때문에 업로드할 수 없습니다",
"Upload Error" => "업로드 오류",
"Close" => "닫기",
@@ -60,7 +60,6 @@
"Text file" => "텍스트 파일",
"Folder" => "폴더",
"From link" => "링크에서",
-"Upload" => "업로드",
"Cancel upload" => "업로드 취소",
"Nothing in here. Upload something!" => "내용이 없습니다. 업로드할 수 있습니다!",
"Download" => "다운로드",
diff --git a/apps/files/l10n/ku_IQ.php b/apps/files/l10n/ku_IQ.php
index d6cf6450792..ddd2c142788 100644
--- a/apps/files/l10n/ku_IQ.php
+++ b/apps/files/l10n/ku_IQ.php
@@ -1,9 +1,9 @@
<?php $TRANSLATIONS = array(
+"Upload" => "بارکردن",
"Close" => "داخستن",
"URL cannot be empty." => "ناونیشانی به‌سته‌ر نابێت به‌تاڵ بێت.",
"Name" => "ناو",
"Save" => "پاشکه‌وتکردن",
"Folder" => "بوخچه",
-"Upload" => "بارکردن",
"Download" => "داگرتن"
);
diff --git a/apps/files/l10n/lb.php b/apps/files/l10n/lb.php
index 229ec3f2024..b041079f0d8 100644
--- a/apps/files/l10n/lb.php
+++ b/apps/files/l10n/lb.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Upload" => "Eroplueden",
"There is no error, the file uploaded with success" => "Keen Feeler, Datei ass komplett ropgelueden ginn",
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Déi ropgelueden Datei ass méi grouss wei d'MAX_FILE_SIZE Eegenschaft déi an der HTML form uginn ass",
"The uploaded file was only partially uploaded" => "Déi ropgelueden Datei ass nëmmen hallef ropgelueden ginn",
@@ -10,7 +11,6 @@
"replace" => "ersetzen",
"cancel" => "ofbriechen",
"undo" => "réckgängeg man",
-"generating ZIP-file, it may take some time." => "Et gëtt eng ZIP-File generéiert, dëst ka bëssen daueren.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Kann deng Datei net eroplueden well et en Dossier ass oder 0 byte grouss ass.",
"Upload Error" => "Fehler beim eroplueden",
"Close" => "Zoumaachen",
@@ -30,7 +30,6 @@
"New" => "Nei",
"Text file" => "Text Fichier",
"Folder" => "Dossier",
-"Upload" => "Eroplueden",
"Cancel upload" => "Upload ofbriechen",
"Nothing in here. Upload something!" => "Hei ass näischt. Lued eppes rop!",
"Download" => "Eroflueden",
diff --git a/apps/files/l10n/lt_LT.php b/apps/files/l10n/lt_LT.php
index fd9824e0c19..22490f8e9fd 100644
--- a/apps/files/l10n/lt_LT.php
+++ b/apps/files/l10n/lt_LT.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Upload" => "Įkelti",
"There is no error, the file uploaded with success" => "Klaidų nėra, failas įkeltas sėkmingai",
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Įkeliamo failo dydis viršija MAX_FILE_SIZE parametrą, kuris yra nustatytas HTML formoje",
"The uploaded file was only partially uploaded" => "Failas buvo įkeltas tik dalinai",
@@ -18,7 +19,6 @@
"replaced {new_name} with {old_name}" => "pakeiskite {new_name} į {old_name}",
"unshared {files}" => "nebesidalinti {files}",
"deleted {files}" => "ištrinti {files}",
-"generating ZIP-file, it may take some time." => "kuriamas ZIP archyvas, tai gali užtrukti šiek tiek laiko.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Neįmanoma įkelti failo - jo dydis gali būti 0 bitų arba tai katalogas",
"Upload Error" => "Įkėlimo klaida",
"Close" => "Užverti",
@@ -47,7 +47,6 @@
"New" => "Naujas",
"Text file" => "Teksto failas",
"Folder" => "Katalogas",
-"Upload" => "Įkelti",
"Cancel upload" => "Atšaukti siuntimą",
"Nothing in here. Upload something!" => "Čia tuščia. Įkelkite ką nors!",
"Download" => "Atsisiųsti",
diff --git a/apps/files/l10n/lv.php b/apps/files/l10n/lv.php
index 33367984918..589b7020c4a 100644
--- a/apps/files/l10n/lv.php
+++ b/apps/files/l10n/lv.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Upload" => "Augšuplādet",
"There is no error, the file uploaded with success" => "Viss kārtībā, augšupielāde veiksmīga",
"No file was uploaded" => "Neviens fails netika augšuplādēts",
"Missing a temporary folder" => "Trūkst pagaidu mapes",
@@ -11,7 +12,6 @@
"suggest name" => "Ieteiktais nosaukums",
"cancel" => "atcelt",
"undo" => "vienu soli atpakaļ",
-"generating ZIP-file, it may take some time." => "lai uzģenerētu ZIP failu, kāds brīdis ir jāpagaida",
"Unable to upload your file as it is a directory or has 0 bytes" => "Nav iespējams augšuplādēt jūsu failu, jo tāds jau eksistē vai arī failam nav izmēra (0 baiti)",
"Upload Error" => "Augšuplādēšanas laikā radās kļūda",
"Pending" => "Gaida savu kārtu",
@@ -30,7 +30,6 @@
"New" => "Jauns",
"Text file" => "Teksta fails",
"Folder" => "Mape",
-"Upload" => "Augšuplādet",
"Cancel upload" => "Atcelt augšuplādi",
"Nothing in here. Upload something!" => "Te vēl nekas nav. Rīkojies, sāc augšuplādēt",
"Download" => "Lejuplādēt",
diff --git a/apps/files/l10n/mk.php b/apps/files/l10n/mk.php
index 3f48a69874e..2916e86a94d 100644
--- a/apps/files/l10n/mk.php
+++ b/apps/files/l10n/mk.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Upload" => "Подигни",
"No file was uploaded. Unknown error" => "Ниту еден фајл не се вчита. Непозната грешка",
"There is no error, the file uploaded with success" => "Нема грешка, датотеката беше подигната успешно",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Подигнатата датотека ја надминува upload_max_filesize директивата во php.ini:",
@@ -21,7 +22,6 @@
"unshared {files}" => "без споделување {files}",
"deleted {files}" => "избришани {files}",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Неправилно име. , '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' не се дозволени.",
-"generating ZIP-file, it may take some time." => "Се генерира ZIP фајлот, ќе треба извесно време.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Не може да се преземе вашата датотека бидејќи фолдерот во кој се наоѓа фајлот има големина од 0 бајти",
"Upload Error" => "Грешка при преземање",
"Close" => "Затвои",
@@ -52,7 +52,6 @@
"Text file" => "Текстуална датотека",
"Folder" => "Папка",
"From link" => "Од врска",
-"Upload" => "Подигни",
"Cancel upload" => "Откажи прикачување",
"Nothing in here. Upload something!" => "Тука нема ништо. Снимете нешто!",
"Download" => "Преземи",
diff --git a/apps/files/l10n/ms_MY.php b/apps/files/l10n/ms_MY.php
index 7fa87840842..23a2783cd9a 100644
--- a/apps/files/l10n/ms_MY.php
+++ b/apps/files/l10n/ms_MY.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Upload" => "Muat naik",
"No file was uploaded. Unknown error" => "Tiada fail dimuatnaik. Ralat tidak diketahui.",
"There is no error, the file uploaded with success" => "Tiada ralat, fail berjaya dimuat naik.",
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Fail yang dimuat naik melebihi MAX_FILE_SIZE yang dinyatakan dalam form HTML ",
@@ -10,7 +11,6 @@
"Delete" => "Padam",
"replace" => "ganti",
"cancel" => "Batal",
-"generating ZIP-file, it may take some time." => "sedang menghasilkan fail ZIP, mungkin mengambil sedikit masa.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Tidak boleh memuatnaik fail anda kerana mungkin ianya direktori atau saiz fail 0 bytes",
"Upload Error" => "Muat naik ralat",
"Close" => "Tutup",
@@ -30,7 +30,6 @@
"New" => "Baru",
"Text file" => "Fail teks",
"Folder" => "Folder",
-"Upload" => "Muat naik",
"Cancel upload" => "Batal muat naik",
"Nothing in here. Upload something!" => "Tiada apa-apa di sini. Muat naik sesuatu!",
"Download" => "Muat turun",
diff --git a/apps/files/l10n/nb_NO.php b/apps/files/l10n/nb_NO.php
index 9be868164b1..48b873e1ef0 100644
--- a/apps/files/l10n/nb_NO.php
+++ b/apps/files/l10n/nb_NO.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Upload" => "Last opp",
"No file was uploaded. Unknown error" => "Ingen filer ble lastet opp. Ukjent feil.",
"There is no error, the file uploaded with success" => "Det er ingen feil. Filen ble lastet opp.",
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Filstørrelsen overskrider maksgrensen på MAX_FILE_SIZE som ble oppgitt i HTML-skjemaet",
@@ -19,7 +20,6 @@
"replaced {new_name} with {old_name}" => "erstatt {new_name} med {old_name}",
"deleted {files}" => "slettet {files}",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ugyldig navn, '\\', '/', '<', '>', ':', '\"', '|', '?' og '*' er ikke tillatt.",
-"generating ZIP-file, it may take some time." => "opprettet ZIP-fil, dette kan ta litt tid",
"Unable to upload your file as it is a directory or has 0 bytes" => "Kan ikke laste opp filen din siden det er en mappe eller den har 0 bytes",
"Upload Error" => "Opplasting feilet",
"Close" => "Lukk",
@@ -50,7 +50,6 @@
"Text file" => "Tekstfil",
"Folder" => "Mappe",
"From link" => "Fra link",
-"Upload" => "Last opp",
"Cancel upload" => "Avbryt opplasting",
"Nothing in here. Upload something!" => "Ingenting her. Last opp noe!",
"Download" => "Last ned",
diff --git a/apps/files/l10n/nl.php b/apps/files/l10n/nl.php
index 77219abcf20..4a9685e06c9 100644
--- a/apps/files/l10n/nl.php
+++ b/apps/files/l10n/nl.php
@@ -1,4 +1,8 @@
<?php $TRANSLATIONS = array(
+"Upload" => "Upload",
+"Could not move %s - File with this name already exists" => "Kon %s niet verplaatsen - Er bestaat al een bestand met deze naam",
+"Could not move %s" => "Kon %s niet verplaatsen",
+"Unable to rename file" => "Kan bestand niet hernoemen",
"No file was uploaded. Unknown error" => "Er was geen bestand geladen. Onbekende fout",
"There is no error, the file uploaded with success" => "Geen fout opgetreden, bestand successvol geupload.",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Het geüploade bestand overscheidt de upload_max_filesize optie in php.ini:",
@@ -25,7 +29,7 @@
"'.' is an invalid file name." => "'.' is een ongeldige bestandsnaam.",
"File name cannot be empty." => "Bestandsnaam kan niet leeg zijn.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Onjuiste naam; '\\', '/', '<', '>', ':', '\"', '|', '?' en '*' zijn niet toegestaan.",
-"generating ZIP-file, it may take some time." => "aanmaken ZIP-file, dit kan enige tijd duren.",
+"Your download is being prepared. This might take some time if the files are big." => "Uw download wordt voorbereid. Dit kan enige tijd duren bij grote bestanden.",
"Unable to upload your file as it is a directory or has 0 bytes" => "uploaden van de file mislukt, het is of een directory of de bestandsgrootte is 0 bytes",
"Upload Error" => "Upload Fout",
"Close" => "Sluit",
@@ -35,6 +39,7 @@
"Upload cancelled." => "Uploaden geannuleerd.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Bestandsupload is bezig. Wanneer de pagina nu verlaten wordt, stopt de upload.",
"URL cannot be empty." => "URL kan niet leeg zijn.",
+"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Ongeldige mapnaam. Gebruik van'Gedeeld' is voorbehouden aan Owncloud",
"{count} files scanned" => "{count} bestanden gescanned",
"error while scanning" => "Fout tijdens het scannen",
"Name" => "Naam",
@@ -56,7 +61,6 @@
"Text file" => "Tekstbestand",
"Folder" => "Map",
"From link" => "Vanaf link",
-"Upload" => "Upload",
"Cancel upload" => "Upload afbreken",
"Nothing in here. Upload something!" => "Er bevindt zich hier niets. Upload een bestand!",
"Download" => "Download",
diff --git a/apps/files/l10n/nn_NO.php b/apps/files/l10n/nn_NO.php
index 04e01a39cfc..8abbe1b6cd3 100644
--- a/apps/files/l10n/nn_NO.php
+++ b/apps/files/l10n/nn_NO.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Upload" => "Last opp",
"There is no error, the file uploaded with success" => "Ingen feil, fila vart lasta opp",
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Den opplasta fila er større enn variabelen MAX_FILE_SIZE i HTML-skjemaet",
"The uploaded file was only partially uploaded" => "Fila vart berre delvis lasta opp",
@@ -15,7 +16,6 @@
"New" => "Ny",
"Text file" => "Tekst fil",
"Folder" => "Mappe",
-"Upload" => "Last opp",
"Nothing in here. Upload something!" => "Ingenting her. Last noko opp!",
"Download" => "Last ned",
"Upload too large" => "For stor opplasting",
diff --git a/apps/files/l10n/oc.php b/apps/files/l10n/oc.php
index 36bbb433394..87ec98e4cf8 100644
--- a/apps/files/l10n/oc.php
+++ b/apps/files/l10n/oc.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Upload" => "Amontcarga",
"There is no error, the file uploaded with success" => "Amontcargament capitat, pas d'errors",
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Lo fichièr amontcargat es mai gròs que la directiva «MAX_FILE_SIZE» especifiada dins lo formulari HTML",
"The uploaded file was only partially uploaded" => "Lo fichièr foguèt pas completament amontcargat",
@@ -13,7 +14,6 @@
"suggest name" => "nom prepausat",
"cancel" => "anulla",
"undo" => "defar",
-"generating ZIP-file, it may take some time." => "Fichièr ZIP a se far, aquò pòt trigar un briu.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Impossible d'amontcargar lo teu fichièr qu'es un repertòri o que ten pas que 0 octet.",
"Upload Error" => "Error d'amontcargar",
"Pending" => "Al esperar",
@@ -35,7 +35,6 @@
"New" => "Nòu",
"Text file" => "Fichièr de tèxte",
"Folder" => "Dorsièr",
-"Upload" => "Amontcarga",
"Cancel upload" => " Anulla l'amontcargar",
"Nothing in here. Upload something!" => "Pas res dedins. Amontcarga qualquaren",
"Download" => "Avalcarga",
diff --git a/apps/files/l10n/pl.php b/apps/files/l10n/pl.php
index b96048cf002..4166bac545d 100644
--- a/apps/files/l10n/pl.php
+++ b/apps/files/l10n/pl.php
@@ -1,4 +1,8 @@
<?php $TRANSLATIONS = array(
+"Upload" => "Prześlij",
+"Could not move %s - File with this name already exists" => "Nie można było przenieść %s - Plik o takiej nazwie już istnieje",
+"Could not move %s" => "Nie można było przenieść %s",
+"Unable to rename file" => "Nie można zmienić nazwy pliku",
"No file was uploaded. Unknown error" => "Plik nie został załadowany. Nieznany błąd",
"There is no error, the file uploaded with success" => "Przesłano plik",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Wgrany plik przekracza wartość upload_max_filesize zdefiniowaną w php.ini: ",
@@ -25,7 +29,6 @@
"'.' is an invalid file name." => "'.' jest nieprawidłową nazwą pliku.",
"File name cannot be empty." => "Nazwa pliku nie może być pusta.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Niepoprawna nazwa, Znaki '\\', '/', '<', '>', ':', '\"', '|', '?' oraz '*'są niedozwolone.",
-"generating ZIP-file, it may take some time." => "Generowanie pliku ZIP, może potrwać pewien czas.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Nie można wczytać pliku jeśli jest katalogiem lub ma 0 bajtów",
"Upload Error" => "Błąd wczytywania",
"Close" => "Zamknij",
@@ -57,7 +60,6 @@
"Text file" => "Plik tekstowy",
"Folder" => "Katalog",
"From link" => "Z linku",
-"Upload" => "Prześlij",
"Cancel upload" => "Przestań wysyłać",
"Nothing in here. Upload something!" => "Brak zawartości. Proszę wysłać pliki!",
"Download" => "Pobiera element",
diff --git a/apps/files/l10n/pt_BR.php b/apps/files/l10n/pt_BR.php
index ece24c7a2fa..b199ded9fe0 100644
--- a/apps/files/l10n/pt_BR.php
+++ b/apps/files/l10n/pt_BR.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Upload" => "Carregar",
"No file was uploaded. Unknown error" => "Nenhum arquivo foi transferido. Erro desconhecido",
"There is no error, the file uploaded with success" => "Não houve nenhum erro, o arquivo foi transferido com sucesso",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "O arquivo enviado excede a diretiva upload_max_filesize no php.ini: ",
@@ -21,7 +22,6 @@
"unshared {files}" => "{files} não compartilhados",
"deleted {files}" => "{files} apagados",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nome inválido, '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' não são permitidos.",
-"generating ZIP-file, it may take some time." => "gerando arquivo ZIP, isso pode levar um tempo.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Impossível enviar seus arquivo como diretório ou ele tem 0 bytes.",
"Upload Error" => "Erro de envio",
"Close" => "Fechar",
@@ -52,7 +52,6 @@
"Text file" => "Arquivo texto",
"Folder" => "Pasta",
"From link" => "Do link",
-"Upload" => "Carregar",
"Cancel upload" => "Cancelar upload",
"Nothing in here. Upload something!" => "Nada aqui.Carrege alguma coisa!",
"Download" => "Baixar",
diff --git a/apps/files/l10n/pt_PT.php b/apps/files/l10n/pt_PT.php
index fb22894b34e..0ed13fa9983 100644
--- a/apps/files/l10n/pt_PT.php
+++ b/apps/files/l10n/pt_PT.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Upload" => "Enviar",
"Could not move %s - File with this name already exists" => "Não foi possível mover o ficheiro %s - Já existe um ficheiro com esse nome",
"Could not move %s" => "Não foi possível move o ficheiro %s",
"Unable to rename file" => "Não foi possível renomear o ficheiro",
@@ -28,7 +29,7 @@
"'.' is an invalid file name." => "'.' não é um nome de ficheiro válido!",
"File name cannot be empty." => "O nome do ficheiro não pode estar vazio.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nome Inválido, os caracteres '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' não são permitidos.",
-"generating ZIP-file, it may take some time." => "a gerar o ficheiro ZIP, poderá demorar algum tempo.",
+"Your download is being prepared. This might take some time if the files are big." => "O seu download está a ser preparado. Este processo pode demorar algum tempo se os ficheiros forem grandes.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Não é possível fazer o envio do ficheiro devido a ser uma pasta ou ter 0 bytes",
"Upload Error" => "Erro no envio",
"Close" => "Fechar",
@@ -60,7 +61,6 @@
"Text file" => "Ficheiro de texto",
"Folder" => "Pasta",
"From link" => "Da ligação",
-"Upload" => "Enviar",
"Cancel upload" => "Cancelar envio",
"Nothing in here. Upload something!" => "Vazio. Envie alguma coisa!",
"Download" => "Transferir",
diff --git a/apps/files/l10n/ro.php b/apps/files/l10n/ro.php
index c34a341e53f..fdba003bf3e 100644
--- a/apps/files/l10n/ro.php
+++ b/apps/files/l10n/ro.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Upload" => "Încarcă",
"Could not move %s" => "Nu s-a putut muta %s",
"Unable to rename file" => "Nu s-a putut redenumi fișierul",
"No file was uploaded. Unknown error" => "Nici un fișier nu a fost încărcat. Eroare necunoscută",
@@ -27,7 +28,6 @@
"'.' is an invalid file name." => "'.' este un nume invalid de fișier.",
"File name cannot be empty." => "Numele fișierului nu poate rămâne gol.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nume invalid, '\\', '/', '<', '>', ':', '\"', '|', '?' si '*' nu sunt permise.",
-"generating ZIP-file, it may take some time." => "se generază fișierul ZIP, va dura ceva timp.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Nu s-a putut încărca fișierul tău deoarece pare să fie un director sau are 0 bytes.",
"Upload Error" => "Eroare la încărcare",
"Close" => "Închide",
@@ -37,6 +37,7 @@
"Upload cancelled." => "Încărcare anulată.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Fișierul este în curs de încărcare. Părăsirea paginii va întrerupe încărcarea.",
"URL cannot be empty." => "Adresa URL nu poate fi goală.",
+"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Invalid folder name. Usage of 'Shared' is reserved by Ownclou",
"{count} files scanned" => "{count} fisiere scanate",
"error while scanning" => "eroare la scanarea",
"Name" => "Nume",
@@ -58,7 +59,6 @@
"Text file" => "Fișier text",
"Folder" => "Dosar",
"From link" => "de la adresa",
-"Upload" => "Încarcă",
"Cancel upload" => "Anulează încărcarea",
"Nothing in here. Upload something!" => "Nimic aici. Încarcă ceva!",
"Download" => "Descarcă",
diff --git a/apps/files/l10n/ru.php b/apps/files/l10n/ru.php
index 49ead61f67e..cb17476b9f8 100644
--- a/apps/files/l10n/ru.php
+++ b/apps/files/l10n/ru.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Upload" => "Загрузить",
"Could not move %s - File with this name already exists" => "Невозможно переместить %s - файл с таким именем уже существует",
"Could not move %s" => "Невозможно переместить %s",
"Unable to rename file" => "Невозможно переименовать файл",
@@ -28,7 +29,6 @@
"'.' is an invalid file name." => "'.' - неправильное имя файла.",
"File name cannot be empty." => "Имя файла не может быть пустым.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Неправильное имя, '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' недопустимы.",
-"generating ZIP-file, it may take some time." => "создание ZIP-файла, это может занять некоторое время.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Не удается загрузить файл размером 0 байт в каталог",
"Upload Error" => "Ошибка загрузки",
"Close" => "Закрыть",
@@ -60,7 +60,6 @@
"Text file" => "Текстовый файл",
"Folder" => "Папка",
"From link" => "Из ссылки",
-"Upload" => "Загрузить",
"Cancel upload" => "Отмена загрузки",
"Nothing in here. Upload something!" => "Здесь ничего нет. Загрузите что-нибудь!",
"Download" => "Скачать",
diff --git a/apps/files/l10n/ru_RU.php b/apps/files/l10n/ru_RU.php
index 16bcc54e59f..4f8bd1d5b95 100644
--- a/apps/files/l10n/ru_RU.php
+++ b/apps/files/l10n/ru_RU.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Upload" => "Загрузить ",
"No file was uploaded. Unknown error" => "Файл не был загружен. Неизвестная ошибка",
"There is no error, the file uploaded with success" => "Ошибка отсутствует, файл загружен успешно.",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Размер загружаемого файла превышает upload_max_filesize директиву в php.ini:",
@@ -21,7 +22,6 @@
"unshared {files}" => "Cовместное использование прекращено {файлы}",
"deleted {files}" => "удалено {файлы}",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Некорректное имя, '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' не допустимы.",
-"generating ZIP-file, it may take some time." => "Создание ZIP-файла, это может занять некоторое время.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Невозможно загрузить файл,\n так как он имеет нулевой размер или является директорией",
"Upload Error" => "Ошибка загрузки",
"Close" => "Закрыть",
@@ -52,7 +52,6 @@
"Text file" => "Текстовый файл",
"Folder" => "Папка",
"From link" => "По ссылке",
-"Upload" => "Загрузить ",
"Cancel upload" => "Отмена загрузки",
"Nothing in here. Upload something!" => "Здесь ничего нет. Загрузите что-нибудь!",
"Download" => "Загрузить",
diff --git a/apps/files/l10n/si_LK.php b/apps/files/l10n/si_LK.php
index e1e06c4f814..8b276bdaa8f 100644
--- a/apps/files/l10n/si_LK.php
+++ b/apps/files/l10n/si_LK.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Upload" => "උඩුගත කිරීම",
"No file was uploaded. Unknown error" => "ගොනුවක් උඩුගත නොවුනි. නොහැඳිනු දෝෂයක්",
"There is no error, the file uploaded with success" => "නිවැරදි ව ගොනුව උඩුගත කෙරිනි",
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "උඩුගත කළ ගොනුවේ විශාලත්වය HTML පෝරමයේ නියම කළ ඇති MAX_FILE_SIZE විශාලත්වයට වඩා වැඩිය",
@@ -14,7 +15,6 @@
"suggest name" => "නමක් යෝජනා කරන්න",
"cancel" => "අත් හරින්න",
"undo" => "නිෂ්ප්‍රභ කරන්න",
-"generating ZIP-file, it may take some time." => "ගොනුවක් සෑදෙමින් පවතී. කෙටි වේලාවක් ගත විය හැක",
"Upload Error" => "උඩුගත කිරීමේ දෝශයක්",
"Close" => "වසන්න",
"1 file uploading" => "1 ගොනුවක් උඩගත කෙරේ",
@@ -39,7 +39,6 @@
"Text file" => "පෙළ ගොනුව",
"Folder" => "ෆෝල්ඩරය",
"From link" => "යොමුවෙන්",
-"Upload" => "උඩුගත කිරීම",
"Cancel upload" => "උඩුගත කිරීම අත් හරින්න",
"Nothing in here. Upload something!" => "මෙහි කිසිවක් නොමැත. යමක් උඩුගත කරන්න",
"Download" => "බාගත කිරීම",
diff --git a/apps/files/l10n/sk_SK.php b/apps/files/l10n/sk_SK.php
index 003b1aff225..b28e2648fef 100644
--- a/apps/files/l10n/sk_SK.php
+++ b/apps/files/l10n/sk_SK.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Upload" => "Odoslať",
"No file was uploaded. Unknown error" => "Žiaden súbor nebol odoslaný. Neznáma chyba",
"There is no error, the file uploaded with success" => "Nenastala žiadna chyba, súbor bol úspešne nahraný",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Nahraný súbor predčil konfiguračnú direktívu upload_max_filesize v súbore php.ini:",
@@ -21,7 +22,6 @@
"unshared {files}" => "zdieľanie zrušené pre {files}",
"deleted {files}" => "zmazané {files}",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nesprávne meno, '\\', '/', '<', '>', ':', '\"', '|', '?' a '*' nie sú povolené hodnoty.",
-"generating ZIP-file, it may take some time." => "generujem ZIP-súbor, môže to chvíľu trvať.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Nemôžem nahrať súbor lebo je to priečinok alebo má 0 bajtov.",
"Upload Error" => "Chyba odosielania",
"Close" => "Zavrieť",
@@ -52,7 +52,6 @@
"Text file" => "Textový súbor",
"Folder" => "Priečinok",
"From link" => "Z odkazu",
-"Upload" => "Odoslať",
"Cancel upload" => "Zrušiť odosielanie",
"Nothing in here. Upload something!" => "Žiadny súbor. Nahrajte niečo!",
"Download" => "Stiahnuť",
diff --git a/apps/files/l10n/sl.php b/apps/files/l10n/sl.php
index 2a0f4506386..34544e3401c 100644
--- a/apps/files/l10n/sl.php
+++ b/apps/files/l10n/sl.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Upload" => "Pošlji",
"No file was uploaded. Unknown error" => "Nobena datoteka ni naložena. Neznana napaka.",
"There is no error, the file uploaded with success" => "Datoteka je uspešno naložena brez napak.",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Naložena datoteka presega dovoljeno velikost. Le-ta je določena z vrstico upload_max_filesize v datoteki php.ini:",
@@ -21,7 +22,6 @@
"unshared {files}" => "odstranjeno iz souporabe {files}",
"deleted {files}" => "izbrisano {files}",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Neveljavno ime, znaki '\\', '/', '<', '>', ':', '\"', '|', '?' in '*' niso dovoljeni.",
-"generating ZIP-file, it may take some time." => "Ustvarjanje datoteke ZIP. To lahko traja nekaj časa.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Pošiljanje ni mogoče, saj gre za mapo, ali pa je datoteka velikosti 0 bajtov.",
"Upload Error" => "Napaka med nalaganjem",
"Close" => "Zapri",
@@ -52,7 +52,6 @@
"Text file" => "Besedilna datoteka",
"Folder" => "Mapa",
"From link" => "Iz povezave",
-"Upload" => "Pošlji",
"Cancel upload" => "Prekliči pošiljanje",
"Nothing in here. Upload something!" => "Tukaj ni ničesar. Naložite kaj!",
"Download" => "Prejmi",
diff --git a/apps/files/l10n/sr.php b/apps/files/l10n/sr.php
index ecde8be4cc0..3da6e27373f 100644
--- a/apps/files/l10n/sr.php
+++ b/apps/files/l10n/sr.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Upload" => "Отпреми",
"There is no error, the file uploaded with success" => "Није дошло до грешке. Датотека је успешно отпремљена.",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Отпремљена датотека прелази смерницу upload_max_filesize у датотеци php.ini:",
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Отпремљена датотека прелази смерницу MAX_FILE_SIZE која је наведена у HTML обрасцу",
@@ -20,7 +21,6 @@
"unshared {files}" => "укинуто дељење {files}",
"deleted {files}" => "обрисано {files}",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Неисправан назив. Следећи знакови нису дозвољени: \\, /, <, >, :, \", |, ? и *.",
-"generating ZIP-file, it may take some time." => "правим ZIP датотеку…",
"Unable to upload your file as it is a directory or has 0 bytes" => "Не могу да отпремим датотеку као фасциклу или она има 0 бајтова",
"Upload Error" => "Грешка при отпремању",
"Close" => "Затвори",
@@ -50,7 +50,6 @@
"Text file" => "текстуална датотека",
"Folder" => "фасцикла",
"From link" => "Са везе",
-"Upload" => "Отпреми",
"Cancel upload" => "Прекини отпремање",
"Nothing in here. Upload something!" => "Овде нема ничег. Отпремите нешто!",
"Download" => "Преузми",
diff --git a/apps/files/l10n/sr@latin.php b/apps/files/l10n/sr@latin.php
index fddaf5840ce..117d437f0bb 100644
--- a/apps/files/l10n/sr@latin.php
+++ b/apps/files/l10n/sr@latin.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Upload" => "Pošalji",
"There is no error, the file uploaded with success" => "Nema greške, fajl je uspešno poslat",
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Poslati fajl prevazilazi direktivu MAX_FILE_SIZE koja je navedena u HTML formi",
"The uploaded file was only partially uploaded" => "Poslati fajl je samo delimično otpremljen!",
@@ -12,7 +13,6 @@
"Modified" => "Zadnja izmena",
"Maximum upload size" => "Maksimalna veličina pošiljke",
"Save" => "Snimi",
-"Upload" => "Pošalji",
"Nothing in here. Upload something!" => "Ovde nema ničeg. Pošaljite nešto!",
"Download" => "Preuzmi",
"Upload too large" => "Pošiljka je prevelika",
diff --git a/apps/files/l10n/sv.php b/apps/files/l10n/sv.php
index 7277ec17852..7597f6908eb 100644
--- a/apps/files/l10n/sv.php
+++ b/apps/files/l10n/sv.php
@@ -1,4 +1,8 @@
<?php $TRANSLATIONS = array(
+"Upload" => "Ladda upp",
+"Could not move %s - File with this name already exists" => "Kunde inte flytta %s - Det finns redan en fil med detta namn",
+"Could not move %s" => "Kan inte flytta %s",
+"Unable to rename file" => "Kan inte byta namn på filen",
"No file was uploaded. Unknown error" => "Ingen fil uppladdad. Okänt fel",
"There is no error, the file uploaded with success" => "Inga fel uppstod. Filen laddades upp utan problem",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Den uppladdade filen överskrider upload_max_filesize direktivet php.ini:",
@@ -25,7 +29,7 @@
"'.' is an invalid file name." => "'.' är ett ogiltigt filnamn.",
"File name cannot be empty." => "Filnamn kan inte vara tomt.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ogiltigt namn, '\\', '/', '<', '>', ':', '\"', '|', '?' och '*' är inte tillåtet.",
-"generating ZIP-file, it may take some time." => "genererar ZIP-fil, det kan ta lite tid.",
+"Your download is being prepared. This might take some time if the files are big." => "Din nedladdning förbereds. Det kan ta tid om det är stora filer.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Kunde inte ladda upp dina filer eftersom det antingen är en mapp eller har 0 bytes.",
"Upload Error" => "Uppladdningsfel",
"Close" => "Stäng",
@@ -57,7 +61,6 @@
"Text file" => "Textfil",
"Folder" => "Mapp",
"From link" => "Från länk",
-"Upload" => "Ladda upp",
"Cancel upload" => "Avbryt uppladdning",
"Nothing in here. Upload something!" => "Ingenting här. Ladda upp något!",
"Download" => "Ladda ner",
diff --git a/apps/files/l10n/ta_LK.php b/apps/files/l10n/ta_LK.php
index 16cab5cf963..d7a9313d974 100644
--- a/apps/files/l10n/ta_LK.php
+++ b/apps/files/l10n/ta_LK.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Upload" => "பதிவேற்றுக",
"No file was uploaded. Unknown error" => "ஒரு கோப்பும் பதிவேற்றப்படவில்லை. அறியப்படாத வழு",
"There is no error, the file uploaded with success" => "இங்கு வழு இல்லை, கோப்பு வெற்றிகரமாக பதிவேற்றப்பட்டது",
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "பதிவேற்றப்பட்ட கோப்பானது HTML படிவத்தில் குறிப்பிடப்பட்டுள்ள MAX_FILE_SIZE directive ஐ விட கூடியது",
@@ -20,7 +21,6 @@
"unshared {files}" => "பகிரப்படாதது {கோப்புகள்}",
"deleted {files}" => "நீக்கப்பட்டது {கோப்புகள்}",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "செல்லுபடியற்ற பெயர்,'\\', '/', '<', '>', ':', '\"', '|', '?' மற்றும் '*' ஆகியன அனுமதிக்கப்படமாட்டாது.",
-"generating ZIP-file, it may take some time." => " ZIP கோப்பு உருவாக்கப்படுகின்றது, இது சில நேரம் ஆகலாம்.",
"Unable to upload your file as it is a directory or has 0 bytes" => "அடைவு அல்லது 0 bytes ஐ கொண்டுள்ளதால் உங்களுடைய கோப்பை பதிவேற்ற முடியவில்லை",
"Upload Error" => "பதிவேற்றல் வழு",
"Close" => "மூடுக",
@@ -51,7 +51,6 @@
"Text file" => "கோப்பு உரை",
"Folder" => "கோப்புறை",
"From link" => "இணைப்பிலிருந்து",
-"Upload" => "பதிவேற்றுக",
"Cancel upload" => "பதிவேற்றலை இரத்து செய்க",
"Nothing in here. Upload something!" => "இங்கு ஒன்றும் இல்லை. ஏதாவது பதிவேற்றுக!",
"Download" => "பதிவிறக்குக",
diff --git a/apps/files/l10n/th_TH.php b/apps/files/l10n/th_TH.php
index 3fda142a4e9..43a905ea3bc 100644
--- a/apps/files/l10n/th_TH.php
+++ b/apps/files/l10n/th_TH.php
@@ -1,4 +1,8 @@
<?php $TRANSLATIONS = array(
+"Upload" => "อัพโหลด",
+"Could not move %s - File with this name already exists" => "ไม่สามารถย้าย %s ได้ - ไฟล์ที่ใช้ชื่อนี้มีอยู่แล้ว",
+"Could not move %s" => "ไม่สามารถย้าย %s ได้",
+"Unable to rename file" => "ไม่สามารถเปลี่ยนชื่อไฟล์ได้",
"No file was uploaded. Unknown error" => "ยังไม่มีไฟล์ใดที่ถูกอัพโหลด เกิดข้อผิดพลาดที่ไม่ทราบสาเหตุ",
"There is no error, the file uploaded with success" => "ไม่มีข้อผิดพลาดใดๆ ไฟล์ถูกอัพโหลดเรียบร้อยแล้ว",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "ขนาดไฟล์ที่อัพโหลดมีขนาดเกิน upload_max_filesize ที่ระบุไว้ใน php.ini",
@@ -7,6 +11,8 @@
"No file was uploaded" => "ยังไม่มีไฟล์ที่ถูกอัพโหลด",
"Missing a temporary folder" => "แฟ้มเอกสารชั่วคราวเกิดการสูญหาย",
"Failed to write to disk" => "เขียนข้อมูลลงแผ่นดิสก์ล้มเหลว",
+"Not enough space available" => "มีพื้นที่เหลือไม่เพียงพอ",
+"Invalid directory." => "ไดเร็กทอรี่ไม่ถูกต้อง",
"Files" => "ไฟล์",
"Unshare" => "ยกเลิกการแชร์ข้อมูล",
"Delete" => "ลบ",
@@ -20,8 +26,10 @@
"replaced {new_name} with {old_name}" => "แทนที่ {new_name} ด้วย {old_name} แล้ว",
"unshared {files}" => "ยกเลิกการแชร์แล้ว {files} ไฟล์",
"deleted {files}" => "ลบไฟล์แล้ว {files} ไฟล์",
+"'.' is an invalid file name." => "'.' เป็นชื่อไฟล์ที่ไม่ถูกต้อง",
+"File name cannot be empty." => "ชื่อไฟล์ไม่สามารถเว้นว่างได้",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "ชื่อที่ใช้ไม่ถูกต้อง, '\\', '/', '<', '>', ':', '\"', '|', '?' และ '*' ไม่ได้รับอนุญาตให้ใช้งานได้",
-"generating ZIP-file, it may take some time." => "กำลังสร้างไฟล์บีบอัด ZIP อาจใช้เวลาสักครู่",
+"Your download is being prepared. This might take some time if the files are big." => "กำลังเตรียมดาวน์โหลดข้อมูล หากไฟล์มีขนาดใหญ่ อาจใช้เวลาสักครู่",
"Unable to upload your file as it is a directory or has 0 bytes" => "ไม่สามารถอัพโหลดไฟล์ของคุณได้ เนื่องจากไฟล์ดังกล่าวเป็นไดเร็กทอรี่หรือมีขนาด 0 ไบต์",
"Upload Error" => "เกิดข้อผิดพลาดในการอัพโหลด",
"Close" => "ปิด",
@@ -31,6 +39,7 @@
"Upload cancelled." => "การอัพโหลดถูกยกเลิก",
"File upload is in progress. Leaving the page now will cancel the upload." => "การอัพโหลดไฟล์กำลังอยู่ในระหว่างดำเนินการ การออกจากหน้าเว็บนี้จะทำให้การอัพโหลดถูกยกเลิก",
"URL cannot be empty." => "URL ไม่สามารถเว้นว่างได้",
+"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "ชื่อโฟลเดอร์ไม่ถูกต้อง การใช้งาน 'แชร์' สงวนไว้สำหรับ Owncloud เท่านั้น",
"{count} files scanned" => "สแกนไฟล์แล้ว {count} ไฟล์",
"error while scanning" => "พบข้อผิดพลาดในระหว่างการสแกนไฟล์",
"Name" => "ชื่อ",
@@ -52,7 +61,6 @@
"Text file" => "ไฟล์ข้อความ",
"Folder" => "แฟ้มเอกสาร",
"From link" => "จากลิงก์",
-"Upload" => "อัพโหลด",
"Cancel upload" => "ยกเลิกการอัพโหลด",
"Nothing in here. Upload something!" => "ยังไม่มีไฟล์ใดๆอยู่ที่นี่ กรุณาอัพโหลดไฟล์!",
"Download" => "ดาวน์โหลด",
diff --git a/apps/files/l10n/tr.php b/apps/files/l10n/tr.php
index b32da7de25e..6b390570f30 100644
--- a/apps/files/l10n/tr.php
+++ b/apps/files/l10n/tr.php
@@ -1,4 +1,8 @@
<?php $TRANSLATIONS = array(
+"Upload" => "Yükle",
+"Could not move %s - File with this name already exists" => "%s taşınamadı. Bu isimde dosya zaten var.",
+"Could not move %s" => "%s taşınamadı",
+"Unable to rename file" => "Dosya adı değiştirilemedi",
"No file was uploaded. Unknown error" => "Dosya yüklenmedi. Bilinmeyen hata",
"There is no error, the file uploaded with success" => "Bir hata yok, dosya başarıyla yüklendi",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "php.ini dosyasında upload_max_filesize ile belirtilen dosya yükleme sınırı aşıldı.",
@@ -7,6 +11,8 @@
"No file was uploaded" => "Hiç dosya yüklenmedi",
"Missing a temporary folder" => "Geçici bir klasör eksik",
"Failed to write to disk" => "Diske yazılamadı",
+"Not enough space available" => "Yeterli disk alanı yok",
+"Invalid directory." => "Geçersiz dizin.",
"Files" => "Dosyalar",
"Unshare" => "Paylaşılmayan",
"Delete" => "Sil",
@@ -20,8 +26,10 @@
"replaced {new_name} with {old_name}" => "{new_name} ismi {old_name} ile değiştirildi",
"unshared {files}" => "paylaşılmamış {files}",
"deleted {files}" => "silinen {files}",
+"'.' is an invalid file name." => "'.' geçersiz dosya adı.",
+"File name cannot be empty." => "Dosya adı boş olamaz.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Geçersiz isim, '\\', '/', '<', '>', ':', '\"', '|', '?' ve '*' karakterlerine izin verilmemektedir.",
-"generating ZIP-file, it may take some time." => "ZIP dosyası oluşturuluyor, biraz sürebilir.",
+"Your download is being prepared. This might take some time if the files are big." => "İndirmeniz hazırlanıyor. Dosya büyük ise biraz zaman alabilir.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Dosyanızın boyutu 0 byte olduğundan veya bir dizin olduğundan yüklenemedi",
"Upload Error" => "Yükleme hatası",
"Close" => "Kapat",
@@ -31,6 +39,7 @@
"Upload cancelled." => "Yükleme iptal edildi.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Dosya yükleme işlemi sürüyor. Şimdi sayfadan ayrılırsanız işleminiz iptal olur.",
"URL cannot be empty." => "URL boş olamaz.",
+"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Geçersiz dizin adı. Shared isminin kullanımı Owncloud tarafından rezerver edilmiştir.",
"{count} files scanned" => "{count} dosya tarandı",
"error while scanning" => "tararamada hata oluşdu",
"Name" => "Ad",
@@ -52,7 +61,6 @@
"Text file" => "Metin dosyası",
"Folder" => "Klasör",
"From link" => "Bağlantıdan",
-"Upload" => "Yükle",
"Cancel upload" => "Yüklemeyi iptal et",
"Nothing in here. Upload something!" => "Burada hiçbir şey yok. Birşeyler yükleyin!",
"Download" => "İndir",
diff --git a/apps/files/l10n/uk.php b/apps/files/l10n/uk.php
index eba48a41cb6..f1279bc77c8 100644
--- a/apps/files/l10n/uk.php
+++ b/apps/files/l10n/uk.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Upload" => "Відвантажити",
"No file was uploaded. Unknown error" => "Не завантажено жодного файлу. Невідома помилка",
"There is no error, the file uploaded with success" => "Файл успішно вивантажено без помилок.",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Розмір звантаження перевищує upload_max_filesize параметра в php.ini: ",
@@ -21,7 +22,6 @@
"unshared {files}" => "неопубліковано {files}",
"deleted {files}" => "видалено {files}",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Невірне ім'я, '\\', '/', '<', '>', ':', '\"', '|', '?' та '*' не дозволені.",
-"generating ZIP-file, it may take some time." => "Створення ZIP-файлу, це може зайняти певний час.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Неможливо завантажити ваш файл тому, що він тека або файл розміром 0 байт",
"Upload Error" => "Помилка завантаження",
"Close" => "Закрити",
@@ -52,7 +52,6 @@
"Text file" => "Текстовий файл",
"Folder" => "Папка",
"From link" => "З посилання",
-"Upload" => "Відвантажити",
"Cancel upload" => "Перервати завантаження",
"Nothing in here. Upload something!" => "Тут нічого немає. Відвантажте що-небудь!",
"Download" => "Завантажити",
diff --git a/apps/files/l10n/vi.php b/apps/files/l10n/vi.php
index 7d5c5290502..dcaf8900014 100644
--- a/apps/files/l10n/vi.php
+++ b/apps/files/l10n/vi.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Upload" => "Tải lên",
"No file was uploaded. Unknown error" => "Không có tập tin nào được tải lên. Lỗi không xác định",
"There is no error, the file uploaded with success" => "Không có lỗi, các tập tin đã được tải lên thành công",
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Kích thước những tập tin tải lên vượt quá MAX_FILE_SIZE đã được quy định",
@@ -20,7 +21,6 @@
"unshared {files}" => "hủy chia sẽ {files}",
"deleted {files}" => "đã xóa {files}",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Tên không hợp lệ, '\\', '/', '<', '>', ':', '\"', '|', '?' và '*' thì không được phép dùng.",
-"generating ZIP-file, it may take some time." => "Tạo tập tin ZIP, điều này có thể làm mất một chút thời gian",
"Unable to upload your file as it is a directory or has 0 bytes" => "Không thể tải lên tập tin này do nó là một thư mục hoặc kích thước tập tin bằng 0 byte",
"Upload Error" => "Tải lên lỗi",
"Close" => "Đóng",
@@ -51,7 +51,6 @@
"Text file" => "Tập tin văn bản",
"Folder" => "Thư mục",
"From link" => "Từ liên kết",
-"Upload" => "Tải lên",
"Cancel upload" => "Hủy upload",
"Nothing in here. Upload something!" => "Không có gì ở đây .Hãy tải lên một cái gì đó !",
"Download" => "Tải xuống",
diff --git a/apps/files/l10n/zh_CN.GB2312.php b/apps/files/l10n/zh_CN.GB2312.php
index e60df8291a9..4416ce9a4a2 100644
--- a/apps/files/l10n/zh_CN.GB2312.php
+++ b/apps/files/l10n/zh_CN.GB2312.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Upload" => "上传",
"No file was uploaded. Unknown error" => "没有上传文件。未知错误",
"There is no error, the file uploaded with success" => "没有任何错误,文件上传成功了",
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "上传的文件超过了HTML表单指定的MAX_FILE_SIZE",
@@ -19,7 +20,6 @@
"replaced {new_name} with {old_name}" => "已用 {old_name} 替换 {new_name}",
"unshared {files}" => "未分享的 {files}",
"deleted {files}" => "已删除的 {files}",
-"generating ZIP-file, it may take some time." => "正在生成ZIP文件,这可能需要点时间",
"Unable to upload your file as it is a directory or has 0 bytes" => "不能上传你指定的文件,可能因为它是个文件夹或者大小为0",
"Upload Error" => "上传错误",
"Close" => "关闭",
@@ -50,7 +50,6 @@
"Text file" => "文本文档",
"Folder" => "文件夹",
"From link" => "来自链接",
-"Upload" => "上传",
"Cancel upload" => "取消上传",
"Nothing in here. Upload something!" => "这里没有东西.上传点什么!",
"Download" => "下载",
diff --git a/apps/files/l10n/zh_CN.php b/apps/files/l10n/zh_CN.php
index 0b26a4b174f..f8dedc118e0 100644
--- a/apps/files/l10n/zh_CN.php
+++ b/apps/files/l10n/zh_CN.php
@@ -1,4 +1,8 @@
<?php $TRANSLATIONS = array(
+"Upload" => "上传",
+"Could not move %s - File with this name already exists" => "无法移动 %s - 同名文件已存在",
+"Could not move %s" => "无法移动 %s",
+"Unable to rename file" => "无法重命名文件",
"No file was uploaded. Unknown error" => "没有文件被上传。未知错误",
"There is no error, the file uploaded with success" => "没有发生错误,文件上传成功。",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "上传文件大小已超过php.ini中upload_max_filesize所规定的值",
@@ -7,6 +11,8 @@
"No file was uploaded" => "文件没有上传",
"Missing a temporary folder" => "缺少临时目录",
"Failed to write to disk" => "写入磁盘失败",
+"Not enough space available" => "没有足够可用空间",
+"Invalid directory." => "无效文件夹。",
"Files" => "文件",
"Unshare" => "取消分享",
"Delete" => "删除",
@@ -20,8 +26,10 @@
"replaced {new_name} with {old_name}" => "已将 {old_name}替换成 {new_name}",
"unshared {files}" => "取消了共享 {files}",
"deleted {files}" => "删除了 {files}",
+"'.' is an invalid file name." => "'.' 是一个无效的文件名。",
+"File name cannot be empty." => "文件名不能为空。",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "无效名称,'\\', '/', '<', '>', ':', '\"', '|', '?' 和 '*' 不被允许使用。",
-"generating ZIP-file, it may take some time." => "正在生成 ZIP 文件,可能需要一些时间",
+"Your download is being prepared. This might take some time if the files are big." => "下载正在准备中。如果文件较大可能会花费一些时间。",
"Unable to upload your file as it is a directory or has 0 bytes" => "无法上传文件,因为它是一个目录或者大小为 0 字节",
"Upload Error" => "上传错误",
"Close" => "关闭",
@@ -31,6 +39,7 @@
"Upload cancelled." => "上传已取消",
"File upload is in progress. Leaving the page now will cancel the upload." => "文件正在上传中。现在离开此页会导致上传动作被取消。",
"URL cannot be empty." => "URL不能为空",
+"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "无效文件夹名。'共享' 是 Owncloud 预留的文件夹名。",
"{count} files scanned" => "{count} 个文件已扫描。",
"error while scanning" => "扫描时出错",
"Name" => "名称",
@@ -52,7 +61,6 @@
"Text file" => "文本文件",
"Folder" => "文件夹",
"From link" => "来自链接",
-"Upload" => "上传",
"Cancel upload" => "取消上传",
"Nothing in here. Upload something!" => "这里还什么都没有。上传些东西吧!",
"Download" => "下载",
diff --git a/apps/files/l10n/zh_TW.php b/apps/files/l10n/zh_TW.php
index 7f0f44baca9..61f8c288288 100644
--- a/apps/files/l10n/zh_TW.php
+++ b/apps/files/l10n/zh_TW.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Upload" => "上傳",
"Could not move %s - File with this name already exists" => "無法移動 %s - 同名的檔案已經存在",
"Could not move %s" => "無法移動 %s",
"Unable to rename file" => "無法重新命名檔案",
@@ -28,7 +29,6 @@
"'.' is an invalid file name." => "'.' 是不合法的檔名。",
"File name cannot be empty." => "檔名不能為空。",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "檔名不合法,不允許 '\\', '/', '<', '>', ':', '\"', '|', '?' 和 '*' 。",
-"generating ZIP-file, it may take some time." => "產生 ZIP 壓縮檔,這可能需要一段時間。",
"Unable to upload your file as it is a directory or has 0 bytes" => "無法上傳您的檔案因為它可能是一個目錄或檔案大小為0",
"Upload Error" => "上傳發生錯誤",
"Close" => "關閉",
@@ -60,7 +60,6 @@
"Text file" => "文字檔",
"Folder" => "資料夾",
"From link" => "從連結",
-"Upload" => "上傳",
"Cancel upload" => "取消上傳",
"Nothing in here. Upload something!" => "沒有任何東西。請上傳內容!",
"Download" => "下載",
diff --git a/apps/files/templates/part.breadcrumb.php b/apps/files/templates/part.breadcrumb.php
index a298f1ccc4b..7df2afc1f52 100644
--- a/apps/files/templates/part.breadcrumb.php
+++ b/apps/files/templates/part.breadcrumb.php
@@ -1,10 +1,10 @@
- <?php for($i=0; $i<count($_["breadcrumb"]); $i++):
- $crumb = $_["breadcrumb"][$i];
- $dir = str_replace('+', '%20', urlencode($crumb["dir"]));
- $dir = str_replace('%2F', '/', $dir); ?>
- <div class="crumb <?php if($i == count($_["breadcrumb"])-1) echo 'last';?> svg"
- data-dir='<?php echo $dir;?>'
- style='background-image:url("<?php echo OCP\image_path('core', 'breadcrumb.png');?>")'>
- <a href="<?php echo $_['baseURL'].$dir; ?>"><?php echo OCP\Util::sanitizeHTML($crumb["name"]); ?></a>
- </div>
- <?php endfor; \ No newline at end of file
+<?php for($i=0; $i<count($_["breadcrumb"]); $i++):
+ $crumb = $_["breadcrumb"][$i];
+ $dir = str_replace('+', '%20', urlencode($crumb["dir"]));
+ $dir = str_replace('%2F', '/', $dir); ?>
+ <div class="crumb <?php if($i == count($_["breadcrumb"])-1) echo 'last';?> svg"
+ data-dir='<?php echo $dir;?>'
+ style='background-image:url("<?php echo OCP\image_path('core', 'breadcrumb.png');?>")'>
+ <a href="<?php echo $_['baseURL'].$dir; ?>"><?php echo OCP\Util::sanitizeHTML($crumb["name"]); ?></a>
+ </div>
+<?php endfor; \ No newline at end of file
diff --git a/apps/files/templates/part.list.php b/apps/files/templates/part.list.php
index 4c765adb7af..dfac43d1b12 100644
--- a/apps/files/templates/part.list.php
+++ b/apps/files/templates/part.list.php
@@ -1,70 +1,70 @@
- <script type="text/javascript">
- <?php if ( array_key_exists('publicListView', $_) && $_['publicListView'] == true ) :?>
- var publicListView = true;
+<script type="text/javascript">
+<?php if ( array_key_exists('publicListView', $_) && $_['publicListView'] == true ) :?>
+ var publicListView = true;
+<?php else: ?>
+ var publicListView = false;
+<?php endif; ?>
+</script>
+
+<?php foreach($_['files'] as $file):
+ $simple_file_size = OCP\simple_file_size($file['size']);
+ // the bigger the file, the darker the shade of grey; megabytes*2
+ $simple_size_color = intval(200-$file['size']/(1024*1024)*2);
+ if($simple_size_color<0) $simple_size_color = 0;
+ $relative_modified_date = OCP\relative_modified_date($file['mtime']);
+ // the older the file, the brighter the shade of grey; days*14
+ $relative_date_color = round((time()-$file['mtime'])/60/60/24*14);
+ if($relative_date_color>200) $relative_date_color = 200;
+ $name = str_replace('+', '%20', urlencode($file['name']));
+ $name = str_replace('%2F', '/', $name);
+ $directory = str_replace('+', '%20', urlencode($file['directory']));
+ $directory = str_replace('%2F', '/', $directory); ?>
+ <tr data-id="<?php echo $file['id']; ?>"
+ data-file="<?php echo $name;?>"
+ data-type="<?php echo ($file['type'] == 'dir')?'dir':'file'?>"
+ data-mime="<?php echo $file['mimetype']?>"
+ data-size='<?php echo $file['size'];?>'
+ data-permissions='<?php echo $file['permissions']; ?>'>
+ <td class="filename svg"
+ <?php if($file['type'] == 'dir'): ?>
+ style="background-image:url(<?php echo OCP\mimetype_icon('dir'); ?>)"
<?php else: ?>
- var publicListView = false;
+ style="background-image:url(<?php echo OCP\mimetype_icon($file['mimetype']); ?>)"
<?php endif; ?>
- </script>
-
- <?php foreach($_['files'] as $file):
- $simple_file_size = OCP\simple_file_size($file['size']);
- // the bigger the file, the darker the shade of grey; megabytes*2
- $simple_size_color = intval(200-$file['size']/(1024*1024)*2);
- if($simple_size_color<0) $simple_size_color = 0;
- $relative_modified_date = OCP\relative_modified_date($file['mtime']);
- // the older the file, the brighter the shade of grey; days*14
- $relative_date_color = round((time()-$file['mtime'])/60/60/24*14);
- if($relative_date_color>200) $relative_date_color = 200;
- $name = str_replace('+', '%20', urlencode($file['name']));
- $name = str_replace('%2F', '/', $name);
- $directory = str_replace('+', '%20', urlencode($file['directory']));
- $directory = str_replace('%2F', '/', $directory); ?>
- <tr data-id="<?php echo $file['id']; ?>"
- data-file="<?php echo $name;?>"
- data-type="<?php echo ($file['type'] == 'dir')?'dir':'file'?>"
- data-mime="<?php echo $file['mimetype']?>"
- data-size='<?php echo $file['size'];?>'
- data-permissions='<?php echo $file['permissions']; ?>'>
- <td class="filename svg"
- <?php if($file['type'] == 'dir'): ?>
- style="background-image:url(<?php echo OCP\mimetype_icon('dir'); ?>)"
- <?php else: ?>
- style="background-image:url(<?php echo OCP\mimetype_icon($file['mimetype']); ?>)"
- <?php endif; ?>
- >
- <?php if(!isset($_['readonly']) || !$_['readonly']): ?><input type="checkbox" /><?php endif; ?>
- <?php if($file['type'] == 'dir'): ?>
- <a class="name" href="<?php $_['baseURL'].$directory.'/'.$name; ?>)" title="">
- <?php else: ?>
- <a class="name" href="<?php echo $_['downloadURL'].$directory.'/'.$name; ?>" title="">
- <?php endif; ?>
- <span class="nametext">
- <?php if($file['type'] == 'dir'):?>
- <?php echo htmlspecialchars($file['name']);?>
- <?php else:?>
- <?php echo htmlspecialchars($file['basename']);?><span
- class='extension'><?php echo $file['extension'];?></span>
- <?php endif;?>
- </span>
- <?php if($file['type'] == 'dir'):?>
- <span class="uploadtext" currentUploads="0">
- </span>
- <?php endif;?>
- </a>
- </td>
- <td class="filesize"
- title="<?php echo OCP\human_file_size($file['size']); ?>"
- style="color:rgb(<?php echo $simple_size_color.','.$simple_size_color.','.$simple_size_color ?>)">
- <?php echo $simple_file_size; ?>
- </td>
- <td class="date">
- <span class="modified"
- title="<?php echo $file['date']; ?>"
- style="color:rgb(<?php echo $relative_date_color.','
- .$relative_date_color.','
- .$relative_date_color ?>)">
- <?php echo $relative_modified_date; ?>
- </span>
- </td>
- </tr>
- <?php endforeach; \ No newline at end of file
+ >
+ <?php if(!isset($_['readonly']) || !$_['readonly']): ?><input type="checkbox" /><?php endif; ?>
+ <?php if($file['type'] == 'dir'): ?>
+ <a class="name" href="<?php $_['baseURL'].$directory.'/'.$name; ?>)" title="">
+ <?php else: ?>
+ <a class="name" href="<?php echo $_['downloadURL'].$directory.'/'.$name; ?>" title="">
+ <?php endif; ?>
+ <span class="nametext">
+ <?php if($file['type'] == 'dir'):?>
+ <?php echo htmlspecialchars($file['name']);?>
+ <?php else:?>
+ <?php echo htmlspecialchars($file['basename']);?><span
+ class='extension'><?php echo $file['extension'];?></span>
+ <?php endif;?>
+ </span>
+ <?php if($file['type'] == 'dir'):?>
+ <span class="uploadtext" currentUploads="0">
+ </span>
+ <?php endif;?>
+ </a>
+ </td>
+ <td class="filesize"
+ title="<?php echo OCP\human_file_size($file['size']); ?>"
+ style="color:rgb(<?php echo $simple_size_color.','.$simple_size_color.','.$simple_size_color ?>)">
+ <?php echo $simple_file_size; ?>
+ </td>
+ <td class="date">
+ <span class="modified"
+ title="<?php echo $file['date']; ?>"
+ style="color:rgb(<?php echo $relative_date_color.','
+ .$relative_date_color.','
+ .$relative_date_color ?>)">
+ <?php echo $relative_modified_date; ?>
+ </span>
+ </td>
+ </tr>
+<?php endforeach; \ No newline at end of file
diff --git a/apps/files_encryption/ajax/mode.php b/apps/files_encryption/ajax/mode.php
new file mode 100644
index 00000000000..64c5be94401
--- /dev/null
+++ b/apps/files_encryption/ajax/mode.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright (c) 2012, Bjoern Schiessle <schiessle@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or later.
+ * See the COPYING-README file.
+ */
+
+use OCA\Encryption\Keymanager;
+
+OCP\JSON::checkAppEnabled('files_encryption');
+OCP\JSON::checkLoggedIn();
+OCP\JSON::callCheck();
+
+$mode = $_POST['mode'];
+$changePasswd = false;
+$passwdChanged = false;
+
+if ( isset($_POST['newpasswd']) && isset($_POST['oldpasswd']) ) {
+ $oldpasswd = $_POST['oldpasswd'];
+ $newpasswd = $_POST['newpasswd'];
+ $changePasswd = true;
+ $passwdChanged = Keymanager::changePasswd($oldpasswd, $newpasswd);
+}
+
+$query = \OC_DB::prepare( "SELECT mode FROM *PREFIX*encryption WHERE uid = ?" );
+$result = $query->execute(array(\OCP\User::getUser()));
+
+if ($result->fetchRow()){
+ $query = OC_DB::prepare( 'UPDATE *PREFIX*encryption SET mode = ? WHERE uid = ?' );
+} else {
+ $query = OC_DB::prepare( 'INSERT INTO *PREFIX*encryption ( mode, uid ) VALUES( ?, ? )' );
+}
+
+if ( (!$changePasswd || $passwdChanged) && $query->execute(array($mode, \OCP\User::getUser())) ) {
+ OCP\JSON::success();
+} else {
+ OCP\JSON::error();
+} \ No newline at end of file
diff --git a/apps/files_encryption/appinfo/app.php b/apps/files_encryption/appinfo/app.php
index 2a30d0beb67..31b430d37a9 100644
--- a/apps/files_encryption/appinfo/app.php
+++ b/apps/files_encryption/appinfo/app.php
@@ -1,21 +1,37 @@
<?php
-OC::$CLASSPATH['OC_Crypt'] = 'apps/files_encryption/lib/crypt.php';
-OC::$CLASSPATH['OC_CryptStream'] = 'apps/files_encryption/lib/cryptstream.php';
-OC::$CLASSPATH['OC_FileProxy_Encryption'] = 'apps/files_encryption/lib/proxy.php';
+OC::$CLASSPATH['OCA\Encryption\Crypt'] = 'apps/files_encryption/lib/crypt.php';
+OC::$CLASSPATH['OCA\Encryption\Hooks'] = 'apps/files_encryption/hooks/hooks.php';
+OC::$CLASSPATH['OCA\Encryption\Util'] = 'apps/files_encryption/lib/util.php';
+OC::$CLASSPATH['OCA\Encryption\Keymanager'] = 'apps/files_encryption/lib/keymanager.php';
+OC::$CLASSPATH['OCA\Encryption\Stream'] = 'apps/files_encryption/lib/stream.php';
+OC::$CLASSPATH['OCA\Encryption\Proxy'] = 'apps/files_encryption/lib/proxy.php';
+OC::$CLASSPATH['OCA\Encryption\Session'] = 'apps/files_encryption/lib/session.php';
-OC_FileProxy::register(new OC_FileProxy_Encryption());
+OC_FileProxy::register( new OCA\Encryption\Proxy() );
-OCP\Util::connectHook('OC_User', 'post_login', 'OC_Crypt', 'loginListener');
+OCP\Util::connectHook( 'OC_User','post_login', 'OCA\Encryption\Hooks', 'login' );
+OCP\Util::connectHook( 'OC_Webdav_Properties', 'update', 'OCA\Encryption\Hooks', 'updateKeyfile' );
+OCP\Util::connectHook( 'OC_User','post_setPassword','OCA\Encryption\Hooks' ,'setPassphrase' );
-stream_wrapper_register('crypt', 'OC_CryptStream');
+stream_wrapper_register( 'crypt', 'OCA\Encryption\Stream' );
-// force the user to re-loggin if the encryption key isn't unlocked
-// (happens when a user is logged in before the encryption app is enabled)
-if ( ! isset($_SESSION['enckey']) and OCP\User::isLoggedIn()) {
+$session = new OCA\Encryption\Session();
+
+if (
+! $session->getPrivateKey( \OCP\USER::getUser() )
+&& OCP\User::isLoggedIn()
+&& OCA\Encryption\Crypt::mode() == 'server'
+) {
+
+ // Force the user to re-log in if the encryption key isn't unlocked (happens when a user is logged in before the encryption app is enabled)
OCP\User::logout();
- header("Location: ".OC::$WEBROOT.'/');
+
+ header( "Location: " . OC::$WEBROOT.'/' );
+
exit();
+
}
-OCP\App::registerAdmin('files_encryption', 'settings'); \ No newline at end of file
+OCP\App::registerAdmin( 'files_encryption', 'settings');
+OCP\App::registerPersonal( 'files_encryption', 'settings-personal' ); \ No newline at end of file
diff --git a/apps/files_encryption/appinfo/database.xml b/apps/files_encryption/appinfo/database.xml
new file mode 100644
index 00000000000..d294c35d63d
--- /dev/null
+++ b/apps/files_encryption/appinfo/database.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<database>
+ <name>*dbname*</name>
+ <create>true</create>
+ <overwrite>false</overwrite>
+ <charset>utf8</charset>
+ <table>
+ <name>*dbprefix*encryption</name>
+ <declaration>
+ <field>
+ <name>uid</name>
+ <type>text</type>
+ <notnull>true</notnull>
+ <length>64</length>
+ </field>
+ <field>
+ <name>mode</name>
+ <type>text</type>
+ <notnull>true</notnull>
+ <length>64</length>
+ </field>
+ </declaration>
+ </table>
+</database> \ No newline at end of file
diff --git a/apps/files_encryption/appinfo/info.xml b/apps/files_encryption/appinfo/info.xml
index 48a28fde78a..39ea155488f 100644
--- a/apps/files_encryption/appinfo/info.xml
+++ b/apps/files_encryption/appinfo/info.xml
@@ -2,10 +2,10 @@
<info>
<id>files_encryption</id>
<name>Encryption</name>
- <description>Server side encryption of files. DEPRECATED. This app is no longer supported and will be replaced with an improved version in ownCloud 5. Only enable this features if you want to read old encrypted data. Warning: You will lose your data if you enable this App and forget your password. Encryption is not yet compatible with LDAP.</description>
+ <description>Server side encryption of files. Warning: You will lose your data if you enable this App and forget your password. Encryption is not yet compatible with LDAP.</description>
<licence>AGPL</licence>
- <author>Robin Appelman</author>
- <require>4.9</require>
+ <author>Sam Tuke</author>
+ <require>4</require>
<shipped>true</shipped>
<types>
<filesystem/>
diff --git a/apps/files_encryption/appinfo/version b/apps/files_encryption/appinfo/version
index 2f4536184bc..7dff5b89211 100644
--- a/apps/files_encryption/appinfo/version
+++ b/apps/files_encryption/appinfo/version
@@ -1 +1 @@
-0.2 \ No newline at end of file
+0.2.1 \ No newline at end of file
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
new file mode 100644
index 00000000000..c2f97247835
--- /dev/null
+++ b/apps/files_encryption/hooks/hooks.php
@@ -0,0 +1,143 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Sam Tuke
+ * @copyright 2012 Sam Tuke samtuke@owncloud.org
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCA\Encryption;
+
+/**
+ * Class for hook specific logic
+ */
+
+class Hooks {
+
+ # TODO: use passphrase for encrypting private key that is separate to the login password
+
+ /**
+ * @brief Startup encryption backend upon user login
+ * @note This method should never be called for users using client side encryption
+ */
+ public static function login( $params ) {
+
+// if ( Crypt::mode( $params['uid'] ) == 'server' ) {
+
+ # TODO: use lots of dependency injection here
+
+ $view = new \OC_FilesystemView( '/' );
+
+ $util = new Util( $view, $params['uid'] );
+
+ if ( ! $util->ready() ) {
+
+ \OC_Log::write( 'Encryption library', 'User account "' . $params['uid'] . '" is not ready for encryption; configuration started' , \OC_Log::DEBUG );
+
+ return $util->setupServerSide( $params['password'] );
+
+ }
+
+ \OC_FileProxy::$enabled = false;
+
+ $encryptedKey = Keymanager::getPrivateKey( $view, $params['uid'] );
+
+ \OC_FileProxy::$enabled = true;
+
+ # TODO: dont manually encrypt the private keyfile - use the config options of openssl_pkey_export instead for better mobile compatibility
+
+ $privateKey = Crypt::symmetricDecryptFileContent( $encryptedKey, $params['password'] );
+
+ $session = new Session();
+
+ $session->setPrivateKey( $privateKey, $params['uid'] );
+
+ $view1 = new \OC_FilesystemView( '/' . $params['uid'] );
+
+ // Set legacy encryption key if it exists, to support
+ // depreciated encryption system
+ if (
+ $view1->file_exists( 'encryption.key' )
+ && $legacyKey = $view1->file_get_contents( 'encryption.key' )
+ ) {
+
+ $_SESSION['legacyenckey'] = Crypt::legacyDecrypt( $legacyKey, $params['password'] );
+
+ }
+// }
+
+ return true;
+
+ }
+
+ /**
+ * @brief Change a user's encryption passphrase
+ * @param array $params keys: uid, password
+ */
+ public static function setPassphrase( $params ) {
+
+ // Only attempt to change passphrase if server-side encryption
+ // is in use (client-side encryption does not have access to
+ // the necessary keys)
+ if ( Crypt::mode() == 'server' ) {
+
+ // Get existing decrypted private key
+ $privateKey = $_SESSION['privateKey'];
+
+ // Encrypt private key with new user pwd as passphrase
+ $encryptedPrivateKey = Crypt::symmetricEncryptFileContent( $privateKey, $params['password'] );
+
+ // Save private key
+ Keymanager::setPrivateKey( $encryptedPrivateKey );
+
+ # NOTE: Session does not need to be updated as the
+ # private key has not changed, only the passphrase
+ # used to decrypt it has changed
+
+ }
+
+ }
+
+ /**
+ * @brief update the encryption key of the file uploaded by the client
+ */
+ public static function updateKeyfile( $params ) {
+
+ if ( Crypt::mode() == 'client' ) {
+
+ if ( isset( $params['properties']['key'] ) ) {
+
+ Keymanager::setFileKey( $params['path'], $params['properties']['key'] );
+
+ } else {
+
+ \OC_Log::write(
+ 'Encryption library', "Client side encryption is enabled but the client doesn't provide a encryption key for the file!"
+ , \OC_Log::ERROR
+ );
+
+ error_log( "Client side encryption is enabled but the client doesn't provide an encryption key for the file!" );
+
+ }
+
+ }
+
+ }
+
+}
+
+?> \ No newline at end of file
diff --git a/apps/files_encryption/js/settings-personal.js b/apps/files_encryption/js/settings-personal.js
new file mode 100644
index 00000000000..1a53e99d2b4
--- /dev/null
+++ b/apps/files_encryption/js/settings-personal.js
@@ -0,0 +1,38 @@
+/**
+ * Copyright (c) 2012, Bjoern Schiessle <schiessle@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or later.
+ * See the COPYING-README file.
+ */
+
+$(document).ready(function(){
+ $('input[name=encryption_mode]').change(function(){
+ var prevmode = document.getElementById('prev_encryption_mode').value
+ var client=$('input[value="client"]:checked').val()
+ ,server=$('input[value="server"]:checked').val()
+ ,user=$('input[value="user"]:checked').val()
+ ,none=$('input[value="none"]:checked').val()
+ if (client) {
+ $.post(OC.filePath('files_encryption', 'ajax', 'mode.php'), { mode: 'client' });
+ if (prevmode == 'server') {
+ OC.dialogs.info(t('encryption', 'Please switch to your ownCloud client and change your encryption password to complete the conversion.'), t('encryption', 'switched to client side encryption'));
+ }
+ } else if (server) {
+ if (prevmode == 'client') {
+ OC.dialogs.form([{text:'Login password', name:'newpasswd', type:'password'},{text:'Encryption password used on the client', name:'oldpasswd', type:'password'}],t('encryption', 'Change encryption password to login password'), function(data) {
+ $.post(OC.filePath('files_encryption', 'ajax', 'mode.php'), { mode: 'server', newpasswd: data[0].value, oldpasswd: data[1].value }, function(result) {
+ if (result.status != 'success') {
+ document.getElementById(prevmode+'_encryption').checked = true;
+ OC.dialogs.alert(t('encryption', 'Please check your passwords and try again.'), t('encryption', 'Could not change your file encryption password to your login password'))
+ } else {
+ console.log("alles super");
+ }
+ }, true);
+ });
+ } else {
+ $.post(OC.filePath('files_encryption', 'ajax', 'mode.php'), { mode: 'server' });
+ }
+ } else {
+ $.post(OC.filePath('files_encryption', 'ajax', 'mode.php'), { mode: 'none' });
+ }
+ })
+}) \ No newline at end of file
diff --git a/apps/files_encryption/js/settings.js b/apps/files_encryption/js/settings.js
index 6fc70eba7f6..60563bde859 100644
--- a/apps/files_encryption/js/settings.js
+++ b/apps/files_encryption/js/settings.js
@@ -11,14 +11,36 @@ $(document).ready(function(){
onuncheck:blackListChange,
createText:'...',
});
-
+
function blackListChange(){
var blackList=$('#encryption_blacklist').val().join(',');
OC.AppConfig.setValue('files_encryption','type_blacklist',blackList);
}
- $('#enable_encryption').change(function(){
- var checked=$('#enable_encryption').is(':checked');
- OC.AppConfig.setValue('files_encryption','enable_encryption',(checked)?'true':'false');
- });
-});
+ //TODO: Handle switch between client and server side encryption
+ $('input[name=encryption_mode]').change(function(){
+ var client=$('input[value="client"]:checked').val()
+ ,server=$('input[value="server"]:checked').val()
+ ,user=$('input[value="user"]:checked').val()
+ ,none=$('input[value="none"]:checked').val()
+ ,disable=false
+ if (client) {
+ OC.AppConfig.setValue('files_encryption','mode','client');
+ disable = true;
+ } else if (server) {
+ OC.AppConfig.setValue('files_encryption','mode','server');
+ disable = true;
+ } else if (user) {
+ OC.AppConfig.setValue('files_encryption','mode','user');
+ disable = true;
+ } else {
+ OC.AppConfig.setValue('files_encryption','mode','none');
+ }
+ if (disable) {
+ document.getElementById('server_encryption').disabled = true;
+ document.getElementById('client_encryption').disabled = true;
+ document.getElementById('user_encryption').disabled = true;
+ document.getElementById('none_encryption').disabled = true;
+ }
+ })
+}) \ No newline at end of file
diff --git a/apps/files_encryption/l10n/ar.php b/apps/files_encryption/l10n/ar.php
index 756a9d72799..f08585e485f 100644
--- a/apps/files_encryption/l10n/ar.php
+++ b/apps/files_encryption/l10n/ar.php
@@ -1,6 +1,5 @@
<?php $TRANSLATIONS = array(
"Encryption" => "التشفير",
"Exclude the following file types from encryption" => "استبعد أنواع الملفات التالية من التشفير",
-"None" => "لا شيء",
-"Enable Encryption" => "تفعيل التشفير"
+"None" => "لا شيء"
);
diff --git a/apps/files_encryption/l10n/bg_BG.php b/apps/files_encryption/l10n/bg_BG.php
index cb1613ef375..4ceee127af1 100644
--- a/apps/files_encryption/l10n/bg_BG.php
+++ b/apps/files_encryption/l10n/bg_BG.php
@@ -1,6 +1,5 @@
<?php $TRANSLATIONS = array(
"Encryption" => "Криптиране",
-"Enable Encryption" => "Включване на криптирането",
-"None" => "Няма",
-"Exclude the following file types from encryption" => "Изключване на следните файлови типове от криптирането"
+"Exclude the following file types from encryption" => "Изключване на следните файлови типове от криптирането",
+"None" => "Няма"
);
diff --git a/apps/files_encryption/l10n/bn_BD.php b/apps/files_encryption/l10n/bn_BD.php
index c8f041d7622..29c486b8ca0 100644
--- a/apps/files_encryption/l10n/bn_BD.php
+++ b/apps/files_encryption/l10n/bn_BD.php
@@ -1,6 +1,5 @@
<?php $TRANSLATIONS = array(
"Encryption" => "সংকেতায়ন",
-"Enable Encryption" => "সংকেতায়ন সক্রিয় কর",
-"None" => "কোনটিই নয়",
-"Exclude the following file types from encryption" => "সংকেতায়ন থেকে নিম্নোক্ত ধরণসমূহ বাদ দাও"
+"Exclude the following file types from encryption" => "সংকেতায়ন থেকে নিম্নোক্ত ধরণসমূহ বাদ দাও",
+"None" => "কোনটিই নয়"
);
diff --git a/apps/files_encryption/l10n/ca.php b/apps/files_encryption/l10n/ca.php
index 8e087b34620..d97a8666df4 100644
--- a/apps/files_encryption/l10n/ca.php
+++ b/apps/files_encryption/l10n/ca.php
@@ -1,6 +1,5 @@
<?php $TRANSLATIONS = array(
"Encryption" => "Encriptatge",
"Exclude the following file types from encryption" => "Exclou els tipus de fitxers següents de l'encriptatge",
-"None" => "Cap",
-"Enable Encryption" => "Activa l'encriptatge"
+"None" => "Cap"
);
diff --git a/apps/files_encryption/l10n/cs_CZ.php b/apps/files_encryption/l10n/cs_CZ.php
index 9be2be98092..90b1243f1fc 100644
--- a/apps/files_encryption/l10n/cs_CZ.php
+++ b/apps/files_encryption/l10n/cs_CZ.php
@@ -1,6 +1,5 @@
<?php $TRANSLATIONS = array(
"Encryption" => "Šifrování",
"Exclude the following file types from encryption" => "Při šifrování vynechat následující typy souborů",
-"None" => "Žádné",
-"Enable Encryption" => "Povolit šifrování"
+"None" => "Žádné"
);
diff --git a/apps/files_encryption/l10n/da.php b/apps/files_encryption/l10n/da.php
index 144c9f97084..1b4664ce1cb 100644
--- a/apps/files_encryption/l10n/da.php
+++ b/apps/files_encryption/l10n/da.php
@@ -1,6 +1,5 @@
<?php $TRANSLATIONS = array(
"Encryption" => "Kryptering",
"Exclude the following file types from encryption" => "Ekskluder følgende filtyper fra kryptering",
-"None" => "Ingen",
-"Enable Encryption" => "Aktivér kryptering"
+"None" => "Ingen"
);
diff --git a/apps/files_encryption/l10n/de.php b/apps/files_encryption/l10n/de.php
index d486a82322b..34c596dc4bb 100644
--- a/apps/files_encryption/l10n/de.php
+++ b/apps/files_encryption/l10n/de.php
@@ -1,6 +1,5 @@
<?php $TRANSLATIONS = array(
"Encryption" => "Verschlüsselung",
"Exclude the following file types from encryption" => "Die folgenden Dateitypen von der Verschlüsselung ausnehmen",
-"None" => "Keine",
-"Enable Encryption" => "Verschlüsselung aktivieren"
+"None" => "Keine"
);
diff --git a/apps/files_encryption/l10n/de_DE.php b/apps/files_encryption/l10n/de_DE.php
index d486a82322b..34c596dc4bb 100644
--- a/apps/files_encryption/l10n/de_DE.php
+++ b/apps/files_encryption/l10n/de_DE.php
@@ -1,6 +1,5 @@
<?php $TRANSLATIONS = array(
"Encryption" => "Verschlüsselung",
"Exclude the following file types from encryption" => "Die folgenden Dateitypen von der Verschlüsselung ausnehmen",
-"None" => "Keine",
-"Enable Encryption" => "Verschlüsselung aktivieren"
+"None" => "Keine"
);
diff --git a/apps/files_encryption/l10n/el.php b/apps/files_encryption/l10n/el.php
index 40a7c6a3672..70e65a5237d 100644
--- a/apps/files_encryption/l10n/el.php
+++ b/apps/files_encryption/l10n/el.php
@@ -1,6 +1,5 @@
<?php $TRANSLATIONS = array(
"Encryption" => "Κρυπτογράφηση",
"Exclude the following file types from encryption" => "Εξαίρεση των παρακάτω τύπων αρχείων από την κρυπτογράφηση",
-"None" => "Καμία",
-"Enable Encryption" => "Ενεργοποίηση Κρυπτογράφησης"
+"None" => "Καμία"
);
diff --git a/apps/files_encryption/l10n/eo.php b/apps/files_encryption/l10n/eo.php
index af3c9ae98e4..c6f82dcb8a0 100644
--- a/apps/files_encryption/l10n/eo.php
+++ b/apps/files_encryption/l10n/eo.php
@@ -1,6 +1,5 @@
<?php $TRANSLATIONS = array(
"Encryption" => "Ĉifrado",
"Exclude the following file types from encryption" => "Malinkluzivigi la jenajn dosiertipojn el ĉifrado",
-"None" => "Nenio",
-"Enable Encryption" => "Kapabligi ĉifradon"
+"None" => "Nenio"
);
diff --git a/apps/files_encryption/l10n/es.php b/apps/files_encryption/l10n/es.php
index b7e7601b35f..1fea54ff358 100644
--- a/apps/files_encryption/l10n/es.php
+++ b/apps/files_encryption/l10n/es.php
@@ -1,6 +1,5 @@
<?php $TRANSLATIONS = array(
"Encryption" => "Cifrado",
"Exclude the following file types from encryption" => "Excluir del cifrado los siguientes tipos de archivo",
-"None" => "Ninguno",
-"Enable Encryption" => "Habilitar cifrado"
+"None" => "Ninguno"
);
diff --git a/apps/files_encryption/l10n/es_AR.php b/apps/files_encryption/l10n/es_AR.php
index a15c37e730e..31898f50fde 100644
--- a/apps/files_encryption/l10n/es_AR.php
+++ b/apps/files_encryption/l10n/es_AR.php
@@ -1,6 +1,5 @@
<?php $TRANSLATIONS = array(
"Encryption" => "Encriptación",
"Exclude the following file types from encryption" => "Exceptuar de la encriptación los siguientes tipos de archivo",
-"None" => "Ninguno",
-"Enable Encryption" => "Habilitar encriptación"
+"None" => "Ninguno"
);
diff --git a/apps/files_encryption/l10n/et_EE.php b/apps/files_encryption/l10n/et_EE.php
index a7cd9395bf0..0c0ef231145 100644
--- a/apps/files_encryption/l10n/et_EE.php
+++ b/apps/files_encryption/l10n/et_EE.php
@@ -1,6 +1,5 @@
<?php $TRANSLATIONS = array(
"Encryption" => "Krüpteerimine",
"Exclude the following file types from encryption" => "Järgnevaid failitüüpe ära krüpteeri",
-"None" => "Pole",
-"Enable Encryption" => "Luba krüpteerimine"
+"None" => "Pole"
);
diff --git a/apps/files_encryption/l10n/eu.php b/apps/files_encryption/l10n/eu.php
index 57b6a4927bf..2bb1a46954c 100644
--- a/apps/files_encryption/l10n/eu.php
+++ b/apps/files_encryption/l10n/eu.php
@@ -1,6 +1,5 @@
<?php $TRANSLATIONS = array(
"Encryption" => "Enkriptazioa",
"Exclude the following file types from encryption" => "Ez enkriptatu hurrengo fitxategi motak",
-"None" => "Bat ere ez",
-"Enable Encryption" => "Gaitu enkriptazioa"
+"None" => "Bat ere ez"
);
diff --git a/apps/files_encryption/l10n/fa.php b/apps/files_encryption/l10n/fa.php
index 01582e48e60..0cdee74f5a9 100644
--- a/apps/files_encryption/l10n/fa.php
+++ b/apps/files_encryption/l10n/fa.php
@@ -1,6 +1,5 @@
<?php $TRANSLATIONS = array(
"Encryption" => "رمزگذاری",
"Exclude the following file types from encryption" => "نادیده گرفتن فایل های زیر برای رمز گذاری",
-"None" => "هیچ‌کدام",
-"Enable Encryption" => "فعال کردن رمزگذاری"
+"None" => "هیچ‌کدام"
);
diff --git a/apps/files_encryption/l10n/fi_FI.php b/apps/files_encryption/l10n/fi_FI.php
index 5796499a26c..433ae890ef6 100644
--- a/apps/files_encryption/l10n/fi_FI.php
+++ b/apps/files_encryption/l10n/fi_FI.php
@@ -1,6 +1,5 @@
<?php $TRANSLATIONS = array(
"Encryption" => "Salaus",
"Exclude the following file types from encryption" => "Jätä seuraavat tiedostotyypit salaamatta",
-"None" => "Ei mitään",
-"Enable Encryption" => "Käytä salausta"
+"None" => "Ei mitään"
);
diff --git a/apps/files_encryption/l10n/fr.php b/apps/files_encryption/l10n/fr.php
index c9367d1a312..f78a90ad59b 100644
--- a/apps/files_encryption/l10n/fr.php
+++ b/apps/files_encryption/l10n/fr.php
@@ -1,6 +1,5 @@
<?php $TRANSLATIONS = array(
"Encryption" => "Chiffrement",
"Exclude the following file types from encryption" => "Ne pas chiffrer les fichiers dont les types sont les suivants",
-"None" => "Aucun",
-"Enable Encryption" => "Activer le chiffrement"
+"None" => "Aucun"
);
diff --git a/apps/files_encryption/l10n/gl.php b/apps/files_encryption/l10n/gl.php
index 91d155ccad3..42fcfce1cc0 100644
--- a/apps/files_encryption/l10n/gl.php
+++ b/apps/files_encryption/l10n/gl.php
@@ -1,6 +1,5 @@
<?php $TRANSLATIONS = array(
"Encryption" => "Cifrado",
"Exclude the following file types from encryption" => "Excluír os seguintes tipos de ficheiro do cifrado",
-"None" => "Nada",
-"Enable Encryption" => "Activar o cifrado"
+"None" => "Nada"
);
diff --git a/apps/files_encryption/l10n/he.php b/apps/files_encryption/l10n/he.php
index 0332d59520a..9adb6d2b92a 100644
--- a/apps/files_encryption/l10n/he.php
+++ b/apps/files_encryption/l10n/he.php
@@ -1,6 +1,5 @@
<?php $TRANSLATIONS = array(
"Encryption" => "הצפנה",
-"Enable Encryption" => "הפעל הצפנה",
-"None" => "כלום",
-"Exclude the following file types from encryption" => "הוצא את סוגי הקבצים הבאים מהצפנה"
+"Exclude the following file types from encryption" => "הוצא את סוגי הקבצים הבאים מהצפנה",
+"None" => "כלום"
);
diff --git a/apps/files_encryption/l10n/hu_HU.php b/apps/files_encryption/l10n/hu_HU.php
index 8ea0f731736..1ef1effd41e 100644
--- a/apps/files_encryption/l10n/hu_HU.php
+++ b/apps/files_encryption/l10n/hu_HU.php
@@ -1,6 +1,5 @@
<?php $TRANSLATIONS = array(
"Encryption" => "Titkosítás",
-"Enable Encryption" => "A titkosítás engedélyezése",
-"None" => "Egyik sem",
-"Exclude the following file types from encryption" => "A következő fájltípusok kizárása a titkosításból"
+"Exclude the following file types from encryption" => "A következő fájltípusok kizárása a titkosításból",
+"None" => "Egyik sem"
);
diff --git a/apps/files_encryption/l10n/id.php b/apps/files_encryption/l10n/id.php
index 824ae883041..20f33b87829 100644
--- a/apps/files_encryption/l10n/id.php
+++ b/apps/files_encryption/l10n/id.php
@@ -1,6 +1,5 @@
<?php $TRANSLATIONS = array(
"Encryption" => "enkripsi",
"Exclude the following file types from encryption" => "pengecualian untuk tipe file berikut dari enkripsi",
-"None" => "tidak ada",
-"Enable Encryption" => "aktifkan enkripsi"
+"None" => "tidak ada"
);
diff --git a/apps/files_encryption/l10n/is.php b/apps/files_encryption/l10n/is.php
index 3210ecb4f8a..a2559cf2b76 100644
--- a/apps/files_encryption/l10n/is.php
+++ b/apps/files_encryption/l10n/is.php
@@ -1,6 +1,5 @@
<?php $TRANSLATIONS = array(
"Encryption" => "Dulkóðun",
-"Enable Encryption" => "Virkja dulkóðun",
-"None" => "Ekkert",
-"Exclude the following file types from encryption" => "Undanskilja eftirfarandi skráartegundir frá dulkóðun"
+"Exclude the following file types from encryption" => "Undanskilja eftirfarandi skráartegundir frá dulkóðun",
+"None" => "Ekkert"
);
diff --git a/apps/files_encryption/l10n/it.php b/apps/files_encryption/l10n/it.php
index 5136b061797..d7e68a66e97 100644
--- a/apps/files_encryption/l10n/it.php
+++ b/apps/files_encryption/l10n/it.php
@@ -1,6 +1,5 @@
<?php $TRANSLATIONS = array(
"Encryption" => "Cifratura",
"Exclude the following file types from encryption" => "Escludi i seguenti tipi di file dalla cifratura",
-"None" => "Nessuna",
-"Enable Encryption" => "Abilita cifratura"
+"None" => "Nessuna"
);
diff --git a/apps/files_encryption/l10n/ja_JP.php b/apps/files_encryption/l10n/ja_JP.php
index 2c3e5410de3..bd630c1d71f 100644
--- a/apps/files_encryption/l10n/ja_JP.php
+++ b/apps/files_encryption/l10n/ja_JP.php
@@ -1,6 +1,5 @@
<?php $TRANSLATIONS = array(
"Encryption" => "暗号化",
"Exclude the following file types from encryption" => "暗号化から除外するファイルタイプ",
-"None" => "なし",
-"Enable Encryption" => "暗号化を有効にする"
+"None" => "なし"
);
diff --git a/apps/files_encryption/l10n/ko.php b/apps/files_encryption/l10n/ko.php
index 4702753435e..68d60c1ae30 100644
--- a/apps/files_encryption/l10n/ko.php
+++ b/apps/files_encryption/l10n/ko.php
@@ -1,6 +1,5 @@
<?php $TRANSLATIONS = array(
"Encryption" => "암호화",
"Exclude the following file types from encryption" => "다음 파일 형식은 암호화하지 않음",
-"None" => "없음",
-"Enable Encryption" => "암호화 사용"
+"None" => "없음"
);
diff --git a/apps/files_encryption/l10n/ku_IQ.php b/apps/files_encryption/l10n/ku_IQ.php
index bd8977ac515..06bb9b93251 100644
--- a/apps/files_encryption/l10n/ku_IQ.php
+++ b/apps/files_encryption/l10n/ku_IQ.php
@@ -1,6 +1,5 @@
<?php $TRANSLATIONS = array(
"Encryption" => "نهێنیکردن",
"Exclude the following file types from encryption" => "به‌ربه‌ست کردنی ئه‌م جۆره‌ په‌ڕگانه له‌ نهێنیکردن",
-"None" => "هیچ",
-"Enable Encryption" => "چالاکردنی نهێنیکردن"
+"None" => "هیچ"
);
diff --git a/apps/files_encryption/l10n/lt_LT.php b/apps/files_encryption/l10n/lt_LT.php
index b939df164c8..22cbe7a4ffa 100644
--- a/apps/files_encryption/l10n/lt_LT.php
+++ b/apps/files_encryption/l10n/lt_LT.php
@@ -1,6 +1,5 @@
<?php $TRANSLATIONS = array(
"Encryption" => "Šifravimas",
"Exclude the following file types from encryption" => "Nešifruoti pasirinkto tipo failų",
-"None" => "Nieko",
-"Enable Encryption" => "Įjungti šifravimą"
+"None" => "Nieko"
);
diff --git a/apps/files_encryption/l10n/mk.php b/apps/files_encryption/l10n/mk.php
index dfcaed9f37e..7ccf8ac2d5b 100644
--- a/apps/files_encryption/l10n/mk.php
+++ b/apps/files_encryption/l10n/mk.php
@@ -1,6 +1,5 @@
<?php $TRANSLATIONS = array(
"Encryption" => "Енкрипција",
"Exclude the following file types from encryption" => "Исклучи ги следните типови на датотеки од енкрипција",
-"None" => "Ништо",
-"Enable Encryption" => "Овозможи енкрипција"
+"None" => "Ништо"
);
diff --git a/apps/files_encryption/l10n/nb_NO.php b/apps/files_encryption/l10n/nb_NO.php
index e65df7b6ce3..2ec6670e928 100644
--- a/apps/files_encryption/l10n/nb_NO.php
+++ b/apps/files_encryption/l10n/nb_NO.php
@@ -1,6 +1,5 @@
<?php $TRANSLATIONS = array(
"Encryption" => "Kryptering",
"Exclude the following file types from encryption" => "Ekskluder følgende filer fra kryptering",
-"None" => "Ingen",
-"Enable Encryption" => "Slå på kryptering"
+"None" => "Ingen"
);
diff --git a/apps/files_encryption/l10n/nl.php b/apps/files_encryption/l10n/nl.php
index 1ea56006fc3..7c09009cba9 100644
--- a/apps/files_encryption/l10n/nl.php
+++ b/apps/files_encryption/l10n/nl.php
@@ -1,6 +1,5 @@
<?php $TRANSLATIONS = array(
"Encryption" => "Versleuteling",
"Exclude the following file types from encryption" => "Versleutel de volgende bestand types niet",
-"None" => "Geen",
-"Enable Encryption" => "Zet versleuteling aan"
+"None" => "Geen"
);
diff --git a/apps/files_encryption/l10n/pl.php b/apps/files_encryption/l10n/pl.php
index 5cfc707450e..896086108ec 100644
--- a/apps/files_encryption/l10n/pl.php
+++ b/apps/files_encryption/l10n/pl.php
@@ -1,6 +1,5 @@
<?php $TRANSLATIONS = array(
"Encryption" => "Szyfrowanie",
"Exclude the following file types from encryption" => "Wyłącz następujące typy plików z szyfrowania",
-"None" => "Brak",
-"Enable Encryption" => "Włącz szyfrowanie"
+"None" => "Brak"
);
diff --git a/apps/files_encryption/l10n/pt_BR.php b/apps/files_encryption/l10n/pt_BR.php
index 5c02f52217f..086d073cf5c 100644
--- a/apps/files_encryption/l10n/pt_BR.php
+++ b/apps/files_encryption/l10n/pt_BR.php
@@ -1,6 +1,5 @@
<?php $TRANSLATIONS = array(
"Encryption" => "Criptografia",
"Exclude the following file types from encryption" => "Excluir os seguintes tipos de arquivo da criptografia",
-"None" => "Nenhuma",
-"Enable Encryption" => "Habilitar Criptografia"
+"None" => "Nenhuma"
);
diff --git a/apps/files_encryption/l10n/pt_PT.php b/apps/files_encryption/l10n/pt_PT.php
index 570462b414f..5634184a3b6 100644
--- a/apps/files_encryption/l10n/pt_PT.php
+++ b/apps/files_encryption/l10n/pt_PT.php
@@ -1,6 +1,5 @@
<?php $TRANSLATIONS = array(
"Encryption" => "Encriptação",
"Exclude the following file types from encryption" => "Excluir da encriptação os seguintes tipo de ficheiros",
-"None" => "Nenhum",
-"Enable Encryption" => "Activar Encriptação"
+"None" => "Nenhum"
);
diff --git a/apps/files_encryption/l10n/ro.php b/apps/files_encryption/l10n/ro.php
index 97f3f262d76..fc0f24f483d 100644
--- a/apps/files_encryption/l10n/ro.php
+++ b/apps/files_encryption/l10n/ro.php
@@ -1,6 +1,5 @@
<?php $TRANSLATIONS = array(
"Encryption" => "Încriptare",
"Exclude the following file types from encryption" => "Exclude următoarele tipuri de fișiere de la încriptare",
-"None" => "Niciuna",
-"Enable Encryption" => "Activare încriptare"
+"None" => "Niciuna"
);
diff --git a/apps/files_encryption/l10n/ru.php b/apps/files_encryption/l10n/ru.php
index 3a7e84b6d01..14115c12683 100644
--- a/apps/files_encryption/l10n/ru.php
+++ b/apps/files_encryption/l10n/ru.php
@@ -1,6 +1,5 @@
<?php $TRANSLATIONS = array(
"Encryption" => "Шифрование",
"Exclude the following file types from encryption" => "Исключить шифрование следующих типов файлов",
-"None" => "Ничего",
-"Enable Encryption" => "Включить шифрование"
+"None" => "Ничего"
);
diff --git a/apps/files_encryption/l10n/ru_RU.php b/apps/files_encryption/l10n/ru_RU.php
index 1328b0d0359..4321fb8a8a3 100644
--- a/apps/files_encryption/l10n/ru_RU.php
+++ b/apps/files_encryption/l10n/ru_RU.php
@@ -1,6 +1,5 @@
<?php $TRANSLATIONS = array(
"Encryption" => "Шифрование",
"Exclude the following file types from encryption" => "Исключите следующие типы файлов из шифрования",
-"None" => "Ни один",
-"Enable Encryption" => "Включить шифрование"
+"None" => "Ни один"
);
diff --git a/apps/files_encryption/l10n/si_LK.php b/apps/files_encryption/l10n/si_LK.php
index a29884afffd..2d61bec45b8 100644
--- a/apps/files_encryption/l10n/si_LK.php
+++ b/apps/files_encryption/l10n/si_LK.php
@@ -1,6 +1,5 @@
<?php $TRANSLATIONS = array(
"Encryption" => "ගුප්ත කේතනය",
"Exclude the following file types from encryption" => "මෙම ගොනු වර්ග ගුප්ත කේතනය කිරීමෙන් බැහැරව තබන්න",
-"None" => "කිසිවක් නැත",
-"Enable Encryption" => "ගුප්ත කේතනය සක්‍රිය කරන්න"
+"None" => "කිසිවක් නැත"
);
diff --git a/apps/files_encryption/l10n/sk_SK.php b/apps/files_encryption/l10n/sk_SK.php
index 598f1294f6e..5aebb6e35bd 100644
--- a/apps/files_encryption/l10n/sk_SK.php
+++ b/apps/files_encryption/l10n/sk_SK.php
@@ -1,6 +1,5 @@
<?php $TRANSLATIONS = array(
"Encryption" => "Šifrovanie",
"Exclude the following file types from encryption" => "Vynechať nasledujúce súbory pri šifrovaní",
-"None" => "Žiadne",
-"Enable Encryption" => "Zapnúť šifrovanie"
+"None" => "Žiadne"
);
diff --git a/apps/files_encryption/l10n/sl.php b/apps/files_encryption/l10n/sl.php
index f62fe781c6a..db963ef2f8d 100644
--- a/apps/files_encryption/l10n/sl.php
+++ b/apps/files_encryption/l10n/sl.php
@@ -1,6 +1,5 @@
<?php $TRANSLATIONS = array(
"Encryption" => "Šifriranje",
"Exclude the following file types from encryption" => "Navedene vrste datotek naj ne bodo šifrirane",
-"None" => "Brez",
-"Enable Encryption" => "Omogoči šifriranje"
+"None" => "Brez"
);
diff --git a/apps/files_encryption/l10n/sr.php b/apps/files_encryption/l10n/sr.php
index 4718780ee52..198bcc94ef9 100644
--- a/apps/files_encryption/l10n/sr.php
+++ b/apps/files_encryption/l10n/sr.php
@@ -1,6 +1,5 @@
<?php $TRANSLATIONS = array(
"Encryption" => "Шифровање",
"Exclude the following file types from encryption" => "Не шифруј следеће типове датотека",
-"None" => "Ништа",
-"Enable Encryption" => "Омогући шифровање"
+"None" => "Ништа"
);
diff --git a/apps/files_encryption/l10n/sv.php b/apps/files_encryption/l10n/sv.php
index 0a477f83460..c154de1a768 100644
--- a/apps/files_encryption/l10n/sv.php
+++ b/apps/files_encryption/l10n/sv.php
@@ -1,6 +1,5 @@
<?php $TRANSLATIONS = array(
"Encryption" => "Kryptering",
"Exclude the following file types from encryption" => "Exkludera följande filtyper från kryptering",
-"None" => "Ingen",
-"Enable Encryption" => "Aktivera kryptering"
+"None" => "Ingen"
);
diff --git a/apps/files_encryption/l10n/ta_LK.php b/apps/files_encryption/l10n/ta_LK.php
index 1d1ef74007e..aab628b5519 100644
--- a/apps/files_encryption/l10n/ta_LK.php
+++ b/apps/files_encryption/l10n/ta_LK.php
@@ -1,6 +1,5 @@
<?php $TRANSLATIONS = array(
"Encryption" => "மறைக்குறியீடு",
"Exclude the following file types from encryption" => "மறைக்குறியாக்கலில் பின்வரும் கோப்பு வகைகளை நீக்கவும்",
-"None" => "ஒன்றுமில்லை",
-"Enable Encryption" => "மறைக்குறியாக்கலை இயலுமைப்படுத்துக"
+"None" => "ஒன்றுமில்லை"
);
diff --git a/apps/files_encryption/l10n/th_TH.php b/apps/files_encryption/l10n/th_TH.php
index c2685de6e3a..65fcd80685f 100644
--- a/apps/files_encryption/l10n/th_TH.php
+++ b/apps/files_encryption/l10n/th_TH.php
@@ -1,6 +1,5 @@
<?php $TRANSLATIONS = array(
"Encryption" => "การเข้ารหัส",
"Exclude the following file types from encryption" => "ไม่ต้องรวมชนิดของไฟล์ดังต่อไปนี้จากการเข้ารหัส",
-"None" => "ไม่ต้อง",
-"Enable Encryption" => "เปิดใช้งานการเข้ารหัส"
+"None" => "ไม่ต้อง"
);
diff --git a/apps/files_encryption/l10n/tr.php b/apps/files_encryption/l10n/tr.php
index 474ee42b842..07f78d148c8 100644
--- a/apps/files_encryption/l10n/tr.php
+++ b/apps/files_encryption/l10n/tr.php
@@ -1,6 +1,5 @@
<?php $TRANSLATIONS = array(
"Encryption" => "Şifreleme",
-"Enable Encryption" => "Şifrelemeyi Etkinleştir",
-"None" => "Hiçbiri",
-"Exclude the following file types from encryption" => "Aşağıdaki dosya tiplerini şifrelemeye dahil etme"
+"Exclude the following file types from encryption" => "Aşağıdaki dosya tiplerini şifrelemeye dahil etme",
+"None" => "Hiçbiri"
);
diff --git a/apps/files_encryption/l10n/uk.php b/apps/files_encryption/l10n/uk.php
index 3c15bb28436..e3589215658 100644
--- a/apps/files_encryption/l10n/uk.php
+++ b/apps/files_encryption/l10n/uk.php
@@ -1,6 +1,5 @@
<?php $TRANSLATIONS = array(
"Encryption" => "Шифрування",
"Exclude the following file types from encryption" => "Не шифрувати файли наступних типів",
-"None" => "Жоден",
-"Enable Encryption" => "Включити шифрування"
+"None" => "Жоден"
);
diff --git a/apps/files_encryption/l10n/vi.php b/apps/files_encryption/l10n/vi.php
index 6365084fdc6..218285b675a 100644
--- a/apps/files_encryption/l10n/vi.php
+++ b/apps/files_encryption/l10n/vi.php
@@ -1,6 +1,5 @@
<?php $TRANSLATIONS = array(
"Encryption" => "Mã hóa",
"Exclude the following file types from encryption" => "Loại trừ các loại tập tin sau đây từ mã hóa",
-"None" => "Không có gì hết",
-"Enable Encryption" => "BẬT mã hóa"
+"None" => "Không có gì hết"
);
diff --git a/apps/files_encryption/l10n/zh_CN.GB2312.php b/apps/files_encryption/l10n/zh_CN.GB2312.php
index 297444fcf55..31a3d3b49b8 100644
--- a/apps/files_encryption/l10n/zh_CN.GB2312.php
+++ b/apps/files_encryption/l10n/zh_CN.GB2312.php
@@ -1,6 +1,5 @@
<?php $TRANSLATIONS = array(
"Encryption" => "加密",
"Exclude the following file types from encryption" => "从加密中排除如下文件类型",
-"None" => "无",
-"Enable Encryption" => "启用加密"
+"None" => "无"
);
diff --git a/apps/files_encryption/l10n/zh_CN.php b/apps/files_encryption/l10n/zh_CN.php
index 1e1247d15ff..aa4817b590c 100644
--- a/apps/files_encryption/l10n/zh_CN.php
+++ b/apps/files_encryption/l10n/zh_CN.php
@@ -1,6 +1,5 @@
<?php $TRANSLATIONS = array(
"Encryption" => "加密",
"Exclude the following file types from encryption" => "从加密中排除列出的文件类型",
-"None" => "None",
-"Enable Encryption" => "开启加密"
+"None" => "None"
);
diff --git a/apps/files_encryption/l10n/zh_TW.php b/apps/files_encryption/l10n/zh_TW.php
index 4c62130cf4f..fecebbe2509 100644
--- a/apps/files_encryption/l10n/zh_TW.php
+++ b/apps/files_encryption/l10n/zh_TW.php
@@ -1,6 +1,5 @@
<?php $TRANSLATIONS = array(
"Encryption" => "加密",
"Exclude the following file types from encryption" => "下列的檔案類型不加密",
-"None" => "無",
-"Enable Encryption" => "啟用加密"
+"None" => "無"
);
diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index 666fedb4e1b..fddc89dae54 100644..100755
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -1,220 +1,732 @@
-<?php
-/**
- * ownCloud
- *
- * @author Frank Karlitschek
- * @copyright 2012 Frank Karlitschek frank@owncloud.org
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-
-
-// Todo:
-// - Crypt/decrypt button in the userinterface
-// - Setting if crypto should be on by default
-// - Add a setting "Don´t encrypt files larger than xx because of performance reasons"
-// - Transparent decrypt/encrypt in filesystem.php. Autodetect if a file is encrypted (.encrypted extension)
-// - Don't use a password directly as encryption key, but a key which is stored on the server and encrypted with the
-// user password. -> password change faster
-// - IMPORTANT! Check if the block lenght of the encrypted data stays the same
-
-
-require_once 'Crypt_Blowfish/Blowfish.php';
-
-/**
- * This class is for crypting and decrypting
- */
-class OC_Crypt {
- static private $bf = null;
-
- public static function loginListener($params) {
- self::init($params['uid'], $params['password']);
- }
-
- public static function init($login, $password) {
- $view=new OC_FilesystemView('/');
- if ( ! $view->file_exists('/'.$login)) {
- $view->mkdir('/'.$login);
- }
-
- OC_FileProxy::$enabled=false;
- if ( ! $view->file_exists('/'.$login.'/encryption.key')) {// does key exist?
- OC_Crypt::createkey($login, $password);
- }
- $key=$view->file_get_contents('/'.$login.'/encryption.key');
- OC_FileProxy::$enabled=true;
- $_SESSION['enckey']=OC_Crypt::decrypt($key, $password);
- }
-
-
- /**
- * get the blowfish encryption handeler for a key
- * @param string $key (optional)
- * @return Crypt_Blowfish
- *
- * if the key is left out, the default handeler will be used
- */
- public static function getBlowfish($key='') {
- if ($key) {
- return new Crypt_Blowfish($key);
- } else {
- if ( ! isset($_SESSION['enckey'])) {
- return false;
- }
- if ( ! self::$bf) {
- self::$bf=new Crypt_Blowfish($_SESSION['enckey']);
- }
- return self::$bf;
- }
- }
-
- public static function createkey($username, $passcode) {
- // generate a random key
- $key=mt_rand(10000, 99999).mt_rand(10000, 99999).mt_rand(10000, 99999).mt_rand(10000, 99999);
-
- // encrypt the key with the passcode of the user
- $enckey=OC_Crypt::encrypt($key, $passcode);
-
- // Write the file
- $proxyEnabled=OC_FileProxy::$enabled;
- OC_FileProxy::$enabled=false;
- $view=new OC_FilesystemView('/'.$username);
- $view->file_put_contents('/encryption.key', $enckey);
- OC_FileProxy::$enabled=$proxyEnabled;
- }
-
- public static function changekeypasscode($oldPassword, $newPassword) {
- if (OCP\User::isLoggedIn()) {
- $username=OCP\USER::getUser();
- $view=new OC_FilesystemView('/'.$username);
-
- // read old key
- $key=$view->file_get_contents('/encryption.key');
-
- // decrypt key with old passcode
- $key=OC_Crypt::decrypt($key, $oldPassword);
-
- // encrypt again with new passcode
- $key=OC_Crypt::encrypt($key, $newPassword);
-
- // store the new key
- $view->file_put_contents('/encryption.key', $key );
- }
- }
-
- /**
- * @brief encrypts an content
- * @param $content the cleartext message you want to encrypt
- * @param $key the encryption key (optional)
- * @returns encrypted content
- *
- * This function encrypts an content
- */
- public static function encrypt( $content, $key='') {
- $bf = self::getBlowfish($key);
- return $bf->encrypt($content);
- }
-
- /**
- * @brief decryption of an content
- * @param $content the cleartext message you want to decrypt
- * @param $key the encryption key (optional)
- * @returns cleartext content
- *
- * This function decrypts an content
- */
- public static function decrypt( $content, $key='') {
- $bf = self::getBlowfish($key);
- $data=$bf->decrypt($content);
- return $data;
- }
-
- /**
- * @brief encryption of a file
- * @param string $source
- * @param string $target
- * @param string $key the decryption key
- *
- * This function encrypts a file
- */
- public static function encryptFile( $source, $target, $key='') {
- $handleread = fopen($source, "rb");
- if ($handleread!=false) {
- $handlewrite = fopen($target, "wb");
- while (!feof($handleread)) {
- $content = fread($handleread, 8192);
- $enccontent=OC_CRYPT::encrypt( $content, $key);
- fwrite($handlewrite, $enccontent);
- }
- fclose($handlewrite);
- fclose($handleread);
- }
- }
-
-
- /**
- * @brief decryption of a file
- * @param string $source
- * @param string $target
- * @param string $key the decryption key
- *
- * This function decrypts a file
- */
- public static function decryptFile( $source, $target, $key='') {
- $handleread = fopen($source, "rb");
- if ($handleread!=false) {
- $handlewrite = fopen($target, "wb");
- while (!feof($handleread)) {
- $content = fread($handleread, 8192);
- $enccontent=OC_CRYPT::decrypt( $content, $key);
- if (feof($handleread)) {
- $enccontent=rtrim($enccontent, "\0");
- }
- fwrite($handlewrite, $enccontent);
- }
- fclose($handlewrite);
- fclose($handleread);
- }
- }
-
- /**
- * encrypt data in 8192b sized blocks
- */
- public static function blockEncrypt($data, $key='') {
- $result='';
- while (strlen($data)) {
- $result.=self::encrypt(substr($data, 0, 8192), $key);
- $data=substr($data, 8192);
- }
- return $result;
- }
-
- /**
- * decrypt data in 8192b sized blocks
- */
- public static function blockDecrypt($data, $key='', $maxLength=0) {
- $result='';
- while (strlen($data)) {
- $result.=self::decrypt(substr($data, 0, 8192), $key);
- $data=substr($data, 8192);
- }
- if ($maxLength>0) {
- return substr($result, 0, $maxLength);
- } else {
- return rtrim($result, "\0");
- }
- }
-}
+<?php
+/**
+ * ownCloud
+ *
+ * @author Sam Tuke, Frank Karlitschek, Robin Appelman
+ * @copyright 2012 Sam Tuke samtuke@owncloud.com,
+ * Robin Appelman icewind@owncloud.com, Frank Karlitschek
+ * frank@owncloud.org
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCA\Encryption;
+
+require_once 'Crypt_Blowfish/Blowfish.php';
+
+// Todo:
+// - Crypt/decrypt button in the userinterface
+// - Setting if crypto should be on by default
+// - Add a setting "Don´t encrypt files larger than xx because of performance reasons"
+// - Transparent decrypt/encrypt in filesystem.php. Autodetect if a file is encrypted (.encrypted extension)
+// - Don't use a password directly as encryption key. but a key which is stored on the server and encrypted with the user password. -> password change faster
+// - IMPORTANT! Check if the block lenght of the encrypted data stays the same
+
+/**
+ * Class for common cryptography functionality
+ */
+
+class Crypt {
+
+ /**
+ * @brief return encryption mode client or server side encryption
+ * @param string user name (use system wide setting if name=null)
+ * @return string 'client' or 'server'
+ */
+ public static function mode( $user = null ) {
+
+// $mode = \OC_Appconfig::getValue( 'files_encryption', 'mode', 'none' );
+//
+// if ( $mode == 'user') {
+// if ( !$user ) {
+// $user = \OCP\User::getUser();
+// }
+// $mode = 'none';
+// if ( $user ) {
+// $query = \OC_DB::prepare( "SELECT mode FROM *PREFIX*encryption WHERE uid = ?" );
+// $result = $query->execute(array($user));
+// if ($row = $result->fetchRow()){
+// $mode = $row['mode'];
+// }
+// }
+// }
+//
+// return $mode;
+
+ return 'server';
+
+ }
+
+ /**
+ * @brief Create a new encryption keypair
+ * @return array publicKey, privatekey
+ */
+ public static function createKeypair() {
+
+ $res = openssl_pkey_new();
+
+ // Get private key
+ openssl_pkey_export( $res, $privateKey );
+
+ // Get public key
+ $publicKey = openssl_pkey_get_details( $res );
+
+ $publicKey = $publicKey['key'];
+
+ return( array( 'publicKey' => $publicKey, 'privateKey' => $privateKey ) );
+
+ }
+
+ /**
+ * @brief Add arbitrary padding to encrypted data
+ * @param string $data data to be padded
+ * @return padded data
+ * @note In order to end up with data exactly 8192 bytes long we must add two letters. It is impossible to achieve exactly 8192 length blocks with encryption alone, hence padding is added to achieve the required length.
+ */
+ public static function addPadding( $data ) {
+
+ $padded = $data . 'xx';
+
+ return $padded;
+
+ }
+
+ /**
+ * @brief Remove arbitrary padding to encrypted data
+ * @param string $padded padded data to remove padding from
+ * @return unpadded data on success, false on error
+ */
+ public static function removePadding( $padded ) {
+
+ if ( substr( $padded, -2 ) == 'xx' ) {
+
+ $data = substr( $padded, 0, -2 );
+
+ return $data;
+
+ } else {
+
+ # TODO: log the fact that unpadded data was submitted for removal of padding
+ return false;
+
+ }
+
+ }
+
+ /**
+ * @brief Check if a file's contents contains an IV and is symmetrically encrypted
+ * @return true / false
+ * @note see also OCA\Encryption\Util->isEncryptedPath()
+ */
+ public static function isEncryptedContent( $content ) {
+
+ if ( !$content ) {
+
+ return false;
+
+ }
+
+ $noPadding = self::removePadding( $content );
+
+ // Fetch encryption metadata from end of file
+ $meta = substr( $noPadding, -22 );
+
+ // Fetch IV from end of file
+ $iv = substr( $meta, -16 );
+
+ // Fetch identifier from start of metadata
+ $identifier = substr( $meta, 0, 6 );
+
+ if ( $identifier == '00iv00') {
+
+ return true;
+
+ } else {
+
+ return false;
+
+ }
+
+ }
+
+ /**
+ * Check if a file is encrypted according to database file cache
+ * @param string $path
+ * @return bool
+ */
+ public static function isEncryptedMeta( $path ) {
+
+ # TODO: Use DI to get OC_FileCache_Cached out of here
+
+ // Fetch all file metadata from DB
+ $metadata = \OC_FileCache_Cached::get( $path, '' );
+
+ // Return encryption status
+ return isset( $metadata['encrypted'] ) and ( bool )$metadata['encrypted'];
+
+ }
+
+ /**
+ * @brief Check if a file is encrypted via legacy system
+ * @return true / false
+ */
+ public static function isLegacyEncryptedContent( $content ) {
+
+ // Fetch all file metadata from DB
+ $metadata = \OC_FileCache_Cached::get( $content, '' );
+
+ // If a file is flagged with encryption in DB, but isn't a valid content + IV combination, it's probably using the legacy encryption system
+ if (
+ $content
+ and isset( $metadata['encrypted'] )
+ and $metadata['encrypted'] === true
+ and !self::isEncryptedContent( $content )
+ ) {
+
+ return true;
+
+ } else {
+
+ return false;
+
+ }
+
+ }
+
+ /**
+ * @brief Symmetrically encrypt a string
+ * @returns encrypted file
+ */
+ public static function encrypt( $plainContent, $iv, $passphrase = '' ) {
+
+ if ( $encryptedContent = openssl_encrypt( $plainContent, 'AES-128-CFB', $passphrase, false, $iv ) ) {
+
+ return $encryptedContent;
+
+ } else {
+
+ \OC_Log::write( 'Encryption library', 'Encryption (symmetric) of content failed' , \OC_Log::ERROR );
+
+ return false;
+
+ }
+
+ }
+
+ /**
+ * @brief Symmetrically decrypt a string
+ * @returns decrypted file
+ */
+ public static function decrypt( $encryptedContent, $iv, $passphrase ) {
+
+ if ( $plainContent = openssl_decrypt( $encryptedContent, 'AES-128-CFB', $passphrase, false, $iv ) ) {
+
+ return $plainContent;
+
+
+ } else {
+
+ throw new \Exception( 'Encryption library: Decryption (symmetric) of content failed' );
+
+ return false;
+
+ }
+
+ }
+
+ /**
+ * @brief Concatenate encrypted data with its IV and padding
+ * @param string $content content to be concatenated
+ * @param string $iv IV to be concatenated
+ * @returns string concatenated content
+ */
+ public static function concatIv ( $content, $iv ) {
+
+ $combined = $content . '00iv00' . $iv;
+
+ return $combined;
+
+ }
+
+ /**
+ * @brief Split concatenated data and IV into respective parts
+ * @param string $catFile concatenated data to be split
+ * @returns array keys: encrypted, iv
+ */
+ public static function splitIv ( $catFile ) {
+
+ // Fetch encryption metadata from end of file
+ $meta = substr( $catFile, -22 );
+
+ // Fetch IV from end of file
+ $iv = substr( $meta, -16 );
+
+ // Remove IV and IV identifier text to expose encrypted content
+ $encrypted = substr( $catFile, 0, -22 );
+
+ $split = array(
+ 'encrypted' => $encrypted
+ , 'iv' => $iv
+ );
+
+ return $split;
+
+ }
+
+ /**
+ * @brief Symmetrically encrypts a string and returns keyfile content
+ * @param $plainContent content to be encrypted in keyfile
+ * @returns encrypted content combined with IV
+ * @note IV need not be specified, as it will be stored in the returned keyfile
+ * and remain accessible therein.
+ */
+ public static function symmetricEncryptFileContent( $plainContent, $passphrase = '' ) {
+
+ if ( !$plainContent ) {
+
+ return false;
+
+ }
+
+ $iv = self::generateIv();
+
+ if ( $encryptedContent = self::encrypt( $plainContent, $iv, $passphrase ) ) {
+
+ // Combine content to encrypt with IV identifier and actual IV
+ $catfile = self::concatIv( $encryptedContent, $iv );
+
+ $padded = self::addPadding( $catfile );
+
+ return $padded;
+
+ } else {
+
+ \OC_Log::write( 'Encryption library', 'Encryption (symmetric) of keyfile content failed' , \OC_Log::ERROR );
+
+ return false;
+
+ }
+
+ }
+
+
+ /**
+ * @brief Symmetrically decrypts keyfile content
+ * @param string $source
+ * @param string $target
+ * @param string $key the decryption key
+ * @returns decrypted content
+ *
+ * This function decrypts a file
+ */
+ public static function symmetricDecryptFileContent( $keyfileContent, $passphrase = '' ) {
+
+ if ( !$keyfileContent ) {
+
+ throw new \Exception( 'Encryption library: no data provided for decryption' );
+
+ }
+
+ // Remove padding
+ $noPadding = self::removePadding( $keyfileContent );
+
+ // Split into enc data and catfile
+ $catfile = self::splitIv( $noPadding );
+
+ if ( $plainContent = self::decrypt( $catfile['encrypted'], $catfile['iv'], $passphrase ) ) {
+
+ return $plainContent;
+
+ }
+
+ }
+
+ /**
+ * @brief Creates symmetric keyfile content using a generated key
+ * @param string $plainContent content to be encrypted
+ * @returns array keys: key, encrypted
+ * @note symmetricDecryptFileContent() can be used to decrypt files created using this method
+ *
+ * This function decrypts a file
+ */
+ public static function symmetricEncryptFileContentKeyfile( $plainContent ) {
+
+ $key = self::generateKey();
+
+ if( $encryptedContent = self::symmetricEncryptFileContent( $plainContent, $key ) ) {
+
+ return array(
+ 'key' => $key
+ , 'encrypted' => $encryptedContent
+ );
+
+ } else {
+
+ return false;
+
+ }
+
+ }
+
+ /**
+ * @brief Create asymmetrically encrypted keyfile content using a generated key
+ * @param string $plainContent content to be encrypted
+ * @returns array keys: key, encrypted
+ * @note symmetricDecryptFileContent() can be used to decrypt files created using this method
+ *
+ * This function decrypts a file
+ */
+ public static function multiKeyEncrypt( $plainContent, array $publicKeys ) {
+
+ $envKeys = array();
+
+ if( openssl_seal( $plainContent, $sealed, $envKeys, $publicKeys ) ) {
+
+ return array(
+ 'keys' => $envKeys
+ , 'encrypted' => $sealed
+ );
+
+ } else {
+
+ return false;
+
+ }
+
+ }
+
+ /**
+ * @brief Asymmetrically encrypt a file using multiple public keys
+ * @param string $plainContent content to be encrypted
+ * @returns string $plainContent decrypted string
+ * @note symmetricDecryptFileContent() can be used to decrypt files created using this method
+ *
+ * This function decrypts a file
+ */
+ public static function multiKeyDecrypt( $encryptedContent, $envKey, $privateKey ) {
+
+ if ( !$encryptedContent ) {
+
+ return false;
+
+ }
+
+ if ( openssl_open( $encryptedContent, $plainContent, $envKey, $privateKey ) ) {
+
+ return $plainContent;
+
+ } else {
+
+ \OC_Log::write( 'Encryption library', 'Decryption (asymmetric) of sealed content failed' , \OC_Log::ERROR );
+
+ return false;
+
+ }
+
+ }
+
+ /**
+ * @brief Asymetrically encrypt a string using a public key
+ * @returns encrypted file
+ */
+ public static function keyEncrypt( $plainContent, $publicKey ) {
+
+ openssl_public_encrypt( $plainContent, $encryptedContent, $publicKey );
+
+ return $encryptedContent;
+
+ }
+
+ /**
+ * @brief Asymetrically decrypt a file using a private key
+ * @returns decrypted file
+ */
+ public static function keyDecrypt( $encryptedContent, $privatekey ) {
+
+ openssl_private_decrypt( $encryptedContent, $plainContent, $privatekey );
+
+ return $plainContent;
+
+ }
+
+ /**
+ * @brief Encrypts content symmetrically and generates keyfile asymmetrically
+ * @returns array containing catfile and new keyfile.
+ * keys: data, key
+ * @note this method is a wrapper for combining other crypt class methods
+ */
+ public static function keyEncryptKeyfile( $plainContent, $publicKey ) {
+
+ // Encrypt plain data, generate keyfile & encrypted file
+ $cryptedData = self::symmetricEncryptFileContentKeyfile( $plainContent );
+
+ // Encrypt keyfile
+ $cryptedKey = self::keyEncrypt( $cryptedData['key'], $publicKey );
+
+ return array( 'data' => $cryptedData['encrypted'], 'key' => $cryptedKey );
+
+ }
+
+ /**
+ * @brief Takes catfile, keyfile, and private key, and
+ * performs decryption
+ * @returns decrypted content
+ * @note this method is a wrapper for combining other crypt class methods
+ */
+ public static function keyDecryptKeyfile( $catfile, $keyfile, $privateKey ) {
+
+ // Decrypt the keyfile with the user's private key
+ $decryptedKeyfile = self::keyDecrypt( $keyfile, $privateKey );
+
+ // Decrypt the catfile symmetrically using the decrypted keyfile
+ $decryptedData = self::symmetricDecryptFileContent( $catfile, $decryptedKeyfile );
+
+ return $decryptedData;
+
+ }
+
+ /**
+ * @brief Symmetrically encrypt a file by combining encrypted component data blocks
+ */
+ public static function symmetricBlockEncryptFileContent( $plainContent, $key ) {
+
+ $crypted = '';
+
+ $remaining = $plainContent;
+
+ $testarray = array();
+
+ while( strlen( $remaining ) ) {
+
+ //echo "\n\n\$block = ".substr( $remaining, 0, 6126 );
+
+ // Encrypt a chunk of unencrypted data and add it to the rest
+ $block = self::symmetricEncryptFileContent( substr( $remaining, 0, 6126 ), $key );
+
+ $padded = self::addPadding( $block );
+
+ $crypted .= $block;
+
+ $testarray[] = $block;
+
+ // Remove the data already encrypted from remaining unencrypted data
+ $remaining = substr( $remaining, 6126 );
+
+ }
+
+ //echo "hags ";
+
+ //echo "\n\n\n\$crypted = $crypted\n\n\n";
+
+ //print_r($testarray);
+
+ return $crypted;
+
+ }
+
+
+ /**
+ * @brief Symmetrically decrypt a file by combining encrypted component data blocks
+ */
+ public static function symmetricBlockDecryptFileContent( $crypted, $key ) {
+
+ $decrypted = '';
+
+ $remaining = $crypted;
+
+ $testarray = array();
+
+ while( strlen( $remaining ) ) {
+
+ $testarray[] = substr( $remaining, 0, 8192 );
+
+ // Decrypt a chunk of unencrypted data and add it to the rest
+ $decrypted .= self::symmetricDecryptFileContent( $remaining, $key );
+
+ // Remove the data already encrypted from remaining unencrypted data
+ $remaining = substr( $remaining, 8192 );
+
+ }
+
+ //echo "\n\n\$testarray = "; print_r($testarray);
+
+ return $decrypted;
+
+ }
+
+ /**
+ * @brief Generates a pseudo random initialisation vector
+ * @return String $iv generated IV
+ */
+ public static function generateIv() {
+
+ if ( $random = openssl_random_pseudo_bytes( 12, $strong ) ) {
+
+ if ( !$strong ) {
+
+ // If OpenSSL indicates randomness is insecure, log error
+ \OC_Log::write( 'Encryption library', 'Insecure symmetric key was generated using openssl_random_pseudo_bytes()' , \OC_Log::WARN );
+
+ }
+
+ // We encode the iv purely for string manipulation
+ // purposes - it gets decoded before use
+ $iv = base64_encode( $random );
+
+ return $iv;
+
+ } else {
+
+ throw new Exception( 'Generating IV failed' );
+
+ }
+
+ }
+
+ /**
+ * @brief Generate a pseudo random 1024kb ASCII key
+ * @returns $key Generated key
+ */
+ public static function generateKey() {
+
+ // Generate key
+ if ( $key = base64_encode( openssl_random_pseudo_bytes( 183, $strong ) ) ) {
+
+ if ( !$strong ) {
+
+ // If OpenSSL indicates randomness is insecure, log error
+ throw new Exception ( 'Encryption library, Insecure symmetric key was generated using openssl_random_pseudo_bytes()' );
+
+ }
+
+ return $key;
+
+ } else {
+
+ return false;
+
+ }
+
+ }
+
+ public static function changekeypasscode($oldPassword, $newPassword) {
+
+ if(\OCP\User::isLoggedIn()){
+ $key = Keymanager::getPrivateKey( $user, $view );
+ if ( ($key = Crypt::symmetricDecryptFileContent($key,$oldpasswd)) ) {
+ if ( ($key = Crypt::symmetricEncryptFileContent($key, $newpasswd)) ) {
+ Keymanager::setPrivateKey($key);
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
+ /**
+ * @brief Get the blowfish encryption handeler for a key
+ * @param $key string (optional)
+ * @return Crypt_Blowfish blowfish object
+ *
+ * if the key is left out, the default handeler will be used
+ */
+ public static function getBlowfish( $key = '' ) {
+
+ if ( $key ) {
+
+ return new \Crypt_Blowfish( $key );
+
+ } else {
+
+ return false;
+
+ }
+
+ }
+
+ public static function legacyCreateKey( $passphrase ) {
+
+ // Generate a random integer
+ $key = mt_rand( 10000, 99999 ) . mt_rand( 10000, 99999 ) . mt_rand( 10000, 99999 ) . mt_rand( 10000, 99999 );
+
+ // Encrypt the key with the passphrase
+ $legacyEncKey = self::legacyEncrypt( $key, $passphrase );
+
+ return $legacyEncKey;
+
+ }
+
+ /**
+ * @brief encrypts content using legacy blowfish system
+ * @param $content the cleartext message you want to encrypt
+ * @param $key the encryption key (optional)
+ * @returns encrypted content
+ *
+ * This function encrypts an content
+ */
+ public static function legacyEncrypt( $content, $passphrase = '' ) {
+
+ $bf = self::getBlowfish( $passphrase );
+
+ return $bf->encrypt( $content );
+
+ }
+
+ /**
+ * @brief decrypts content using legacy blowfish system
+ * @param $content the cleartext message you want to decrypt
+ * @param $key the encryption key (optional)
+ * @returns cleartext content
+ *
+ * This function decrypts an content
+ */
+ public static function legacyDecrypt( $content, $passphrase = '' ) {
+
+ $bf = self::getBlowfish( $passphrase );
+
+ $decrypted = $bf->decrypt( $content );
+
+ $trimmed = rtrim( $decrypted, "\0" );
+
+ return $trimmed;
+
+ }
+
+ public static function legacyKeyRecryptKeyfile( $legacyEncryptedContent, $legacyPassphrase, $publicKey, $newPassphrase ) {
+
+ $decrypted = self::legacyDecrypt( $legacyEncryptedContent, $legacyPassphrase );
+
+ $recrypted = self::keyEncryptKeyfile( $decrypted, $publicKey );
+
+ return $recrypted;
+
+ }
+
+ /**
+ * @brief Re-encryptes a legacy blowfish encrypted file using AES with integrated IV
+ * @param $legacyContent the legacy encrypted content to re-encrypt
+ * @returns cleartext content
+ *
+ * This function decrypts an content
+ */
+ public static function legacyRecrypt( $legacyContent, $legacyPassphrase, $newPassphrase ) {
+
+ # TODO: write me
+
+ }
+
+}
+
+?> \ No newline at end of file
diff --git a/apps/files_encryption/lib/cryptstream.php b/apps/files_encryption/lib/cryptstream.php
deleted file mode 100644
index d516c0c21b2..00000000000
--- a/apps/files_encryption/lib/cryptstream.php
+++ /dev/null
@@ -1,177 +0,0 @@
-<?php
-/**
- * ownCloud
- *
- * @author Robin Appelman
- * @copyright 2011 Robin Appelman icewind1991@gmail.com
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-/**
- * transparently encrypted filestream
- *
- * you can use it as wrapper around an existing stream by setting
- * OC_CryptStream::$sourceStreams['foo']=array('path'=>$path, 'stream'=>$stream)
- * and then fopen('crypt://streams/foo');
- */
-
-class OC_CryptStream{
- public static $sourceStreams=array();
- private $source;
- private $path;
- private $meta=array();//header/meta for source stream
- private $writeCache;
- private $size;
- private static $rootView;
-
- public function stream_open($path, $mode, $options, &$opened_path) {
- if ( ! self::$rootView) {
- self::$rootView=new OC_FilesystemView('');
- }
- $path=str_replace('crypt://', '', $path);
- if (dirname($path)=='streams' and isset(self::$sourceStreams[basename($path)])) {
- $this->source=self::$sourceStreams[basename($path)]['stream'];
- $this->path=self::$sourceStreams[basename($path)]['path'];
- $this->size=self::$sourceStreams[basename($path)]['size'];
- } else {
- $this->path=$path;
- if ($mode=='w' or $mode=='w+' or $mode=='wb' or $mode=='wb+') {
- $this->size=0;
- } else {
- $this->size=self::$rootView->filesize($path, $mode);
- }
- OC_FileProxy::$enabled=false;//disable fileproxies so we can open the source file
- $this->source=self::$rootView->fopen($path, $mode);
- OC_FileProxy::$enabled=true;
- if ( ! is_resource($this->source)) {
- OCP\Util::writeLog('files_encryption', 'failed to open '.$path, OCP\Util::ERROR);
- }
- }
- if (is_resource($this->source)) {
- $this->meta=stream_get_meta_data($this->source);
- }
- return is_resource($this->source);
- }
-
- public function stream_seek($offset, $whence=SEEK_SET) {
- $this->flush();
- fseek($this->source, $offset, $whence);
- }
-
- public function stream_tell() {
- return ftell($this->source);
- }
-
- public function stream_read($count) {
- //$count will always be 8192 https://bugs.php.net/bug.php?id=21641
- //This makes this function a lot simpler but will breake everything the moment it's fixed
- $this->writeCache='';
- if ($count!=8192) {
- OCP\Util::writeLog('files_encryption',
- 'php bug 21641 no longer holds, decryption will not work',
- OCP\Util::FATAL);
- die();
- }
- $pos=ftell($this->source);
- $data=fread($this->source, 8192);
- if (strlen($data)) {
- $result=OC_Crypt::decrypt($data);
- } else {
- $result='';
- }
- $length=$this->size-$pos;
- if ($length<8192) {
- $result=substr($result, 0, $length);
- }
- return $result;
- }
-
- public function stream_write($data) {
- $length=strlen($data);
- $currentPos=ftell($this->source);
- if ($this->writeCache) {
- $data=$this->writeCache.$data;
- $this->writeCache='';
- }
- if ($currentPos%8192!=0) {
- //make sure we always start on a block start
- fseek($this->source, -($currentPos%8192), SEEK_CUR);
- $encryptedBlock=fread($this->source, 8192);
- fseek($this->source, -($currentPos%8192), SEEK_CUR);
- $block=OC_Crypt::decrypt($encryptedBlock);
- $data=substr($block, 0, $currentPos%8192).$data;
- fseek($this->source, -($currentPos%8192), SEEK_CUR);
- }
- $currentPos=ftell($this->source);
- while ($remainingLength=strlen($data)>0) {
- if ($remainingLength<8192) {
- $this->writeCache=$data;
- $data='';
- } else {
- $encrypted=OC_Crypt::encrypt(substr($data, 0, 8192));
- fwrite($this->source, $encrypted);
- $data=substr($data, 8192);
- }
- }
- $this->size=max($this->size, $currentPos+$length);
- return $length;
- }
-
- public function stream_set_option($option, $arg1, $arg2) {
- switch($option) {
- case STREAM_OPTION_BLOCKING:
- stream_set_blocking($this->source, $arg1);
- break;
- case STREAM_OPTION_READ_TIMEOUT:
- stream_set_timeout($this->source, $arg1, $arg2);
- break;
- case STREAM_OPTION_WRITE_BUFFER:
- stream_set_write_buffer($this->source, $arg1, $arg2);
- }
- }
-
- public function stream_stat() {
- return fstat($this->source);
- }
-
- public function stream_lock($mode) {
- flock($this->source, $mode);
- }
-
- public function stream_flush() {
- return fflush($this->source);
- }
-
- public function stream_eof() {
- return feof($this->source);
- }
-
- private function flush() {
- if ($this->writeCache) {
- $encrypted=OC_Crypt::encrypt($this->writeCache);
- fwrite($this->source, $encrypted);
- $this->writeCache='';
- }
- }
-
- public function stream_close() {
- $this->flush();
- if ($this->meta['mode']!='r' and $this->meta['mode']!='rb') {
- OC_FileCache::put($this->path, array('encrypted'=>true, 'size'=>$this->size), '');
- }
- return fclose($this->source);
- }
-}
diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php
new file mode 100755
index 00000000000..706e1c2661e
--- /dev/null
+++ b/apps/files_encryption/lib/keymanager.php
@@ -0,0 +1,365 @@
+<?php
+/***
+ * ownCloud
+ *
+ * @author Bjoern Schiessle
+ * @copyright 2012 Bjoern Schiessle <schiessle@owncloud.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCA\Encryption;
+
+/**
+ * @brief Class to manage storage and retrieval of encryption keys
+ * @note Where a method requires a view object, it's root must be '/'
+ */
+class Keymanager {
+
+ # TODO: make all dependencies (including static classes) explicit, such as ocfsview objects, by adding them as method arguments (dependency injection)
+
+ /**
+ * @brief retrieve the ENCRYPTED private key from a user
+ *
+ * @return string private key or false
+ * @note the key returned by this method must be decrypted before use
+ */
+ public static function getPrivateKey( \OC_FilesystemView $view, $user ) {
+
+ $path = '/' . $user . '/' . 'files_encryption' . '/' . $user.'.private.key';
+
+ $key = $view->file_get_contents( $path );
+
+ return $key;
+ }
+
+ /**
+ * @brief retrieve public key for a specified user
+ * @return string public key or false
+ */
+ public static function getPublicKey( \OC_FilesystemView $view, $userId ) {
+
+ return $view->file_get_contents( '/public-keys/' . '/' . $userId . '.public.key' );
+
+ }
+
+ /**
+ * @brief retrieve both keys from a user (private and public)
+ * @return array keys: privateKey, publicKey
+ */
+ public static function getUserKeys( \OC_FilesystemView $view, $userId ) {
+
+ return array(
+ 'publicKey' => self::getPublicKey( $view, $userId )
+ , 'privateKey' => self::getPrivateKey( $view, $userId )
+ );
+
+ }
+
+ /**
+ * @brief Retrieve public keys of all users with access to a file
+ * @param string $path Path to file
+ * @return array of public keys for the given file
+ * @note Checks that the sharing app is enabled should be performed
+ * by client code, that isn't checked here
+ */
+ public static function getPublicKeys( \OC_FilesystemView $view, $userId, $filePath ) {
+
+ $path = ltrim( $path, '/' );
+
+ $filepath = '/' . $userId . '/files/' . $filePath;
+
+ // Check if sharing is enabled
+ if ( OC_App::isEnabled( 'files_sharing' ) ) {
+
+// // Check if file was shared with other users
+// $query = \OC_DB::prepare( "
+// SELECT
+// uid_owner
+// , source
+// , target
+// , uid_shared_with
+// FROM
+// `*PREFIX*sharing`
+// WHERE
+// ( target = ? AND uid_shared_with = ? )
+// OR source = ?
+// " );
+//
+// $result = $query->execute( array ( $filepath, $userId, $filepath ) );
+//
+// $users = array();
+//
+// if ( $row = $result->fetchRow() )
+// {
+// $source = $row['source'];
+// $owner = $row['uid_owner'];
+// $users[] = $owner;
+// // get the uids of all user with access to the file
+// $query = \OC_DB::prepare( "SELECT source, uid_shared_with FROM `*PREFIX*sharing` WHERE source = ?" );
+// $result = $query->execute( array ($source));
+// while ( ($row = $result->fetchRow()) ) {
+// $users[] = $row['uid_shared_with'];
+//
+// }
+//
+// }
+
+ } else {
+
+ // check if it is a file owned by the user and not shared at all
+ $userview = new \OC_FilesystemView( '/'.$userId.'/files/' );
+
+ if ( $userview->file_exists( $path ) ) {
+
+ $users[] = $userId;
+
+ }
+
+ }
+
+ $view = new \OC_FilesystemView( '/public-keys/' );
+
+ $keylist = array();
+
+ $count = 0;
+
+ foreach ( $users as $user ) {
+
+ $keylist['key'.++$count] = $view->file_get_contents( $user.'.public.key' );
+
+ }
+
+ return $keylist;
+
+ }
+
+ /**
+ * @brief retrieve keyfile for an encrypted file
+ * @param string file name
+ * @return string file key or false
+ * @note The keyfile returned is asymmetrically encrypted. Decryption
+ * of the keyfile must be performed by client code
+ */
+ public static function getFileKey( \OC_FilesystemView $view, $userId, $filePath ) {
+
+ $filePath_f = ltrim( $filePath, '/' );
+
+// // update $keypath and $userId if path point to a file shared by someone else
+// $query = \OC_DB::prepare( "SELECT uid_owner, source, target FROM `*PREFIX*sharing` WHERE target = ? AND uid_shared_with = ?" );
+//
+// $result = $query->execute( array ('/'.$userId.'/files/'.$keypath, $userId));
+//
+// if ($row = $result->fetchRow()) {
+//
+// $keypath = $row['source'];
+// $keypath_parts = explode( '/', $keypath );
+// $userId = $keypath_parts[1];
+// $keypath = str_replace( '/' . $userId . '/files/', '', $keypath );
+//
+// }
+
+ return $view->file_get_contents( '/' . $userId . '/files_encryption/keyfiles/' . $filePath_f . '.key' );
+
+ }
+
+ /**
+ * @brief retrieve file encryption key
+ *
+ * @param string file name
+ * @return string file key or false
+ */
+ public static function deleteFileKey( $path, $staticUserClass = 'OCP\User' ) {
+
+ $keypath = ltrim( $path, '/' );
+ $user = $staticUserClass::getUser();
+
+ // update $keypath and $user if path point to a file shared by someone else
+// $query = \OC_DB::prepare( "SELECT uid_owner, source, target FROM `*PREFIX*sharing` WHERE target = ? AND uid_shared_with = ?" );
+//
+// $result = $query->execute( array ('/'.$user.'/files/'.$keypath, $user));
+//
+// if ($row = $result->fetchRow()) {
+//
+// $keypath = $row['source'];
+// $keypath_parts = explode( '/', $keypath );
+// $user = $keypath_parts[1];
+// $keypath = str_replace( '/' . $user . '/files/', '', $keypath );
+//
+// }
+
+ $view = new \OC_FilesystemView('/'.$user.'/files_encryption/keyfiles/');
+
+ return $view->unlink( $keypath . '.key' );
+
+ }
+
+ /**
+ * @brief store private key from the user
+ * @param string key
+ * @return bool
+ * @note Encryption of the private key must be performed by client code
+ * as no encryption takes place here
+ */
+ public static function setPrivateKey( $key ) {
+
+ $user = \OCP\User::getUser();
+
+ $view = new \OC_FilesystemView( '/' . $user . '/files_encryption' );
+
+ \OC_FileProxy::$enabled = false;
+
+ if ( !$view->file_exists( '' ) ) $view->mkdir( '' );
+
+ return $view->file_put_contents( $user . '.private.key', $key );
+
+ \OC_FileProxy::$enabled = true;
+
+ }
+
+ /**
+ * @brief store private keys from the user
+ *
+ * @param string privatekey
+ * @param string publickey
+ * @return bool true/false
+ */
+ public static function setUserKeys($privatekey, $publickey) {
+
+ return (self::setPrivateKey($privatekey) && self::setPublicKey($publickey));
+
+ }
+
+ /**
+ * @brief store public key of the user
+ *
+ * @param string key
+ * @return bool true/false
+ */
+ public static function setPublicKey( $key ) {
+
+ $view = new \OC_FilesystemView( '/public-keys' );
+
+ \OC_FileProxy::$enabled = false;
+
+ if ( !$view->file_exists( '' ) ) $view->mkdir( '' );
+
+ return $view->file_put_contents( \OCP\User::getUser() . '.public.key', $key );
+
+ \OC_FileProxy::$enabled = true;
+
+ }
+
+ /**
+ * @brief store file encryption key
+ *
+ * @param string $path relative path of the file, including filename
+ * @param string $key
+ * @return bool true/false
+ * @note The keyfile is not encrypted here. Client code must
+ * asymmetrically encrypt the keyfile before passing it to this method
+ */
+ public static function setFileKey( $path, $key, $view = Null, $dbClassName = '\OC_DB') {
+
+ $targetPath = ltrim( $path, '/' );
+ $user = \OCP\User::getUser();
+
+// // update $keytarget and $user if key belongs to a file shared by someone else
+// $query = $dbClassName::prepare( "SELECT uid_owner, source, target FROM `*PREFIX*sharing` WHERE target = ? AND uid_shared_with = ?" );
+//
+// $result = $query->execute( array ( '/'.$user.'/files/'.$targetPath, $user ) );
+//
+// if ( $row = $result->fetchRow( ) ) {
+//
+// $targetPath = $row['source'];
+//
+// $targetPath_parts = explode( '/', $targetPath );
+//
+// $user = $targetPath_parts[1];
+//
+// $rootview = new \OC_FilesystemView( '/' );
+//
+// if ( ! $rootview->is_writable( $targetPath ) ) {
+//
+// \OC_Log::write( 'Encryption library', "File Key not updated because you don't have write access for the corresponding file", \OC_Log::ERROR );
+//
+// return false;
+//
+// }
+//
+// $targetPath = str_replace( '/'.$user.'/files/', '', $targetPath );
+//
+// //TODO: check for write permission on shared file once the new sharing API is in place
+//
+// }
+
+ $path_parts = pathinfo( $targetPath );
+
+ if ( !$view ) {
+
+ $view = new \OC_FilesystemView( '/' );
+
+ }
+
+ $view->chroot( '/' . $user . '/files_encryption/keyfiles' );
+
+ // If the file resides within a subdirectory, create it
+ if (
+ isset( $path_parts['dirname'] )
+ && ! $view->file_exists( $path_parts['dirname'] )
+ ) {
+
+ $view->mkdir( $path_parts['dirname'] );
+
+ }
+
+ // Save the keyfile in parallel directory
+ return $view->file_put_contents( '/' . $targetPath . '.key', $key );
+
+ }
+
+ /**
+ * @brief change password of private encryption key
+ *
+ * @param string $oldpasswd old password
+ * @param string $newpasswd new password
+ * @return bool true/false
+ */
+ public static function changePasswd($oldpasswd, $newpasswd) {
+
+ if ( \OCP\User::checkPassword(\OCP\User::getUser(), $newpasswd) ) {
+ return Crypt::changekeypasscode($oldpasswd, $newpasswd);
+ }
+ return false;
+
+ }
+
+ /**
+ * @brief Fetch the legacy encryption key from user files
+ * @param string $login used to locate the legacy key
+ * @param string $passphrase used to decrypt the legacy key
+ * @return true / false
+ *
+ * if the key is left out, the default handeler will be used
+ */
+ public function getLegacyKey() {
+
+ $user = \OCP\User::getUser();
+ $view = new \OC_FilesystemView( '/' . $user );
+ return $view->file_get_contents( 'encryption.key' );
+
+ }
+
+} \ No newline at end of file
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index e8dbd95c29d..52f47dba294 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -3,8 +3,9 @@
/**
* ownCloud
*
-* @author Robin Appelman
-* @copyright 2011 Robin Appelman icewind1991@gmail.com
+* @author Sam Tuke, Robin Appelman
+* @copyright 2012 Sam Tuke samtuke@owncloud.com, Robin Appelman
+* icewind1991@gmail.com
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
@@ -21,111 +22,267 @@
*
*/
-/**
- * transparent encryption
- */
+namespace OCA\Encryption;
-class OC_FileProxy_Encryption extends OC_FileProxy{
- private static $blackList=null; //mimetypes blacklisted from encryption
- private static $enableEncryption=null;
+class Proxy extends \OC_FileProxy {
+ private static $blackList = null; //mimetypes blacklisted from encryption
+
+ private static $enableEncryption = null;
+
/**
- * check if a file should be encrypted during write
+ * Check if a file requires encryption
* @param string $path
* @return bool
+ *
+ * Tests if server side encryption is enabled, and file is allowed by blacklists
*/
- private static function shouldEncrypt($path) {
- if (is_null(self::$enableEncryption)) {
- self::$enableEncryption=(OCP\Config::getAppValue('files_encryption', 'enable_encryption', 'true')=='true');
+ private static function shouldEncrypt( $path ) {
+
+ if ( is_null( self::$enableEncryption ) ) {
+
+ if (
+ \OCP\Config::getAppValue( 'files_encryption', 'enable_encryption', 'true' ) == 'true'
+ && Crypt::mode() == 'server'
+ ) {
+
+ self::$enableEncryption = true;
+
+ } else {
+
+ self::$enableEncryption = false;
+
+ }
+
}
- if ( ! self::$enableEncryption) {
+
+ if ( !self::$enableEncryption ) {
+
return false;
+
}
- if (is_null(self::$blackList)) {
- self::$blackList=explode(',', OCP\Config::getAppValue('files_encryption',
- 'type_blacklist',
- 'jpg,png,jpeg,avi,mpg,mpeg,mkv,mp3,oga,ogv,ogg'));
+
+ if ( is_null(self::$blackList ) ) {
+
+ self::$blackList = explode(',', \OCP\Config::getAppValue( 'files_encryption','type_blacklist','jpg,png,jpeg,avi,mpg,mpeg,mkv,mp3,oga,ogv,ogg' ) );
+
}
- if (self::isEncrypted($path)) {
+
+ if ( Crypt::isEncryptedContent( $path ) ) {
+
return true;
+
}
- $extension=substr($path, strrpos($path, '.')+1);
- if (array_search($extension, self::$blackList)===false) {
+
+ $extension = substr( $path, strrpos( $path,'.' ) +1 );
+
+ if ( array_search( $extension, self::$blackList ) === false ){
+
return true;
+
}
+
+ return false;
}
-
- /**
- * check if a file is encrypted
- * @param string $path
- * @return bool
- */
- private static function isEncrypted($path) {
- $metadata=OC_FileCache_Cached::get($path, '');
- return isset($metadata['encrypted']) and (bool)$metadata['encrypted'];
- }
-
- public function preFile_put_contents($path,&$data) {
- if (self::shouldEncrypt($path)) {
- if ( ! is_resource($data)) {//stream put contents should have been converter to fopen
- $size=strlen($data);
- $data=OC_Crypt::blockEncrypt($data);
- OC_FileCache::put($path, array('encrypted'=>true,'size'=>$size), '');
+
+ public function preFile_put_contents( $path, &$data ) {
+
+ if ( self::shouldEncrypt( $path ) ) {
+
+ if ( !is_resource( $data ) ) { //stream put contents should have been converted to fopen
+
+ $userId = \OCP\USER::getUser();
+
+ $rootView = new \OC_FilesystemView( '/' );
+
+ // Set the filesize for userland, before encrypting
+ $size = strlen( $data );
+
+ // Disable encryption proxy to prevent recursive calls
+ \OC_FileProxy::$enabled = false;
+
+ // Encrypt plain data and fetch key
+ $encrypted = Crypt::keyEncryptKeyfile( $data, Keymanager::getPublicKey( $rootView, $userId ) );
+
+ // Replace plain content with encrypted content by reference
+ $data = $encrypted['data'];
+
+ $filePath = explode( '/', $path );
+
+ $filePath = array_slice( $filePath, 3 );
+
+ $filePath = '/' . implode( '/', $filePath );
+
+ # TODO: make keyfile dir dynamic from app config
+ $view = new \OC_FilesystemView( '/' . $userId . '/files_encryption/keyfiles' );
+
+ // Save keyfile for newly encrypted file in parallel directory tree
+ Keymanager::setFileKey( $filePath, $encrypted['key'], $view, '\OC_DB' );
+
+ // Update the file cache with file info
+ \OC_FileCache::put( $path, array( 'encrypted'=>true, 'size' => $size ), '' );
+
+ // Re-enable proxy - our work is done
+ \OC_FileProxy::$enabled = true;
+
}
}
+
}
+
+ /**
+ * @param string $path Path of file from which has been read
+ * @param string $data Data that has been read from file
+ */
+ public function postFile_get_contents( $path, $data ) {
+
+ # TODO: Use dependency injection to add required args for view and user etc. to this method
+
+ // Disable encryption proxy to prevent recursive calls
+ \OC_FileProxy::$enabled = false;
+
+ // If data is a catfile
+ if (
+ Crypt::mode() == 'server'
+ && Crypt::isEncryptedContent( $data )
+ ) {
+
+ $split = explode( '/', $path );
+
+ $filePath = array_slice( $split, 3 );
+
+ $filePath = '/' . implode( '/', $filePath );
+
+ //$cached = \OC_FileCache_Cached::get( $path, '' );
+
+ $view = new \OC_FilesystemView( '' );
+
+ $userId = \OCP\USER::getUser();
+
+ $encryptedKeyfile = Keymanager::getFileKey( $view, $userId, $filePath );
- public function postFile_get_contents($path, $data) {
- if (self::isEncrypted($path)) {
- $cached=OC_FileCache_Cached::get($path, '');
- $data=OC_Crypt::blockDecrypt($data, '', $cached['size']);
+ $session = new Session();
+
+ $decrypted = Crypt::keyDecryptKeyfile( $data, $encryptedKeyfile, $session->getPrivateKey( $split[1] ) );
+
+ } elseif (
+ Crypt::mode() == 'server'
+ && isset( $_SESSION['legacyenckey'] )
+ && Crypt::isEncryptedMeta( $path )
+ ) {
+
+ $decrypted = Crypt::legacyDecrypt( $data, $_SESSION['legacyenckey'] );
+
}
- return $data;
+
+ \OC_FileProxy::$enabled = true;
+
+ if ( ! isset( $decrypted ) ) {
+
+ $decrypted = $data;
+
+ }
+
+ return $decrypted;
+
}
-
- public function postFopen($path,&$result) {
- if ( ! $result) {
+
+ public function postFopen( $path, &$result ){
+
+ if ( !$result ) {
+
return $result;
+
}
- $meta=stream_get_meta_data($result);
- if (self::isEncrypted($path)) {
- fclose($result);
- $result=fopen('crypt://'.$path, $meta['mode']);
- } elseif (self::shouldEncrypt($path) and $meta['mode']!='r' and $meta['mode']!='rb') {
- if (OC_Filesystem::file_exists($path) and OC_Filesystem::filesize($path)>0) {
- //first encrypt the target file so we don't end up with a half encrypted file
- OCP\Util::writeLog('files_encryption', 'Decrypting '.$path.' before writing', OCP\Util::DEBUG);
- $tmp=fopen('php://temp');
- OCP\Files::streamCopy($result, $tmp);
- fclose($result);
- OC_Filesystem::file_put_contents($path, $tmp);
- fclose($tmp);
+
+ // Reformat path for use with OC_FSV
+ $path_split = explode( '/', $path );
+ $path_f = implode( array_slice( $path_split, 3 ) );
+
+ // Disable encryption proxy to prevent recursive calls
+ \OC_FileProxy::$enabled = false;
+
+ $meta = stream_get_meta_data( $result );
+
+ $view = new \OC_FilesystemView( '' );
+
+ $util = new Util( $view, \OCP\USER::getUser());
+
+ // If file is already encrypted, decrypt using crypto protocol
+ if (
+ Crypt::mode() == 'server'
+ && $util->isEncryptedPath( $path )
+ ) {
+
+ // Close the original encrypted file
+ fclose( $result );
+
+ // Open the file using the crypto stream wrapper
+ // protocol and let it do the decryption work instead
+ $result = fopen( 'crypt://' . $path_f, $meta['mode'] );
+
+
+ } elseif (
+ self::shouldEncrypt( $path )
+ and $meta ['mode'] != 'r'
+ and $meta['mode'] != 'rb'
+ ) {
+ // If the file is not yet encrypted, but should be
+ // encrypted when it's saved (it's not read only)
+
+ // NOTE: this is the case for new files saved via WebDAV
+
+ if (
+ $view->file_exists( $path )
+ and $view->filesize( $path ) > 0
+ ) {
+ $x = $view->file_get_contents( $path );
+
+ $tmp = tmpfile();
+
+// // Make a temporary copy of the original file
+// \OCP\Files::streamCopy( $result, $tmp );
+//
+// // Close the original stream, we'll return another one
+// fclose( $result );
+//
+// $view->file_put_contents( $path_f, $tmp );
+//
+// fclose( $tmp );
+
}
- $result=fopen('crypt://'.$path, $meta['mode']);
+
+ $result = fopen( 'crypt://'.$path_f, $meta['mode'] );
+
}
+
+ // Re-enable the proxy
+ \OC_FileProxy::$enabled = true;
+
return $result;
+
}
- public function postGetMimeType($path, $mime) {
- if (self::isEncrypted($path)) {
- $mime=OCP\Files::getMimeType('crypt://'.$path, 'w');
+ public function postGetMimeType($path,$mime){
+ if( Crypt::isEncryptedContent($path)){
+ $mime = \OCP\Files::getMimeType('crypt://'.$path,'w');
}
return $mime;
}
- public function postStat($path, $data) {
- if (self::isEncrypted($path)) {
- $cached=OC_FileCache_Cached::get($path, '');
+ public function postStat($path,$data){
+ if( Crypt::isEncryptedContent($path)){
+ $cached= \OC_FileCache_Cached::get($path,'');
$data['size']=$cached['size'];
}
return $data;
}
- public function postFileSize($path, $size) {
- if (self::isEncrypted($path)) {
- $cached=OC_FileCache_Cached::get($path, '');
+ public function postFileSize($path,$size){
+ if( Crypt::isEncryptedContent($path)){
+ $cached = \OC_FileCache_Cached::get($path,'');
return $cached['size'];
- } else {
+ }else{
return $size;
}
}
diff --git a/apps/files_encryption/lib/session.php b/apps/files_encryption/lib/session.php
new file mode 100644
index 00000000000..85d533fde7a
--- /dev/null
+++ b/apps/files_encryption/lib/session.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Sam Tuke
+ * @copyright 2012 Sam Tuke samtuke@owncloud.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCA\Encryption;
+
+/**
+ * Class for handling encryption related session data
+ */
+
+class Session {
+
+ /**
+ * @brief Sets user id for session and triggers emit
+ * @return bool
+ *
+ */
+ public function setPrivateKey( $privateKey, $userId ) {
+
+ $_SESSION['privateKey'] = $privateKey;
+
+ return true;
+
+ }
+
+ /**
+ * @brief Gets user id for session and triggers emit
+ * @returns string $privateKey The user's plaintext private key
+ *
+ */
+ public function getPrivateKey( $userId ) {
+
+ if (
+ isset( $_SESSION['privateKey'] )
+ && !empty( $_SESSION['privateKey'] )
+ ) {
+
+ return $_SESSION['privateKey'];
+
+ } else {
+
+ return false;
+
+ }
+
+ }
+
+} \ No newline at end of file
diff --git a/apps/files_encryption/lib/stream.php b/apps/files_encryption/lib/stream.php
new file mode 100644
index 00000000000..f482e2d75ac
--- /dev/null
+++ b/apps/files_encryption/lib/stream.php
@@ -0,0 +1,464 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Robin Appelman
+ * @copyright 2012 Sam Tuke <samtuke@owncloud.com>, 2011 Robin Appelman
+ * <icewind1991@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * transparently encrypted filestream
+ *
+ * you can use it as wrapper around an existing stream by setting CryptStream::$sourceStreams['foo']=array('path'=>$path,'stream'=>$stream)
+ * and then fopen('crypt://streams/foo');
+ */
+
+namespace OCA\Encryption;
+
+/**
+ * @brief Provides 'crypt://' stream wrapper protocol.
+ * @note We use a stream wrapper because it is the most secure way to handle
+ * decrypted content transfers. There is no safe way to decrypt the entire file
+ * somewhere on the server, so we have to encrypt and decrypt blocks on the fly.
+ * @note Paths used with this protocol MUST BE RELATIVE. Use URLs like:
+ * crypt://filename, or crypt://subdirectory/filename, NOT
+ * crypt:///home/user/owncloud/data. Otherwise keyfiles will be put in
+ * [owncloud]/data/user/files_encryption/keyfiles/home/user/owncloud/data and
+ * will not be accessible to other methods.
+ * @note Data read and written must always be 8192 bytes long, as this is the
+ * buffer size used internally by PHP. The encryption process makes the input
+ * data longer, and input is chunked into smaller pieces in order to result in
+ * a 8192 encrypted block size.
+ */
+class Stream {
+
+ public static $sourceStreams = array();
+
+ # TODO: make all below properties private again once unit testing is configured correctly
+ public $rawPath; // The raw path received by stream_open
+ public $path_f; // The raw path formatted to include username and data directory
+ private $userId;
+ private $handle; // Resource returned by fopen
+ private $path;
+ private $readBuffer; // For streams that dont support seeking
+ private $meta = array(); // Header / meta for source stream
+ private $count;
+ private $writeCache;
+ public $size;
+ private $publicKey;
+ private $keyfile;
+ private $encKeyfile;
+ private static $view; // a fsview object set to user dir
+ private $rootView; // a fsview object set to '/'
+
+ public function stream_open( $path, $mode, $options, &$opened_path ) {
+
+ // Get access to filesystem via filesystemview object
+ if ( !self::$view ) {
+
+ self::$view = new \OC_FilesystemView( $this->userId . '/' );
+
+ }
+
+ // Set rootview object if necessary
+ if ( ! $this->rootView ) {
+
+ $this->rootView = new \OC_FilesystemView( $this->userId . '/' );
+
+ }
+
+ $this->userId = \OCP\User::getUser();
+
+ // Get the bare file path
+ $path = str_replace( 'crypt://', '', $path );
+
+ $this->rawPath = $path;
+
+ $this->path_f = $this->userId . '/files/' . $path;
+
+ if (
+ dirname( $path ) == 'streams'
+ and isset( self::$sourceStreams[basename( $path )] )
+ ) {
+
+ // Is this just for unit testing purposes?
+
+ $this->handle = self::$sourceStreams[basename( $path )]['stream'];
+
+ $this->path = self::$sourceStreams[basename( $path )]['path'];
+
+ $this->size = self::$sourceStreams[basename( $path )]['size'];
+
+ } else {
+
+ if (
+ $mode == 'w'
+ or $mode == 'w+'
+ or $mode == 'wb'
+ or $mode == 'wb+'
+ ) {
+
+ $this->size = 0;
+
+ } else {
+
+
+
+ $this->size = self::$view->filesize( $this->path_f, $mode );
+
+ //$this->size = filesize( $path );
+
+ }
+
+ // Disable fileproxies so we can open the source file without recursive encryption
+ \OC_FileProxy::$enabled = false;
+
+ //$this->handle = fopen( $path, $mode );
+
+ $this->handle = self::$view->fopen( $this->path_f, $mode );
+
+ \OC_FileProxy::$enabled = true;
+
+ if ( !is_resource( $this->handle ) ) {
+
+ \OCP\Util::writeLog( 'files_encryption', 'failed to open '.$path, \OCP\Util::ERROR );
+
+ }
+
+ }
+
+ if ( is_resource( $this->handle ) ) {
+
+ $this->meta = stream_get_meta_data( $this->handle );
+
+ }
+
+ return is_resource( $this->handle );
+
+ }
+
+ public function stream_seek( $offset, $whence = SEEK_SET ) {
+
+ $this->flush();
+
+ fseek( $this->handle, $offset, $whence );
+
+ }
+
+ public function stream_tell() {
+ return ftell($this->handle);
+ }
+
+ public function stream_read( $count ) {
+
+ $this->writeCache = '';
+
+ if ( $count != 8192 ) {
+
+ // $count will always be 8192 https://bugs.php.net/bug.php?id=21641
+ // This makes this function a lot simpler, but will break this class if the above 'bug' gets 'fixed'
+ \OCP\Util::writeLog( 'files_encryption', 'PHP "bug" 21641 no longer holds, decryption system requires refactoring', OCP\Util::FATAL );
+
+ die();
+
+ }
+
+// $pos = ftell( $this->handle );
+//
+ // Get the data from the file handle
+ $data = fread( $this->handle, 8192 );
+
+ if ( strlen( $data ) ) {
+
+ $this->getKey();
+
+ $result = Crypt::symmetricDecryptFileContent( $data, $this->keyfile );
+
+ } else {
+
+ $result = '';
+
+ }
+
+// $length = $this->size - $pos;
+//
+// if ( $length < 8192 ) {
+//
+// $result = substr( $result, 0, $length );
+//
+// }
+
+ return $result;
+
+ }
+
+ /**
+ * @brief Encrypt and pad data ready for writting to disk
+ * @param string $plainData data to be encrypted
+ * @param string $key key to use for encryption
+ * @return encrypted data on success, false on failure
+ */
+ public function preWriteEncrypt( $plainData, $key ) {
+
+ // Encrypt data to 'catfile', which includes IV
+ if ( $encrypted = Crypt::symmetricEncryptFileContent( $plainData, $key ) ) {
+
+ return $encrypted;
+
+ } else {
+
+ return false;
+
+ }
+
+ }
+
+ /**
+ * @brief Get the keyfile for the current file, generate one if necessary
+ * @param bool $generate if true, a new key will be generated if none can be found
+ * @return bool true on key found and set, false on key not found and new key generated and set
+ */
+ public function getKey() {
+
+ // If a keyfile already exists for a file named identically to file to be written
+ if ( self::$view->file_exists( $this->userId . '/'. 'files_encryption' . '/' . 'keyfiles' . '/' . $this->rawPath . '.key' ) ) {
+
+ # TODO: add error handling for when file exists but no keyfile
+
+ // Fetch existing keyfile
+ $this->encKeyfile = Keymanager::getFileKey( $this->rootView, $this->userId, $this->rawPath );
+
+ $this->getUser();
+
+ $session = new Session();
+
+ $privateKey = $session->getPrivateKey( $this->userId );
+
+ $this->keyfile = Crypt::keyDecrypt( $this->encKeyfile, $privateKey );
+
+ return true;
+
+ } else {
+
+ return false;
+
+ }
+
+ }
+
+ public function getuser() {
+
+ // Only get the user again if it isn't already set
+ if ( empty( $this->userId ) ) {
+
+ # TODO: Move this user call out of here - it belongs elsewhere
+ $this->userId = \OCP\User::getUser();
+
+ }
+
+ # TODO: Add a method for getting the user in case OCP\User::
+ # getUser() doesn't work (can that scenario ever occur?)
+
+ }
+
+ /**
+ * @brief Handle plain data from the stream, and write it in 8192 byte blocks
+ * @param string $data data to be written to disk
+ * @note the data will be written to the path stored in the stream handle, set in stream_open()
+ * @note $data is only ever be a maximum of 8192 bytes long. This is set by PHP internally. stream_write() is called multiple times in a loop on data larger than 8192 bytes
+ * @note Because the encryption process used increases the length of $data, a writeCache is used to carry over data which would not fit in the required block size
+ * @note Padding is added to each encrypted block to ensure that the resulting block is exactly 8192 bytes. This is removed during stream_read
+ * @note PHP automatically updates the file pointer after writing data to reflect it's length. There is generally no need to update the poitner manually using fseek
+ */
+ public function stream_write( $data ) {
+
+ // Disable the file proxies so that encryption is not automatically attempted when the file is written to disk - we are handling that separately here and we don't want to get into an infinite loop
+ \OC_FileProxy::$enabled = false;
+
+ // Get the length of the unencrypted data that we are handling
+ $length = strlen( $data );
+
+ // So far this round, no data has been written
+ $written = 0;
+
+ // Find out where we are up to in the writing of data to the file
+ $pointer = ftell( $this->handle );
+
+ // Make sure the userId is set
+ $this->getuser();
+
+ // Get / generate the keyfile for the file we're handling
+ // If we're writing a new file (not overwriting an existing one), save the newly generated keyfile
+ if ( ! $this->getKey() ) {
+
+ $this->keyfile = Crypt::generateKey();
+
+ $this->publicKey = Keymanager::getPublicKey( $this->rootView, $this->userId );
+
+ $this->encKeyfile = Crypt::keyEncrypt( $this->keyfile, $this->publicKey );
+
+ // Save the new encrypted file key
+ Keymanager::setFileKey( $this->rawPath, $this->encKeyfile, new \OC_FilesystemView( '/' ) );
+
+ # TODO: move this new OCFSV out of here some how, use DI
+
+ }
+
+ // If extra data is left over from the last round, make sure it is integrated into the next 6126 / 8192 block
+ if ( $this->writeCache ) {
+
+ // Concat writeCache to start of $data
+ $data = $this->writeCache . $data;
+
+ // Clear the write cache, ready for resuse - it has been flushed and its old contents processed
+ $this->writeCache = '';
+
+ }
+//
+// // Make sure we always start on a block start
+ if ( 0 != ( $pointer % 8192 ) ) { // if the current positoin of file indicator is not aligned to a 8192 byte block, fix it so that it is
+
+// fseek( $this->handle, - ( $pointer % 8192 ), SEEK_CUR );
+//
+// $pointer = ftell( $this->handle );
+//
+// $unencryptedNewBlock = fread( $this->handle, 8192 );
+//
+// fseek( $this->handle, - ( $currentPos % 8192 ), SEEK_CUR );
+//
+// $block = Crypt::symmetricDecryptFileContent( $unencryptedNewBlock, $this->keyfile );
+//
+// $x = substr( $block, 0, $currentPos % 8192 );
+//
+// $data = $x . $data;
+//
+// fseek( $this->handle, - ( $currentPos % 8192 ), SEEK_CUR );
+//
+ }
+
+// $currentPos = ftell( $this->handle );
+
+// // While there still remains somed data to be processed & written
+ while( strlen( $data ) > 0 ) {
+//
+// // Remaining length for this iteration, not of the entire file (may be greater than 8192 bytes)
+// $remainingLength = strlen( $data );
+//
+// // If data remaining to be written is less than the size of 1 6126 byte block
+ if ( strlen( $data ) < 6126 ) {
+
+ // Set writeCache to contents of $data
+ // The writeCache will be carried over to the next write round, and added to the start of $data to ensure that written blocks are always the correct length. If there is still data in writeCache after the writing round has finished, then the data will be written to disk by $this->flush().
+ $this->writeCache = $data;
+
+ // Clear $data ready for next round
+ $data = '';
+//
+ } else {
+
+ // Read the chunk from the start of $data
+ $chunk = substr( $data, 0, 6126 );
+
+ $encrypted = $this->preWriteEncrypt( $chunk, $this->keyfile );
+
+ // Write the data chunk to disk. This will be addended to the last data chunk if the file being handled totals more than 6126 bytes
+ fwrite( $this->handle, $encrypted );
+
+ $writtenLen = strlen( $encrypted );
+ //fseek( $this->handle, $writtenLen, SEEK_CUR );
+
+ // Remove the chunk we just processed from $data, leaving only unprocessed data in $data var, for handling on the next round
+ $data = substr( $data, 6126 );
+
+ }
+
+ }
+
+ $this->size = max( $this->size, $pointer + $length );
+
+ return $length;
+
+ }
+
+
+ public function stream_set_option($option,$arg1,$arg2) {
+ switch($option) {
+ case STREAM_OPTION_BLOCKING:
+ stream_set_blocking($this->handle,$arg1);
+ break;
+ case STREAM_OPTION_READ_TIMEOUT:
+ stream_set_timeout($this->handle,$arg1,$arg2);
+ break;
+ case STREAM_OPTION_WRITE_BUFFER:
+ stream_set_write_buffer($this->handle,$arg1,$arg2);
+ }
+ }
+
+ public function stream_stat() {
+ return fstat($this->handle);
+ }
+
+ public function stream_lock($mode) {
+ flock($this->handle,$mode);
+ }
+
+ public function stream_flush() {
+
+ return fflush($this->handle); // Not a typo: http://php.net/manual/en/function.fflush.php
+
+ }
+
+ public function stream_eof() {
+ return feof($this->handle);
+ }
+
+ private function flush() {
+
+ if ( $this->writeCache ) {
+
+ // Set keyfile property for file in question
+ $this->getKey();
+
+ $encrypted = $this->preWriteEncrypt( $this->writeCache, $this->keyfile );
+
+ fwrite( $this->handle, $encrypted );
+
+ $this->writeCache = '';
+
+ }
+
+ }
+
+ public function stream_close() {
+
+ $this->flush();
+
+ if (
+ $this->meta['mode']!='r'
+ and $this->meta['mode']!='rb'
+ ) {
+
+ \OC_FileCache::put( $this->path, array( 'encrypted' => true, 'size' => $this->size ), '' );
+
+ }
+
+ return fclose( $this->handle );
+
+ }
+
+}
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
new file mode 100644
index 00000000000..cd46d23108a
--- /dev/null
+++ b/apps/files_encryption/lib/util.php
@@ -0,0 +1,330 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Sam Tuke, Frank Karlitschek
+ * @copyright 2012 Sam Tuke samtuke@owncloud.com,
+ * Frank Karlitschek frank@owncloud.org
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+// Todo:
+// - Crypt/decrypt button in the userinterface
+// - Setting if crypto should be on by default
+// - Add a setting "Don´t encrypt files larger than xx because of performance reasons"
+// - Transparent decrypt/encrypt in filesystem.php. Autodetect if a file is encrypted (.encrypted extension)
+// - Don't use a password directly as encryption key. but a key which is stored on the server and encrypted with the user password. -> password change faster
+// - IMPORTANT! Check if the block lenght of the encrypted data stays the same
+
+namespace OCA\Encryption;
+
+/**
+ * @brief Class for utilities relating to encrypted file storage system
+ * @param $view OC_FilesystemView object, expected to have OC '/' as root path
+ * @param $client flag indicating status of client side encryption. Currently
+ * unused, likely to become obsolete shortly
+ */
+
+class Util {
+
+
+ # Web UI:
+
+ ## DONE: files created via web ui are encrypted
+ ## DONE: file created & encrypted via web ui are readable in web ui
+ ## DONE: file created & encrypted via web ui are readable via webdav
+
+
+ # WebDAV:
+
+ ## DONE: new data filled files added via webdav get encrypted
+ ## DONE: new data filled files added via webdav are readable via webdav
+ ## DONE: reading unencrypted files when encryption is enabled works via webdav
+ ## DONE: files created & encrypted via web ui are readable via webdav
+
+
+ # Legacy support:
+
+ ## DONE: add method to check if file is encrypted using new system
+ ## DONE: add method to check if file is encrypted using old system
+ ## DONE: add method to fetch legacy key
+ ## DONE: add method to decrypt legacy encrypted data
+
+ ## TODO: add method to encrypt all user files using new system
+ ## TODO: add method to decrypt all user files using new system
+ ## TODO: add method to encrypt all user files using old system
+ ## TODO: add method to decrypt all user files using old system
+
+
+ # Admin UI:
+
+ ## DONE: changing user password also changes encryption passphrase
+
+ ## TODO: add support for optional recovery in case of lost passphrase / keys
+ ## TODO: add admin optional required long passphrase for users
+ ## TODO: add UI buttons for encrypt / decrypt everything
+ ## TODO: implement flag system to allow user to specify encryption by folder, subfolder, etc.
+
+
+ # Sharing:
+
+ ## TODO: add support for encrypting to multiple public keys
+ ## TODO: add support for decrypting to multiple private keys
+
+
+ # Integration testing:
+
+ ## TODO: test new encryption with webdav
+ ## TODO: test new encryption with versioning
+ ## TODO: test new encryption with sharing
+ ## TODO: test new encryption with proxies
+
+
+ private $view; // OC_FilesystemView object for filesystem operations
+ private $pwd; // User Password
+ private $client; // Client side encryption mode flag
+ private $publicKeyDir; // Directory containing all public user keys
+ private $encryptionDir; // Directory containing user's files_encryption
+ private $keyfilesPath; // Directory containing user's keyfiles
+ private $publicKeyPath; // Path to user's public key
+ private $privateKeyPath; // Path to user's private key
+
+ public function __construct( \OC_FilesystemView $view, $userId, $client = false ) {
+
+ $this->view = $view;
+ $this->userId = $userId;
+ $this->client = $client;
+ $this->publicKeyDir = '/' . 'public-keys';
+ $this->encryptionDir = '/' . $this->userId . '/' . 'files_encryption';
+ $this->keyfilesPath = $this->encryptionDir . '/' . 'keyfiles';
+ $this->publicKeyPath = $this->publicKeyDir . '/' . $this->userId . '.public.key'; // e.g. data/public-keys/admin.public.key
+ $this->privateKeyPath = $this->encryptionDir . '/' . $this->userId . '.private.key'; // e.g. data/admin/admin.private.key
+
+ }
+
+ public function ready() {
+
+ if(
+ !$this->view->file_exists( $this->keyfilesPath )
+ or !$this->view->file_exists( $this->publicKeyPath )
+ or !$this->view->file_exists( $this->privateKeyPath )
+ ) {
+
+ return false;
+
+ } else {
+
+ return true;
+
+ }
+
+ }
+
+ /**
+ * @brief Sets up user folders and keys for serverside encryption
+ * @param $passphrase passphrase to encrypt server-stored private key with
+ */
+ public function setupServerSide( $passphrase = null ) {
+
+ // Create shared public key directory
+ if( !$this->view->file_exists( $this->publicKeyDir ) ) {
+
+ $this->view->mkdir( $this->publicKeyDir );
+
+ }
+
+ // Create encryption app directory
+ if( !$this->view->file_exists( $this->encryptionDir ) ) {
+
+ $this->view->mkdir( $this->encryptionDir );
+
+ }
+
+ // Create mirrored keyfile directory
+ if( !$this->view->file_exists( $this->keyfilesPath ) ) {
+
+ $this->view->mkdir( $this->keyfilesPath );
+
+ }
+
+ // Create user keypair
+ if (
+ !$this->view->file_exists( $this->publicKeyPath )
+ or !$this->view->file_exists( $this->privateKeyPath )
+ ) {
+
+ // Generate keypair
+ $keypair = Crypt::createKeypair();
+
+ \OC_FileProxy::$enabled = false;
+
+ // Save public key
+ $this->view->file_put_contents( $this->publicKeyPath, $keypair['publicKey'] );
+
+ // Encrypt private key with user pwd as passphrase
+ $encryptedPrivateKey = Crypt::symmetricEncryptFileContent( $keypair['privateKey'], $passphrase );
+
+ // Save private key
+ $this->view->file_put_contents( $this->privateKeyPath, $encryptedPrivateKey );
+
+ \OC_FileProxy::$enabled = true;
+
+ }
+
+ return true;
+
+ }
+
+ public function findFiles( $directory, $type = 'plain' ) {
+
+ # TODO: test finding non plain content
+
+ if ( $handle = $this->view->opendir( $directory ) ) {
+
+ while ( false !== ( $file = readdir( $handle ) ) ) {
+
+ if (
+ $file != "."
+ && $file != ".."
+ ) {
+
+ $filePath = $directory . '/' . $this->view->getRelativePath( '/' . $file );
+
+ var_dump($filePath);
+
+ if ( $this->view->is_dir( $filePath ) ) {
+
+ $this->findFiles( $filePath );
+
+ } elseif ( $this->view->is_file( $filePath ) ) {
+
+ if ( $type == 'plain' ) {
+
+ $this->files[] = array( 'name' => $file, 'path' => $filePath );
+
+ } elseif ( $type == 'encrypted' ) {
+
+ if ( Crypt::isEncryptedContent( $this->view->file_get_contents( $filePath ) ) ) {
+
+ $this->files[] = array( 'name' => $file, 'path' => $filePath );
+
+ }
+
+ } elseif ( $type == 'legacy' ) {
+
+ if ( Crypt::isLegacyEncryptedContent( $this->view->file_get_contents( $filePath ) ) ) {
+
+ $this->files[] = array( 'name' => $file, 'path' => $filePath );
+
+ }
+
+ }
+
+ }
+
+ }
+
+ }
+
+ if ( !empty( $this->files ) ) {
+
+ return $this->files;
+
+ } else {
+
+ return false;
+
+ }
+
+ }
+
+ return false;
+
+ }
+
+ /**
+ * @brief Check if a given path identifies an encrypted file
+ * @return true / false
+ */
+ public function isEncryptedPath( $path ) {
+
+ // Disable encryption proxy so data retreived is in its
+ // original form
+ \OC_FileProxy::$enabled = false;
+
+ $data = $this->view->file_get_contents( $path );
+
+ \OC_FileProxy::$enabled = true;
+
+ return Crypt::isEncryptedContent( $data );
+
+ }
+
+ public function encryptAll( $directory ) {
+
+ $plainFiles = $this->findFiles( $this->view, 'plain' );
+
+ if ( $this->encryptFiles( $plainFiles ) ) {
+
+ return true;
+
+ } else {
+
+ return false;
+
+ }
+
+ }
+
+ public function getPath( $pathName ) {
+
+ switch ( $pathName ) {
+
+ case 'publicKeyDir':
+
+ return $this->publicKeyDir;
+
+ break;
+
+ case 'encryptionDir':
+
+ return $this->encryptionDir;
+
+ break;
+
+ case 'keyfilesPath':
+
+ return $this->keyfilesPath;
+
+ break;
+
+ case 'publicKeyPath':
+
+ return $this->publicKeyPath;
+
+ break;
+
+ case 'privateKeyPath':
+
+ return $this->privateKeyPath;
+
+ break;
+
+ }
+
+ }
+
+}
diff --git a/apps/files_encryption/settings-personal.php b/apps/files_encryption/settings-personal.php
new file mode 100644
index 00000000000..014288f2efe
--- /dev/null
+++ b/apps/files_encryption/settings-personal.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright (c) 2012 Bjoern Schiessle <schiessle@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+$sysEncMode = \OC_Appconfig::getValue('files_encryption', 'mode', 'none');
+
+if ($sysEncMode == 'user') {
+
+ $tmpl = new OCP\Template( 'files_encryption', 'settings-personal');
+
+ $query = \OC_DB::prepare( "SELECT mode FROM *PREFIX*encryption WHERE uid = ?" );
+ $result = $query->execute(array(\OCP\User::getUser()));
+
+ if ($row = $result->fetchRow()){
+ $mode = $row['mode'];
+ } else {
+ $mode = 'none';
+ }
+
+ OCP\Util::addscript('files_encryption','settings-personal');
+ $tmpl->assign('encryption_mode', $mode);
+ return $tmpl->fetchPage();
+}
+
+return null;
diff --git a/apps/files_encryption/settings.php b/apps/files_encryption/settings.php
index 94ff5ab94ba..d1260f44e9f 100644
--- a/apps/files_encryption/settings.php
+++ b/apps/files_encryption/settings.php
@@ -6,17 +6,16 @@
* See the COPYING-README file.
*/
-OC_Util::checkAdminUser();
+\OC_Util::checkAdminUser();
-$tmpl = new OCP\Template( 'files_encryption', 'settings');
-$blackList=explode(',', OCP\Config::getAppValue('files_encryption',
- 'type_blacklist',
- 'jpg,png,jpeg,avi,mpg,mpeg,mkv,mp3,oga,ogv,ogg'));
-$enabled=(OCP\Config::getAppValue('files_encryption', 'enable_encryption', 'true')=='true');
-$tmpl->assign('blacklist', $blackList);
-$tmpl->assign('encryption_enabled', $enabled);
+$tmpl = new OCP\Template( 'files_encryption', 'settings' );
-OCP\Util::addscript('files_encryption', 'settings');
-OCP\Util::addscript('core', 'multiselect');
+$blackList = explode( ',', \OCP\Config::getAppValue( 'files_encryption', 'type_blacklist', 'jpg,png,jpeg,avi,mpg,mpeg,mkv,mp3,oga,ogv,ogg' ) );
+
+$tmpl->assign( 'blacklist', $blackList );
+$tmpl->assign( 'encryption_mode', \OC_Appconfig::getValue( 'files_encryption', 'mode', 'none' ) );
+
+\OCP\Util::addscript( 'files_encryption', 'settings' );
+\OCP\Util::addscript( 'core', 'multiselect' );
return $tmpl->fetchPage();
diff --git a/apps/files_encryption/templates/settings-personal.php b/apps/files_encryption/templates/settings-personal.php
new file mode 100644
index 00000000000..1274bd3bb5c
--- /dev/null
+++ b/apps/files_encryption/templates/settings-personal.php
@@ -0,0 +1,45 @@
+<form id="encryption">
+ <fieldset class="personalblock">
+ <strong><?php echo $l->t('Choose encryption mode:'); ?></strong>
+ <p>
+ <input
+ type="hidden"
+ name="prev_encryption_mode"
+ id="prev_encryption_mode"
+ value="<?php echo $_['encryption_mode']; ?>"
+ >
+
+ <input
+ type="radio"
+ name="encryption_mode"
+ value="client"
+ id='client_encryption'
+ style="width:20px;"
+ <?php if ($_['encryption_mode'] == 'client') echo "checked='checked'"?>
+ />
+ <?php echo $l->t('Client side encryption (most secure but makes it impossible to access your data from the web interface)'); ?>
+ <br />
+
+ <input
+ type="radio"
+ name="encryption_mode"
+ value="server"
+ id='server_encryption'
+ style="width:20px;" <?php if ($_['encryption_mode'] == 'server') echo "checked='checked'"?>
+ />
+ <?php echo $l->t('Server side encryption (allows you to access your files from the web interface and the desktop client)'); ?>
+ <br />
+
+ <input
+ type="radio"
+ name="encryption_mode"
+ value="none"
+ id='none_encryption'
+ style="width:20px;"
+ <?php if ($_['encryption_mode'] == 'none') echo "checked='checked'"?>
+ />
+ <?php echo $l->t('None (no encryption at all)'); ?>
+ <br/>
+ </p>
+ </fieldset>
+</form>
diff --git a/apps/files_encryption/templates/settings.php b/apps/files_encryption/templates/settings.php
index 268b1a80ccd..544ec793f37 100644
--- a/apps/files_encryption/templates/settings.php
+++ b/apps/files_encryption/templates/settings.php
@@ -1,14 +1,79 @@
-<form id="calendar">
+<form id="encryption">
<fieldset class="personalblock">
- <legend><strong><?php echo $l->t('Encryption');?></strong></legend>
- <input type='checkbox'<?php if ($_['encryption_enabled']): ?> checked="checked"<?php endif; ?>
- id='enable_encryption' ></input>
- <label for='enable_encryption'><?php echo $l->t('Enable Encryption')?></label><br />
- <select id='encryption_blacklist' title="<?php echo $l->t('None')?>" multiple="multiple">
- <?php foreach ($_['blacklist'] as $type): ?>
- <option selected="selected" value="<?php echo $type;?>"><?php echo $type;?></option>
+
+ <strong>
+ <?php echo $l->t('Choose encryption mode:'); ?>
+ </strong>
+
+ <p>
+ <i>
+ <?php echo $l->t('Important: Once you selected an encryption mode there is no way to change it back'); ?>
+ </i>
+ </p>
+
+ <p>
+ <input
+ type="radio"
+ name="encryption_mode"
+ id="client_encryption"
+ value="client"
+ style="width:20px;"
+ <?php if ($_['encryption_mode'] == 'client') echo "checked='checked'"; if ($_['encryption_mode'] != 'none') echo "DISABLED"?>
+ />
+
+ <?php echo $l->t("Client side encryption (most secure but makes it impossible to access your data from the web interface)"); ?>
+ <br />
+
+ <input
+ type="radio"
+ name="encryption_mode"
+ id="server_encryption"
+ value="server"
+ style="width:20px;"
+ <?php if ($_['encryption_mode'] == 'server') echo "checked='checked'"; if ($_['encryption_mode'] != 'none') echo "DISABLED"?>
+ />
+
+ <?php echo $l->t('Server side encryption (allows you to access your files from the web interface and the desktop client)'); ?>
+ <br />
+
+ <input
+ type="radio"
+ name="encryption_mode"
+ id="user_encryption"
+ value="user"
+ style="width:20px;"
+ <?php if ($_['encryption_mode'] == 'user') echo "checked='checked'"; if ($_['encryption_mode'] != 'none') echo "DISABLED"?>
+ />
+
+ <?php echo $l->t('User specific (let the user decide)'); ?>
+ <br/>
+
+ <input
+ type="radio"
+ name="encryption_mode"
+ id="none_encryption"
+ value="none"
+ style="width:20px;"
+ <?php if ($_['encryption_mode'] == 'none') echo "checked='checked'"; if ($_['encryption_mode'] != 'none') echo "DISABLED"?>
+ />
+
+ <?php echo $l->t('None (no encryption at all)'); ?>
+ <br/>
+
+ </p>
+ <p>
+ <strong><?php echo $l->t('Encryption'); ?></strong>
+
+ <?php echo $l->t("Exclude the following file types from encryption"); ?>
+
+ <select
+ id='encryption_blacklist'
+ title="<?php echo $l->t('None')?>"
+ multiple="multiple">
+ <?php foreach($_["blacklist"] as $type): ?>
+ <option selected="selected" value="<?php echo $type;?>"> <?php echo $type;?> </option>
<?php endforeach;?>
- </select><br />
- <?php echo $l->t('Exclude the following file types from encryption'); ?>
+ </select>
+ </p>
</fieldset>
</form>
diff --git a/apps/files_encryption/tests/binary b/apps/files_encryption/test/binary
index 79bc99479da..79bc99479da 100644
--- a/apps/files_encryption/tests/binary
+++ b/apps/files_encryption/test/binary
Binary files differ
diff --git a/apps/files_encryption/test/crypt.php b/apps/files_encryption/test/crypt.php
new file mode 100755
index 00000000000..5a7820dc9da
--- /dev/null
+++ b/apps/files_encryption/test/crypt.php
@@ -0,0 +1,667 @@
+<?php
+/**
+ * Copyright (c) 2012 Sam Tuke <samtuke@owncloud.com>, and
+ * Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+//require_once "PHPUnit/Framework/TestCase.php";
+require_once realpath( dirname(__FILE__).'/../../../3rdparty/Crypt_Blowfish/Blowfish.php' );
+require_once realpath( dirname(__FILE__).'/../../../lib/base.php' );
+require_once realpath( dirname(__FILE__).'/../lib/crypt.php' );
+require_once realpath( dirname(__FILE__).'/../lib/keymanager.php' );
+require_once realpath( dirname(__FILE__).'/../lib/proxy.php' );
+require_once realpath( dirname(__FILE__).'/../lib/stream.php' );
+require_once realpath( dirname(__FILE__).'/../lib/util.php' );
+require_once realpath( dirname(__FILE__).'/../appinfo/app.php' );
+
+use OCA\Encryption;
+
+// This has to go here because otherwise session errors arise, and the private
+// encryption key needs to be saved in the session
+\OC_User::login( 'admin', 'admin' );
+
+/**
+ * @note It would be better to use Mockery here for mocking out the session
+ * handling process, and isolate calls to session class and data from the unit
+ * tests relating to them (stream etc.). However getting mockery to work and
+ * overload classes whilst also using the OC autoloader is difficult due to
+ * load order Pear errors.
+ */
+
+class Test_Crypt extends \PHPUnit_Framework_TestCase {
+
+ function setUp() {
+
+ // set content for encrypting / decrypting in tests
+ $this->dataLong = file_get_contents( realpath( dirname(__FILE__).'/../lib/crypt.php' ) );
+ $this->dataShort = 'hats';
+ $this->dataUrl = realpath( dirname(__FILE__).'/../lib/crypt.php' );
+ $this->legacyData = realpath( dirname(__FILE__).'/legacy-text.txt' );
+ $this->legacyEncryptedData = realpath( dirname(__FILE__).'/legacy-encrypted-text.txt' );
+ $this->randomKey = Encryption\Crypt::generateKey();
+
+ $keypair = Encryption\Crypt::createKeypair();
+ $this->genPublicKey = $keypair['publicKey'];
+ $this->genPrivateKey = $keypair['privateKey'];
+
+ $this->view = new \OC_FilesystemView( '/' );
+
+ \OC_User::setUserId( 'admin' );
+ $this->userId = 'admin';
+ $this->pass = 'admin';
+
+ \OC_Filesystem::init( '/' );
+ \OC_Filesystem::mount( 'OC_Filestorage_Local', array('datadir' => \OC_User::getHome($this->userId)), '/' );
+
+ }
+
+ function tearDown() {
+
+ }
+
+ function testGenerateKey() {
+
+ # TODO: use more accurate (larger) string length for test confirmation
+
+ $key = Encryption\Crypt::generateKey();
+
+ $this->assertTrue( strlen( $key ) > 16 );
+
+ }
+
+ function testGenerateIv() {
+
+ $iv = Encryption\Crypt::generateIv();
+
+ $this->assertEquals( 16, strlen( $iv ) );
+
+ return $iv;
+
+ }
+
+ /**
+ * @depends testGenerateIv
+ */
+ function testConcatIv( $iv ) {
+
+ $catFile = Encryption\Crypt::concatIv( $this->dataLong, $iv );
+
+ // Fetch encryption metadata from end of file
+ $meta = substr( $catFile, -22 );
+
+ $identifier = substr( $meta, 0, 6);
+
+ // Fetch IV from end of file
+ $foundIv = substr( $meta, 6 );
+
+ $this->assertEquals( '00iv00', $identifier );
+
+ $this->assertEquals( $iv, $foundIv );
+
+ // Remove IV and IV identifier text to expose encrypted content
+ $data = substr( $catFile, 0, -22 );
+
+ $this->assertEquals( $this->dataLong, $data );
+
+ return array(
+ 'iv' => $iv
+ , 'catfile' => $catFile
+ );
+
+ }
+
+ /**
+ * @depends testConcatIv
+ */
+ function testSplitIv( $testConcatIv ) {
+
+ // Split catfile into components
+ $splitCatfile = Encryption\Crypt::splitIv( $testConcatIv['catfile'] );
+
+ // Check that original IV and split IV match
+ $this->assertEquals( $testConcatIv['iv'], $splitCatfile['iv'] );
+
+ // Check that original data and split data match
+ $this->assertEquals( $this->dataLong, $splitCatfile['encrypted'] );
+
+ }
+
+ function testAddPadding() {
+
+ $padded = Encryption\Crypt::addPadding( $this->dataLong );
+
+ $padding = substr( $padded, -2 );
+
+ $this->assertEquals( 'xx' , $padding );
+
+ return $padded;
+
+ }
+
+ /**
+ * @depends testAddPadding
+ */
+ function testRemovePadding( $padded ) {
+
+ $noPadding = Encryption\Crypt::RemovePadding( $padded );
+
+ $this->assertEquals( $this->dataLong, $noPadding );
+
+ }
+
+ function testEncrypt() {
+
+ $random = openssl_random_pseudo_bytes( 13 );
+
+ $iv = substr( base64_encode( $random ), 0, -4 ); // i.e. E5IG033j+mRNKrht
+
+ $crypted = Encryption\Crypt::encrypt( $this->dataUrl, $iv, 'hat' );
+
+ $this->assertNotEquals( $this->dataUrl, $crypted );
+
+ }
+
+ function testDecrypt() {
+
+ $random = openssl_random_pseudo_bytes( 13 );
+
+ $iv = substr( base64_encode( $random ), 0, -4 ); // i.e. E5IG033j+mRNKrht
+
+ $crypted = Encryption\Crypt::encrypt( $this->dataUrl, $iv, 'hat' );
+
+ $decrypt = Encryption\Crypt::decrypt( $crypted, $iv, 'hat' );
+
+ $this->assertEquals( $this->dataUrl, $decrypt );
+
+ }
+
+ function testSymmetricEncryptFileContent() {
+
+ # TODO: search in keyfile for actual content as IV will ensure this test always passes
+
+ $crypted = Encryption\Crypt::symmetricEncryptFileContent( $this->dataShort, 'hat' );
+
+ $this->assertNotEquals( $this->dataShort, $crypted );
+
+
+ $decrypt = Encryption\Crypt::symmetricDecryptFileContent( $crypted, 'hat' );
+
+ $this->assertEquals( $this->dataShort, $decrypt );
+
+ }
+
+ // These aren't used for now
+// function testSymmetricBlockEncryptShortFileContent() {
+//
+// $crypted = Encryption\Crypt::symmetricBlockEncryptFileContent( $this->dataShort, $this->randomKey );
+//
+// $this->assertNotEquals( $this->dataShort, $crypted );
+//
+//
+// $decrypt = Encryption\Crypt::symmetricBlockDecryptFileContent( $crypted, $this->randomKey );
+//
+// $this->assertEquals( $this->dataShort, $decrypt );
+//
+// }
+//
+// function testSymmetricBlockEncryptLongFileContent() {
+//
+// $crypted = Encryption\Crypt::symmetricBlockEncryptFileContent( $this->dataLong, $this->randomKey );
+//
+// $this->assertNotEquals( $this->dataLong, $crypted );
+//
+//
+// $decrypt = Encryption\Crypt::symmetricBlockDecryptFileContent( $crypted, $this->randomKey );
+//
+// $this->assertEquals( $this->dataLong, $decrypt );
+//
+// }
+
+ function testSymmetricStreamEncryptShortFileContent() {
+
+ $filename = 'tmp-'.time();
+
+ $cryptedFile = file_put_contents( 'crypt://' . $filename, $this->dataShort );
+
+ // Test that data was successfully written
+ $this->assertTrue( is_int( $cryptedFile ) );
+
+
+ // Get file contents without using any wrapper to get it's actual contents on disk
+ $retreivedCryptedFile = $this->view->file_get_contents( $this->userId . '/files/' . $filename );
+
+ // Check that the file was encrypted before being written to disk
+ $this->assertNotEquals( $this->dataShort, $retreivedCryptedFile );
+
+ // Get private key
+ $encryptedPrivateKey = Encryption\Keymanager::getPrivateKey( $this->view, $this->userId );
+
+ $decryptedPrivateKey = Encryption\Crypt::symmetricDecryptFileContent( $encryptedPrivateKey, $this->pass );
+
+
+ // Get keyfile
+ $encryptedKeyfile = Encryption\Keymanager::getFileKey( $this->view, $this->userId, $filename );
+
+ $decryptedKeyfile = Encryption\Crypt::keyDecrypt( $encryptedKeyfile, $decryptedPrivateKey );
+
+
+ // Manually decrypt
+ $manualDecrypt = Encryption\Crypt::symmetricBlockDecryptFileContent( $retreivedCryptedFile, $decryptedKeyfile );
+
+ // Check that decrypted data matches
+ $this->assertEquals( $this->dataShort, $manualDecrypt );
+
+ }
+
+ /**
+ * @brief Test that data that is written by the crypto stream wrapper
+ * @note Encrypted data is manually prepared and decrypted here to avoid dependency on success of stream_read
+ * @note If this test fails with truncate content, check that enough array slices are being rejoined to form $e, as the crypt.php file may have gotten longer and broken the manual
+ * reassembly of its data
+ */
+ function testSymmetricStreamEncryptLongFileContent() {
+
+ // Generate a a random filename
+ $filename = 'tmp-'.time();
+
+ // Save long data as encrypted file using stream wrapper
+ $cryptedFile = file_put_contents( 'crypt://' . $filename, $this->dataLong.$this->dataLong );
+
+ // Test that data was successfully written
+ $this->assertTrue( is_int( $cryptedFile ) );
+
+ // Get file contents without using any wrapper to get it's actual contents on disk
+ $retreivedCryptedFile = $this->view->file_get_contents( $this->userId . '/files/' . $filename );
+
+// echo "\n\n\$retreivedCryptedFile = $retreivedCryptedFile\n\n";
+
+ // Check that the file was encrypted before being written to disk
+ $this->assertNotEquals( $this->dataLong.$this->dataLong, $retreivedCryptedFile );
+
+ // Manuallly split saved file into separate IVs and encrypted chunks
+ $r = preg_split('/(00iv00.{16,18})/', $retreivedCryptedFile, NULL, PREG_SPLIT_DELIM_CAPTURE);
+
+ //print_r($r);
+
+ // Join IVs and their respective data chunks
+ $e = array( $r[0].$r[1], $r[2].$r[3], $r[4].$r[5], $r[6].$r[7], $r[8].$r[9], $r[10].$r[11], $r[12].$r[13] );//.$r[11], $r[12].$r[13], $r[14] );
+
+ //print_r($e);
+
+
+ // Get private key
+ $encryptedPrivateKey = Encryption\Keymanager::getPrivateKey( $this->view, $this->userId );
+
+ $decryptedPrivateKey = Encryption\Crypt::symmetricDecryptFileContent( $encryptedPrivateKey, $this->pass );
+
+
+ // Get keyfile
+ $encryptedKeyfile = Encryption\Keymanager::getFileKey( $this->view, $this->userId, $filename );
+
+ $decryptedKeyfile = Encryption\Crypt::keyDecrypt( $encryptedKeyfile, $decryptedPrivateKey );
+
+
+ // Set var for reassembling decrypted content
+ $decrypt = '';
+
+ // Manually decrypt chunk
+ foreach ($e as $e) {
+
+// echo "\n\$e = $e";
+
+ $chunkDecrypt = Encryption\Crypt::symmetricDecryptFileContent( $e, $decryptedKeyfile );
+
+ // Assemble decrypted chunks
+ $decrypt .= $chunkDecrypt;
+
+// echo "\n\$chunkDecrypt = $chunkDecrypt";
+
+ }
+
+// echo "\n\$decrypt = $decrypt";
+
+ $this->assertEquals( $this->dataLong.$this->dataLong, $decrypt );
+
+ // Teardown
+
+ $this->view->unlink( $filename );
+
+ Encryption\Keymanager::deleteFileKey( $filename );
+
+ }
+
+ /**
+ * @brief Test that data that is read by the crypto stream wrapper
+ */
+ function testSymmetricStreamDecryptShortFileContent() {
+
+ $filename = 'tmp-'.time();
+
+ // Save long data as encrypted file using stream wrapper
+ $cryptedFile = file_put_contents( 'crypt://' . $filename, $this->dataShort );
+
+ // Test that data was successfully written
+ $this->assertTrue( is_int( $cryptedFile ) );
+
+
+ // Get file contents without using any wrapper to get it's actual contents on disk
+ $retreivedCryptedFile = $this->view->file_get_contents( $this->userId . '/files/' . $filename );
+
+ $decrypt = file_get_contents( 'crypt://' . $filename );
+
+ $this->assertEquals( $this->dataShort, $decrypt );
+
+ }
+
+ function testSymmetricStreamDecryptLongFileContent() {
+
+ $filename = 'tmp-'.time();
+
+ // Save long data as encrypted file using stream wrapper
+ $cryptedFile = file_put_contents( 'crypt://' . $filename, $this->dataLong );
+
+ // Test that data was successfully written
+ $this->assertTrue( is_int( $cryptedFile ) );
+
+
+ // Get file contents without using any wrapper to get it's actual contents on disk
+ $retreivedCryptedFile = $this->view->file_get_contents( $this->userId . '/files/' . $filename );
+
+ $decrypt = file_get_contents( 'crypt://' . $filename );
+
+ $this->assertEquals( $this->dataLong, $decrypt );
+
+ }
+
+ // Is this test still necessary?
+// function testSymmetricBlockStreamDecryptFileContent() {
+//
+// \OC_User::setUserId( 'admin' );
+//
+// // Disable encryption proxy to prevent unwanted en/decryption
+// \OC_FileProxy::$enabled = false;
+//
+// $cryptedFile = file_put_contents( 'crypt://' . '/blockEncrypt', $this->dataUrl );
+//
+// // Disable encryption proxy to prevent unwanted en/decryption
+// \OC_FileProxy::$enabled = false;
+//
+// echo "\n\n\$cryptedFile = " . $this->view->file_get_contents( '/blockEncrypt' );
+//
+// $retreivedCryptedFile = file_get_contents( 'crypt://' . '/blockEncrypt' );
+//
+// $this->assertEquals( $this->dataUrl, $retreivedCryptedFile );
+//
+// \OC_FileProxy::$enabled = false;
+//
+// }
+
+ function testSymmetricEncryptFileContentKeyfile() {
+
+ # TODO: search in keyfile for actual content as IV will ensure this test always passes
+
+ $crypted = Encryption\Crypt::symmetricEncryptFileContentKeyfile( $this->dataUrl );
+
+ $this->assertNotEquals( $this->dataUrl, $crypted['encrypted'] );
+
+
+ $decrypt = Encryption\Crypt::symmetricDecryptFileContent( $crypted['encrypted'], $crypted['key'] );
+
+ $this->assertEquals( $this->dataUrl, $decrypt );
+
+ }
+
+ function testIsEncryptedContent() {
+
+ $this->assertFalse( Encryption\Crypt::isEncryptedContent( $this->dataUrl ) );
+
+ $this->assertFalse( Encryption\Crypt::isEncryptedContent( $this->legacyEncryptedData ) );
+
+ $keyfileContent = Encryption\Crypt::symmetricEncryptFileContent( $this->dataUrl, 'hat' );
+
+ $this->assertTrue( Encryption\Crypt::isEncryptedContent( $keyfileContent ) );
+
+ }
+
+ function testMultiKeyEncrypt() {
+
+ # TODO: search in keyfile for actual content as IV will ensure this test always passes
+
+ $pair1 = Encryption\Crypt::createKeypair();
+
+ $this->assertEquals( 2, count( $pair1 ) );
+
+ $this->assertTrue( strlen( $pair1['publicKey'] ) > 1 );
+
+ $this->assertTrue( strlen( $pair1['privateKey'] ) > 1 );
+
+
+ $crypted = Encryption\Crypt::multiKeyEncrypt( $this->dataUrl, array( $pair1['publicKey'] ) );
+
+ $this->assertNotEquals( $this->dataUrl, $crypted['encrypted'] );
+
+
+ $decrypt = Encryption\Crypt::multiKeyDecrypt( $crypted['encrypted'], $crypted['keys'][0], $pair1['privateKey'] );
+
+ $this->assertEquals( $this->dataUrl, $decrypt );
+
+ }
+
+ function testKeyEncrypt() {
+
+ // Generate keypair
+ $pair1 = Encryption\Crypt::createKeypair();
+
+ // Encrypt data
+ $crypted = Encryption\Crypt::keyEncrypt( $this->dataUrl, $pair1['publicKey'] );
+
+ $this->assertNotEquals( $this->dataUrl, $crypted );
+
+ // Decrypt data
+ $decrypt = Encryption\Crypt::keyDecrypt( $crypted, $pair1['privateKey'] );
+
+ $this->assertEquals( $this->dataUrl, $decrypt );
+
+ }
+
+ // What is the point of this test? It doesn't use keyEncryptKeyfile()
+ function testKeyEncryptKeyfile() {
+
+ # TODO: Don't repeat encryption from previous tests, use PHPUnit test interdependency instead
+
+ // Generate keypair
+ $pair1 = Encryption\Crypt::createKeypair();
+
+ // Encrypt plain data, generate keyfile & encrypted file
+ $cryptedData = Encryption\Crypt::symmetricEncryptFileContentKeyfile( $this->dataUrl );
+
+ // Encrypt keyfile
+ $cryptedKey = Encryption\Crypt::keyEncrypt( $cryptedData['key'], $pair1['publicKey'] );
+
+ // Decrypt keyfile
+ $decryptKey = Encryption\Crypt::keyDecrypt( $cryptedKey, $pair1['privateKey'] );
+
+ // Decrypt encrypted file
+ $decryptData = Encryption\Crypt::symmetricDecryptFileContent( $cryptedData['encrypted'], $decryptKey );
+
+ $this->assertEquals( $this->dataUrl, $decryptData );
+
+ }
+
+ /**
+ * @brief test functionality of keyEncryptKeyfile() and
+ * keyDecryptKeyfile()
+ */
+ function testKeyDecryptKeyfile() {
+
+ $encrypted = Encryption\Crypt::keyEncryptKeyfile( $this->dataShort, $this->genPublicKey );
+
+ $this->assertNotEquals( $encrypted['data'], $this->dataShort );
+
+ $decrypted = Encryption\Crypt::keyDecryptKeyfile( $encrypted['data'], $encrypted['key'], $this->genPrivateKey );
+
+ $this->assertEquals( $decrypted, $this->dataShort );
+
+ }
+
+
+ /**
+ * @brief test encryption using legacy blowfish method
+ */
+ function testLegacyEncryptShort() {
+
+ $crypted = Encryption\Crypt::legacyEncrypt( $this->dataShort, $this->pass );
+
+ $this->assertNotEquals( $this->dataShort, $crypted );
+
+ # TODO: search inencrypted text for actual content to ensure it
+ # genuine transformation
+
+ return $crypted;
+
+ }
+
+ /**
+ * @brief test decryption using legacy blowfish method
+ * @depends testLegacyEncryptShort
+ */
+ function testLegacyDecryptShort( $crypted ) {
+
+ $decrypted = Encryption\Crypt::legacyDecrypt( $crypted, $this->pass );
+
+ $this->assertEquals( $this->dataShort, $decrypted );
+
+ }
+
+ /**
+ * @brief test encryption using legacy blowfish method
+ */
+ function testLegacyEncryptLong() {
+
+ $crypted = Encryption\Crypt::legacyEncrypt( $this->dataLong, $this->pass );
+
+ $this->assertNotEquals( $this->dataLong, $crypted );
+
+ # TODO: search inencrypted text for actual content to ensure it
+ # genuine transformation
+
+ return $crypted;
+
+ }
+
+ /**
+ * @brief test decryption using legacy blowfish method
+ * @depends testLegacyEncryptLong
+ */
+ function testLegacyDecryptLong( $crypted ) {
+
+ $decrypted = Encryption\Crypt::legacyDecrypt( $crypted, $this->pass );
+
+ $this->assertEquals( $this->dataLong, $decrypted );
+
+ }
+
+ /**
+ * @brief test generation of legacy encryption key
+ * @depends testLegacyDecryptShort
+ */
+ function testLegacyCreateKey() {
+
+ // Create encrypted key
+ $encKey = Encryption\Crypt::legacyCreateKey( $this->pass );
+
+ // Decrypt key
+ $key = Encryption\Crypt::legacyDecrypt( $encKey, $this->pass );
+
+ $this->assertTrue( is_numeric( $key ) );
+
+ // Check that key is correct length
+ $this->assertEquals( 20, strlen( $key ) );
+
+ }
+
+ /**
+ * @brief test decryption using legacy blowfish method
+ * @depends testLegacyEncryptLong
+ */
+ function testLegacyKeyRecryptKeyfileEncrypt( $crypted ) {
+
+ $recrypted = Encryption\Crypt::LegacyKeyRecryptKeyfile( $crypted, $this->pass, $this->genPublicKey, $this->pass );
+
+ $this->assertNotEquals( $this->dataLong, $recrypted['data'] );
+
+ return $recrypted;
+
+ # TODO: search inencrypted text for actual content to ensure it
+ # genuine transformation
+
+ }
+
+// function testEncryption(){
+//
+// $key=uniqid();
+// $file=OC::$SERVERROOT.'/3rdparty/MDB2.php';
+// $source=file_get_contents($file); //nice large text file
+// $encrypted=OC_Encryption\Crypt::encrypt($source,$key);
+// $decrypted=OC_Encryption\Crypt::decrypt($encrypted,$key);
+// $decrypted=rtrim($decrypted, "\0");
+// $this->assertNotEquals($encrypted,$source);
+// $this->assertEqual($decrypted,$source);
+//
+// $chunk=substr($source,0,8192);
+// $encrypted=OC_Encryption\Crypt::encrypt($chunk,$key);
+// $this->assertEqual(strlen($chunk),strlen($encrypted));
+// $decrypted=OC_Encryption\Crypt::decrypt($encrypted,$key);
+// $decrypted=rtrim($decrypted, "\0");
+// $this->assertEqual($decrypted,$chunk);
+//
+// $encrypted=OC_Encryption\Crypt::blockEncrypt($source,$key);
+// $decrypted=OC_Encryption\Crypt::blockDecrypt($encrypted,$key);
+// $this->assertNotEquals($encrypted,$source);
+// $this->assertEqual($decrypted,$source);
+//
+// $tmpFileEncrypted=OCP\Files::tmpFile();
+// OC_Encryption\Crypt::encryptfile($file,$tmpFileEncrypted,$key);
+// $encrypted=file_get_contents($tmpFileEncrypted);
+// $decrypted=OC_Encryption\Crypt::blockDecrypt($encrypted,$key);
+// $this->assertNotEquals($encrypted,$source);
+// $this->assertEqual($decrypted,$source);
+//
+// $tmpFileDecrypted=OCP\Files::tmpFile();
+// OC_Encryption\Crypt::decryptfile($tmpFileEncrypted,$tmpFileDecrypted,$key);
+// $decrypted=file_get_contents($tmpFileDecrypted);
+// $this->assertEqual($decrypted,$source);
+//
+// $file=OC::$SERVERROOT.'/core/img/weather-clear.png';
+// $source=file_get_contents($file); //binary file
+// $encrypted=OC_Encryption\Crypt::encrypt($source,$key);
+// $decrypted=OC_Encryption\Crypt::decrypt($encrypted,$key);
+// $decrypted=rtrim($decrypted, "\0");
+// $this->assertEqual($decrypted,$source);
+//
+// $encrypted=OC_Encryption\Crypt::blockEncrypt($source,$key);
+// $decrypted=OC_Encryption\Crypt::blockDecrypt($encrypted,$key);
+// $this->assertEqual($decrypted,$source);
+//
+// }
+//
+// function testBinary(){
+// $key=uniqid();
+//
+// $file=__DIR__.'/binary';
+// $source=file_get_contents($file); //binary file
+// $encrypted=OC_Encryption\Crypt::encrypt($source,$key);
+// $decrypted=OC_Encryption\Crypt::decrypt($encrypted,$key);
+//
+// $decrypted=rtrim($decrypted, "\0");
+// $this->assertEqual($decrypted,$source);
+//
+// $encrypted=OC_Encryption\Crypt::blockEncrypt($source,$key);
+// $decrypted=OC_Encryption\Crypt::blockDecrypt($encrypted,$key,strlen($source));
+// $this->assertEqual($decrypted,$source);
+// }
+
+}
diff --git a/apps/files_encryption/test/keymanager.php b/apps/files_encryption/test/keymanager.php
new file mode 100644
index 00000000000..f02d6eb5f7a
--- /dev/null
+++ b/apps/files_encryption/test/keymanager.php
@@ -0,0 +1,132 @@
+<?php
+/**
+ * Copyright (c) 2012 Sam Tuke <samtuke@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+//require_once "PHPUnit/Framework/TestCase.php";
+require_once realpath( dirname(__FILE__).'/../../../lib/base.php' );
+require_once realpath( dirname(__FILE__).'/../lib/crypt.php' );
+require_once realpath( dirname(__FILE__).'/../lib/keymanager.php' );
+require_once realpath( dirname(__FILE__).'/../lib/proxy.php' );
+require_once realpath( dirname(__FILE__).'/../lib/stream.php' );
+require_once realpath( dirname(__FILE__).'/../lib/util.php' );
+require_once realpath( dirname(__FILE__).'/../appinfo/app.php' );
+
+use OCA\Encryption;
+
+// This has to go here because otherwise session errors arise, and the private
+// encryption key needs to be saved in the session
+\OC_User::login( 'admin', 'admin' );
+
+class Test_Keymanager extends \PHPUnit_Framework_TestCase {
+
+ function setUp() {
+
+ \OC_FileProxy::$enabled = false;
+
+ // set content for encrypting / decrypting in tests
+ $this->dataLong = file_get_contents( realpath( dirname(__FILE__).'/../lib/crypt.php' ) );
+ $this->dataShort = 'hats';
+ $this->dataUrl = realpath( dirname(__FILE__).'/../lib/crypt.php' );
+ $this->legacyData = realpath( dirname(__FILE__).'/legacy-text.txt' );
+ $this->legacyEncryptedData = realpath( dirname(__FILE__).'/legacy-encrypted-text.txt' );
+ $this->randomKey = Encryption\Crypt::generateKey();
+
+ $keypair = Encryption\Crypt::createKeypair();
+ $this->genPublicKey = $keypair['publicKey'];
+ $this->genPrivateKey = $keypair['privateKey'];
+
+ $this->view = new \OC_FilesystemView( '/' );
+
+ \OC_User::setUserId( 'admin' );
+ $this->userId = 'admin';
+ $this->pass = 'admin';
+
+ \OC_Filesystem::init( '/' );
+ \OC_Filesystem::mount( 'OC_Filestorage_Local', array('datadir' => \OC_User::getHome($this->userId)), '/' );
+
+ }
+
+ function tearDown(){
+
+ \OC_FileProxy::$enabled = true;
+
+ }
+
+ function testGetPrivateKey() {
+
+ $key = Encryption\Keymanager::getPrivateKey( $this->view, $this->userId );
+
+ // Will this length vary? Perhaps we should use a range instead
+ $this->assertEquals( 2296, strlen( $key ) );
+
+ }
+
+ function testGetPublicKey() {
+
+ $key = Encryption\Keymanager::getPublicKey( $this->view, $this->userId );
+
+ $this->assertEquals( 451, strlen( $key ) );
+
+ $this->assertEquals( '-----BEGIN PUBLIC KEY-----', substr( $key, 0, 26 ) );
+ }
+
+ function testSetFileKey() {
+
+ # NOTE: This cannot be tested until we are able to break out
+ # of the FileSystemView data directory root
+
+// $key = Crypt::symmetricEncryptFileContentKeyfile( $this->data, 'hat' );
+//
+// $tmpPath = sys_get_temp_dir(). '/' . 'testSetFileKey';
+//
+// $view = new \OC_FilesystemView( '/tmp/' );
+//
+// //$view = new \OC_FilesystemView( '/' . $this->userId . '/files_encryption/keyfiles' );
+//
+// Encryption\Keymanager::setFileKey( $tmpPath, $key['key'], $view );
+
+ }
+
+// /**
+// * @depends testGetPrivateKey
+// */
+// function testGetPrivateKey_decrypt() {
+//
+// $key = Encryption\Keymanager::getPrivateKey( $this->view, $this->userId );
+//
+// # TODO: replace call to Crypt with a mock object?
+// $decrypted = Encryption\Crypt::symmetricDecryptFileContent( $key, $this->passphrase );
+//
+// $this->assertEquals( 1704, strlen( $decrypted ) );
+//
+// $this->assertEquals( '-----BEGIN PRIVATE KEY-----', substr( $decrypted, 0, 27 ) );
+//
+// }
+
+ function testGetUserKeys() {
+
+ $keys = Encryption\Keymanager::getUserKeys( $this->view, $this->userId );
+
+ $this->assertEquals( 451, strlen( $keys['publicKey'] ) );
+ $this->assertEquals( '-----BEGIN PUBLIC KEY-----', substr( $keys['publicKey'], 0, 26 ) );
+ $this->assertEquals( 2296, strlen( $keys['privateKey'] ) );
+
+ }
+
+ function testGetPublicKeys() {
+
+ # TODO: write me
+
+ }
+
+ function testGetFileKey() {
+
+// Encryption\Keymanager::getFileKey( $this->view, $this->userId, $this->filePath );
+
+ }
+
+}
diff --git a/apps/files_encryption/test/legacy-encrypted-text.txt b/apps/files_encryption/test/legacy-encrypted-text.txt
new file mode 100644
index 00000000000..cb5bf50550d
--- /dev/null
+++ b/apps/files_encryption/test/legacy-encrypted-text.txt
Binary files differ
diff --git a/apps/files_encryption/test/proxy.php b/apps/files_encryption/test/proxy.php
new file mode 100644
index 00000000000..51e77100baa
--- /dev/null
+++ b/apps/files_encryption/test/proxy.php
@@ -0,0 +1,220 @@
+<?php
+/**
+ * Copyright (c) 2012 Sam Tuke <samtuke@owncloud.com>,
+ * and Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+// require_once "PHPUnit/Framework/TestCase.php";
+// require_once realpath( dirname(__FILE__).'/../../../lib/base.php' );
+// require_once realpath( dirname(__FILE__).'/../../../3rdparty/mockery/Mockery.php' );
+// require_once realpath( dirname(__FILE__).'/../../../3rdparty/mockery/Mockery/Generator.php' );
+// require_once realpath( dirname(__FILE__).'/../../../3rdparty/mockery/Mockery/MockInterface.php' );
+// require_once realpath( dirname(__FILE__).'/../../../3rdparty/mockery/Mockery/Mock.php' );
+// require_once realpath( dirname(__FILE__).'/../../../3rdparty/mockery/Mockery/Container.php' );
+// require_once realpath( dirname(__FILE__).'/../../../3rdparty/mockery/Mockery/Configuration.php' );
+// require_once realpath( dirname(__FILE__).'/../../../3rdparty/mockery/Mockery/CompositeExpectation.php' );
+// require_once realpath( dirname(__FILE__).'/../../../3rdparty/mockery/Mockery/ExpectationDirector.php' );
+// require_once realpath( dirname(__FILE__).'/../../../3rdparty/mockery/Mockery/Expectation.php' );
+// require_once realpath( dirname(__FILE__).'/../../../3rdparty/mockery/Mockery/Exception.php' );
+// require_once realpath( dirname(__FILE__).'/../../../3rdparty/mockery/Mockery/CountValidator/CountValidatorAbstract.php' );
+// require_once realpath( dirname(__FILE__).'/../../../3rdparty/mockery/Mockery/CountValidator/Exception.php' );
+// require_once realpath( dirname(__FILE__).'/../../../3rdparty/mockery/Mockery/CountValidator/Exact.php' );
+//
+// use \Mockery as m;
+// use OCA\Encryption;
+
+// class Test_Util extends \PHPUnit_Framework_TestCase {
+//
+// public function setUp() {
+//
+// $this->proxy = new Encryption\Proxy();
+//
+// $this->tmpFileName = "tmpFile-".time();
+//
+// $this->privateKey = file_get_contents( realpath( dirname(__FILE__).'/data/admin.public.key' ) );
+// $this->publicKey = file_get_contents( realpath( dirname(__FILE__).'/data/admin.private.key' ) );
+// $this->encDataShort = file_get_contents( realpath( dirname(__FILE__).'/data/yoga-manchester-enc' ) );
+// $this->encDataShortKey = file_get_contents( realpath( dirname(__FILE__).'/data/yoga-manchester.key' ) );
+//
+// $this->dataShort = file_get_contents( realpath( dirname(__FILE__).'/data/yoga-manchester' ) );
+// $this->dataLong = file_get_contents( realpath( dirname(__FILE__).'/../lib/crypt.php' ) );
+// $this->longDataPath = realpath( dirname(__FILE__).'/../lib/crypt.php' );
+//
+// $this->data1 = file_get_contents( realpath( dirname(__FILE__).'/../../../data/admin/files/enc-test.txt' ) );
+//
+// \OC_FileProxy::$enabled = false;
+// $this->Encdata1 = file_get_contents( realpath( dirname(__FILE__).'/../../../data/admin/files/enc-test.txt' ) );
+// \OC_FileProxy::$enabled = true;
+//
+// $this->userId = 'admin';
+// $this->pass = 'admin';
+//
+// $this->session = new Encryption\Session();
+//
+// $this->session->setPrivateKey(
+// '-----BEGIN PRIVATE KEY-----
+// MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDiH3EA4EpFA7Fx
+// s2dyyfL5jwXeYXrTqQJ6DqKgGn8VsbT3eu8R9KzM2XitVwZe8c8L52DvJ06o5vg0
+// GqPYxilFdOFJe/ggac5Tq8UmJiZS4EqYEMwxBIfIyWTxeGV06/0HOwnVAkqHMcBz
+// 64qldtgi5O8kZMEM2/gKBgU0kMLJzM+8oEWhL1+gsUWQhxd8cKLXypS6iWgqFJrz
+// f/X0hJsJR+gyYxNpahtnjzd/LxLAETrOMsl2tue+BAxmjbAM0aG0NEM0div+b59s
+// 2uz/iWbxImp5pOdYVKcVW89D4XBMyGegR40trV2VwiuX1blKCfdjMsJhiaL9pymp
+// ug1wzyQFAgMBAAECggEAK6c+PZkPPXuVCgpEcliiW6NM0r2m5K3AGKgypQ34csu3
+// z/8foCvIIFPrhCtEw5eTDQ1CHWlNOjY8vHJYJ0U6Onpx86nHIRrMBkMm8FJ1G5LJ
+// U8oKYXwqaozWu/cuPwA//OFc6I5krOzh5n8WaRMkbrgbor8AtebRX74By0AXGrXe
+// cswJI7zR96oFn4Dm7Pgvpg5Zhk1vFJ+w6QtH+4DDJ6PBvlZsRkGxYBLGVd/3qhAI
+// sBAyjFlSzuP4eCRhHOhHC/e4gmAH9evFVXB88jFyRZm3K+jQ5W5CwrVRBCV2lph6
+// 2B6P7CBJN+IjGKMhy+75y13UvvKPv9IwH8Fzl2x1gQKBgQD8qQOr7a6KhSj16wQE
+// jim2xqt9gQ2jH5No405NrKs/PFQQZnzD4YseQsiK//NUjOJiUhaT+L5jhIpzINHt
+// RJpt3bGkEZmLyjdjgTpB3GwZdXa28DNK9VdXZ19qIl/ZH0qAjKmJCRahUDASMnVi
+// M4Pkk9yx9ZIKkri4TcuMWqc0DQKBgQDlHKBTITZq/arYPD6Nl3NsoOdqVRqJrGay
+// 0TjXAVbBXe46+z5lnMsqwXb79nx14hdmSEsZULrw/3f+MnQbdjMTYLFP24visZg9
+// MN8vAiALiiiR1a+Crz+DTA1Q8sGOMVCMqMDmD7QBys3ZuWxuapm0txAiIYUtsjJZ
+// XN76T4nZ2QKBgQCHaT3igzwsWTmesxowJtEMeGWomeXpKx8h89EfqA8PkRGsyIDN
+// qq+YxEoe1RZgljEuaLhZDdNcGsjo8woPk9kAUPTH7fbRCMuutK+4ZJ469s1tNkcH
+// QX5SBcEJbOrZvv967ehe3VQXmJZq6kgnHVzuwKBjcC2ZJRGDFY6l5l/+cQKBgCqh
+// +Adf/8NK7paMJ0urqfPFwSodKfICXZ3apswDWMRkmSbqh4La+Uc8dsqN5Dz/VEFZ
+// JHhSeGbN8uMfOlG93eU2MehdPxtw1pZUWMNjjtj23XO9ooob2CKzbSrp8TBnZsi1
+// widNNr66oTFpeo7VUUK6acsgF6sYJJxSVr+XO1yJAoGAEhvitq8shNKcEY0xCipS
+// k1kbgyS7KKB7opVxI5+ChEqyUDijS3Y9FZixrRIWE6i2uGu86UG+v2lbKvSbM4Qm
+// xvbOcX9OVMnlRb7n8woOP10UMY+ZE2x+YEUXQTLtPYq7F66e1OfxltstMxLQA+3d
+// Y1d5piFV8PXK3Fg2F+Cj5qg=
+// -----END PRIVATE KEY-----
+// '
+// , $this->userId
+// );
+//
+// \OC_User::setUserId( $this->userId );
+//
+// }
+//
+// public function testpreFile_get_contents() {
+//
+// // This won't work for now because mocking of the static keymanager class isn't working :(
+//
+// // $mock = m::mock( 'alias:OCA\Encryption\Keymanager' );
+// //
+// // $mock->shouldReceive( 'getFileKey' )->times(2)->andReturn( $this->encDataShort );
+// //
+// // $encrypted = $this->proxy->postFile_get_contents( 'data/'.$this->tmpFileName, $this->encDataShortKey );
+// //
+// // $this->assertNotEquals( $this->dataShort, $encrypted );
+//
+// $decrypted = $this->proxy->postFile_get_contents( 'data/admin/files/enc-test.txt', $this->data1 );
+//
+// }
+//
+// }
+
+// class Test_CryptProxy extends UnitTestCase {
+// private $oldConfig;
+// private $oldKey;
+//
+// public function setUp(){
+// $user=OC_User::getUser();
+//
+// $this->oldConfig=OCP\Config::getAppValue('files_encryption','enable_encryption','true');
+// OCP\Config::setAppValue('files_encryption','enable_encryption','true');
+// $this->oldKey=isset($_SESSION['privateKey'])?$_SESSION['privateKey']:null;
+//
+//
+// //set testing key
+// $_SESSION['privateKey']=md5(time());
+//
+// //clear all proxies and hooks so we can do clean testing
+// OC_FileProxy::clearProxies();
+// OC_Hook::clear('OC_Filesystem');
+//
+// //enable only the encryption hook
+// OC_FileProxy::register(new OC_FileProxy_Encryption());
+//
+// //set up temporary storage
+// OC_Filesystem::clearMounts();
+// OC_Filesystem::mount('OC_Filestorage_Temporary',array(),'/');
+//
+// OC_Filesystem::init('/'.$user.'/files');
+//
+// //set up the users home folder in the temp storage
+// $rootView=new OC_FilesystemView('');
+// $rootView->mkdir('/'.$user);
+// $rootView->mkdir('/'.$user.'/files');
+// }
+//
+// public function tearDown(){
+// OCP\Config::setAppValue('files_encryption','enable_encryption',$this->oldConfig);
+// if(!is_null($this->oldKey)){
+// $_SESSION['privateKey']=$this->oldKey;
+// }
+// }
+//
+// public function testSimple(){
+// $file=OC::$SERVERROOT.'/3rdparty/MDB2.php';
+// $original=file_get_contents($file);
+//
+// OC_Filesystem::file_put_contents('/file',$original);
+//
+// OC_FileProxy::$enabled=false;
+// $stored=OC_Filesystem::file_get_contents('/file');
+// OC_FileProxy::$enabled=true;
+//
+// $fromFile=OC_Filesystem::file_get_contents('/file');
+// $this->assertNotEqual($original,$stored);
+// $this->assertEqual(strlen($original),strlen($fromFile));
+// $this->assertEqual($original,$fromFile);
+//
+// }
+//
+// public function testView(){
+// $file=OC::$SERVERROOT.'/3rdparty/MDB2.php';
+// $original=file_get_contents($file);
+//
+// $rootView=new OC_FilesystemView('');
+// $view=new OC_FilesystemView('/'.OC_User::getUser());
+// $userDir='/'.OC_User::getUser().'/files';
+//
+// $rootView->file_put_contents($userDir.'/file',$original);
+//
+// OC_FileProxy::$enabled=false;
+// $stored=$rootView->file_get_contents($userDir.'/file');
+// OC_FileProxy::$enabled=true;
+//
+// $this->assertNotEqual($original,$stored);
+// $fromFile=$rootView->file_get_contents($userDir.'/file');
+// $this->assertEqual($original,$fromFile);
+//
+// $fromFile=$view->file_get_contents('files/file');
+// $this->assertEqual($original,$fromFile);
+// }
+//
+// public function testBinary(){
+// $file=__DIR__.'/binary';
+// $original=file_get_contents($file);
+//
+// OC_Filesystem::file_put_contents('/file',$original);
+//
+// OC_FileProxy::$enabled=false;
+// $stored=OC_Filesystem::file_get_contents('/file');
+// OC_FileProxy::$enabled=true;
+//
+// $fromFile=OC_Filesystem::file_get_contents('/file');
+// $this->assertNotEqual($original,$stored);
+// $this->assertEqual(strlen($original),strlen($fromFile));
+// $this->assertEqual($original,$fromFile);
+//
+// $file=__DIR__.'/zeros';
+// $original=file_get_contents($file);
+//
+// OC_Filesystem::file_put_contents('/file',$original);
+//
+// OC_FileProxy::$enabled=false;
+// $stored=OC_Filesystem::file_get_contents('/file');
+// OC_FileProxy::$enabled=true;
+//
+// $fromFile=OC_Filesystem::file_get_contents('/file');
+// $this->assertNotEqual($original,$stored);
+// $this->assertEqual(strlen($original),strlen($fromFile));
+// }
+// }
diff --git a/apps/files_encryption/test/stream.php b/apps/files_encryption/test/stream.php
new file mode 100644
index 00000000000..4211cab3104
--- /dev/null
+++ b/apps/files_encryption/test/stream.php
@@ -0,0 +1,226 @@
+// <?php
+// /**
+// * Copyright (c) 2012 Robin Appelman <icewind@owncloud.com>
+// * This file is licensed under the Affero General Public License version 3 or
+// * later.
+// * See the COPYING-README file.
+// */
+//
+// namespace OCA\Encryption;
+//
+// class Test_Stream extends \PHPUnit_Framework_TestCase {
+//
+// function setUp() {
+//
+// \OC_Filesystem::mount( 'OC_Filestorage_Local', array(), '/' );
+//
+// $this->empty = '';
+//
+// $this->stream = new Stream();
+//
+// $this->dataLong = file_get_contents( realpath( dirname(__FILE__).'/../lib/crypt.php' ) );
+// $this->dataShort = 'hats';
+//
+// $this->emptyTmpFilePath = \OCP\Files::tmpFile();
+//
+// $this->dataTmpFilePath = \OCP\Files::tmpFile();
+//
+// file_put_contents( $this->dataTmpFilePath, "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec a diam lectus. Sed sit amet ipsum mauris. Maecenas congue ligula ac quam viverra nec consectetur ante hendrerit. Donec et mollis dolor. Praesent et diam eget libero egestas mattis sit amet vitae augue. Nam tincidunt congue enim, ut porta lorem lacinia consectetur. Donec ut libero sed arcu vehicula ultricies a non tortor. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean ut gravida lorem. Ut turpis felis, pulvinar a semper sed, adipiscing id dolor. Pellentesque auctor nisi id magna consequat sagittis. Curabitur dapibus enim sit amet elit pharetra tincidunt feugiat nisl imperdiet. Ut convallis libero in urna ultrices accumsan. Donec sed odio eros. Donec viverra mi quis quam pulvinar at malesuada arcu rhoncus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. In rutrum accumsan ultricies. Mauris vitae nisi at sem facilisis semper ac in est." );
+//
+// }
+//
+// function testStreamOpen() {
+//
+// $stream1 = new Stream();
+//
+// $handle1 = $stream1->stream_open( $this->emptyTmpFilePath, 'wb', array(), $this->empty );
+//
+// // Test that resource was returned successfully
+// $this->assertTrue( $handle1 );
+//
+// // Test that file has correct size
+// $this->assertEquals( 0, $stream1->size );
+//
+// // Test that path is correct
+// $this->assertEquals( $this->emptyTmpFilePath, $stream1->rawPath );
+//
+// $stream2 = new Stream();
+//
+// $handle2 = $stream2->stream_open( 'crypt://' . $this->emptyTmpFilePath, 'wb', array(), $this->empty );
+//
+// // Test that protocol identifier is removed from path
+// $this->assertEquals( $this->emptyTmpFilePath, $stream2->rawPath );
+//
+// // "Stat failed error" prevents this test from executing
+// // $stream3 = new Stream();
+// //
+// // $handle3 = $stream3->stream_open( $this->dataTmpFilePath, 'r', array(), $this->empty );
+// //
+// // $this->assertEquals( 0, $stream3->size );
+//
+// }
+//
+// function testStreamWrite() {
+//
+// $stream1 = new Stream();
+//
+// $handle1 = $stream1->stream_open( $this->emptyTmpFilePath, 'r+b', array(), $this->empty );
+//
+// # what about the keymanager? there is no key for the newly created temporary file!
+//
+// $stream1->stream_write( $this->dataShort );
+//
+// }
+//
+// // function getStream( $id, $mode, $size ) {
+// //
+// // if ( $id === '' ) {
+// //
+// // $id = uniqid();
+// // }
+// //
+// //
+// // if ( !isset( $this->tmpFiles[$id] ) ) {
+// //
+// // // If tempfile with given name does not already exist, create it
+// //
+// // $file = OCP\Files::tmpFile();
+// //
+// // $this->tmpFiles[$id] = $file;
+// //
+// // } else {
+// //
+// // $file = $this->tmpFiles[$id];
+// //
+// // }
+// //
+// // $stream = fopen( $file, $mode );
+// //
+// // Stream::$sourceStreams[$id] = array( 'path' => 'dummy' . $id, 'stream' => $stream, 'size' => $size );
+// //
+// // return fopen( 'crypt://streams/'.$id, $mode );
+// //
+// // }
+// //
+// // function testStream( ){
+// //
+// // $stream = $this->getStream( 'test1', 'w', strlen( 'foobar' ) );
+// //
+// // fwrite( $stream, 'foobar' );
+// //
+// // fclose( $stream );
+// //
+// //
+// // $stream = $this->getStream( 'test1', 'r', strlen( 'foobar' ) );
+// //
+// // $data = fread( $stream, 6 );
+// //
+// // fclose( $stream );
+// //
+// // $this->assertEqual( 'foobar', $data );
+// //
+// //
+// // $file = OC::$SERVERROOT.'/3rdparty/MDB2.php';
+// //
+// // $source = fopen( $file, 'r' );
+// //
+// // $target = $this->getStream( 'test2', 'w', 0 );
+// //
+// // OCP\Files::streamCopy( $source, $target );
+// //
+// // fclose( $target );
+// //
+// // fclose( $source );
+// //
+// //
+// // $stream = $this->getStream( 'test2', 'r', filesize( $file ) );
+// //
+// // $data = stream_get_contents( $stream );
+// //
+// // $original = file_get_contents( $file );
+// //
+// // $this->assertEqual( strlen( $original ), strlen( $data ) );
+// //
+// // $this->assertEqual( $original, $data );
+// //
+// // }
+//
+// }
+//
+// // class Test_CryptStream extends UnitTestCase {
+// // private $tmpFiles=array();
+// //
+// // function testStream(){
+// // $stream=$this->getStream('test1','w',strlen('foobar'));
+// // fwrite($stream,'foobar');
+// // fclose($stream);
+// //
+// // $stream=$this->getStream('test1','r',strlen('foobar'));
+// // $data=fread($stream,6);
+// // fclose($stream);
+// // $this->assertEqual('foobar',$data);
+// //
+// // $file=OC::$SERVERROOT.'/3rdparty/MDB2.php';
+// // $source=fopen($file,'r');
+// // $target=$this->getStream('test2','w',0);
+// // OCP\Files::streamCopy($source,$target);
+// // fclose($target);
+// // fclose($source);
+// //
+// // $stream=$this->getStream('test2','r',filesize($file));
+// // $data=stream_get_contents($stream);
+// // $original=file_get_contents($file);
+// // $this->assertEqual(strlen($original),strlen($data));
+// // $this->assertEqual($original,$data);
+// // }
+// //
+// // /**
+// // * get a cryptstream to a temporary file
+// // * @param string $id
+// // * @param string $mode
+// // * @param int size
+// // * @return resource
+// // */
+// // function getStream($id,$mode,$size){
+// // if($id===''){
+// // $id=uniqid();
+// // }
+// // if(!isset($this->tmpFiles[$id])){
+// // $file=OCP\Files::tmpFile();
+// // $this->tmpFiles[$id]=$file;
+// // }else{
+// // $file=$this->tmpFiles[$id];
+// // }
+// // $stream=fopen($file,$mode);
+// // OC_CryptStream::$sourceStreams[$id]=array('path'=>'dummy'.$id,'stream'=>$stream,'size'=>$size);
+// // return fopen('crypt://streams/'.$id,$mode);
+// // }
+// //
+// // function testBinary(){
+// // $file=__DIR__.'/binary';
+// // $source=file_get_contents($file);
+// //
+// // $stream=$this->getStream('test','w',strlen($source));
+// // fwrite($stream,$source);
+// // fclose($stream);
+// //
+// // $stream=$this->getStream('test','r',strlen($source));
+// // $data=stream_get_contents($stream);
+// // fclose($stream);
+// // $this->assertEqual(strlen($data),strlen($source));
+// // $this->assertEqual($source,$data);
+// //
+// // $file=__DIR__.'/zeros';
+// // $source=file_get_contents($file);
+// //
+// // $stream=$this->getStream('test2','w',strlen($source));
+// // fwrite($stream,$source);
+// // fclose($stream);
+// //
+// // $stream=$this->getStream('test2','r',strlen($source));
+// // $data=stream_get_contents($stream);
+// // fclose($stream);
+// // $this->assertEqual(strlen($data),strlen($source));
+// // $this->assertEqual($source,$data);
+// // }
+// // }
diff --git a/apps/files_encryption/test/util.php b/apps/files_encryption/test/util.php
new file mode 100755
index 00000000000..016787fbfba
--- /dev/null
+++ b/apps/files_encryption/test/util.php
@@ -0,0 +1,210 @@
+<?php
+/**
+ * Copyright (c) 2012 Sam Tuke <samtuke@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+//require_once "PHPUnit/Framework/TestCase.php";
+require_once realpath( dirname(__FILE__).'/../../../lib/base.php' );
+require_once realpath( dirname(__FILE__).'/../lib/crypt.php' );
+require_once realpath( dirname(__FILE__).'/../lib/keymanager.php' );
+require_once realpath( dirname(__FILE__).'/../lib/proxy.php' );
+require_once realpath( dirname(__FILE__).'/../lib/stream.php' );
+require_once realpath( dirname(__FILE__).'/../lib/util.php' );
+require_once realpath( dirname(__FILE__).'/../appinfo/app.php' );
+
+// Load mockery files
+require_once 'Mockery/Loader.php';
+require_once 'Hamcrest/Hamcrest.php';
+$loader = new \Mockery\Loader;
+$loader->register();
+
+use \Mockery as m;
+use OCA\Encryption;
+
+class Test_Enc_Util extends \PHPUnit_Framework_TestCase {
+
+ function setUp() {
+
+ \OC_Filesystem::mount( 'OC_Filestorage_Local', array(), '/' );
+
+ // set content for encrypting / decrypting in tests
+ $this->dataUrl = realpath( dirname(__FILE__).'/../lib/crypt.php' );
+ $this->dataShort = 'hats';
+ $this->dataLong = file_get_contents( realpath( dirname(__FILE__).'/../lib/crypt.php' ) );
+ $this->legacyData = realpath( dirname(__FILE__).'/legacy-text.txt' );
+ $this->legacyEncryptedData = realpath( dirname(__FILE__).'/legacy-encrypted-text.txt' );
+
+ $this->userId = 'admin';
+ $this->pass = 'admin';
+
+ $keypair = Encryption\Crypt::createKeypair();
+
+ $this->genPublicKey = $keypair['publicKey'];
+ $this->genPrivateKey = $keypair['privateKey'];
+
+ $this->publicKeyDir = '/' . 'public-keys';
+ $this->encryptionDir = '/' . $this->userId . '/' . 'files_encryption';
+ $this->keyfilesPath = $this->encryptionDir . '/' . 'keyfiles';
+ $this->publicKeyPath = $this->publicKeyDir . '/' . $this->userId . '.public.key'; // e.g. data/public-keys/admin.public.key
+ $this->privateKeyPath = $this->encryptionDir . '/' . $this->userId . '.private.key'; // e.g. data/admin/admin.private.key
+
+ $this->view = new OC_FilesystemView( '/admin' );
+
+ $this->mockView = m::mock('OC_FilesystemView');
+ $this->util = new Encryption\Util( $this->mockView, $this->userId );
+
+ }
+
+ function tearDown(){
+
+ m::close();
+
+ }
+
+ /**
+ * @brief test that paths set during User construction are correct
+ */
+ function testKeyPaths() {
+
+ $mockView = m::mock('OC_FilesystemView');
+
+ $util = new Encryption\Util( $mockView, $this->userId );
+
+ $this->assertEquals( $this->publicKeyDir, $util->getPath( 'publicKeyDir' ) );
+ $this->assertEquals( $this->encryptionDir, $util->getPath( 'encryptionDir' ) );
+ $this->assertEquals( $this->keyfilesPath, $util->getPath( 'keyfilesPath' ) );
+ $this->assertEquals( $this->publicKeyPath, $util->getPath( 'publicKeyPath' ) );
+ $this->assertEquals( $this->privateKeyPath, $util->getPath( 'privateKeyPath' ) );
+
+ }
+
+ /**
+ * @brief test setup of encryption directories when they don't yet exist
+ */
+ function testSetupServerSideNotSetup() {
+
+ $mockView = m::mock('OC_FilesystemView');
+
+ $mockView->shouldReceive( 'file_exists' )->times(4)->andReturn( false );
+ $mockView->shouldReceive( 'mkdir' )->times(3)->andReturn( true );
+ $mockView->shouldReceive( 'file_put_contents' )->withAnyArgs();
+
+ $util = new Encryption\Util( $mockView, $this->userId );
+
+ $this->assertEquals( true, $util->setupServerSide( $this->pass ) );
+
+ }
+
+ /**
+ * @brief test setup of encryption directories when they already exist
+ */
+ function testSetupServerSideIsSetup() {
+
+ $mockView = m::mock('OC_FilesystemView');
+
+ $mockView->shouldReceive( 'file_exists' )->times(5)->andReturn( true );
+ $mockView->shouldReceive( 'file_put_contents' )->withAnyArgs();
+
+ $util = new Encryption\Util( $mockView, $this->userId );
+
+ $this->assertEquals( true, $util->setupServerSide( $this->pass ) );
+
+ }
+
+ /**
+ * @brief test checking whether account is ready for encryption, when it isn't ready
+ */
+ function testReadyNotReady() {
+
+ $mockView = m::mock('OC_FilesystemView');
+
+ $mockView->shouldReceive( 'file_exists' )->times(1)->andReturn( false );
+
+ $util = new Encryption\Util( $mockView, $this->userId );
+
+ $this->assertEquals( false, $util->ready() );
+
+ # TODO: Add more tests here to check that if any of the dirs are
+ # then false will be returned. Use strict ordering?
+
+ }
+
+ /**
+ * @brief test checking whether account is ready for encryption, when it is ready
+ */
+ function testReadyIsReady() {
+
+ $mockView = m::mock('OC_FilesystemView');
+
+ $mockView->shouldReceive( 'file_exists' )->times(3)->andReturn( true );
+
+ $util = new Encryption\Util( $mockView, $this->userId );
+
+ $this->assertEquals( true, $util->ready() );
+
+ # TODO: Add more tests here to check that if any of the dirs are
+ # then false will be returned. Use strict ordering?
+
+ }
+
+// /**
+// * @brief test decryption using legacy blowfish method
+// * @depends testLegacyEncryptLong
+// */
+// function testLegacyKeyRecryptKeyfileDecrypt( $recrypted ) {
+//
+// $decrypted = Encryption\Crypt::keyDecryptKeyfile( $recrypted['data'], $recrypted['key'], $this->genPrivateKey );
+//
+// $this->assertEquals( $this->dataLong, $decrypted );
+//
+// }
+
+// // Cannot use this test for now due to hidden dependencies in OC_FileCache
+// function testIsLegacyEncryptedContent() {
+//
+// $keyfileContent = OCA\Encryption\Crypt::symmetricEncryptFileContent( $this->legacyEncryptedData, 'hat' );
+//
+// $this->assertFalse( OCA\Encryption\Crypt::isLegacyEncryptedContent( $keyfileContent, '/files/admin/test.txt' ) );
+//
+// OC_FileCache::put( '/admin/files/legacy-encrypted-test.txt', $this->legacyEncryptedData );
+//
+// $this->assertTrue( OCA\Encryption\Crypt::isLegacyEncryptedContent( $this->legacyEncryptedData, '/files/admin/test.txt' ) );
+//
+// }
+
+// // Cannot use this test for now due to need for different root in OC_Filesystem_view class
+// function testGetLegacyKey() {
+//
+// $c = new \OCA\Encryption\Util( $view, false );
+//
+// $bool = $c->getLegacyKey( 'admin' );
+//
+// $this->assertTrue( $bool );
+//
+// $this->assertTrue( $c->legacyKey );
+//
+// $this->assertTrue( is_int( $c->legacyKey ) );
+//
+// $this->assertTrue( strlen( $c->legacyKey ) == 20 );
+//
+// }
+
+// // Cannot use this test for now due to need for different root in OC_Filesystem_view class
+// function testLegacyDecrypt() {
+//
+// $c = new OCA\Encryption\Util( $this->view, false );
+//
+// $bool = $c->getLegacyKey( 'admin' );
+//
+// $encrypted = $c->legacyEncrypt( $this->data, $c->legacyKey );
+//
+// $decrypted = $c->legacyDecrypt( $encrypted, $c->legacyKey );
+//
+// $this->assertEqual( $decrypted, $this->data );
+//
+// }
+
+} \ No newline at end of file
diff --git a/apps/files_encryption/tests/zeros b/apps/files_encryption/test/zeros
index ff982acf423..ff982acf423 100644
--- a/apps/files_encryption/tests/zeros
+++ b/apps/files_encryption/test/zeros
Binary files differ
diff --git a/apps/files_encryption/tests/encryption.php b/apps/files_encryption/tests/encryption.php
deleted file mode 100644
index 0e119f55bea..00000000000
--- a/apps/files_encryption/tests/encryption.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Robin Appelman <icewind@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-class Test_Encryption extends UnitTestCase {
- function testEncryption() {
- $key=uniqid();
- $file=OC::$SERVERROOT.'/3rdparty/MDB2.php';
- $source=file_get_contents($file); //nice large text file
- $encrypted=OC_Crypt::encrypt($source, $key);
- $decrypted=OC_Crypt::decrypt($encrypted, $key);
- $decrypted=rtrim($decrypted, "\0");
- $this->assertNotEqual($encrypted, $source);
- $this->assertEqual($decrypted, $source);
-
- $chunk=substr($source, 0, 8192);
- $encrypted=OC_Crypt::encrypt($chunk, $key);
- $this->assertEqual(strlen($chunk), strlen($encrypted));
- $decrypted=OC_Crypt::decrypt($encrypted, $key);
- $decrypted=rtrim($decrypted, "\0");
- $this->assertEqual($decrypted, $chunk);
-
- $encrypted=OC_Crypt::blockEncrypt($source, $key);
- $decrypted=OC_Crypt::blockDecrypt($encrypted, $key);
- $this->assertNotEqual($encrypted, $source);
- $this->assertEqual($decrypted, $source);
-
- $tmpFileEncrypted=OCP\Files::tmpFile();
- OC_Crypt::encryptfile($file, $tmpFileEncrypted, $key);
- $encrypted=file_get_contents($tmpFileEncrypted);
- $decrypted=OC_Crypt::blockDecrypt($encrypted, $key);
- $this->assertNotEqual($encrypted, $source);
- $this->assertEqual($decrypted, $source);
-
- $tmpFileDecrypted=OCP\Files::tmpFile();
- OC_Crypt::decryptfile($tmpFileEncrypted, $tmpFileDecrypted, $key);
- $decrypted=file_get_contents($tmpFileDecrypted);
- $this->assertEqual($decrypted, $source);
-
- $file=OC::$SERVERROOT.'/core/img/weather-clear.png';
- $source=file_get_contents($file); //binary file
- $encrypted=OC_Crypt::encrypt($source, $key);
- $decrypted=OC_Crypt::decrypt($encrypted, $key);
- $decrypted=rtrim($decrypted, "\0");
- $this->assertEqual($decrypted, $source);
-
- $encrypted=OC_Crypt::blockEncrypt($source, $key);
- $decrypted=OC_Crypt::blockDecrypt($encrypted, $key);
- $this->assertEqual($decrypted, $source);
-
- }
-
- function testBinary() {
- $key=uniqid();
-
- $file=__DIR__.'/binary';
- $source=file_get_contents($file); //binary file
- $encrypted=OC_Crypt::encrypt($source, $key);
- $decrypted=OC_Crypt::decrypt($encrypted, $key);
-
- $decrypted=rtrim($decrypted, "\0");
- $this->assertEqual($decrypted, $source);
-
- $encrypted=OC_Crypt::blockEncrypt($source, $key);
- $decrypted=OC_Crypt::blockDecrypt($encrypted, $key, strlen($source));
- $this->assertEqual($decrypted, $source);
- }
-}
diff --git a/apps/files_encryption/tests/proxy.php b/apps/files_encryption/tests/proxy.php
deleted file mode 100644
index 5aa617e7472..00000000000
--- a/apps/files_encryption/tests/proxy.php
+++ /dev/null
@@ -1,117 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Robin Appelman <icewind@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-class Test_CryptProxy extends UnitTestCase {
- private $oldConfig;
- private $oldKey;
-
- public function setUp() {
- $user=OC_User::getUser();
-
- $this->oldConfig=OCP\Config::getAppValue('files_encryption','enable_encryption', 'true');
- OCP\Config::setAppValue('files_encryption', 'enable_encryption', 'true');
- $this->oldKey=isset($_SESSION['enckey'])?$_SESSION['enckey']:null;
-
-
- //set testing key
- $_SESSION['enckey']=md5(time());
-
- //clear all proxies and hooks so we can do clean testing
- OC_FileProxy::clearProxies();
- OC_Hook::clear('OC_Filesystem');
-
- //enable only the encryption hook
- OC_FileProxy::register(new OC_FileProxy_Encryption());
-
- //set up temporary storage
- OC_Filesystem::clearMounts();
- OC_Filesystem::mount('OC_Filestorage_Temporary', array(), '/');
-
- OC_Filesystem::init('/'.$user.'/files');
-
- //set up the users home folder in the temp storage
- $rootView=new OC_FilesystemView('');
- $rootView->mkdir('/'.$user);
- $rootView->mkdir('/'.$user.'/files');
- }
-
- public function tearDown() {
- OCP\Config::setAppValue('files_encryption', 'enable_encryption', $this->oldConfig);
- if ( ! is_null($this->oldKey)) {
- $_SESSION['enckey']=$this->oldKey;
- }
- }
-
- public function testSimple() {
- $file=OC::$SERVERROOT.'/3rdparty/MDB2.php';
- $original=file_get_contents($file);
-
- OC_Filesystem::file_put_contents('/file', $original);
-
- OC_FileProxy::$enabled=false;
- $stored=OC_Filesystem::file_get_contents('/file');
- OC_FileProxy::$enabled=true;
-
- $fromFile=OC_Filesystem::file_get_contents('/file');
- $this->assertNotEqual($original, $stored);
- $this->assertEqual(strlen($original), strlen($fromFile));
- $this->assertEqual($original, $fromFile);
-
- }
-
- public function testView() {
- $file=OC::$SERVERROOT.'/3rdparty/MDB2.php';
- $original=file_get_contents($file);
-
- $rootView=new OC_FilesystemView('');
- $view=new OC_FilesystemView('/'.OC_User::getUser());
- $userDir='/'.OC_User::getUser().'/files';
-
- $rootView->file_put_contents($userDir.'/file', $original);
-
- OC_FileProxy::$enabled=false;
- $stored=$rootView->file_get_contents($userDir.'/file');
- OC_FileProxy::$enabled=true;
-
- $this->assertNotEqual($original, $stored);
- $fromFile=$rootView->file_get_contents($userDir.'/file');
- $this->assertEqual($original, $fromFile);
-
- $fromFile=$view->file_get_contents('files/file');
- $this->assertEqual($original, $fromFile);
- }
-
- public function testBinary() {
- $file=__DIR__.'/binary';
- $original=file_get_contents($file);
-
- OC_Filesystem::file_put_contents('/file', $original);
-
- OC_FileProxy::$enabled=false;
- $stored=OC_Filesystem::file_get_contents('/file');
- OC_FileProxy::$enabled=true;
-
- $fromFile=OC_Filesystem::file_get_contents('/file');
- $this->assertNotEqual($original, $stored);
- $this->assertEqual(strlen($original), strlen($fromFile));
- $this->assertEqual($original, $fromFile);
-
- $file=__DIR__.'/zeros';
- $original=file_get_contents($file);
-
- OC_Filesystem::file_put_contents('/file', $original);
-
- OC_FileProxy::$enabled=false;
- $stored=OC_Filesystem::file_get_contents('/file');
- OC_FileProxy::$enabled=true;
-
- $fromFile=OC_Filesystem::file_get_contents('/file');
- $this->assertNotEqual($original, $stored);
- $this->assertEqual(strlen($original), strlen($fromFile));
- }
-}
diff --git a/apps/files_encryption/tests/stream.php b/apps/files_encryption/tests/stream.php
deleted file mode 100644
index e4af17d47b5..00000000000
--- a/apps/files_encryption/tests/stream.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Robin Appelman <icewind@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-class Test_CryptStream extends UnitTestCase {
- private $tmpFiles=array();
-
- function testStream() {
- $stream=$this->getStream('test1', 'w', strlen('foobar'));
- fwrite($stream, 'foobar');
- fclose($stream);
-
- $stream=$this->getStream('test1', 'r', strlen('foobar'));
- $data=fread($stream, 6);
- fclose($stream);
- $this->assertEqual('foobar', $data);
-
- $file=OC::$SERVERROOT.'/3rdparty/MDB2.php';
- $source=fopen($file, 'r');
- $target=$this->getStream('test2', 'w', 0);
- OCP\Files::streamCopy($source, $target);
- fclose($target);
- fclose($source);
-
- $stream=$this->getStream('test2', 'r', filesize($file));
- $data=stream_get_contents($stream);
- $original=file_get_contents($file);
- $this->assertEqual(strlen($original), strlen($data));
- $this->assertEqual($original, $data);
- }
-
- /**
- * get a cryptstream to a temporary file
- * @param string $id
- * @param string $mode
- * @param int size
- * @return resource
- */
- function getStream($id, $mode, $size) {
- if ($id==='') {
- $id=uniqid();
- }
- if ( ! isset($this->tmpFiles[$id])) {
- $file=OCP\Files::tmpFile();
- $this->tmpFiles[$id]=$file;
- } else {
- $file=$this->tmpFiles[$id];
- }
- $stream=fopen($file, $mode);
- OC_CryptStream::$sourceStreams[$id]=array('path'=>'dummy'.$id, 'stream'=>$stream, 'size'=>$size);
- return fopen('crypt://streams/'.$id, $mode);
- }
-
- function testBinary() {
- $file=__DIR__.'/binary';
- $source=file_get_contents($file);
-
- $stream=$this->getStream('test', 'w', strlen($source));
- fwrite($stream, $source);
- fclose($stream);
-
- $stream=$this->getStream('test', 'r', strlen($source));
- $data=stream_get_contents($stream);
- fclose($stream);
- $this->assertEqual(strlen($data), strlen($source));
- $this->assertEqual($source, $data);
-
- $file=__DIR__.'/zeros';
- $source=file_get_contents($file);
-
- $stream=$this->getStream('test2', 'w', strlen($source));
- fwrite($stream, $source);
- fclose($stream);
-
- $stream=$this->getStream('test2', 'r', strlen($source));
- $data=stream_get_contents($stream);
- fclose($stream);
- $this->assertEqual(strlen($data), strlen($source));
- $this->assertEqual($source, $data);
- }
-}
diff --git a/apps/files_external/l10n/th_TH.php b/apps/files_external/l10n/th_TH.php
index 70ab8d33485..870995c8e7a 100644
--- a/apps/files_external/l10n/th_TH.php
+++ b/apps/files_external/l10n/th_TH.php
@@ -5,6 +5,8 @@
"Fill out all required fields" => "กรอกข้อมูลในช่องข้อมูลที่จำเป็นต้องกรอกทั้งหมด",
"Please provide a valid Dropbox app key and secret." => "กรุณากรอกรหัส app key ของ Dropbox และรหัสลับ",
"Error configuring Google Drive storage" => "เกิดข้อผิดพลาดในการกำหนดค่าการจัดเก็บข้อมูลในพื้นที่ของ Google Drive",
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>คำเตือน:</b> \"smbclient\" ยังไม่ได้ถูกติดตั้ง. การชี้ CIFS/SMB เพื่อแชร์ข้อมูลไม่สามารถกระทำได้ กรุณาสอบถามข้อมูลเพิ่มเติมจากผู้ดูแลระบบเพื่อติดตั้ง.",
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>คำเตือน:</b> การสนับสนุนการใช้งาน FTP ในภาษา PHP ยังไม่ได้ถูกเปิดใช้งานหรือถูกติดตั้ง. การชี้ FTP เพื่อแชร์ข้อมูลไม่สามารถดำเนินการได้ กรุณาสอบถามข้อมูลเพิ่มเติมจากผู้ดูแลระบบเพื่อติดตั้ง",
"External Storage" => "พื้นทีจัดเก็บข้อมูลจากภายนอก",
"Mount point" => "จุดชี้ตำแหน่ง",
"Backend" => "ด้านหลังระบบ",
diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php
index 235ade06db6..e5ef4eb097c 100644
--- a/apps/files_external/lib/amazons3.php
+++ b/apps/files_external/lib/amazons3.php
@@ -108,7 +108,7 @@ class OC_Filestorage_AmazonS3 extends OC_Filestorage_Common {
$stat['atime'] = time();
$stat['mtime'] = $stat['atime'];
$stat['ctime'] = $stat['atime'];
- } else {
+ } else {
$object = $this->getObject($path);
if ($object) {
$stat['size'] = $object['Size'];
diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index 1be544fbc07..fd3dc2ca0d0 100755
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -38,7 +38,7 @@ class OC_Mount_Config {
* @return array
*/
public static function getBackends() {
-
+
$backends['OC_Filestorage_Local']=array(
'backend' => 'Local',
'configuration' => array(
@@ -77,7 +77,7 @@ class OC_Mount_Config {
'token' => '#token',
'token_secret' => '#token secret'),
'custom' => 'google');
-
+
$backends['OC_Filestorage_SWIFT']=array(
'backend' => 'OpenStack Swift',
'configuration' => array(
@@ -86,7 +86,7 @@ class OC_Mount_Config {
'token' => '*Token',
'root' => '&Root',
'secure' => '!Secure ftps://'));
-
+
if(OC_Mount_Config::checksmbclient()) $backends['OC_Filestorage_SMB']=array(
'backend' => 'SMB / CIFS',
'configuration' => array(
@@ -95,7 +95,7 @@ class OC_Mount_Config {
'password' => '*Password',
'share' => 'Share',
'root' => '&Root'));
-
+
$backends['OC_Filestorage_DAV']=array(
'backend' => 'ownCloud / WebDAV',
'configuration' => array(
@@ -103,7 +103,7 @@ class OC_Mount_Config {
'user' => 'Username',
'password' => '*Password',
'root' => '&Root',
- 'secure' => '!Secure https://'));
+ 'secure' => '!Secure https://'));
return($backends);
}
@@ -403,7 +403,7 @@ class OC_Mount_Config {
}
/**
- * check if smbclient is installed
+ * check if smbclient is installed
*/
public static function checksmbclient() {
if(function_exists('shell_exec')) {
@@ -415,7 +415,7 @@ class OC_Mount_Config {
}
/**
- * check if php-ftp is installed
+ * check if php-ftp is installed
*/
public static function checkphpftp() {
if(function_exists('ftp_login')) {
diff --git a/apps/files_external/lib/webdav.php b/apps/files_external/lib/webdav.php
index 6c5bc579c30..920aefc12de 100644
--- a/apps/files_external/lib/webdav.php
+++ b/apps/files_external/lib/webdav.php
@@ -234,12 +234,11 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{
$path1=$this->cleanPath($path1);
$path2=$this->root.$this->cleanPath($path2);
try {
- $response=$this->client->request('MOVE', $path1, null, array('Destination'=>$path2));
+ $this->client->request('MOVE', $path1, null, array('Destination'=>$path2));
return true;
} catch(Exception $e) {
echo $e;
echo 'fail';
- var_dump($response);
return false;
}
}
@@ -248,12 +247,11 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{
$path1=$this->cleanPath($path1);
$path2=$this->root.$this->cleanPath($path2);
try {
- $response=$this->client->request('COPY', $path1, null, array('Destination'=>$path2));
+ $this->client->request('COPY', $path1, null, array('Destination'=>$path2));
return true;
} catch(Exception $e) {
echo $e;
echo 'fail';
- var_dump($response);
return false;
}
}
diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php
index dd537d779a6..78ca1c87fee 100644
--- a/apps/files_external/templates/settings.php
+++ b/apps/files_external/templates/settings.php
@@ -1,7 +1,7 @@
<form id="files_external">
<fieldset class="personalblock">
<legend><strong><?php echo $l->t('External Storage'); ?></strong></legend>
- <?php if (isset($_['dependencies']) and ($_['dependencies']<>'')) echo ''.$_['dependencies'].''; ?>
+ <?php if (isset($_['dependencies']) and ($_['dependencies']<>'')) echo ''.$_['dependencies'].''; ?>
<table id="externalStorage" data-admin='<?php echo json_encode($_['isAdminPage']); ?>'>
<thead>
<tr>
@@ -47,7 +47,7 @@
<?php elseif (strpos($placeholder, '!') !== false): ?>
<label><input type="checkbox"
data-parameter="<?php echo $parameter; ?>"
- <?php if ($value == 'true'): ?> checked="checked"<?php endif; ?>
+ <?php if ($value == 'true'): ?> checked="checked"<?php endif; ?>
/><?php echo substr($placeholder, 1); ?></label>
<?php elseif (strpos($placeholder, '&') !== false): ?>
<input type="text"
@@ -105,7 +105,7 @@
<?php endif; ?>
<td <?php if ($mountPoint != ''): ?>class="remove"
<?php else: ?>style="visibility:hidden;"
- <?php endif ?>><img alt="<?php echo $l->t('Delete'); ?>"
+ <?php endif ?>><img alt="<?php echo $l->t('Delete'); ?>"
title="<?php echo $l->t('Delete'); ?>"
class="svg action"
src="<?php echo image_path('core', 'actions/delete.svg'); ?>" /></td>
diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js
index 8a546d62163..a46d0179801 100644
--- a/apps/files_sharing/js/share.js
+++ b/apps/files_sharing/js/share.js
@@ -1,7 +1,7 @@
$(document).ready(function() {
if (typeof OC.Share !== 'undefined' && typeof FileActions !== 'undefined' && !publicListView) {
-
+
FileActions.register('all', 'Share', OC.PERMISSION_READ, OC.imagePath('core', 'actions/share'), function(filename) {
if ($('#dir').val() == '/') {
var item = $('#dir').val() + filename;
diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php
index 487b9e79961..efd977a1b6a 100644
--- a/apps/files_sharing/public.php
+++ b/apps/files_sharing/public.php
@@ -66,12 +66,12 @@ if (isset($_GET['t'])) {
$type = $linkItem['item_type'];
$fileSource = $linkItem['file_source'];
$shareOwner = $linkItem['uid_owner'];
-
+
if (OCP\User::userExists($shareOwner) && $fileSource != -1 ) {
-
+
$pathAndUser = getPathAndUser($linkItem['file_source']);
$fileOwner = $pathAndUser['user'];
-
+
//if this is a reshare check the file owner also exists
if ($shareOwner != $fileOwner && ! OCP\User::userExists($fileOwner)) {
OCP\Util::writeLog('share', 'original file owner '.$fileOwner
@@ -81,7 +81,7 @@ if (isset($_GET['t'])) {
$tmpl->printPage();
exit();
}
-
+
//mount filesystem of file owner
OC_Util::setupFS($fileOwner);
}
@@ -104,7 +104,7 @@ if (isset($_GET['t'])) {
}
}
$shareOwner = substr($path, 1, strpos($path, '/', 1) - 1);
-
+
if (OCP\User::userExists($shareOwner)) {
OC_Util::setupFS($shareOwner);
$fileSource = getId($path);
@@ -159,7 +159,7 @@ if ($linkItem) {
$tmpl->printPage();
exit();
}
-
+
} else {
// Check if item id is set in session
if (!isset($_SESSION['public_link_authenticated'])
diff --git a/apps/files_versions/history.php b/apps/files_versions/history.php
index 6e27f43d576..6071240e583 100644
--- a/apps/files_versions/history.php
+++ b/apps/files_versions/history.php
@@ -28,7 +28,6 @@ $tmpl = new OCP\Template( 'files_versions', 'history', 'user' );
if ( isset( $_GET['path'] ) ) {
$path = $_GET['path'];
- $path = $path;
$tmpl->assign( 'path', $path );
$versions = new OCA_Versions\Storage();
diff --git a/apps/files_versions/l10n/ar.php b/apps/files_versions/l10n/ar.php
index fea7f1c7562..1f1f3100405 100644
--- a/apps/files_versions/l10n/ar.php
+++ b/apps/files_versions/l10n/ar.php
@@ -1,8 +1,5 @@
<?php $TRANSLATIONS = array(
-"Expire all versions" => "إنهاء تاريخ الإنتهاء لجميع الإصدارات",
"History" => "السجل الزمني",
-"Versions" => "الإصدارات",
-"This will delete all existing backup versions of your files" => "هذه العملية ستقوم بإلغاء جميع إصدارات النسخ الاحتياطي للملفات",
"Files Versioning" => "أصدرة الملفات",
"Enable" => "تفعيل"
);
diff --git a/apps/files_versions/l10n/bg_BG.php b/apps/files_versions/l10n/bg_BG.php
index 98b5f4113ae..6ecf12d0b00 100644
--- a/apps/files_versions/l10n/bg_BG.php
+++ b/apps/files_versions/l10n/bg_BG.php
@@ -1,6 +1,4 @@
<?php $TRANSLATIONS = array(
"History" => "История",
-"Versions" => "Версии",
-"This will delete all existing backup versions of your files" => "Това действие ще изтрие всички налични архивни версии на Вашите файлове",
"Enable" => "Включено"
);
diff --git a/apps/files_versions/l10n/bn_BD.php b/apps/files_versions/l10n/bn_BD.php
index 88349342fa9..dffa4d79a06 100644
--- a/apps/files_versions/l10n/bn_BD.php
+++ b/apps/files_versions/l10n/bn_BD.php
@@ -1,8 +1,5 @@
<?php $TRANSLATIONS = array(
-"Expire all versions" => "সমস্ত ভার্সন মেয়াদোত্তীর্ণ",
"History" => "ইতিহাস",
-"Versions" => "ভার্সন",
-"This will delete all existing backup versions of your files" => "এটি আপনার বিদ্যমান ফাইলের সমস্ত ব্যাক-আপ ভার্সন মুছে ফেলবে।",
"Files Versioning" => "ফাইল ভার্সন করা",
"Enable" => "সক্রিয় "
);
diff --git a/apps/files_versions/l10n/ca.php b/apps/files_versions/l10n/ca.php
index 0076d02992f..01e0a116873 100644
--- a/apps/files_versions/l10n/ca.php
+++ b/apps/files_versions/l10n/ca.php
@@ -1,8 +1,5 @@
<?php $TRANSLATIONS = array(
-"Expire all versions" => "Expira totes les versions",
"History" => "Historial",
-"Versions" => "Versions",
-"This will delete all existing backup versions of your files" => "Això eliminarà totes les versions de còpia de seguretat dels vostres fitxers",
"Files Versioning" => "Fitxers de Versions",
"Enable" => "Habilita"
);
diff --git a/apps/files_versions/l10n/cs_CZ.php b/apps/files_versions/l10n/cs_CZ.php
index 3995334d9ee..d219c3e68da 100644
--- a/apps/files_versions/l10n/cs_CZ.php
+++ b/apps/files_versions/l10n/cs_CZ.php
@@ -1,8 +1,5 @@
<?php $TRANSLATIONS = array(
-"Expire all versions" => "Vypršet všechny verze",
"History" => "Historie",
-"Versions" => "Verze",
-"This will delete all existing backup versions of your files" => "Odstraní všechny existující zálohované verze Vašich souborů",
"Files Versioning" => "Verzování souborů",
"Enable" => "Povolit"
);
diff --git a/apps/files_versions/l10n/da.php b/apps/files_versions/l10n/da.php
index bc02b47f2ad..98579747643 100644
--- a/apps/files_versions/l10n/da.php
+++ b/apps/files_versions/l10n/da.php
@@ -1,8 +1,5 @@
<?php $TRANSLATIONS = array(
-"Expire all versions" => "Lad alle versioner udløbe",
"History" => "Historik",
-"Versions" => "Versioner",
-"This will delete all existing backup versions of your files" => "Dette vil slette alle eksisterende backupversioner af dine filer",
"Files Versioning" => "Versionering af filer",
"Enable" => "Aktiver"
);
diff --git a/apps/files_versions/l10n/de.php b/apps/files_versions/l10n/de.php
index 092bbfbff70..2fcb996de7b 100644
--- a/apps/files_versions/l10n/de.php
+++ b/apps/files_versions/l10n/de.php
@@ -1,8 +1,5 @@
<?php $TRANSLATIONS = array(
-"Expire all versions" => "Alle Versionen löschen",
"History" => "Historie",
-"Versions" => "Versionen",
-"This will delete all existing backup versions of your files" => "Dies löscht alle vorhandenen Sicherungsversionen Deiner Dateien.",
"Files Versioning" => "Dateiversionierung",
"Enable" => "Aktivieren"
);
diff --git a/apps/files_versions/l10n/de_DE.php b/apps/files_versions/l10n/de_DE.php
index a568112d02d..2fcb996de7b 100644
--- a/apps/files_versions/l10n/de_DE.php
+++ b/apps/files_versions/l10n/de_DE.php
@@ -1,8 +1,5 @@
<?php $TRANSLATIONS = array(
-"Expire all versions" => "Alle Versionen löschen",
"History" => "Historie",
-"Versions" => "Versionen",
-"This will delete all existing backup versions of your files" => "Dies löscht alle vorhandenen Sicherungsversionen Ihrer Dateien.",
"Files Versioning" => "Dateiversionierung",
"Enable" => "Aktivieren"
);
diff --git a/apps/files_versions/l10n/el.php b/apps/files_versions/l10n/el.php
index f6b9a5b2998..6b189c2cdd3 100644
--- a/apps/files_versions/l10n/el.php
+++ b/apps/files_versions/l10n/el.php
@@ -1,8 +1,5 @@
<?php $TRANSLATIONS = array(
-"Expire all versions" => "Λήξη όλων των εκδόσεων",
"History" => "Ιστορικό",
-"Versions" => "Εκδόσεις",
-"This will delete all existing backup versions of your files" => "Αυτό θα διαγράψει όλες τις υπάρχουσες εκδόσεις των αντιγράφων ασφαλείας των αρχείων σας",
"Files Versioning" => "Εκδόσεις Αρχείων",
"Enable" => "Ενεργοποίηση"
);
diff --git a/apps/files_versions/l10n/eo.php b/apps/files_versions/l10n/eo.php
index 0c3835373ef..87b314655c0 100644
--- a/apps/files_versions/l10n/eo.php
+++ b/apps/files_versions/l10n/eo.php
@@ -1,8 +1,5 @@
<?php $TRANSLATIONS = array(
-"Expire all versions" => "Eksvalidigi ĉiujn eldonojn",
"History" => "Historio",
-"Versions" => "Eldonoj",
-"This will delete all existing backup versions of your files" => "Ĉi tio forigos ĉiujn estantajn sekurkopiajn eldonojn de viaj dosieroj",
"Files Versioning" => "Dosiereldonigo",
"Enable" => "Kapabligi"
);
diff --git a/apps/files_versions/l10n/es.php b/apps/files_versions/l10n/es.php
index f6b63df7c2b..4a8c34e5180 100644
--- a/apps/files_versions/l10n/es.php
+++ b/apps/files_versions/l10n/es.php
@@ -1,8 +1,5 @@
<?php $TRANSLATIONS = array(
-"Expire all versions" => "Expirar todas las versiones",
"History" => "Historial",
-"Versions" => "Versiones",
-"This will delete all existing backup versions of your files" => "Esto eliminará todas las versiones guardadas como copia de seguridad de tus archivos",
"Files Versioning" => "Versionado de archivos",
"Enable" => "Habilitar"
);
diff --git a/apps/files_versions/l10n/es_AR.php b/apps/files_versions/l10n/es_AR.php
index a78264de03f..74d8907fc35 100644
--- a/apps/files_versions/l10n/es_AR.php
+++ b/apps/files_versions/l10n/es_AR.php
@@ -1,8 +1,5 @@
<?php $TRANSLATIONS = array(
-"Expire all versions" => "Expirar todas las versiones",
"History" => "Historia",
-"Versions" => "Versiones",
-"This will delete all existing backup versions of your files" => "Hacer estom borrará todas las versiones guardadas como copia de seguridad de tus archivos",
"Files Versioning" => "Versionado de archivos",
"Enable" => "Activar"
);
diff --git a/apps/files_versions/l10n/et_EE.php b/apps/files_versions/l10n/et_EE.php
index f1296f23fcd..ff119d5374e 100644
--- a/apps/files_versions/l10n/et_EE.php
+++ b/apps/files_versions/l10n/et_EE.php
@@ -1,8 +1,5 @@
<?php $TRANSLATIONS = array(
-"Expire all versions" => "Kõikide versioonide aegumine",
"History" => "Ajalugu",
-"Versions" => "Versioonid",
-"This will delete all existing backup versions of your files" => "See kustutab kõik sinu failidest tehtud varuversiooni",
"Files Versioning" => "Failide versioonihaldus",
"Enable" => "Luba"
);
diff --git a/apps/files_versions/l10n/eu.php b/apps/files_versions/l10n/eu.php
index d84d9011707..c6b4cd7692d 100644
--- a/apps/files_versions/l10n/eu.php
+++ b/apps/files_versions/l10n/eu.php
@@ -1,8 +1,5 @@
<?php $TRANSLATIONS = array(
-"Expire all versions" => "Iraungi bertsio guztiak",
"History" => "Historia",
-"Versions" => "Bertsioak",
-"This will delete all existing backup versions of your files" => "Honek zure fitxategien bertsio guztiak ezabatuko ditu",
"Files Versioning" => "Fitxategien Bertsioak",
"Enable" => "Gaitu"
);
diff --git a/apps/files_versions/l10n/fi_FI.php b/apps/files_versions/l10n/fi_FI.php
index 3cec4c04bfe..bdce8e9fe52 100644
--- a/apps/files_versions/l10n/fi_FI.php
+++ b/apps/files_versions/l10n/fi_FI.php
@@ -1,8 +1,5 @@
<?php $TRANSLATIONS = array(
-"Expire all versions" => "Vanhenna kaikki versiot",
"History" => "Historia",
-"Versions" => "Versiot",
-"This will delete all existing backup versions of your files" => "Tämä poistaa kaikki tiedostojesi olemassa olevat varmuuskopioversiot",
"Files Versioning" => "Tiedostojen versiointi",
"Enable" => "Käytä"
);
diff --git a/apps/files_versions/l10n/fr.php b/apps/files_versions/l10n/fr.php
index e6dbc274456..2d26b98860a 100644
--- a/apps/files_versions/l10n/fr.php
+++ b/apps/files_versions/l10n/fr.php
@@ -1,8 +1,5 @@
<?php $TRANSLATIONS = array(
-"Expire all versions" => "Supprimer les versions intermédiaires",
"History" => "Historique",
-"Versions" => "Versions",
-"This will delete all existing backup versions of your files" => "Cette opération va effacer toutes les versions intermédiaires de vos fichiers (et ne garder que la dernière version en date).",
"Files Versioning" => "Versionnage des fichiers",
"Enable" => "Activer"
);
diff --git a/apps/files_versions/l10n/gl.php b/apps/files_versions/l10n/gl.php
index f10c1e16263..7e44b8898bf 100644
--- a/apps/files_versions/l10n/gl.php
+++ b/apps/files_versions/l10n/gl.php
@@ -1,8 +1,5 @@
<?php $TRANSLATIONS = array(
-"Expire all versions" => "Caducan todas as versións",
"History" => "Historial",
-"Versions" => "Versións",
-"This will delete all existing backup versions of your files" => "Isto eliminará todas as copias de seguranza que haxa dos seus ficheiros",
"Files Versioning" => "Sistema de versión de ficheiros",
"Enable" => "Activar"
);
diff --git a/apps/files_versions/l10n/he.php b/apps/files_versions/l10n/he.php
index 061e88b0dbf..9eb4df64857 100644
--- a/apps/files_versions/l10n/he.php
+++ b/apps/files_versions/l10n/he.php
@@ -1,8 +1,5 @@
<?php $TRANSLATIONS = array(
-"Expire all versions" => "הפגת תוקף כל הגרסאות",
"History" => "היסטוריה",
-"Versions" => "גרסאות",
-"This will delete all existing backup versions of your files" => "פעולה זו תמחק את כל גיבויי הגרסאות הקיימים של הקבצים שלך",
"Files Versioning" => "שמירת הבדלי גרסאות של קבצים",
"Enable" => "הפעלה"
);
diff --git a/apps/files_versions/l10n/hu_HU.php b/apps/files_versions/l10n/hu_HU.php
index 1575eda3f35..95d37ad06ed 100644
--- a/apps/files_versions/l10n/hu_HU.php
+++ b/apps/files_versions/l10n/hu_HU.php
@@ -1,8 +1,5 @@
<?php $TRANSLATIONS = array(
-"Expire all versions" => "Az összes korábbi változat törlése",
"History" => "Korábbi változatok",
-"Versions" => "Az állományok korábbi változatai",
-"This will delete all existing backup versions of your files" => "Itt törölni tudja állományainak összes korábbi verzióját",
"Files Versioning" => "Az állományok verzionálása",
"Enable" => "engedélyezve"
);
diff --git a/apps/files_versions/l10n/id.php b/apps/files_versions/l10n/id.php
index d8ac66c9763..6c553327c42 100644
--- a/apps/files_versions/l10n/id.php
+++ b/apps/files_versions/l10n/id.php
@@ -1,8 +1,5 @@
<?php $TRANSLATIONS = array(
-"Expire all versions" => "kadaluarsakan semua versi",
"History" => "riwayat",
-"Versions" => "versi",
-"This will delete all existing backup versions of your files" => "ini akan menghapus semua versi backup yang ada dari file anda",
"Files Versioning" => "pembuatan versi file",
"Enable" => "aktifkan"
);
diff --git a/apps/files_versions/l10n/is.php b/apps/files_versions/l10n/is.php
index f63939d3af9..ccb8287b71e 100644
--- a/apps/files_versions/l10n/is.php
+++ b/apps/files_versions/l10n/is.php
@@ -1,8 +1,5 @@
<?php $TRANSLATIONS = array(
-"Expire all versions" => "Úrelda allar útgáfur",
"History" => "Saga",
-"Versions" => "Útgáfur",
-"This will delete all existing backup versions of your files" => "Þetta mun eyða öllum afritum af skránum þínum",
"Files Versioning" => "Útgáfur af skrám",
"Enable" => "Virkja"
);
diff --git a/apps/files_versions/l10n/it.php b/apps/files_versions/l10n/it.php
index 0b1e70823d5..c57b0930111 100644
--- a/apps/files_versions/l10n/it.php
+++ b/apps/files_versions/l10n/it.php
@@ -1,8 +1,5 @@
<?php $TRANSLATIONS = array(
-"Expire all versions" => "Scadenza di tutte le versioni",
"History" => "Cronologia",
-"Versions" => "Versioni",
-"This will delete all existing backup versions of your files" => "Ciò eliminerà tutte le versioni esistenti dei tuoi file",
"Files Versioning" => "Controllo di versione dei file",
"Enable" => "Abilita"
);
diff --git a/apps/files_versions/l10n/ja_JP.php b/apps/files_versions/l10n/ja_JP.php
index 367152c0743..c97ba3d00ee 100644
--- a/apps/files_versions/l10n/ja_JP.php
+++ b/apps/files_versions/l10n/ja_JP.php
@@ -1,8 +1,5 @@
<?php $TRANSLATIONS = array(
-"Expire all versions" => "すべてのバージョンを削除する",
"History" => "履歴",
-"Versions" => "バージョン",
-"This will delete all existing backup versions of your files" => "これは、あなたのファイルのすべてのバックアップバージョンを削除します",
"Files Versioning" => "ファイルのバージョン管理",
"Enable" => "有効化"
);
diff --git a/apps/files_versions/l10n/ko.php b/apps/files_versions/l10n/ko.php
index 688babb1121..f40925e1be2 100644
--- a/apps/files_versions/l10n/ko.php
+++ b/apps/files_versions/l10n/ko.php
@@ -1,8 +1,5 @@
<?php $TRANSLATIONS = array(
-"Expire all versions" => "모든 버전 삭제",
"History" => "역사",
-"Versions" => "버전",
-"This will delete all existing backup versions of your files" => "이 파일의 모든 백업 버전을 삭제합니다",
"Files Versioning" => "파일 버전 관리",
"Enable" => "사용함"
);
diff --git a/apps/files_versions/l10n/ku_IQ.php b/apps/files_versions/l10n/ku_IQ.php
index 5fa3b9080d7..db5dbad49fc 100644
--- a/apps/files_versions/l10n/ku_IQ.php
+++ b/apps/files_versions/l10n/ku_IQ.php
@@ -1,8 +1,5 @@
<?php $TRANSLATIONS = array(
-"Expire all versions" => "وه‌شانه‌کان گشتیان به‌سه‌رده‌چن",
"History" => "مێژوو",
-"Versions" => "وه‌شان",
-"This will delete all existing backup versions of your files" => "ئه‌مه‌ سه‌رجه‌م پاڵپشتی وه‌شانه‌ هه‌بووه‌کانی په‌ڕگه‌کانت ده‌سڕینته‌وه",
"Files Versioning" => "وه‌شانی په‌ڕگه",
"Enable" => "چالاککردن"
);
diff --git a/apps/files_versions/l10n/lt_LT.php b/apps/files_versions/l10n/lt_LT.php
index 3250ddc7c3c..adf4893020e 100644
--- a/apps/files_versions/l10n/lt_LT.php
+++ b/apps/files_versions/l10n/lt_LT.php
@@ -1,8 +1,5 @@
<?php $TRANSLATIONS = array(
-"Expire all versions" => "Panaikinti visų versijų galiojimą",
"History" => "Istorija",
-"Versions" => "Versijos",
-"This will delete all existing backup versions of your files" => "Tai ištrins visas esamas failo versijas",
"Files Versioning" => "Failų versijos",
"Enable" => "Įjungti"
);
diff --git a/apps/files_versions/l10n/mk.php b/apps/files_versions/l10n/mk.php
index 60a06ad3384..d3ec233fe41 100644
--- a/apps/files_versions/l10n/mk.php
+++ b/apps/files_versions/l10n/mk.php
@@ -1,8 +1,5 @@
<?php $TRANSLATIONS = array(
-"Expire all versions" => "Истечи ги сите верзии",
"History" => "Историја",
-"Versions" => "Версии",
-"This will delete all existing backup versions of your files" => "Ова ќе ги избрише сите постоечки резервни копии од вашите датотеки",
"Files Versioning" => "Верзии на датотеки",
"Enable" => "Овозможи"
);
diff --git a/apps/files_versions/l10n/nb_NO.php b/apps/files_versions/l10n/nb_NO.php
index b441008db01..18c72506102 100644
--- a/apps/files_versions/l10n/nb_NO.php
+++ b/apps/files_versions/l10n/nb_NO.php
@@ -1,7 +1,5 @@
<?php $TRANSLATIONS = array(
"History" => "Historie",
-"Versions" => "Versjoner",
-"This will delete all existing backup versions of your files" => "Dette vil slette alle tidligere versjoner av alle filene dine",
"Files Versioning" => "Fil versjonering",
"Enable" => "Aktiver"
);
diff --git a/apps/files_versions/l10n/nl.php b/apps/files_versions/l10n/nl.php
index f9b5507621d..cd147ca693f 100644
--- a/apps/files_versions/l10n/nl.php
+++ b/apps/files_versions/l10n/nl.php
@@ -1,8 +1,5 @@
<?php $TRANSLATIONS = array(
-"Expire all versions" => "Alle versies laten verlopen",
"History" => "Geschiedenis",
-"Versions" => "Versies",
-"This will delete all existing backup versions of your files" => "Dit zal alle bestaande backup versies van uw bestanden verwijderen",
"Files Versioning" => "Bestand versies",
"Enable" => "Activeer"
);
diff --git a/apps/files_versions/l10n/pl.php b/apps/files_versions/l10n/pl.php
index 46c28d4590a..a0247b8abc6 100644
--- a/apps/files_versions/l10n/pl.php
+++ b/apps/files_versions/l10n/pl.php
@@ -1,8 +1,5 @@
<?php $TRANSLATIONS = array(
-"Expire all versions" => "Wygasają wszystkie wersje",
"History" => "Historia",
-"Versions" => "Wersje",
-"This will delete all existing backup versions of your files" => "Spowoduje to usunięcie wszystkich istniejących wersji kopii zapasowych plików",
"Files Versioning" => "Wersjonowanie plików",
"Enable" => "Włącz"
);
diff --git a/apps/files_versions/l10n/pt_BR.php b/apps/files_versions/l10n/pt_BR.php
index 3d39a533d65..854a30e6bee 100644
--- a/apps/files_versions/l10n/pt_BR.php
+++ b/apps/files_versions/l10n/pt_BR.php
@@ -1,8 +1,5 @@
<?php $TRANSLATIONS = array(
-"Expire all versions" => "Expirar todas as versões",
"History" => "Histórico",
-"Versions" => "Versões",
-"This will delete all existing backup versions of your files" => "Isso removerá todas as versões de backup existentes dos seus arquivos",
"Files Versioning" => "Versionamento de Arquivos",
"Enable" => "Habilitar"
);
diff --git a/apps/files_versions/l10n/pt_PT.php b/apps/files_versions/l10n/pt_PT.php
index 2ddf70cc6c5..dc1bde08cad 100644
--- a/apps/files_versions/l10n/pt_PT.php
+++ b/apps/files_versions/l10n/pt_PT.php
@@ -1,8 +1,5 @@
<?php $TRANSLATIONS = array(
-"Expire all versions" => "Expirar todas as versões",
"History" => "Histórico",
-"Versions" => "Versões",
-"This will delete all existing backup versions of your files" => "Isto irá apagar todas as versões de backup do seus ficheiros",
"Files Versioning" => "Versionamento de Ficheiros",
"Enable" => "Activar"
);
diff --git a/apps/files_versions/l10n/ro.php b/apps/files_versions/l10n/ro.php
index e23e771e392..7dfaee3672b 100644
--- a/apps/files_versions/l10n/ro.php
+++ b/apps/files_versions/l10n/ro.php
@@ -1,8 +1,5 @@
<?php $TRANSLATIONS = array(
-"Expire all versions" => "Expiră toate versiunile",
"History" => "Istoric",
-"Versions" => "Versiuni",
-"This will delete all existing backup versions of your files" => "Această acțiune va șterge toate versiunile salvate ale fișierelor tale",
"Files Versioning" => "Versionare fișiere",
"Enable" => "Activare"
);
diff --git a/apps/files_versions/l10n/ru.php b/apps/files_versions/l10n/ru.php
index d698e90b8b8..4c7fb501091 100644
--- a/apps/files_versions/l10n/ru.php
+++ b/apps/files_versions/l10n/ru.php
@@ -1,8 +1,5 @@
<?php $TRANSLATIONS = array(
-"Expire all versions" => "Просрочить все версии",
"History" => "История",
-"Versions" => "Версии",
-"This will delete all existing backup versions of your files" => "Очистить список версий ваших файлов",
"Files Versioning" => "Версии файлов",
"Enable" => "Включить"
);
diff --git a/apps/files_versions/l10n/ru_RU.php b/apps/files_versions/l10n/ru_RU.php
index 557c2f8e6d1..8656e346eb6 100644
--- a/apps/files_versions/l10n/ru_RU.php
+++ b/apps/files_versions/l10n/ru_RU.php
@@ -1,8 +1,5 @@
<?php $TRANSLATIONS = array(
-"Expire all versions" => "Срок действия всех версий истекает",
"History" => "История",
-"Versions" => "Версии",
-"This will delete all existing backup versions of your files" => "Это приведет к удалению всех существующих версий резервной копии Ваших файлов",
"Files Versioning" => "Файлы управления версиями",
"Enable" => "Включить"
);
diff --git a/apps/files_versions/l10n/si_LK.php b/apps/files_versions/l10n/si_LK.php
index dbddf6dc2e9..37debf869bc 100644
--- a/apps/files_versions/l10n/si_LK.php
+++ b/apps/files_versions/l10n/si_LK.php
@@ -1,8 +1,5 @@
<?php $TRANSLATIONS = array(
-"Expire all versions" => "සියලු අනුවාද අවලංගු කරන්න",
"History" => "ඉතිහාසය",
-"Versions" => "අනුවාද",
-"This will delete all existing backup versions of your files" => "මෙයින් ඔබගේ ගොනුවේ රක්ශිත කරනු ලැබු අනුවාද සියල්ල මකා දමනු ලැබේ",
"Files Versioning" => "ගොනු අනුවාදයන්",
"Enable" => "සක්‍රිය කරන්න"
);
diff --git a/apps/files_versions/l10n/sk_SK.php b/apps/files_versions/l10n/sk_SK.php
index 132c6c09682..a3a3567cb4f 100644
--- a/apps/files_versions/l10n/sk_SK.php
+++ b/apps/files_versions/l10n/sk_SK.php
@@ -1,8 +1,5 @@
<?php $TRANSLATIONS = array(
-"Expire all versions" => "Expirovať všetky verzie",
"History" => "História",
-"Versions" => "Verzie",
-"This will delete all existing backup versions of your files" => "Budú zmazané všetky zálohované verzie vašich súborov",
"Files Versioning" => "Vytváranie verzií súborov",
"Enable" => "Zapnúť"
);
diff --git a/apps/files_versions/l10n/sl.php b/apps/files_versions/l10n/sl.php
index 22b890a042d..7f386c9edaa 100644
--- a/apps/files_versions/l10n/sl.php
+++ b/apps/files_versions/l10n/sl.php
@@ -1,8 +1,5 @@
<?php $TRANSLATIONS = array(
-"Expire all versions" => "Zastaraj vse različice",
"History" => "Zgodovina",
-"Versions" => "Različice",
-"This will delete all existing backup versions of your files" => "S tem bodo izbrisane vse obstoječe različice varnostnih kopij vaših datotek",
"Files Versioning" => "Sledenje različicam",
"Enable" => "Omogoči"
);
diff --git a/apps/files_versions/l10n/sv.php b/apps/files_versions/l10n/sv.php
index e36164e30ab..6788d1fb0f9 100644
--- a/apps/files_versions/l10n/sv.php
+++ b/apps/files_versions/l10n/sv.php
@@ -1,8 +1,5 @@
<?php $TRANSLATIONS = array(
-"Expire all versions" => "Upphör alla versioner",
"History" => "Historik",
-"Versions" => "Versioner",
-"This will delete all existing backup versions of your files" => "Detta kommer att radera alla befintliga säkerhetskopior av dina filer",
"Files Versioning" => "Versionshantering av filer",
"Enable" => "Aktivera"
);
diff --git a/apps/files_versions/l10n/ta_LK.php b/apps/files_versions/l10n/ta_LK.php
index f1215b3ecc1..aca76dcc262 100644
--- a/apps/files_versions/l10n/ta_LK.php
+++ b/apps/files_versions/l10n/ta_LK.php
@@ -1,8 +1,5 @@
<?php $TRANSLATIONS = array(
-"Expire all versions" => "எல்லா பதிப்புகளும் காலாவதியாகிவிட்டது",
"History" => "வரலாறு",
-"Versions" => "பதிப்புகள்",
-"This will delete all existing backup versions of your files" => "உங்களுடைய கோப்புக்களில் ஏற்கனவே உள்ள ஆதாரநகல்களின் பதிப்புக்களை இவை அழித்துவிடும்",
"Files Versioning" => "கோப்பு பதிப்புகள்",
"Enable" => "இயலுமைப்படுத்துக"
);
diff --git a/apps/files_versions/l10n/th_TH.php b/apps/files_versions/l10n/th_TH.php
index 89b9f626911..e1e996903ae 100644
--- a/apps/files_versions/l10n/th_TH.php
+++ b/apps/files_versions/l10n/th_TH.php
@@ -1,8 +1,5 @@
<?php $TRANSLATIONS = array(
-"Expire all versions" => "หมดอายุทุกรุ่น",
"History" => "ประวัติ",
-"Versions" => "รุ่น",
-"This will delete all existing backup versions of your files" => "นี่จะเป็นลบทิ้งไฟล์รุ่นที่ทำการสำรองข้อมูลทั้งหมดที่มีอยู่ของคุณทิ้งไป",
"Files Versioning" => "การกำหนดเวอร์ชั่นของไฟล์",
"Enable" => "เปิดใช้งาน"
);
diff --git a/apps/files_versions/l10n/tr.php b/apps/files_versions/l10n/tr.php
index 73f207d5024..e9a4c4702e1 100644
--- a/apps/files_versions/l10n/tr.php
+++ b/apps/files_versions/l10n/tr.php
@@ -1,8 +1,5 @@
<?php $TRANSLATIONS = array(
-"Expire all versions" => "Tüm sürümleri sona erdir",
"History" => "Geçmiş",
-"Versions" => "Sürümler",
-"This will delete all existing backup versions of your files" => "Bu dosyalarınızın tüm yedek sürümlerini silecektir",
"Files Versioning" => "Dosya Sürümleri",
"Enable" => "Etkinleştir"
);
diff --git a/apps/files_versions/l10n/uk.php b/apps/files_versions/l10n/uk.php
index 7532f755c88..49acda81079 100644
--- a/apps/files_versions/l10n/uk.php
+++ b/apps/files_versions/l10n/uk.php
@@ -1,8 +1,5 @@
<?php $TRANSLATIONS = array(
-"Expire all versions" => "Термін дії всіх версій",
"History" => "Історія",
-"Versions" => "Версії",
-"This will delete all existing backup versions of your files" => "Це призведе до знищення всіх існуючих збережених версій Ваших файлів",
"Files Versioning" => "Версії файлів",
"Enable" => "Включити"
);
diff --git a/apps/files_versions/l10n/vi.php b/apps/files_versions/l10n/vi.php
index 260c3b6b39c..bb7163f6b18 100644
--- a/apps/files_versions/l10n/vi.php
+++ b/apps/files_versions/l10n/vi.php
@@ -1,8 +1,5 @@
<?php $TRANSLATIONS = array(
-"Expire all versions" => "Hết hạn tất cả các phiên bản",
"History" => "Lịch sử",
-"Versions" => "Phiên bản",
-"This will delete all existing backup versions of your files" => "Khi bạn thực hiện thao tác này sẽ xóa tất cả các phiên bản sao lưu hiện có ",
"Files Versioning" => "Phiên bản tập tin",
"Enable" => "Bật "
);
diff --git a/apps/files_versions/l10n/zh_CN.GB2312.php b/apps/files_versions/l10n/zh_CN.GB2312.php
index 107805221b8..d9e788033aa 100644
--- a/apps/files_versions/l10n/zh_CN.GB2312.php
+++ b/apps/files_versions/l10n/zh_CN.GB2312.php
@@ -1,8 +1,5 @@
<?php $TRANSLATIONS = array(
-"Expire all versions" => "作废所有版本",
"History" => "历史",
-"Versions" => "版本",
-"This will delete all existing backup versions of your files" => "这将删除所有您现有文件的备份版本",
"Files Versioning" => "文件版本",
"Enable" => "启用"
);
diff --git a/apps/files_versions/l10n/zh_CN.php b/apps/files_versions/l10n/zh_CN.php
index 48e7157c98f..14301ff0c04 100644
--- a/apps/files_versions/l10n/zh_CN.php
+++ b/apps/files_versions/l10n/zh_CN.php
@@ -1,8 +1,5 @@
<?php $TRANSLATIONS = array(
-"Expire all versions" => "过期所有版本",
"History" => "历史",
-"Versions" => "版本",
-"This will delete all existing backup versions of your files" => "将会删除您的文件的所有备份版本",
"Files Versioning" => "文件版本",
"Enable" => "开启"
);
diff --git a/apps/files_versions/l10n/zh_TW.php b/apps/files_versions/l10n/zh_TW.php
index a21fdc85f8d..a7b496b37db 100644
--- a/apps/files_versions/l10n/zh_TW.php
+++ b/apps/files_versions/l10n/zh_TW.php
@@ -1,7 +1,5 @@
<?php $TRANSLATIONS = array(
-"Expire all versions" => "所有逾期的版本",
"History" => "歷史",
-"Versions" => "版本",
"Files Versioning" => "檔案版本化中...",
"Enable" => "啟用"
);
diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php
index f938a2dbe84..48be5e223ac 100644
--- a/apps/files_versions/lib/versions.php
+++ b/apps/files_versions/lib/versions.php
@@ -79,6 +79,7 @@ class Storage {
// create all parent folders
$info=pathinfo($filename);
+ $versionsFolderName=\OCP\Config::getSystemValue('datadirectory').$users_view->getAbsolutePath('files_versions/');
if(!file_exists($versionsFolderName.'/'.$info['dirname'])) {
mkdir($versionsFolderName.'/'.$info['dirname'], 0750, true);
}
@@ -127,7 +128,8 @@ class Storage {
list($uid, $oldpath) = self::getUidAndFilename($oldpath);
list($uidn, $newpath) = self::getUidAndFilename($newpath);
$versions_view = new \OC_FilesystemView('/'.$uid .'/files_versions');
- $files_view = new \OC_FilesystemView('/'.$uid .'/files');
+ $files_view = new \OC_FilesystemView('/'.$uid .'/files');
+ $abs_newpath = \OCP\Config::getSystemValue('datadirectory').$versions_view->getAbsolutePath('').$newpath;
if ( $files_view->is_dir($oldpath) && $versions_view->is_dir($oldpath) ) {
$versions_view->rename($oldpath, $newpath);
@@ -149,7 +151,8 @@ class Storage {
if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
list($uid, $filename) = self::getUidAndFilename($filename);
$users_view = new \OC_FilesystemView('/'.$uid);
-
+ $versionCreated = false;
+
//first create a new version
$version = 'files_versions'.$filename.'.v'.$users_view->filemtime('files'.$filename);
if ( !$users_view->file_exists($version)) {
diff --git a/apps/files_versions/templates/settings.php b/apps/files_versions/templates/settings.php
index 88063cb075b..bfca8366f5d 100644
--- a/apps/files_versions/templates/settings.php
+++ b/apps/files_versions/templates/settings.php
@@ -1,6 +1,6 @@
<form id="versionssettings">
- <fieldset class="personalblock">
- <legend><strong><?php echo $l->t('Files Versioning');?></strong></legend>
- <input type="checkbox" name="versions" id="versions" value="1" <?php if (OCP\Config::getSystemValue('versions', 'true')=='true') echo ' checked="checked"'; ?> /> <label for="versions"><?php echo $l->t('Enable'); ?></label> <br/>
- </fieldset>
+ <fieldset class="personalblock">
+ <legend><strong><?php echo $l->t('Files Versioning');?></strong></legend>
+ <input type="checkbox" name="versions" id="versions" value="1" <?php if (OCP\Config::getSystemValue('versions', 'true')=='true') echo ' checked="checked"'; ?> /> <label for="versions"><?php echo $l->t('Enable'); ?></label> <br/>
+ </fieldset>
</form>
diff --git a/apps/user_ldap/css/settings.css b/apps/user_ldap/css/settings.css
index f3f41fb2d8b..84ada0832ab 100644
--- a/apps/user_ldap/css/settings.css
+++ b/apps/user_ldap/css/settings.css
@@ -2,9 +2,11 @@
width: 20%;
max-width: 200px;
display: inline-block;
+ vertical-align: top;
+ padding-top: 9px;
}
-#ldap fieldset input {
+#ldap fieldset input, #ldap fieldset textarea {
width: 70%;
display: inline-block;
}
diff --git a/apps/user_ldap/l10n/ar.php b/apps/user_ldap/l10n/ar.php
index ced0b4293b7..da1710a0a3c 100644
--- a/apps/user_ldap/l10n/ar.php
+++ b/apps/user_ldap/l10n/ar.php
@@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
-"Password" => "كلمة المرور"
+"Password" => "كلمة المرور",
+"Help" => "المساعدة"
);
diff --git a/apps/user_ldap/l10n/ca.php b/apps/user_ldap/l10n/ca.php
index d801ddff631..06255c1249a 100644
--- a/apps/user_ldap/l10n/ca.php
+++ b/apps/user_ldap/l10n/ca.php
@@ -1,9 +1,10 @@
<?php $TRANSLATIONS = array(
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Avís:</b> Les aplicacions user_ldap i user_webdavauth són incompatibles. Podeu experimentar comportaments no desitjats. Demaneu a l'administrador del sistema que en desactivi una.",
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Avís:</b> El mòdul PHP LDAP necessari no està instal·lat, el dorsal no funcionarà. Demaneu a l'administrador del sistema que l'instal·li.",
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Avís:</b> El mòdul PHP LDAP no està instal·lat, el dorsal no funcionarà. Demaneu a l'administrador del sistema que l'instal·li.",
"Host" => "Màquina",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Podeu ometre el protocol, excepte si requeriu SSL. Llavors comenceu amb ldaps://",
"Base DN" => "DN Base",
+"One Base DN per line" => "Una DN Base per línia",
"You can specify Base DN for users and groups in the Advanced tab" => "Podeu especificar DN Base per usuaris i grups a la pestanya Avançat",
"User DN" => "DN Usuari",
"The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "La DN de l'usuari client amb la que s'haurà de fer, per exemple uid=agent,dc=exemple,dc=com. Per un accés anònim, deixeu la DN i la contrasenya en blanc.",
@@ -20,7 +21,9 @@
"without any placeholder, e.g. \"objectClass=posixGroup\"." => "sense cap paràmetre de substitució, per exemple \"objectClass=grupPosix\".",
"Port" => "Port",
"Base User Tree" => "Arbre base d'usuaris",
+"One User Base DN per line" => "Una DN Base d'Usuari per línia",
"Base Group Tree" => "Arbre base de grups",
+"One Group Base DN per line" => "Una DN Base de Grup per línia",
"Group-Member association" => "Associació membres-grup",
"Use TLS" => "Usa TLS",
"Do not use it for SSL connections, it will fail." => "No ho useu en connexions SSL, fallarà.",
diff --git a/apps/user_ldap/l10n/cs_CZ.php b/apps/user_ldap/l10n/cs_CZ.php
index 0c14ebb9d1e..80e27f1e62a 100644
--- a/apps/user_ldap/l10n/cs_CZ.php
+++ b/apps/user_ldap/l10n/cs_CZ.php
@@ -1,9 +1,10 @@
<?php $TRANSLATIONS = array(
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Varování:</b> Aplikace user_ldap a user_webdavauth nejsou kompatibilní. Může nastávat neočekávané chování. Požádejte, prosím, správce systému aby jednu z nich zakázal.",
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Varování:</b> není nainstalován LDAP modul pro PHP, podpůrná vrstva nebude fungovat. Požádejte, prosím, správce systému aby jej nainstaloval.",
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Varování:</b> není nainstalován LDAP modul pro PHP, podpůrná vrstva nebude fungovat. Požádejte, prosím, správce systému aby jej nainstaloval.",
"Host" => "Počítač",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Můžete vynechat protokol, vyjma pokud požadujete SSL. Tehdy začněte s ldaps://",
"Base DN" => "Základní DN",
+"One Base DN per line" => "Jedna základní DN na řádku",
"You can specify Base DN for users and groups in the Advanced tab" => "V rozšířeném nastavení můžete určit základní DN pro uživatele a skupiny",
"User DN" => "Uživatelské DN",
"The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "DN klentského uživatele ke kterému tvoříte vazbu, např. uid=agent,dc=example,dc=com. Pro anonymní přístup ponechte údaje DN and Heslo prázdné.",
@@ -20,7 +21,9 @@
"without any placeholder, e.g. \"objectClass=posixGroup\"." => "bez zástupných znaků, např. \"objectClass=posixGroup\".",
"Port" => "Port",
"Base User Tree" => "Základní uživatelský strom",
+"One User Base DN per line" => "Jedna uživatelská základní DN na řádku",
"Base Group Tree" => "Základní skupinový strom",
+"One Group Base DN per line" => "Jedna skupinová základní DN na řádku",
"Group-Member association" => "Asociace člena skupiny",
"Use TLS" => "Použít TLS",
"Do not use it for SSL connections, it will fail." => "Nepoužívejte pro připojení pomocí SSL, připojení selže.",
diff --git a/apps/user_ldap/l10n/de.php b/apps/user_ldap/l10n/de.php
index 87579cb2431..89bda8af97f 100644
--- a/apps/user_ldap/l10n/de.php
+++ b/apps/user_ldap/l10n/de.php
@@ -1,6 +1,5 @@
<?php $TRANSLATIONS = array(
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann demzufolge zu unerwarteten Verhalten kommen. Bitte Deinen Systemadministator eine der beiden Anwendungen zu deaktivieren.",
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Warnung:</b> Das PHP-Modul, das LDAP benöntigt, ist nicht installiert. Das Backend wird nicht funktionieren. Bitte deinen Systemadministrator das Modul zu installieren.",
"Host" => "Host",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Du kannst das Protokoll auslassen, außer wenn Du SSL benötigst. Beginne dann mit ldaps://",
"Base DN" => "Basis-DN",
diff --git a/apps/user_ldap/l10n/de_DE.php b/apps/user_ldap/l10n/de_DE.php
index f986ae83e87..1e816018386 100644
--- a/apps/user_ldap/l10n/de_DE.php
+++ b/apps/user_ldap/l10n/de_DE.php
@@ -1,9 +1,10 @@
<?php $TRANSLATIONS = array(
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann demzufolge zu unerwarteten Verhalten kommen. Bitten Sie Ihren Systemadministator eine der beiden Anwendungen zu deaktivieren.",
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Warnung:</b> Das PHP-Modul, das LDAP benöntigt, ist nicht installiert. Das Backend wird nicht funktionieren. Bitten Sie Ihren Systemadministrator das Modul zu installieren.",
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Warnung:</b> Da das PHP-Modul für LDAP nicht installiert ist, wird das Backend nicht funktionieren. Bitten Sie Ihren Systemadministrator das Modul zu installieren.",
"Host" => "Host",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Sie können das Protokoll auslassen, außer wenn Sie SSL benötigen. Beginnen Sie dann mit ldaps://",
"Base DN" => "Basis-DN",
+"One Base DN per line" => "Ein Base DN pro Zeile",
"You can specify Base DN for users and groups in the Advanced tab" => "Sie können Basis-DN für Benutzer und Gruppen in dem \"Erweitert\"-Reiter konfigurieren",
"User DN" => "Benutzer-DN",
"The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "Der DN des Benutzers für LDAP-Bind, z.B.: uid=agent,dc=example,dc=com. Für anonymen Zugriff lassen Sie DN und Passwort leer.",
@@ -20,7 +21,9 @@
"without any placeholder, e.g. \"objectClass=posixGroup\"." => "ohne Platzhalter, z.B.: \"objectClass=posixGroup\"",
"Port" => "Port",
"Base User Tree" => "Basis-Benutzerbaum",
+"One User Base DN per line" => "Ein Benutzer Base DN pro Zeile",
"Base Group Tree" => "Basis-Gruppenbaum",
+"One Group Base DN per line" => "Ein Gruppen Base DN pro Zeile",
"Group-Member association" => "Assoziation zwischen Gruppe und Benutzer",
"Use TLS" => "Nutze TLS",
"Do not use it for SSL connections, it will fail." => "Verwenden Sie dies nicht für SSL-Verbindungen, es wird fehlschlagen.",
diff --git a/apps/user_ldap/l10n/el.php b/apps/user_ldap/l10n/el.php
index 8c421cf162b..1f75a687a5d 100644
--- a/apps/user_ldap/l10n/el.php
+++ b/apps/user_ldap/l10n/el.php
@@ -1,6 +1,5 @@
<?php $TRANSLATIONS = array(
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Προσοχή:</b> Οι εφαρμογές user_ldap και user_webdavauth είναι ασύμβατες. Μπορεί να αντιμετωπίσετε απρόβλεπτη συμπεριφορά. Παρακαλώ ζητήστε από τον διαχειριστή συστήματος να απενεργοποιήσει μία από αυτές.",
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Προσοχή:</b> Το PHP LDAP module που απαιτείται δεν είναι εγκατεστημένο και ο μηχανισμός δεν θα λειτουργήσει. Παρακαλώ ζητήστε από τον διαχειριστή του συστήματος να το εγκαταστήσει.",
"Host" => "Διακομιστής",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Μπορείτε να παραλείψετε το πρωτόκολλο, εκτός αν απαιτείται SSL. Σε αυτή την περίπτωση ξεκινήστε με ldaps://",
"Base DN" => "Base DN",
diff --git a/apps/user_ldap/l10n/eo.php b/apps/user_ldap/l10n/eo.php
index ef8aff8a390..35f436a0b0a 100644
--- a/apps/user_ldap/l10n/eo.php
+++ b/apps/user_ldap/l10n/eo.php
@@ -1,7 +1,7 @@
<?php $TRANSLATIONS = array(
"Host" => "Gastigo",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Vi povas neglekti la protokolon, escepte se vi bezonas SSL-on. Tiuokaze, komencu per ldaps://",
-"Base DN" => "Baz-DN",
+"Base DN" => "Bazo-DN",
"User DN" => "Uzanto-DN",
"Password" => "Pasvorto",
"For anonymous access, leave DN and Password empty." => "Por sennoman aliron, lasu DN-on kaj Pasvorton malplenaj.",
diff --git a/apps/user_ldap/l10n/es.php b/apps/user_ldap/l10n/es.php
index 4931af79eaf..48e7b24734e 100644
--- a/apps/user_ldap/l10n/es.php
+++ b/apps/user_ldap/l10n/es.php
@@ -1,6 +1,5 @@
<?php $TRANSLATIONS = array(
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Advertencia:</b> Los Apps user_ldap y user_webdavauth son incompatibles. Puede que experimente un comportamiento inesperado. Pregunte al administrador del sistema para desactivar uno de ellos.",
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Advertencia:</b> El módulo PHP LDAP necesario no está instalado, el sistema no funcionará. Pregunte al administrador del sistema para instalarlo.",
"Host" => "Servidor",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Puede omitir el protocolo, excepto si requiere SSL. En ese caso, empiece con ldaps://",
"Base DN" => "DN base",
diff --git a/apps/user_ldap/l10n/es_AR.php b/apps/user_ldap/l10n/es_AR.php
index 0b1340d4397..331bf8699f4 100644
--- a/apps/user_ldap/l10n/es_AR.php
+++ b/apps/user_ldap/l10n/es_AR.php
@@ -1,6 +1,5 @@
<?php $TRANSLATIONS = array(
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Advertencia:</b> Los Apps user_ldap y user_webdavauth son incompatibles. Puede que experimente un comportamiento inesperado. Pregunte al administrador del sistema para desactivar uno de ellos.",
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Advertencia:</b> El módulo PHP LDAP necesario no está instalado, el sistema no funcionará. Pregunte al administrador del sistema para instalarlo.",
"Host" => "Servidor",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Podés omitir el protocolo, excepto si SSL es requerido. En ese caso, empezá con ldaps://",
"Base DN" => "DN base",
diff --git a/apps/user_ldap/l10n/eu.php b/apps/user_ldap/l10n/eu.php
index 06ca9cb294e..e2b50f28ee9 100644
--- a/apps/user_ldap/l10n/eu.php
+++ b/apps/user_ldap/l10n/eu.php
@@ -1,9 +1,10 @@
<?php $TRANSLATIONS = array(
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Abisua:</b> user_ldap eta user_webdavauth aplikazioak bateraezinak dira. Portaera berezia izan dezakezu. Mesedez eskatu zure sistema kudeatzaileari bietako bat desgaitzeko.",
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Abisua:</b> PHPk behar duen LDAP modulua ez dago instalaturik, motorrak ez du funtzionatuko. Mesedez eskatu zure sistema kudeatzaileari instala dezan.",
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Abisua:</b> PHPk behar duen LDAP modulua ez dago instalaturik, motorrak ez du funtzionatuko. Mesedez eskatu zure sistema kudeatzaileari instala dezan.",
"Host" => "Hostalaria",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Protokoloa ez da beharrezkoa, SSL behar baldin ez baduzu. Honela bada hasi ldaps://",
"Base DN" => "Oinarrizko DN",
+"One Base DN per line" => "DN Oinarri bat lerroko",
"You can specify Base DN for users and groups in the Advanced tab" => "Erabiltzaile eta taldeentzako Oinarrizko DN zehaztu dezakezu Aurreratu fitxan",
"User DN" => "Erabiltzaile DN",
"The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "Lotura egingo den bezero erabiltzailearen DNa, adb. uid=agent,dc=example,dc=com. Sarrera anonimoak gaitzeko utzi DN eta Pasahitza hutsik.",
@@ -20,7 +21,9 @@
"without any placeholder, e.g. \"objectClass=posixGroup\"." => "txantiloirik gabe, adb. \"objectClass=posixGroup\".",
"Port" => "Portua",
"Base User Tree" => "Oinarrizko Erabiltzaile Zuhaitza",
+"One User Base DN per line" => "Erabiltzaile DN Oinarri bat lerroko",
"Base Group Tree" => "Oinarrizko Talde Zuhaitza",
+"One Group Base DN per line" => "Talde DN Oinarri bat lerroko",
"Group-Member association" => "Talde-Kide elkarketak",
"Use TLS" => "Erabili TLS",
"Do not use it for SSL connections, it will fail." => "Ez erabili SSL konexioetan, huts egingo du.",
diff --git a/apps/user_ldap/l10n/fr.php b/apps/user_ldap/l10n/fr.php
index 9750d1352a8..dd2fb08091c 100644
--- a/apps/user_ldap/l10n/fr.php
+++ b/apps/user_ldap/l10n/fr.php
@@ -1,6 +1,5 @@
<?php $TRANSLATIONS = array(
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Avertissement:</b> Les applications user_ldap et user_webdavauth sont incompatibles. Des disfonctionnements peuvent survenir. Contactez votre administrateur système pour qu'il désactive l'une d'elles.",
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Avertissement:</b> Le module PHP LDAP requis n'est pas installé, l'application ne marchera pas. Contactez votre administrateur système pour qu'il l'installe.",
"Host" => "Hôte",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Vous pouvez omettre le protocole, sauf si vous avez besoin de SSL. Dans ce cas préfixez avec ldaps://",
"Base DN" => "DN Racine",
diff --git a/apps/user_ldap/l10n/gl.php b/apps/user_ldap/l10n/gl.php
index ae05efcd27f..d60521c4a02 100644
--- a/apps/user_ldap/l10n/gl.php
+++ b/apps/user_ldap/l10n/gl.php
@@ -1,6 +1,5 @@
<?php $TRANSLATIONS = array(
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Aviso:</b> Os aplicativos user_ldap e user_webdavauth son incompatíbeis. Pode acontecer un comportamento estraño. Consulte co administrador do sistema para desactivar un deles.",
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Aviso:</b> O módulo PHP LDAP é necesario e non está instalado, a infraestrutura non funcionará. Consulte co administrador do sistema para instalalo.",
"Host" => "Servidor",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Pode omitir o protocolo agás que precise de SSL. Nese caso comece con ldaps://",
"Base DN" => "DN base",
diff --git a/apps/user_ldap/l10n/hr.php b/apps/user_ldap/l10n/hr.php
new file mode 100644
index 00000000000..91503315066
--- /dev/null
+++ b/apps/user_ldap/l10n/hr.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"Help" => "Pomoć"
+);
diff --git a/apps/user_ldap/l10n/hu_HU.php b/apps/user_ldap/l10n/hu_HU.php
index 577afcef1c9..25ee47786ef 100644
--- a/apps/user_ldap/l10n/hu_HU.php
+++ b/apps/user_ldap/l10n/hu_HU.php
@@ -1,11 +1,13 @@
<?php $TRANSLATIONS = array(
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Figyelem:</b> a user_ldap és user_webdavauth alkalmazások nem kompatibilisek. Együttes használatuk váratlan eredményekhez vezethet. Kérje meg a rendszergazdát, hogy a kettő közül kapcsolja ki az egyiket.",
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Figyelem:</b> a szükséges PHP LDAP modul nincs telepítve. Enélkül az LDAP azonosítás nem fog működni. Kérje meg a rendszergazdát, hogy telepítse a szükséges modult!",
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Figyelmeztetés:</b> Az LDAP PHP modul nincs telepítve, ezért ez az alrendszer nem fog működni. Kérje meg a rendszergazdát, hogy telepítse!",
"Host" => "Kiszolgáló",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "A protokoll előtag elhagyható, kivéve, ha SSL-t kíván használni. Ebben az esetben kezdje így: ldaps://",
"Base DN" => "DN-gyökér",
+"One Base DN per line" => "Soronként egy DN-gyökér",
"You can specify Base DN for users and groups in the Advanced tab" => "A Haladó fülre kattintva külön DN-gyökér állítható be a felhasználók és a csoportok számára",
"User DN" => "A kapcsolódó felhasználó DN-je",
+"The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "Annak a felhasználónak a DN-je, akinek a nevében bejelentkezve kapcsolódunk a kiszolgálóhoz, pl. uid=agent,dc=example,dc=com. Bejelentkezés nélküli eléréshez ne töltse ki a DN és Jelszó mezőket!",
"Password" => "Jelszó",
"For anonymous access, leave DN and Password empty." => "Bejelentkezés nélküli eléréshez ne töltse ki a DN és Jelszó mezőket!",
"User Login Filter" => "Szűrő a bejelentkezéshez",
@@ -19,7 +21,9 @@
"without any placeholder, e.g. \"objectClass=posixGroup\"." => "itt ne használjunk változót, pl. \"objectClass=posixGroup\".",
"Port" => "Port",
"Base User Tree" => "A felhasználói fa gyökere",
+"One User Base DN per line" => "Soronként egy felhasználói fa gyökerét adhatjuk meg",
"Base Group Tree" => "A csoportfa gyökere",
+"One Group Base DN per line" => "Soronként egy csoportfa gyökerét adhatjuk meg",
"Group-Member association" => "A csoporttagság attribútuma",
"Use TLS" => "Használjunk TLS-t",
"Do not use it for SSL connections, it will fail." => "Ne használjuk SSL-kapcsolat esetén, mert nem fog működni!",
diff --git a/apps/user_ldap/l10n/ia.php b/apps/user_ldap/l10n/ia.php
new file mode 100644
index 00000000000..3586bf5a2e7
--- /dev/null
+++ b/apps/user_ldap/l10n/ia.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"Help" => "Adjuta"
+);
diff --git a/apps/user_ldap/l10n/it.php b/apps/user_ldap/l10n/it.php
index 915ce3af5b8..bee30cfe6ec 100644
--- a/apps/user_ldap/l10n/it.php
+++ b/apps/user_ldap/l10n/it.php
@@ -1,9 +1,10 @@
<?php $TRANSLATIONS = array(
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Avviso:</b> le applicazioni user_ldap e user_webdavauth sono incompatibili. Potresti riscontrare un comportamento inatteso. Chiedi al tuo amministratore di sistema di disabilitarne uno.",
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Avviso:</b> il modulo PHP LDAP richiesto non è installato, il motore non funzionerà. Chiedi al tuo amministratore di sistema di installarlo.",
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Avviso:</b> il modulo PHP LDAP non è installato, il motore non funzionerà. Chiedi al tuo amministratore di sistema di installarlo.",
"Host" => "Host",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "È possibile omettere il protocollo, ad eccezione se è necessario SSL. Quindi inizia con ldaps://",
"Base DN" => "DN base",
+"One Base DN per line" => "Un DN base per riga",
"You can specify Base DN for users and groups in the Advanced tab" => "Puoi specificare una DN base per gli utenti ed i gruppi nella scheda Avanzate",
"User DN" => "DN utente",
"The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "Il DN per il client dell'utente con cui deve essere associato, ad esempio uid=agent,dc=example,dc=com. Per l'accesso anonimo, lasciare vuoti i campi DN e Password",
@@ -20,7 +21,9 @@
"without any placeholder, e.g. \"objectClass=posixGroup\"." => "senza nessun segnaposto, per esempio \"objectClass=posixGroup\".",
"Port" => "Porta",
"Base User Tree" => "Struttura base dell'utente",
+"One User Base DN per line" => "Un DN base utente per riga",
"Base Group Tree" => "Struttura base del gruppo",
+"One Group Base DN per line" => "Un DN base gruppo per riga",
"Group-Member association" => "Associazione gruppo-utente ",
"Use TLS" => "Usa TLS",
"Do not use it for SSL connections, it will fail." => "Non utilizzare per le connessioni SSL, fallirà.",
diff --git a/apps/user_ldap/l10n/ja_JP.php b/apps/user_ldap/l10n/ja_JP.php
index c7b2a0f91b8..1c93db7ba09 100644
--- a/apps/user_ldap/l10n/ja_JP.php
+++ b/apps/user_ldap/l10n/ja_JP.php
@@ -1,9 +1,10 @@
<?php $TRANSLATIONS = array(
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>警告:</b> user_ldap と user_webdavauth のアプリには互換性がありません。予期せぬ動作をする可能姓があります。システム管理者にどちらかを無効にするよう問い合わせてください。",
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>警告:</b> PHP LDAP モジュールがインストールされていません。バックエンドが正しくどうさしません。システム管理者にインストールするよう問い合わせてください。",
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>警告:</b> PHP LDAP モジュールがインストールされていません。バックエンドが正しく動作しません。システム管理者にインストールするよう問い合わせてください。",
"Host" => "ホスト",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "SSL通信しない場合には、プロトコル名を省略することができます。そうでない場合には、ldaps:// から始めてください。",
"Base DN" => "ベースDN",
+"One Base DN per line" => "1行に1つのベースDN",
"You can specify Base DN for users and groups in the Advanced tab" => "拡張タブでユーザとグループのベースDNを指定することができます。",
"User DN" => "ユーザDN",
"The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "クライアントユーザーのDNは、特定のものに結びつけることはしません。 例えば uid=agent,dc=example,dc=com. だと匿名アクセスの場合、DNとパスワードは空のままです。",
@@ -20,7 +21,9 @@
"without any placeholder, e.g. \"objectClass=posixGroup\"." => "プレースホルダーを利用しないでください。例 \"objectClass=posixGroup\"",
"Port" => "ポート",
"Base User Tree" => "ベースユーザツリー",
+"One User Base DN per line" => "1行に1つのユーザベースDN",
"Base Group Tree" => "ベースグループツリー",
+"One Group Base DN per line" => "1行に1つのグループベースDN",
"Group-Member association" => "グループとメンバーの関連付け",
"Use TLS" => "TLSを利用",
"Do not use it for SSL connections, it will fail." => "SSL接続に利用しないでください、失敗します。",
diff --git a/apps/user_ldap/l10n/ka_GE.php b/apps/user_ldap/l10n/ka_GE.php
new file mode 100644
index 00000000000..630d92b73ad
--- /dev/null
+++ b/apps/user_ldap/l10n/ka_GE.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"Help" => "დახმარება"
+);
diff --git a/apps/user_ldap/l10n/ko.php b/apps/user_ldap/l10n/ko.php
index 37ac3d1bda5..c0d09b5c3c1 100644
--- a/apps/user_ldap/l10n/ko.php
+++ b/apps/user_ldap/l10n/ko.php
@@ -1,6 +1,5 @@
<?php $TRANSLATIONS = array(
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>경고</b>user_ldap 앱과 user_webdavauth 앱은 호환되지 않습니다. 오동작을 일으킬 수 있으므로, 시스템 관리자에게 요청하여, 둘 중 하나를 비활성화 하시기 바랍니다.",
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>경고</b>PHP LDAP 모듈이 설치되지 않았습니다. 백엔드가 동작하지 않을 것 입니다. 시스템관리자에게 요청하여 해당 모듈을 설치하시기 바랍니다.",
"Host" => "호스트",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "SSL을 사용하는 경우가 아니라면 프로토콜을 입력하지 않아도 됩니다. SSL을 사용하려면 ldaps://를 입력하십시오.",
"Base DN" => "기본 DN",
diff --git a/apps/user_ldap/l10n/ku_IQ.php b/apps/user_ldap/l10n/ku_IQ.php
new file mode 100644
index 00000000000..1ae808ddd91
--- /dev/null
+++ b/apps/user_ldap/l10n/ku_IQ.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"Help" => "یارمەتی"
+);
diff --git a/apps/user_ldap/l10n/lb.php b/apps/user_ldap/l10n/lb.php
new file mode 100644
index 00000000000..2926538b5b0
--- /dev/null
+++ b/apps/user_ldap/l10n/lb.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"Help" => "Hëllef"
+);
diff --git a/apps/user_ldap/l10n/lv.php b/apps/user_ldap/l10n/lv.php
new file mode 100644
index 00000000000..52353472e4d
--- /dev/null
+++ b/apps/user_ldap/l10n/lv.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"Help" => "Palīdzība"
+);
diff --git a/apps/user_ldap/l10n/mk.php b/apps/user_ldap/l10n/mk.php
index 70a62e71765..4c231b516d4 100644
--- a/apps/user_ldap/l10n/mk.php
+++ b/apps/user_ldap/l10n/mk.php
@@ -1,5 +1,6 @@
<?php $TRANSLATIONS = array(
"Host" => "Домаќин",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Може да го скокнете протколот освен ако не ви треба SSL. Тогаш ставете ldaps://",
-"Password" => "Лозинка"
+"Password" => "Лозинка",
+"Help" => "Помош"
);
diff --git a/apps/user_ldap/l10n/ms_MY.php b/apps/user_ldap/l10n/ms_MY.php
new file mode 100644
index 00000000000..077a5390cf8
--- /dev/null
+++ b/apps/user_ldap/l10n/ms_MY.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"Help" => "Bantuan"
+);
diff --git a/apps/user_ldap/l10n/nl.php b/apps/user_ldap/l10n/nl.php
index 23e9a15c010..27c4407360e 100644
--- a/apps/user_ldap/l10n/nl.php
+++ b/apps/user_ldap/l10n/nl.php
@@ -1,11 +1,12 @@
<?php $TRANSLATIONS = array(
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Waarschuwing:</b> De Apps user_ldap en user_webdavauth zijn incompatible. U kunt onverwacht gedrag ervaren. Vraag uw beheerder om een van beide apps de deactiveren.",
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Waarschuwing:</b> De PHP LDAP module is niet geïnstalleerd, de backend zal dus niet werken. Vraag uw beheerder de module te installeren.",
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Waarschuwing:</b> De PHP LDAP module is niet geïnstalleerd, het backend zal niet werken. Vraag uw systeembeheerder om de module te installeren.",
"Host" => "Host",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Je kunt het protocol weglaten, tenzij je SSL vereist. Start in dat geval met ldaps://",
-"Base DN" => "Basis DN",
-"You can specify Base DN for users and groups in the Advanced tab" => "Je kunt het standaard DN voor gebruikers en groepen specificeren in het tab Geavanceerd.",
-"User DN" => "Gebruikers DN",
+"Base DN" => "Base DN",
+"One Base DN per line" => "Een Base DN per regel",
+"You can specify Base DN for users and groups in the Advanced tab" => "Je kunt het Base DN voor gebruikers en groepen specificeren in het tab Geavanceerd.",
+"User DN" => "User DN",
"The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "De DN van de client gebruiker waarmee de verbinding zal worden gemaakt, bijv. uid=agent,dc=example,dc=com. Voor anonieme toegang laat je het DN en het wachtwoord leeg.",
"Password" => "Wachtwoord",
"For anonymous access, leave DN and Password empty." => "Voor anonieme toegang, laat de DN en het wachtwoord leeg.",
@@ -20,7 +21,9 @@
"without any placeholder, e.g. \"objectClass=posixGroup\"." => "zonder een placeholder, bijv. \"objectClass=posixGroup\"",
"Port" => "Poort",
"Base User Tree" => "Basis Gebruikers Structuur",
+"One User Base DN per line" => "Een User Base DN per regel",
"Base Group Tree" => "Basis Groupen Structuur",
+"One Group Base DN per line" => "Een Group Base DN per regel",
"Group-Member association" => "Groepslid associatie",
"Use TLS" => "Gebruik TLS",
"Do not use it for SSL connections, it will fail." => "Gebruik niet voor SSL connecties, deze mislukken.",
diff --git a/apps/user_ldap/l10n/nn_NO.php b/apps/user_ldap/l10n/nn_NO.php
new file mode 100644
index 00000000000..54d1f158f65
--- /dev/null
+++ b/apps/user_ldap/l10n/nn_NO.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"Help" => "Hjelp"
+);
diff --git a/apps/user_ldap/l10n/oc.php b/apps/user_ldap/l10n/oc.php
new file mode 100644
index 00000000000..0bf27d74f2f
--- /dev/null
+++ b/apps/user_ldap/l10n/oc.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"Help" => "Ajuda"
+);
diff --git a/apps/user_ldap/l10n/pl.php b/apps/user_ldap/l10n/pl.php
index 0a3dea14c94..55110b8a830 100644
--- a/apps/user_ldap/l10n/pl.php
+++ b/apps/user_ldap/l10n/pl.php
@@ -1,6 +1,5 @@
<?php $TRANSLATIONS = array(
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Ostrzeżenie:</b> Aplikacje user_ldap i user_webdavauth nie są kompatybilne. Mogą powodować nieoczekiwane zachowanie. Poproś administratora o wyłączenie jednej z nich.",
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Ostrzeżenie:</b> Moduł PHP LDAP nie jest zainstalowany i nie będzie działał. Poproś administratora o włączenie go.",
"Host" => "Host",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Można pominąć protokół, z wyjątkiem wymaganego protokołu SSL. Następnie uruchom z ldaps://",
"Base DN" => "Baza DN",
diff --git a/apps/user_ldap/l10n/pt_PT.php b/apps/user_ldap/l10n/pt_PT.php
index 1b21b899a2e..9059f178769 100644
--- a/apps/user_ldap/l10n/pt_PT.php
+++ b/apps/user_ldap/l10n/pt_PT.php
@@ -1,9 +1,10 @@
<?php $TRANSLATIONS = array(
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Aviso:</b> A aplicação user_ldap e user_webdavauth são incompativeis. A aplicação pode tornar-se instável. Por favor, peça ao seu administrador para desactivar uma das aplicações.",
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Aviso:</b> O módulo PHP LDAP necessário não está instalado, o backend não irá funcionar. Peça ao seu administrador para o instalar.",
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Aviso:</b> O módulo PHP LDAP não está instalado, logo não irá funcionar. Por favor peça ao administrador para o instalar.",
"Host" => "Anfitrião",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Pode omitir o protocolo, excepto se necessitar de SSL. Neste caso, comece com ldaps://",
"Base DN" => "DN base",
+"One Base DN per line" => "Uma base DN por linho",
"You can specify Base DN for users and groups in the Advanced tab" => "Pode especificar o ND Base para utilizadores e grupos no separador Avançado",
"User DN" => "DN do utilizador",
"The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "O DN to cliente ",
@@ -20,7 +21,9 @@
"without any placeholder, e.g. \"objectClass=posixGroup\"." => "Sem nenhuma variável. Exemplo: \"objectClass=posixGroup\".",
"Port" => "Porto",
"Base User Tree" => "Base da árvore de utilizadores.",
+"One User Base DN per line" => "Uma base de utilizador DN por linha",
"Base Group Tree" => "Base da árvore de grupos.",
+"One Group Base DN per line" => "Uma base de grupo DN por linha",
"Group-Member association" => "Associar utilizador ao grupo.",
"Use TLS" => "Usar TLS",
"Do not use it for SSL connections, it will fail." => "Não use para ligações SSL, irá falhar.",
diff --git a/apps/user_ldap/l10n/ro.php b/apps/user_ldap/l10n/ro.php
index b4d7d4902fe..3ab336cfffb 100644
--- a/apps/user_ldap/l10n/ro.php
+++ b/apps/user_ldap/l10n/ro.php
@@ -1,6 +1,5 @@
<?php $TRANSLATIONS = array(
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Atentie:</b> Apps user_ldap si user_webdavauth sunt incompatibile. Este posibil sa experimentati un comportament neasteptat. Vă rugăm să întrebați administratorul de sistem pentru a dezactiva una dintre ele.",
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Atentie:</b Modulul PHP LDAP care este necesar nu este instalat. Va rugam intrebati administratorul de sistem instalarea acestuia",
"Host" => "Gazdă",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Puteți omite protocolul, decât dacă folosiți SSL. Atunci se începe cu ldaps://",
"Base DN" => "DN de bază",
diff --git a/apps/user_ldap/l10n/ru.php b/apps/user_ldap/l10n/ru.php
index f41a0b05838..42fba32f43f 100644
--- a/apps/user_ldap/l10n/ru.php
+++ b/apps/user_ldap/l10n/ru.php
@@ -1,6 +1,5 @@
<?php $TRANSLATIONS = array(
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Внимание:</b>Приложения user_ldap и user_webdavauth несовместимы. Вы можете столкнуться с неожиданным поведением. Пожалуйста, обратитесь к системному администратору, чтобы отключить одно из них.",
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Внимание:</b> Необходимый PHP LDAP модуль не установлен, внутренний интерфейс не будет работать. Пожалуйста, обратитесь к системному администратору, чтобы установить его.",
"Host" => "Сервер",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Можно опустить протокол, за исключением того, когда вам требуется SSL. Тогда начните с ldaps :/ /",
"Base DN" => "Базовый DN",
diff --git a/apps/user_ldap/l10n/ru_RU.php b/apps/user_ldap/l10n/ru_RU.php
index 09d7899249a..64ba1176f6e 100644
--- a/apps/user_ldap/l10n/ru_RU.php
+++ b/apps/user_ldap/l10n/ru_RU.php
@@ -1,6 +1,5 @@
<?php $TRANSLATIONS = array(
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Предупреждение:</b> Приложения user_ldap и user_webdavauth несовместимы. Вы можете столкнуться с неожиданным поведением системы. Пожалуйста, обратитесь к системному администратору для отключения одного из них.",
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Предупреждение:</b> Необходимый PHP LDAP-модуль не установлен, backend не будет работать. Пожалуйста, обратитесь к системному администратору, чтобы установить его.",
"Host" => "Хост",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Вы можете пропустить протокол, если Вам не требуется SSL. Затем начните с ldaps://",
"Base DN" => "База DN",
diff --git a/apps/user_ldap/l10n/sl.php b/apps/user_ldap/l10n/sl.php
index 1d1fc33a83b..247f2bfdcbd 100644
--- a/apps/user_ldap/l10n/sl.php
+++ b/apps/user_ldap/l10n/sl.php
@@ -1,6 +1,5 @@
<?php $TRANSLATIONS = array(
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Opozorilo:</b> Aplikaciji user_ldap in user_webdavauth nista združljivi. Morda boste opazili nepričakovano obnašanje sistema. Prosimo, prosite vašega skrbnika, da eno od aplikacij onemogoči.",
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Opozorilo:</b> PHP LDAP modul mora biti nameščen, sicer ta vmesnik ne bo deloval. Prosimo, prosite vašega skrbnika, če ga namesti.",
"Host" => "Gostitelj",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Protokol je lahko izpuščen, če ni posebej zahtevan SSL. V tem primeru se mora naslov začeti z ldaps://",
"Base DN" => "Osnovni DN",
diff --git a/apps/user_ldap/l10n/sr.php b/apps/user_ldap/l10n/sr.php
new file mode 100644
index 00000000000..fff39aadc24
--- /dev/null
+++ b/apps/user_ldap/l10n/sr.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"Help" => "Помоћ"
+);
diff --git a/apps/user_ldap/l10n/sr@latin.php b/apps/user_ldap/l10n/sr@latin.php
new file mode 100644
index 00000000000..91503315066
--- /dev/null
+++ b/apps/user_ldap/l10n/sr@latin.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"Help" => "Pomoć"
+);
diff --git a/apps/user_ldap/l10n/sv.php b/apps/user_ldap/l10n/sv.php
index e8e14af7aca..25abfdd7ddb 100644
--- a/apps/user_ldap/l10n/sv.php
+++ b/apps/user_ldap/l10n/sv.php
@@ -1,9 +1,10 @@
<?php $TRANSLATIONS = array(
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Varning:</b> Apps user_ldap och user_webdavauth är inkompatibla. Oväntade problem kan uppstå. Be din systemadministratör att inaktivera en av dom.",
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Varning:</b> PHP LDAP-modulen måste vara installerad, serversidan kommer inte att fungera. Be din systemadministratör att installera den.",
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Varning:</b> PHP LDAP - modulen är inte installerad, serversidan kommer inte att fungera. Kontakta din systemadministratör för installation.",
"Host" => "Server",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Du behöver inte ange protokoll förutom om du använder SSL. Starta då med ldaps://",
"Base DN" => "Start DN",
+"One Base DN per line" => "Ett Start DN per rad",
"You can specify Base DN for users and groups in the Advanced tab" => "Du kan ange start DN för användare och grupper under fliken Avancerat",
"User DN" => "Användare DN",
"The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "DN för användaren som skall användas, t.ex. uid=agent, dc=example, dc=com. För anonym åtkomst, lämna DN och lösenord tomt.",
@@ -20,7 +21,9 @@
"without any placeholder, e.g. \"objectClass=posixGroup\"." => "utan platshållare, t.ex. \"objectClass=posixGroup\".",
"Port" => "Port",
"Base User Tree" => "Bas för användare i katalogtjänst",
+"One User Base DN per line" => "En Användare start DN per rad",
"Base Group Tree" => "Bas för grupper i katalogtjänst",
+"One Group Base DN per line" => "En Grupp start DN per rad",
"Group-Member association" => "Attribut för gruppmedlemmar",
"Use TLS" => "Använd TLS",
"Do not use it for SSL connections, it will fail." => "Använd inte för SSL-anslutningar, det kommer inte att fungera.",
diff --git a/apps/user_ldap/l10n/th_TH.php b/apps/user_ldap/l10n/th_TH.php
index acc7a4936bc..e3a941c4244 100644
--- a/apps/user_ldap/l10n/th_TH.php
+++ b/apps/user_ldap/l10n/th_TH.php
@@ -1,7 +1,10 @@
<?php $TRANSLATIONS = array(
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>คำเตือน:</b> แอปฯ user_ldap และ user_webdavauth ไม่สามารถใช้งานร่วมกันได้. คุณอาจประสพปัญหาที่ไม่คาดคิดจากเหตุการณ์ดังกล่าว กรุณาติดต่อผู้ดูแลระบบของคุณเพื่อระงับการใช้งานแอปฯ ตัวใดตัวหนึ่งข้างต้น",
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>คำเตือน:</b> โมดูล PHP LDAP ยังไม่ได้ถูกติดตั้ง, ระบบด้านหลังจะไม่สามารถทำงานได้ กรุณาติดต่อผู้ดูแลระบบของคุณเพื่อทำการติดตั้งโมดูลดังกล่าว",
"Host" => "โฮสต์",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "คุณสามารถปล่อยช่องโปรโตคอลเว้นไว้ได้, ยกเว้นกรณีที่คุณต้องการใช้ SSL จากนั้นเริ่มต้นด้วย ldaps://",
"Base DN" => "DN ฐาน",
+"One Base DN per line" => "หนึ่ง Base DN ต่อบรรทัด",
"You can specify Base DN for users and groups in the Advanced tab" => "คุณสามารถระบุ DN หลักสำหรับผู้ใช้งานและกลุ่มต่างๆในแท็บขั้นสูงได้",
"User DN" => "DN ของผู้ใช้งาน",
"The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "DN ของผู้ใช้งานที่เป็นลูกค้าอะไรก็ตามที่ผูกอยู่ด้วย เช่น uid=agent, dc=example, dc=com, สำหรับการเข้าถึงโดยบุคคลนิรนาม, ให้เว้นว่าง DN และ รหัสผ่านเอาไว้",
@@ -18,7 +21,9 @@
"without any placeholder, e.g. \"objectClass=posixGroup\"." => "โดยไม่ต้องมีตัวยึดใดๆ, เช่น \"objectClass=posixGroup\",",
"Port" => "พอร์ต",
"Base User Tree" => "รายการผู้ใช้งานหลักแบบ Tree",
+"One User Base DN per line" => "หนึ่ง User Base DN ต่อบรรทัด",
"Base Group Tree" => "รายการกลุ่มหลักแบบ Tree",
+"One Group Base DN per line" => "หนึ่ง Group Base DN ต่อบรรทัด",
"Group-Member association" => "ความสัมพันธ์ของสมาชิกในกลุ่ม",
"Use TLS" => "ใช้ TLS",
"Do not use it for SSL connections, it will fail." => "กรุณาอย่าใช้การเชื่อมต่อแบบ SSL การเชื่อมต่อจะเกิดการล้มเหลว",
diff --git a/apps/user_ldap/l10n/uk.php b/apps/user_ldap/l10n/uk.php
index f82e9f2a420..d617d939265 100644
--- a/apps/user_ldap/l10n/uk.php
+++ b/apps/user_ldap/l10n/uk.php
@@ -1,6 +1,5 @@
<?php $TRANSLATIONS = array(
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Увага:</b> Застосунки user_ldap та user_webdavauth не сумісні. Ви можете зіткнутися з несподіваною поведінкою. Будь ласка, зверніться до системного адміністратора, щоб відключити одну з них.",
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Увага:</ b> Потрібний модуль PHP LDAP не встановлено, базова програма працювати не буде. Будь ласка, зверніться до системного адміністратора, щоб встановити його.",
"Host" => "Хост",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Можна не вказувати протокол, якщо вам не потрібен SSL. Тоді почніть з ldaps://",
"Base DN" => "Базовий DN",
diff --git a/apps/user_ldap/l10n/zh_CN.php b/apps/user_ldap/l10n/zh_CN.php
index bb961d534b7..ed5041eff06 100644
--- a/apps/user_ldap/l10n/zh_CN.php
+++ b/apps/user_ldap/l10n/zh_CN.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>警告:</b>应用 user_ldap 和 user_webdavauth 不兼容。您可能遭遇未预料的行为。请垂询您的系统管理员禁用其中一个。",
"Host" => "主机",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "可以忽略协议,但如要使用SSL,则需以ldaps://开头",
"Base DN" => "Base DN",
@@ -31,6 +32,7 @@
"Group Display Name Field" => "组显示名称字段",
"The LDAP attribute to use to generate the groups`s ownCloud name." => "用来生成组的ownCloud名称的LDAP属性",
"in bytes" => "字节数",
+"in seconds. A change empties the cache." => "以秒计。修改将清空缓存。",
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "将用户名称留空(默认)。否则指定一个LDAP/AD属性",
"Help" => "帮助"
);
diff --git a/apps/user_ldap/l10n/zh_TW.php b/apps/user_ldap/l10n/zh_TW.php
index abc1b03d49d..506ae0f0fbd 100644
--- a/apps/user_ldap/l10n/zh_TW.php
+++ b/apps/user_ldap/l10n/zh_TW.php
@@ -1,5 +1,7 @@
<?php $TRANSLATIONS = array(
+"Host" => "主機",
"Password" => "密碼",
+"Port" => "連接阜",
"Use TLS" => "使用TLS",
"Turn off SSL certificate validation." => "關閉 SSL 憑證驗證",
"Help" => "說明"
diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index f888577aedb..422e43fc003 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -114,6 +114,15 @@ abstract class Access {
* @return the sanitized DN
*/
private function sanitizeDN($dn) {
+ //treating multiple base DNs
+ if(is_array($dn)) {
+ $result = array();
+ foreach($dn as $singleDN) {
+ $result[] = $this->sanitizeDN($singleDN);
+ }
+ return $result;
+ }
+
//OID sometimes gives back DNs with whitespace after the comma a la "uid=foo, cn=bar, dn=..." We need to tackle this!
$dn = preg_replace('/([^\\\]),(\s+)/u', '\1,', $dn);
@@ -212,9 +221,13 @@ abstract class Access {
* returns the internal ownCloud name for the given LDAP DN of the group, false on DN outside of search DN or failure
*/
public function dn2groupname($dn, $ldapname = null) {
- if(mb_strripos($dn, $this->sanitizeDN($this->connection->ldapBaseGroups), 0, 'UTF-8') !== (mb_strlen($dn, 'UTF-8')-mb_strlen($this->sanitizeDN($this->connection->ldapBaseGroups), 'UTF-8'))) {
+ //To avoid bypassing the base DN settings under certain circumstances
+ //with the group support, check whether the provided DN matches one of
+ //the given Bases
+ if(!$this->isDNPartOfBase($dn, $this->connection->ldapBaseGroups)) {
return false;
}
+
return $this->dn2ocname($dn, $ldapname, false);
}
@@ -227,9 +240,13 @@ abstract class Access {
* returns the internal ownCloud name for the given LDAP DN of the user, false on DN outside of search DN or failure
*/
public function dn2username($dn, $ldapname = null) {
- if(mb_strripos($dn, $this->sanitizeDN($this->connection->ldapBaseUsers), 0, 'UTF-8') !== (mb_strlen($dn, 'UTF-8')-mb_strlen($this->sanitizeDN($this->connection->ldapBaseUsers), 'UTF-8'))) {
+ //To avoid bypassing the base DN settings under certain circumstances
+ //with the group support, check whether the provided DN matches one of
+ //the given Bases
+ if(!$this->isDNPartOfBase($dn, $this->connection->ldapBaseUsers)) {
return false;
}
+
return $this->dn2ocname($dn, $ldapname, true);
}
@@ -521,7 +538,7 @@ abstract class Access {
/**
* @brief executes an LDAP search
* @param $filter the LDAP filter for the search
- * @param $base the LDAP subtree that shall be searched
+ * @param $base an array containing the LDAP subtree(s) that shall be searched
* @param $attr optional, when a certain attribute shall be filtered out
* @returns array with the search result
*
@@ -544,18 +561,28 @@ abstract class Access {
//check wether paged search should be attempted
$pagedSearchOK = $this->initPagedSearch($filter, $base, $attr, $limit, $offset);
- $sr = ldap_search($link_resource, $base, $filter, $attr);
- if(!$sr) {
+ $linkResources = array_pad(array(), count($base), $link_resource);
+ $sr = ldap_search($linkResources, $base, $filter, $attr);
+ $error = ldap_errno($link_resource);
+ if(!is_array($sr) || $error > 0) {
\OCP\Util::writeLog('user_ldap', 'Error when searching: '.ldap_error($link_resource).' code '.ldap_errno($link_resource), \OCP\Util::ERROR);
\OCP\Util::writeLog('user_ldap', 'Attempt for Paging? '.print_r($pagedSearchOK, true), \OCP\Util::ERROR);
return array();
}
- $findings = ldap_get_entries($link_resource, $sr );
+ $findings = array();
+ foreach($sr as $key => $res) {
+ $findings = array_merge($findings, ldap_get_entries($link_resource, $res ));
+ }
if($pagedSearchOK) {
\OCP\Util::writeLog('user_ldap', 'Paged search successful', \OCP\Util::INFO);
- ldap_control_paged_result_response($link_resource, $sr, $cookie);
- \OCP\Util::writeLog('user_ldap', 'Set paged search cookie '.$cookie, \OCP\Util::INFO);
- $this->setPagedResultCookie($filter, $limit, $offset, $cookie);
+ foreach($sr as $key => $res) {
+ $cookie = null;
+ if(ldap_control_paged_result_response($link_resource, $res, $cookie)) {
+ \OCP\Util::writeLog('user_ldap', 'Set paged search cookie', \OCP\Util::INFO);
+ $this->setPagedResultCookie($base[$key], $filter, $limit, $offset, $cookie);
+ }
+ }
+
//browsing through prior pages to get the cookie for the new one
if($skipHandling) {
return;
@@ -565,7 +592,9 @@ abstract class Access {
$this->pagedSearchedSuccessful = true;
}
} else {
- \OCP\Util::writeLog('user_ldap', 'Paged search failed :(', \OCP\Util::INFO);
+ if(!is_null($limit)) {
+ \OCP\Util::writeLog('user_ldap', 'Paged search failed :(', \OCP\Util::INFO);
+ }
}
// if we're here, probably no connection resource is returned.
@@ -792,19 +821,40 @@ abstract class Access {
}
/**
+ * @brief checks if the given DN is part of the given base DN(s)
+ * @param $dn the DN
+ * @param $bases array containing the allowed base DN or DNs
+ * @returns Boolean
+ */
+ private function isDNPartOfBase($dn, $bases) {
+ $bases = $this->sanitizeDN($bases);
+ foreach($bases as $base) {
+ $belongsToBase = true;
+ if(mb_strripos($dn, $base, 0, 'UTF-8') !== (mb_strlen($dn, 'UTF-8')-mb_strlen($base))) {
+ $belongsToBase = false;
+ }
+ if($belongsToBase) {
+ break;
+ }
+ }
+ return $belongsToBase;
+ }
+
+ /**
* @brief get a cookie for the next LDAP paged search
+ * @param $base a string with the base DN for the search
* @param $filter the search filter to identify the correct search
* @param $limit the limit (or 'pageSize'), to identify the correct search well
* @param $offset the offset for the new search to identify the correct search really good
* @returns string containing the key or empty if none is cached
*/
- private function getPagedResultCookie($filter, $limit, $offset) {
+ private function getPagedResultCookie($base, $filter, $limit, $offset) {
if($offset == 0) {
return '';
}
$offset -= $limit;
//we work with cache here
- $cachekey = 'lc' . dechex(crc32($filter)) . '-' . $limit . '-' . $offset;
+ $cachekey = 'lc' . crc32($base) . '-' . crc32($filter) . '-' . $limit . '-' . $offset;
$cookie = $this->connection->getFromCache($cachekey);
if(is_null($cookie)) {
$cookie = '';
@@ -814,15 +864,16 @@ abstract class Access {
/**
* @brief set a cookie for LDAP paged search run
+ * @param $base a string with the base DN for the search
* @param $filter the search filter to identify the correct search
* @param $limit the limit (or 'pageSize'), to identify the correct search well
* @param $offset the offset for the run search to identify the correct search really good
* @param $cookie string containing the cookie returned by ldap_control_paged_result_response
* @return void
*/
- private function setPagedResultCookie($filter, $limit, $offset) {
+ private function setPagedResultCookie($base, $filter, $limit, $offset, $cookie) {
if(!empty($cookie)) {
- $cachekey = 'lc' . dechex(crc32($filter)) . '-' . $limit . '-' . $offset;
+ $cachekey = 'lc' . dechex(crc32($base)) . '-' . dechex(crc32($filter)) . '-' .$limit . '-' . $offset;
$cookie = $this->connection->writeToCache($cachekey, $cookie);
}
}
@@ -841,40 +892,47 @@ abstract class Access {
/**
* @brief prepares a paged search, if possible
* @param $filter the LDAP filter for the search
- * @param $base the LDAP subtree that shall be searched
+ * @param $bases an array containing the LDAP subtree(s) that shall be searched
* @param $attr optional, when a certain attribute shall be filtered outside
* @param $limit
* @param $offset
*
*/
- private function initPagedSearch($filter, $base, $attr, $limit, $offset) {
+ private function initPagedSearch($filter, $bases, $attr, $limit, $offset) {
$pagedSearchOK = false;
if($this->connection->hasPagedResultSupport && !is_null($limit)) {
$offset = intval($offset); //can be null
- \OCP\Util::writeLog('user_ldap', 'initializing paged search for Filter'.$filter.' base '.$base.' attr '.print_r($attr, true). ' limit ' .$limit.' offset '.$offset, \OCP\Util::DEBUG);
+ \OCP\Util::writeLog('user_ldap', 'initializing paged search for Filter'.$filter.' base '.print_r($bases, true).' attr '.print_r($attr, true). ' limit ' .$limit.' offset '.$offset, \OCP\Util::INFO);
//get the cookie from the search for the previous search, required by LDAP
- $cookie = $this->getPagedResultCookie($filter, $limit, $offset);
- if(empty($cookie) && ($offset > 0)) {
- //no cookie known, although the offset is not 0. Maybe cache run out. We need to start all over *sigh* (btw, Dear Reader, did you need LDAP paged searching was designed by MSFT?)
- $reOffset = ($offset - $limit) < 0 ? 0 : $offset - $limit;
- //a bit recursive, $offset of 0 is the exit
- \OCP\Util::writeLog('user_ldap', 'Looking for cookie L/O '.$limit.'/'.$reOffset, \OCP\Util::INFO);
- $this->search($filter, $base, $attr, $limit, $reOffset, true);
- $cookie = $this->getPagedResultCookie($filter, $limit, $offset);
- //still no cookie? obviously, the server does not like us. Let's skip paging efforts.
- //TODO: remember this, probably does not change in the next request...
- if(empty($cookie)) {
- $cookie = null;
+ foreach($bases as $base) {
+
+ $cookie = $this->getPagedResultCookie($base, $filter, $limit, $offset);
+ if(empty($cookie) && ($offset > 0)) {
+ //no cookie known, although the offset is not 0. Maybe cache run out. We need to start all over *sigh* (btw, Dear Reader, did you need LDAP paged searching was designed by MSFT?)
+ $reOffset = ($offset - $limit) < 0 ? 0 : $offset - $limit;
+ //a bit recursive, $offset of 0 is the exit
+ \OCP\Util::writeLog('user_ldap', 'Looking for cookie L/O '.$limit.'/'.$reOffset, \OCP\Util::INFO);
+ $this->search($filter, $base, $attr, $limit, $reOffset, true);
+ $cookie = $this->getPagedResultCookie($base, $filter, $limit, $offset);
+ //still no cookie? obviously, the server does not like us. Let's skip paging efforts.
+ //TODO: remember this, probably does not change in the next request...
+ if(empty($cookie)) {
+ $cookie = null;
+ }
}
- }
- if(!is_null($cookie)) {
- if($offset > 0) {
- \OCP\Util::writeLog('user_ldap', 'Cookie '.$cookie, \OCP\Util::INFO);
+ if(!is_null($cookie)) {
+ if($offset > 0) {
+ \OCP\Util::writeLog('user_ldap', 'Cookie '.$cookie, \OCP\Util::INFO);
+ }
+ $pagedSearchOK = ldap_control_paged_result($this->connection->getConnectionResource(), $limit, false, $cookie);
+ if(!$pagedSearchOK) {
+ return false;
+ }
+ \OCP\Util::writeLog('user_ldap', 'Ready for a paged search', \OCP\Util::INFO);
+ } else {
+ \OCP\Util::writeLog('user_ldap', 'No paged search for us, Cpt., Limit '.$limit.' Offset '.$offset, \OCP\Util::INFO);
}
- $pagedSearchOK = ldap_control_paged_result($this->connection->getConnectionResource(), $limit, false, $cookie);
- \OCP\Util::writeLog('user_ldap', 'Ready for a paged search', \OCP\Util::INFO);
- } else {
- \OCP\Util::writeLog('user_ldap', 'No paged search for us, Cpt., Limit '.$limit.' Offset '.$offset, \OCP\Util::INFO);
+
}
}
diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php
index b14cdafff89..7046cbbfc78 100644
--- a/apps/user_ldap/lib/connection.php
+++ b/apps/user_ldap/lib/connection.php
@@ -187,9 +187,9 @@ class Connection {
$this->config['ldapPort'] = \OCP\Config::getAppValue($this->configID, 'ldap_port', 389);
$this->config['ldapAgentName'] = \OCP\Config::getAppValue($this->configID, 'ldap_dn', '');
$this->config['ldapAgentPassword'] = base64_decode(\OCP\Config::getAppValue($this->configID, 'ldap_agent_password', ''));
- $this->config['ldapBase'] = \OCP\Config::getAppValue($this->configID, 'ldap_base', '');
- $this->config['ldapBaseUsers'] = \OCP\Config::getAppValue($this->configID, 'ldap_base_users', $this->config['ldapBase']);
- $this->config['ldapBaseGroups'] = \OCP\Config::getAppValue($this->configID, 'ldap_base_groups', $this->config['ldapBase']);
+ $this->config['ldapBase'] = preg_split('/\r\n|\r|\n/', \OCP\Config::getAppValue($this->configID, 'ldap_base', ''));
+ $this->config['ldapBaseUsers'] = preg_split('/\r\n|\r|\n/', \OCP\Config::getAppValue($this->configID, 'ldap_base_users', $this->config['ldapBase']));
+ $this->config['ldapBaseGroups'] = preg_split('/\r\n|\r|\n/', \OCP\Config::getAppValue($this->configID, 'ldap_base_groups', $this->config['ldapBase']));
$this->config['ldapTLS'] = \OCP\Config::getAppValue($this->configID, 'ldap_tls', 0);
$this->config['ldapNoCase'] = \OCP\Config::getAppValue($this->configID, 'ldap_nocase', 0);
$this->config['turnOffCertCheck'] = \OCP\Config::getAppValue($this->configID, 'ldap_turn_off_cert_check', 0);
diff --git a/apps/user_ldap/templates/settings.php b/apps/user_ldap/templates/settings.php
index 8522d2f835c..b24c6e2f025 100644
--- a/apps/user_ldap/templates/settings.php
+++ b/apps/user_ldap/templates/settings.php
@@ -8,12 +8,12 @@
echo '<p class="ldapwarning">'.$l->t('<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them.').'</p>';
}
if(!function_exists('ldap_connect')) {
- echo '<p class="ldapwarning">'.$l->t('<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it.').'</p>';
+ echo '<p class="ldapwarning">'.$l->t('<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it.').'</p>';
}
?>
<fieldset id="ldapSettings-1">
<p><label for="ldap_host"><?php echo $l->t('Host');?></label><input type="text" id="ldap_host" name="ldap_host" value="<?php echo $_['ldap_host']; ?>" title="<?php echo $l->t('You can omit the protocol, except you require SSL. Then start with ldaps://');?>"></p>
- <p><label for="ldap_base"><?php echo $l->t('Base DN');?></label><input type="text" id="ldap_base" name="ldap_base" value="<?php echo $_['ldap_base']; ?>" title="<?php echo $l->t('You can specify Base DN for users and groups in the Advanced tab');?>" /></p>
+ <p><label for="ldap_base"><?php echo $l->t('Base DN');?></label><textarea id="ldap_base" name="ldap_base" placeholder="<?php echo $l->t('One Base DN per line');?>" title="<?php echo $l->t('You can specify Base DN for users and groups in the Advanced tab');?>"><?php echo $_['ldap_base']; ?></textarea></p>
<p><label for="ldap_dn"><?php echo $l->t('User DN');?></label><input type="text" id="ldap_dn" name="ldap_dn" value="<?php echo $_['ldap_dn']; ?>" title="<?php echo $l->t('The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty.');?>" /></p>
<p><label for="ldap_agent_password"><?php echo $l->t('Password');?></label><input type="password" id="ldap_agent_password" name="ldap_agent_password" value="<?php echo $_['ldap_agent_password']; ?>" title="<?php echo $l->t('For anonymous access, leave DN and Password empty.');?>" /></p>
<p><label for="ldap_login_filter"><?php echo $l->t('User Login Filter');?></label><input type="text" id="ldap_login_filter" name="ldap_login_filter" value="<?php echo $_['ldap_login_filter']; ?>" title="<?php echo $l->t('Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action.');?>" /><br /><small><?php echo $l->t('use %%uid placeholder, e.g. "uid=%%uid"');?></small></p>
@@ -22,8 +22,8 @@
</fieldset>
<fieldset id="ldapSettings-2">
<p><label for="ldap_port"><?php echo $l->t('Port');?></label><input type="text" id="ldap_port" name="ldap_port" value="<?php echo $_['ldap_port']; ?>" /></p>
- <p><label for="ldap_base_users"><?php echo $l->t('Base User Tree');?></label><input type="text" id="ldap_base_users" name="ldap_base_users" value="<?php echo $_['ldap_base_users']; ?>" /></p>
- <p><label for="ldap_base_groups"><?php echo $l->t('Base Group Tree');?></label><input type="text" id="ldap_base_groups" name="ldap_base_groups" value="<?php echo $_['ldap_base_groups']; ?>" /></p>
+ <p><label for="ldap_base_users"><?php echo $l->t('Base User Tree');?></label><textarea id="ldap_base_users" name="ldap_base_users" placeholder="<?php echo $l->t('One User Base DN per line');?>" title="<?php echo $l->t('Base User Tree');?>"><?php echo $_['ldap_base_users']; ?></textarea></p>
+ <p><label for="ldap_base_groups"><?php echo $l->t('Base Group Tree');?></label><textarea id="ldap_base_groups" name="ldap_base_groups" placeholder="<?php echo $l->t('One Group Base DN per line');?>" title="<?php echo $l->t('Base Group Tree');?>"><?php echo $_['ldap_base_groups']; ?></textarea></p>
<p><label for="ldap_group_member_assoc_attribute"><?php echo $l->t('Group-Member association');?></label><select id="ldap_group_member_assoc_attribute" name="ldap_group_member_assoc_attribute"><option value="uniqueMember"<?php if (isset($_['ldap_group_member_assoc_attribute']) && ($_['ldap_group_member_assoc_attribute'] == 'uniqueMember')) echo ' selected'; ?>>uniqueMember</option><option value="memberUid"<?php if (isset($_['ldap_group_member_assoc_attribute']) && ($_['ldap_group_member_assoc_attribute'] == 'memberUid')) echo ' selected'; ?>>memberUid</option><option value="member"<?php if (isset($_['ldap_group_member_assoc_attribute']) && ($_['ldap_group_member_assoc_attribute'] == 'member')) echo ' selected'; ?>>member (AD)</option></select></p>
<p><label for="ldap_tls"><?php echo $l->t('Use TLS');?></label><input type="checkbox" id="ldap_tls" name="ldap_tls" value="1"<?php if ($_['ldap_tls']) echo ' checked'; ?> title="<?php echo $l->t('Do not use it for SSL connections, it will fail.');?>" /></p>
<p><label for="ldap_nocase"><?php echo $l->t('Case insensitve LDAP server (Windows)');?></label> <input type="checkbox" id="ldap_nocase" name="ldap_nocase" value="1"<?php if (isset($_['ldap_nocase']) && ($_['ldap_nocase'])) echo ' checked'; ?>></p>
diff --git a/apps/user_webdavauth/l10n/bn_BD.php b/apps/user_webdavauth/l10n/bn_BD.php
index 773e7f7eb76..5366552efae 100644
--- a/apps/user_webdavauth/l10n/bn_BD.php
+++ b/apps/user_webdavauth/l10n/bn_BD.php
@@ -1,4 +1,3 @@
<?php $TRANSLATIONS = array(
-"URL: http://" => "URL:http://",
-"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct."
+"URL: http://" => "URL:http://"
);
diff --git a/apps/user_webdavauth/l10n/ca.php b/apps/user_webdavauth/l10n/ca.php
index 84a6c599e78..7ac540f2130 100644
--- a/apps/user_webdavauth/l10n/ca.php
+++ b/apps/user_webdavauth/l10n/ca.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"WebDAV Authentication" => "Autenticació WebDAV",
"URL: http://" => "URL: http://",
-"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "ownCloud enviarà les credencials d'usuari a aquesta URL. S'interpretarà http 401 i http 403 com a credencials incorrectes i tots els altres codis com a credencials correctes."
+"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud enviarà les credencials d'usuari a aquesta URL. Aquest endollable en comprova la resposta i interpretarà els codis d'estat 401 i 403 com a credencials no vàlides, i qualsevol altra resposta com a credencials vàlides."
);
diff --git a/apps/user_webdavauth/l10n/cs_CZ.php b/apps/user_webdavauth/l10n/cs_CZ.php
index 5cb9b4c3704..9bd4c96a2bb 100644
--- a/apps/user_webdavauth/l10n/cs_CZ.php
+++ b/apps/user_webdavauth/l10n/cs_CZ.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"WebDAV Authentication" => "Ověření WebDAV",
"URL: http://" => "URL: http://",
-"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "ownCloud odešle přihlašovací údaje uživatele na URL a z návratové hodnoty určí stav přihlášení. Http 401 a 403 vyhodnotí jako neplatné údaje a všechny ostatní jako úspěšné přihlášení."
+"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud odešle uživatelské údaje na zadanou URL. Plugin zkontroluje odpověď a považuje návratovou hodnotu HTTP 401 a 403 za neplatné údaje a všechny ostatní hodnoty jako platné přihlašovací údaje."
);
diff --git a/apps/user_webdavauth/l10n/da.php b/apps/user_webdavauth/l10n/da.php
index 7d9ee1d5b29..245a5101341 100644
--- a/apps/user_webdavauth/l10n/da.php
+++ b/apps/user_webdavauth/l10n/da.php
@@ -1,4 +1,3 @@
<?php $TRANSLATIONS = array(
-"URL: http://" => "URL: http://",
-"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "ownCloud vil sende brugeroplysningerne til denne webadresse er fortolker http 401 og http 403 som brugeroplysninger forkerte og alle andre koder som brugeroplysninger korrekte."
+"URL: http://" => "URL: http://"
);
diff --git a/apps/user_webdavauth/l10n/de.php b/apps/user_webdavauth/l10n/de.php
index 8589dc0c4fd..f893bddc71c 100644
--- a/apps/user_webdavauth/l10n/de.php
+++ b/apps/user_webdavauth/l10n/de.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"WebDAV Authentication" => "WebDAV Authentifikation",
"URL: http://" => "URL: http://",
-"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "ownCloud wird die Logindaten zu dieser URL senden. http 401 und http 403 werden als falsche Logindaten interpretiert und alle anderen Codes als korrekte Logindaten."
+"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud wird die Benutzer-Anmeldedaten an diese URL schicken. Dieses Plugin prüft die Anmeldedaten auf ihre Gültigkeit und interpretiert die HTTP Statusfehler 401 und 403 als ungültige, sowie alle Anderen als gültige Anmeldedaten."
);
diff --git a/apps/user_webdavauth/l10n/de_DE.php b/apps/user_webdavauth/l10n/de_DE.php
index 3d73dccfe8e..8f67575fc0f 100644
--- a/apps/user_webdavauth/l10n/de_DE.php
+++ b/apps/user_webdavauth/l10n/de_DE.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"WebDAV Authentication" => "WebDAV Authentifizierung",
"URL: http://" => "URL: http://",
-"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "ownCloud "
+"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud sendet die Benutzerdaten an diese URL. Dieses Plugin prüft die Antwort und wird die Statuscodes 401 und 403 als ungültige Daten interpretieren und alle anderen Antworten als gültige Daten."
);
diff --git a/apps/user_webdavauth/l10n/el.php b/apps/user_webdavauth/l10n/el.php
index bf4c11af64c..951709c4d64 100644
--- a/apps/user_webdavauth/l10n/el.php
+++ b/apps/user_webdavauth/l10n/el.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"WebDAV Authentication" => "Αυθεντικοποίηση μέσω WebDAV ",
"URL: http://" => "URL: http://",
-"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "Το ownCloud θα στείλει τα συνθηματικά χρήστη σε αυτό το URL, μεταφράζοντας τα http 401 και http 403 ως λανθασμένα συνθηματικά και όλους τους άλλους κωδικούς ως σωστά συνθηματικά."
+"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Το ownCloud θα στείλει τα διαπιστευτήρια χρήστη σε αυτό το URL. Αυτό το plugin ελέγχει την απάντηση και την μετατρέπει σε HTTP κωδικό κατάστασης 401 και 403 για μη έγκυρα, όλες οι υπόλοιπες απαντήσεις είναι έγκυρες."
);
diff --git a/apps/user_webdavauth/l10n/eo.php b/apps/user_webdavauth/l10n/eo.php
index 245a5101341..d945f181e6b 100644
--- a/apps/user_webdavauth/l10n/eo.php
+++ b/apps/user_webdavauth/l10n/eo.php
@@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
+"WebDAV Authentication" => "WebDAV-aŭtentigo",
"URL: http://" => "URL: http://"
);
diff --git a/apps/user_webdavauth/l10n/es.php b/apps/user_webdavauth/l10n/es.php
index 3975b04cbc1..103c3738e2d 100644
--- a/apps/user_webdavauth/l10n/es.php
+++ b/apps/user_webdavauth/l10n/es.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"WebDAV Authentication" => "Autenticación de WevDAV",
"URL: http://" => "URL: http://",
-"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "ownCloud enviará al usuario las interpretaciones 401 y 403 a esta URL como incorrectas y todas las otras credenciales como correctas"
+"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "onwCloud enviará las credenciales de usuario a esta URL. Este complemento verifica la respuesta e interpretará los códigos de respuesta HTTP 401 y 403 como credenciales inválidas y todas las otras respuestas como credenciales válidas."
);
diff --git a/apps/user_webdavauth/l10n/es_AR.php b/apps/user_webdavauth/l10n/es_AR.php
index 0606d3a8eb4..245a5101341 100644
--- a/apps/user_webdavauth/l10n/es_AR.php
+++ b/apps/user_webdavauth/l10n/es_AR.php
@@ -1,4 +1,3 @@
<?php $TRANSLATIONS = array(
-"URL: http://" => "URL: http://",
-"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "ownCloud enviará las credenciales a esta dirección, si son interpretadas como http 401 o http 403 las credenciales son erroneas; todos los otros códigos indican que las credenciales son correctas."
+"URL: http://" => "URL: http://"
);
diff --git a/apps/user_webdavauth/l10n/eu.php b/apps/user_webdavauth/l10n/eu.php
index bbda9f10ba0..d792c1588bb 100644
--- a/apps/user_webdavauth/l10n/eu.php
+++ b/apps/user_webdavauth/l10n/eu.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"WebDAV Authentication" => "WebDAV Autentikazioa",
"URL: http://" => "URL: http://",
-"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "ownCloud erabiltzailearen kredentzialak helbide honetara bidaliko ditu. http 401 eta http 403 kredentzial ez zuzenak bezala hartuko dira eta beste kode guztiak kredentzial zuzentzat hartuko dira."
+"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloudek erabiltzailearen kredentzialak URL honetara bidaliko ditu. Plugin honek erantzuna aztertzen du eta HTTP 401 eta 403 egoera kodeak baliogabezko kredentzialtzat hartuko ditu, beste erantzunak kredentzial egokitzat hartuko dituelarik."
);
diff --git a/apps/user_webdavauth/l10n/fr.php b/apps/user_webdavauth/l10n/fr.php
index 557a22e6c82..339931c7cee 100644
--- a/apps/user_webdavauth/l10n/fr.php
+++ b/apps/user_webdavauth/l10n/fr.php
@@ -1,4 +1,3 @@
<?php $TRANSLATIONS = array(
-"URL: http://" => "URL : http://",
-"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "ownCloud "
+"URL: http://" => "URL : http://"
);
diff --git a/apps/user_webdavauth/l10n/gl.php b/apps/user_webdavauth/l10n/gl.php
index fa81db333d4..a6b8355c074 100644
--- a/apps/user_webdavauth/l10n/gl.php
+++ b/apps/user_webdavauth/l10n/gl.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"WebDAV Authentication" => "Autenticación WebDAV",
"URL: http://" => "URL: http://",
-"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "ownCloud enviará as credenciais do usuario a este URL, http 401 e http 403 interpretanse como credenciais incorrectas e todos os outros códigos como credenciais correctas."
+"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud enviará as credenciais do usuario a esta URL. Este conector comproba a resposta e interpretará os códigos de estado 401 e 403 como credenciais non válidas, e todas as outras respostas como credenciais válidas."
);
diff --git a/apps/user_webdavauth/l10n/hu_HU.php b/apps/user_webdavauth/l10n/hu_HU.php
index 75a23ed7be4..245a5101341 100644
--- a/apps/user_webdavauth/l10n/hu_HU.php
+++ b/apps/user_webdavauth/l10n/hu_HU.php
@@ -1,4 +1,3 @@
<?php $TRANSLATIONS = array(
-"URL: http://" => "URL: http://",
-"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "Az ownCloud rendszer erre a címre fogja elküldeni a felhasználók bejelentkezési adatait. Ha 401-es vagy 403-as http kódot kap vissza, azt sikertelen azonosításként fogja értelmezni, minden más kódot sikeresnek fog tekinteni."
+"URL: http://" => "URL: http://"
);
diff --git a/apps/user_webdavauth/l10n/is.php b/apps/user_webdavauth/l10n/is.php
index 13d9a1fe8f4..8fe0d974b32 100644
--- a/apps/user_webdavauth/l10n/is.php
+++ b/apps/user_webdavauth/l10n/is.php
@@ -1,4 +1,3 @@
<?php $TRANSLATIONS = array(
-"URL: http://" => "Vefslóð: http://",
-"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "ownCloud mun senda auðkenni notenda á þessa vefslóð og túkla svörin http 401 og http 403 sem rangar auðkenniupplýsingar og öll önnur svör sem rétt."
+"URL: http://" => "Vefslóð: http://"
);
diff --git a/apps/user_webdavauth/l10n/it.php b/apps/user_webdavauth/l10n/it.php
index b0abf2f2082..a7cd6e8e4b4 100644
--- a/apps/user_webdavauth/l10n/it.php
+++ b/apps/user_webdavauth/l10n/it.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"WebDAV Authentication" => "Autenticazione WebDAV",
"URL: http://" => "URL: http://",
-"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "ownCloud invierà le credenziali dell'utente a questo URL. Interpreta i codici http 401 e http 403 come credenziali errate e tutti gli altri codici come credenziali corrette."
+"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud invierà le credenziali dell'utente a questo URL. Questa estensione controlla la risposta e interpreta i codici di stato 401 e 403 come credenziali non valide, e tutte le altre risposte come credenziali valide."
);
diff --git a/apps/user_webdavauth/l10n/ja_JP.php b/apps/user_webdavauth/l10n/ja_JP.php
index 8643805ffcc..1cd14a03c72 100644
--- a/apps/user_webdavauth/l10n/ja_JP.php
+++ b/apps/user_webdavauth/l10n/ja_JP.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"WebDAV Authentication" => "WebDAV 認証",
"URL: http://" => "URL: http://",
-"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "ownCloudのこのURLへのユーザ資格情報の送信は、資格情報が間違っている場合はHTTP401もしくは403を返し、正しい場合は全てのコードを返します。"
+"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloudはこのURLにユーザ資格情報を送信します。このプラグインは応答をチェックし、HTTP状態コードが 401 と 403 の場合は無効な資格情報とし、他の応答はすべて有効な資格情報として処理します。"
);
diff --git a/apps/user_webdavauth/l10n/ko.php b/apps/user_webdavauth/l10n/ko.php
index a806df750f7..245a5101341 100644
--- a/apps/user_webdavauth/l10n/ko.php
+++ b/apps/user_webdavauth/l10n/ko.php
@@ -1,4 +1,3 @@
<?php $TRANSLATIONS = array(
-"URL: http://" => "URL: http://",
-"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "ownCloud는 이 URL로 유저 인증을 보내게 되며, http 401 과 http 403은 인증 오류로, 그 외 코드는 인증이 올바른 것으로 해석합니다."
+"URL: http://" => "URL: http://"
);
diff --git a/apps/user_webdavauth/l10n/nl.php b/apps/user_webdavauth/l10n/nl.php
index 687442fb665..7d1bb33923e 100644
--- a/apps/user_webdavauth/l10n/nl.php
+++ b/apps/user_webdavauth/l10n/nl.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"WebDAV Authentication" => "WebDAV authenticatie",
"URL: http://" => "URL: http://",
-"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "ownCloud zal de inloggegevens naar deze URL als geïnterpreteerde http 401 en http 403 als de inloggegevens onjuist zijn. Andere codes als de inloggegevens correct zijn."
+"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud stuurt de inloggegevens naar deze URL. Deze plugin controleert het antwoord en interpreteert de HTTP statuscodes 401 als 403 als ongeldige inloggegevens, maar alle andere antwoorden als geldige inloggegevens."
);
diff --git a/apps/user_webdavauth/l10n/pl.php b/apps/user_webdavauth/l10n/pl.php
index 245a5101341..4887e935316 100644
--- a/apps/user_webdavauth/l10n/pl.php
+++ b/apps/user_webdavauth/l10n/pl.php
@@ -1,3 +1,5 @@
<?php $TRANSLATIONS = array(
-"URL: http://" => "URL: http://"
+"WebDAV Authentication" => "Uwierzytelnienie WebDAV",
+"URL: http://" => "URL: http://",
+"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud wyśle dane uwierzytelniające do tego URL. Ten plugin sprawdza odpowiedź i zinterpretuje kody HTTP 401 oraz 403 jako nieprawidłowe dane uwierzytelniające, a każdy inny kod odpowiedzi jako poprawne dane."
);
diff --git a/apps/user_webdavauth/l10n/pt_PT.php b/apps/user_webdavauth/l10n/pt_PT.php
index e8bfcfda81e..d7e87b5c8d1 100644
--- a/apps/user_webdavauth/l10n/pt_PT.php
+++ b/apps/user_webdavauth/l10n/pt_PT.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"WebDAV Authentication" => "Autenticação WebDAV",
"URL: http://" => "URL: http://",
-"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "O ownCloud vai enviar as credenciais para este URL. Todos os códigos http 401 e 403 serão interpretados como credenciais inválidas, todos os restantes códigos http serão interpretados como credenciais correctas."
+"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "O ownCloud vai enviar as credenciais do utilizador através deste URL. Este plugin verifica a resposta e vai interpretar os códigos de estado HTTP 401 e 403 como credenciais inválidas, e todas as outras como válidas."
);
diff --git a/apps/user_webdavauth/l10n/ro.php b/apps/user_webdavauth/l10n/ro.php
index 17157da044d..245a5101341 100644
--- a/apps/user_webdavauth/l10n/ro.php
+++ b/apps/user_webdavauth/l10n/ro.php
@@ -1,4 +1,3 @@
<?php $TRANSLATIONS = array(
-"URL: http://" => "URL: http://",
-"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "owncloud va trimite acreditatile de utilizator pentru a interpreta aceasta pagina. Http 401 si Http 403 are acreditarile si orice alt cod gresite ca acreditarile corecte"
+"URL: http://" => "URL: http://"
);
diff --git a/apps/user_webdavauth/l10n/sl.php b/apps/user_webdavauth/l10n/sl.php
index 8f4effc81a1..245a5101341 100644
--- a/apps/user_webdavauth/l10n/sl.php
+++ b/apps/user_webdavauth/l10n/sl.php
@@ -1,4 +1,3 @@
<?php $TRANSLATIONS = array(
-"URL: http://" => "URL: http://",
-"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "ownCloud bo poslal uporabniška poverila temu URL naslovu. Pri tem bo interpretiral http 401 in http 403 odgovor kot spodletelo avtentikacijo ter vse ostale http odgovore kot uspešne."
+"URL: http://" => "URL: http://"
);
diff --git a/apps/user_webdavauth/l10n/sv.php b/apps/user_webdavauth/l10n/sv.php
index b7a7e4ea2d9..c79b35c27cd 100644
--- a/apps/user_webdavauth/l10n/sv.php
+++ b/apps/user_webdavauth/l10n/sv.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"WebDAV Authentication" => "WebDAV Autentisering",
"URL: http://" => "URL: http://",
-"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "ownCloud kommer att skicka inloggningsuppgifterna till denna URL och tolkar http 401 och http 403 som fel och alla andra koder som korrekt."
+"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud kommer skicka användaruppgifterna till denna URL. Denna plugin kontrollerar svaret och tolkar HTTP-statuskoderna 401 och 403 som felaktiga uppgifter, och alla andra svar som giltiga uppgifter."
);
diff --git a/apps/user_webdavauth/l10n/th_TH.php b/apps/user_webdavauth/l10n/th_TH.php
index 9bd32954b05..2bd1f685e65 100644
--- a/apps/user_webdavauth/l10n/th_TH.php
+++ b/apps/user_webdavauth/l10n/th_TH.php
@@ -1,3 +1,5 @@
<?php $TRANSLATIONS = array(
-"WebDAV URL: http://" => "WebDAV URL: http://"
+"WebDAV Authentication" => "WebDAV Authentication",
+"URL: http://" => "URL: http://",
+"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud จะส่งข้อมูลการเข้าใช้งานของผู้ใช้งานไปยังที่อยู่ URL ดังกล่าวนี้ ปลั๊กอินดังกล่าวจะทำการตรวจสอบข้อมูลที่โต้ตอบกลับมาและจะทำการแปลรหัส HTTP statuscodes 401 และ 403 ให้เป็นข้อมูลการเข้าใช้งานที่ไม่สามารถใช้งานได้ ส่วนข้อมูลอื่นๆที่เหลือทั้งหมดจะเป็นข้อมูลการเข้าใช้งานที่สามารถใช้งานได้"
);
diff --git a/apps/user_webdavauth/l10n/uk.php b/apps/user_webdavauth/l10n/uk.php
index 57aa90684ae..245a5101341 100644
--- a/apps/user_webdavauth/l10n/uk.php
+++ b/apps/user_webdavauth/l10n/uk.php
@@ -1,4 +1,3 @@
<?php $TRANSLATIONS = array(
-"URL: http://" => "URL: http://",
-"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "ownCloud відправить облікові дані на цей URL та буде інтерпретувати http 401 і http 403, як невірні облікові дані, а всі інші коди, як вірні."
+"URL: http://" => "URL: http://"
);
diff --git a/apps/user_webdavauth/l10n/zh_CN.php b/apps/user_webdavauth/l10n/zh_CN.php
index 5b06409b42e..72d2a0c11df 100644
--- a/apps/user_webdavauth/l10n/zh_CN.php
+++ b/apps/user_webdavauth/l10n/zh_CN.php
@@ -1,3 +1,5 @@
<?php $TRANSLATIONS = array(
-"URL: http://" => "URL:http://"
+"WebDAV Authentication" => "WebDAV 认证",
+"URL: http://" => "URL:http://",
+"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud 将会发送用户的身份到此 URL。这个插件检查返回值并且将 HTTP 状态编码 401 和 403 解释为非法身份,其他所有返回值为合法身份。"
);
diff --git a/apps/user_webdavauth/templates/settings.php b/apps/user_webdavauth/templates/settings.php
index 62ed45fd278..880b77ac959 100755
--- a/apps/user_webdavauth/templates/settings.php
+++ b/apps/user_webdavauth/templates/settings.php
@@ -1,8 +1,8 @@
<form id="webdavauth" action="#" method="post">
<fieldset class="personalblock">
- <legend><strong>WebDAV Authentication</strong></legend>
+ <legend><strong><?php echo $l->t('WebDAV Authentication');?></strong></legend>
<p><label for="webdav_url"><?php echo $l->t('URL: http://');?><input type="text" id="webdav_url" name="webdav_url" value="<?php echo $_['webdav_url']; ?>"></label>
<input type="submit" value="Save" />
- <br /><?php echo $l->t('ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct.'); ?>
+ <br /><?php echo $l->t('ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials.'); ?>
</fieldset>
</form>
diff --git a/config/config.sample.php b/config/config.sample.php
index b1655d02830..dafb536fa6f 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -36,12 +36,6 @@ $CONFIG = array(
/* The automatic protocol detection of ownCloud can fail in certain reverse proxy situations. This option allows to manually override the protocol detection. For example "https" */
"overwriteprotocol" => "",
-/* Enhanced auth forces users to enter their password again when performing potential sensitive actions like creating or deleting users */
-"enhancedauth" => true,
-
-/* Time in seconds how long an user is authenticated without entering his password again before performing sensitive actions like creating or deleting users etc...*/
-"enhancedauthtime" => 15 * 60,
-
/* A proxy to use to connect to the internet. For example "myproxy.org:88" */
"proxy" => "",
@@ -129,12 +123,12 @@ $CONFIG = array(
'path'=> '/var/www/owncloud/apps',
'url' => '/apps',
'writable' => true,
- ),
- ),
- 'user_backends'=>array(
- array(
- 'class'=>'OC_User_IMAP',
- 'arguments'=>array('{imap.gmail.com:993/imap/ssl}INBOX')
- )
- )
+ ),
+),
+'user_backends'=>array(
+ array(
+ 'class'=>'OC_User_IMAP',
+ 'arguments'=>array('{imap.gmail.com:993/imap/ssl}INBOX')
+ )
+)
);
diff --git a/core/ajax/share.php b/core/ajax/share.php
index 72ffc52e997..077baa8ba56 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -98,7 +98,7 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
OCP\Util::sendMail($to_address, $to_address, $subject, $text, $from_address, $user);
OCP\JSON::success();
} catch (Exception $exception) {
- OCP\JSON::error(array('data' => array('message' => $exception->getMessage())));
+ OCP\JSON::error(array('data' => array('message' => OC_Util::sanitizeHTML($exception->getMessage()))));
}
break;
}
diff --git a/core/css/styles.css b/core/css/styles.css
index 496320561f8..3c172d11df8 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -94,8 +94,9 @@ input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-b
/* CONTENT ------------------------------------------------------------------ */
#controls { padding:0 0.5em; width:100%; top:3.5em; height:2.8em; margin:0; background:#f7f7f7; border-bottom:1px solid #eee; position:fixed; z-index:50; -moz-box-shadow:0 -3px 7px #000; -webkit-box-shadow:0 -3px 7px #000; box-shadow:0 -3px 7px #000; }
#controls .button { display:inline-block; }
-#content { top:3.5em; left:12.5em; position:absolute; }
-#leftcontent, .leftcontent { position:fixed; overflow:auto; top:6.4em; width:20em; background:#f8f8f8; border-right:1px solid #ddd; }
+#content { height: 100%; width: 100%; position: relative; }
+#content-wrapper { height: 100%; width: 100%; padding-top: 3.5em; padding-left: 12.5em; box-sizing: border-box; -moz-box-sizing: border-box; position: absolute;}
+#leftcontent, .leftcontent { position:fixed; top: 0; overflow:auto; width:20em; background:#f8f8f8; border-right:1px solid #ddd; box-sizing: border-box; -moz-box-sizing: border-box; height: 100%; padding-top: 6.4em }
#leftcontent li, .leftcontent li { background:#f8f8f8; padding:.5em .8em; white-space:nowrap; overflow:hidden; text-overflow:ellipsis; -webkit-transition:background-color 200ms; -moz-transition:background-color 200ms; -o-transition:background-color 200ms; transition:background-color 200ms; }
#leftcontent li:hover, #leftcontent li:active, #leftcontent li.active, .leftcontent li:hover, .leftcontent li:active, .leftcontent li.active { background:#eee; }
#leftcontent li.active, .leftcontent li.active { font-weight:bold; }
diff --git a/core/js/js.js b/core/js/js.js
index 95889ac8a27..6241036b1b8 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -88,7 +88,7 @@ var OC={
PERMISSION_DELETE:8,
PERMISSION_SHARE:16,
webroot:oc_webroot,
- appswebroots:oc_appswebroots,
+ appswebroots:(typeof oc_appswebroots !== 'undefined') ? oc_appswebroots:false,
currentUser:(typeof oc_current_user!=='undefined')?oc_current_user:false,
coreApps:['', 'admin','log','search','settings','core','3rdparty'],
/**
@@ -504,6 +504,7 @@ function fillHeight(selector) {
if(selector.outerHeight() > selector.height()){
selector.css('height', height-(selector.outerHeight()-selector.height()) + 'px');
}
+ console.warn("This function is deprecated! Use CSS instead");
}
/**
@@ -519,17 +520,11 @@ function fillWindow(selector) {
if(selector.outerWidth() > selector.width()){
selector.css('width', width-(selector.outerWidth()-selector.width()) + 'px');
}
+ console.warn("This function is deprecated! Use CSS instead");
}
$(document).ready(function(){
- $(window).resize(function () {
- fillHeight($('#leftcontent'));
- fillWindow($('#content'));
- fillWindow($('#rightcontent'));
- });
- $(window).trigger('resize');
-
if(!SVGSupport()){ //replace all svg images with png images for browser that dont support svg
replaceSVG();
}else{
diff --git a/core/l10n/ar.php b/core/l10n/ar.php
index 221ea8aebb1..38450f8d54f 100644
--- a/core/l10n/ar.php
+++ b/core/l10n/ar.php
@@ -99,8 +99,5 @@
"remember" => "تذكر",
"Log in" => "أدخل",
"prev" => "السابق",
-"next" => "التالي",
-"Security Warning!" => "تحذير أمان!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "الرجاء التحقق من كلمة السر. <br/>من الممكن أحياناً أن نطلب منك إعادة إدخال كلمة السر مرة أخرى.",
-"Verify" => "تحقيق"
+"next" => "التالي"
);
diff --git a/core/l10n/bn_BD.php b/core/l10n/bn_BD.php
index 60e23e4c16c..333e4bf0be5 100644
--- a/core/l10n/bn_BD.php
+++ b/core/l10n/bn_BD.php
@@ -121,7 +121,5 @@
"Log in" => "প্রবেশ",
"prev" => "পূর্ববর্তী",
"next" => "পরবর্তী",
-"Updating ownCloud to version %s, this may take a while." => "%s ভার্সনে ownCloud পরিবর্ধন করা হচ্ছে, এজন্য কিছু সময় প্রয়োজন।",
-"Security Warning!" => "নিরাপত্তাবিষয়ক সতর্কবাণী",
-"Verify" => "যাচাই কর"
+"Updating ownCloud to version %s, this may take a while." => "%s ভার্সনে ownCloud পরিবর্ধন করা হচ্ছে, এজন্য কিছু সময় প্রয়োজন।"
);
diff --git a/core/l10n/ca.php b/core/l10n/ca.php
index 8a186bfc54e..e66bad25e43 100644
--- a/core/l10n/ca.php
+++ b/core/l10n/ca.php
@@ -127,8 +127,5 @@
"Log in" => "Inici de sessió",
"prev" => "anterior",
"next" => "següent",
-"Updating ownCloud to version %s, this may take a while." => "S'està actualitzant ownCloud a la versió %s, pot trigar una estona.",
-"Security Warning!" => "Avís de seguretat!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Comproveu la vostra contrasenya. <br/>Per raons de seguretat se us pot demanar escriure de nou la vostra contrasenya.",
-"Verify" => "Comprova"
+"Updating ownCloud to version %s, this may take a while." => "S'està actualitzant ownCloud a la versió %s, pot trigar una estona."
);
diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php
index 4d2803261b6..7a766bd7176 100644
--- a/core/l10n/cs_CZ.php
+++ b/core/l10n/cs_CZ.php
@@ -127,8 +127,5 @@
"Log in" => "Přihlásit",
"prev" => "předchozí",
"next" => "následující",
-"Updating ownCloud to version %s, this may take a while." => "Aktualizuji ownCloud na verzi %s, bude to chvíli trvat.",
-"Security Warning!" => "Bezpečnostní upozornění.",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Ověřte, prosím, své heslo. <br/>Z bezpečnostních důvodů můžete být občas požádáni o jeho opětovné zadání.",
-"Verify" => "Ověřit"
+"Updating ownCloud to version %s, this may take a while." => "Aktualizuji ownCloud na verzi %s, bude to chvíli trvat."
);
diff --git a/core/l10n/da.php b/core/l10n/da.php
index 26cc6a5e08e..e8155c298c0 100644
--- a/core/l10n/da.php
+++ b/core/l10n/da.php
@@ -126,8 +126,5 @@
"remember" => "husk",
"Log in" => "Log ind",
"prev" => "forrige",
-"next" => "næste",
-"Security Warning!" => "Sikkerhedsadvarsel!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Verificer din adgangskode.<br/>Af sikkerhedsårsager kan du lejlighedsvist blive bedt om at indtaste din adgangskode igen.",
-"Verify" => "Verificer"
+"next" => "næste"
);
diff --git a/core/l10n/de.php b/core/l10n/de.php
index 76f1379e21e..89846301a58 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -127,8 +127,5 @@
"Log in" => "Einloggen",
"prev" => "Zurück",
"next" => "Weiter",
-"Updating ownCloud to version %s, this may take a while." => "Aktualisiere ownCloud auf Version %s. Dies könnte eine Weile dauern.",
-"Security Warning!" => "Sicherheitswarnung!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Bitte bestätige Dein Passwort. <br/> Aus Sicherheitsgründen wirst Du hierbei gebeten, Dein Passwort erneut einzugeben.",
-"Verify" => "Bestätigen"
+"Updating ownCloud to version %s, this may take a while." => "Aktualisiere ownCloud auf Version %s. Dies könnte eine Weile dauern."
);
diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php
index 2eb8758215f..d62b000c0ab 100644
--- a/core/l10n/de_DE.php
+++ b/core/l10n/de_DE.php
@@ -127,8 +127,5 @@
"Log in" => "Einloggen",
"prev" => "Zurück",
"next" => "Weiter",
-"Updating ownCloud to version %s, this may take a while." => "Aktualisiere ownCloud auf Version %s. Dies könnte eine Weile dauern.",
-"Security Warning!" => "Sicherheitshinweis!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Bitte überprüfen Sie Ihr Passwort. <br/>Aus Sicherheitsgründen werden Sie gelegentlich aufgefordert, Ihr Passwort erneut einzugeben.",
-"Verify" => "Überprüfen"
+"Updating ownCloud to version %s, this may take a while." => "Aktualisiere ownCloud auf Version %s. Dies könnte eine Weile dauern."
);
diff --git a/core/l10n/el.php b/core/l10n/el.php
index 88c169ace7a..c029b01fd9c 100644
--- a/core/l10n/el.php
+++ b/core/l10n/el.php
@@ -127,7 +127,5 @@
"Log in" => "Είσοδος",
"prev" => "προηγούμενο",
"next" => "επόμενο",
-"Security Warning!" => "Προειδοποίηση Ασφαλείας!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Παρακαλώ επιβεβαιώστε το συνθηματικό σας. <br/>Για λόγους ασφαλείας μπορεί να ερωτάστε να εισάγετε ξανά το συνθηματικό σας.",
-"Verify" => "Επαλήθευση"
+"Updating ownCloud to version %s, this may take a while." => "Ενημερώνοντας το ownCloud στην έκδοση %s,μπορεί να πάρει λίγο χρόνο."
);
diff --git a/core/l10n/eo.php b/core/l10n/eo.php
index 0cbe7d33be6..0319eeef2d4 100644
--- a/core/l10n/eo.php
+++ b/core/l10n/eo.php
@@ -122,8 +122,5 @@
"remember" => "memori",
"Log in" => "Ensaluti",
"prev" => "maljena",
-"next" => "jena",
-"Security Warning!" => "Sekureca averto!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Bonvolu kontroli vian pasvorton. <br/>Pro sekureco, oni okaze povas peti al vi enigi vian pasvorton ree.",
-"Verify" => "Kontroli"
+"next" => "jena"
);
diff --git a/core/l10n/es.php b/core/l10n/es.php
index 2cc604f590c..4f8f1936c7f 100644
--- a/core/l10n/es.php
+++ b/core/l10n/es.php
@@ -127,8 +127,5 @@
"Log in" => "Entrar",
"prev" => "anterior",
"next" => "siguiente",
-"Updating ownCloud to version %s, this may take a while." => "Actualizando ownCloud a la versión %s, esto puede demorar un tiempo.",
-"Security Warning!" => "¡Advertencia de seguridad!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Por favor verifique su contraseña. <br/>Por razones de seguridad se le puede volver a preguntar ocasionalmente la contraseña.",
-"Verify" => "Verificar"
+"Updating ownCloud to version %s, this may take a while." => "Actualizando ownCloud a la versión %s, esto puede demorar un tiempo."
);
diff --git a/core/l10n/es_AR.php b/core/l10n/es_AR.php
index 48b8177573b..374a679260b 100644
--- a/core/l10n/es_AR.php
+++ b/core/l10n/es_AR.php
@@ -127,7 +127,5 @@
"Log in" => "Entrar",
"prev" => "anterior",
"next" => "siguiente",
-"Security Warning!" => "¡Advertencia de seguridad!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Por favor, verificá tu contraseña. <br/>Por razones de seguridad, puede ser que que te pregunte ocasionalmente la contraseña.",
-"Verify" => "Verificar"
+"Updating ownCloud to version %s, this may take a while." => "Actualizando ownCloud a la versión %s, puede domorar un rato."
);
diff --git a/core/l10n/et_EE.php b/core/l10n/et_EE.php
index 226c0d27e80..b79dd4761e7 100644
--- a/core/l10n/et_EE.php
+++ b/core/l10n/et_EE.php
@@ -102,7 +102,5 @@
"remember" => "pea meeles",
"Log in" => "Logi sisse",
"prev" => "eelm",
-"next" => "järgm",
-"Security Warning!" => "turvahoiatus!",
-"Verify" => "Kinnita"
+"next" => "järgm"
);
diff --git a/core/l10n/eu.php b/core/l10n/eu.php
index becd4d83b66..3f1a2909531 100644
--- a/core/l10n/eu.php
+++ b/core/l10n/eu.php
@@ -127,7 +127,5 @@
"Log in" => "Hasi saioa",
"prev" => "aurrekoa",
"next" => "hurrengoa",
-"Security Warning!" => "Segurtasun abisua",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Mesedez egiaztatu zure pasahitza. <br/>Segurtasun arrazoiengatik noizbehinka zure pasahitza berriz sartzea eska diezazukegu.",
-"Verify" => "Egiaztatu"
+"Updating ownCloud to version %s, this may take a while." => "ownCloud %s bertsiora eguneratzen, denbora har dezake."
);
diff --git a/core/l10n/fa.php b/core/l10n/fa.php
index a7c3c9ab2e5..ad5bafeb1a2 100644
--- a/core/l10n/fa.php
+++ b/core/l10n/fa.php
@@ -17,6 +17,7 @@
"Ok" => "قبول",
"Error" => "خطا",
"Password" => "گذرواژه",
+"Unshare" => "لغو اشتراک",
"create" => "ایجاد",
"ownCloud password reset" => "پسورد ابرهای شما تغییرکرد",
"Use the following link to reset your password: {link}" => "از لینک زیر جهت دوباره سازی پسورد استفاده کنید :\n{link}",
diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php
index 3d3bd93845f..751293e1fd5 100644
--- a/core/l10n/fi_FI.php
+++ b/core/l10n/fi_FI.php
@@ -5,7 +5,9 @@
"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Käyttäjä %s jakoi kansion \"%s\" kanssasi. Se on ladattavissa täältä: %s",
"No category to add?" => "Ei lisättävää luokkaa?",
"This category already exists: " => "Tämä luokka on jo olemassa: ",
+"Error adding %s to favorites." => "Virhe lisätessä kohdetta %s suosikkeihin.",
"No categories selected for deletion." => "Luokkia ei valittu poistettavaksi.",
+"Error removing %s from favorites." => "Virhe poistaessa kohdetta %s suosikeista.",
"Settings" => "Asetukset",
"seconds ago" => "sekuntia sitten",
"1 minute ago" => "1 minuutti sitten",
@@ -31,6 +33,9 @@
"Error while sharing" => "Virhe jaettaessa",
"Error while unsharing" => "Virhe jakoa peruttaessa",
"Error while changing permissions" => "Virhe oikeuksia muuttaessa",
+"Shared with you and the group {group} by {owner}" => "Jaettu sinun ja ryhmän {group} kanssa käyttäjän {owner} toimesta",
+"Shared with you by {owner}" => "Jaettu kanssasi käyttäjän {owner} toimesta",
+"Share with" => "Jaa",
"Share with link" => "Jaa linkillä",
"Password protect" => "Suojaa salasanalla",
"Password" => "Salasana",
@@ -115,8 +120,5 @@
"Log in" => "Kirjaudu sisään",
"prev" => "edellinen",
"next" => "seuraava",
-"Updating ownCloud to version %s, this may take a while." => "Päivitetään ownCloud versioon %s, tämä saattaa kestää hetken.",
-"Security Warning!" => "Turvallisuusvaroitus!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Vahvista salasanasi. <br/>Turvallisuussyistä sinulta saatetaan ajoittain kysyä salasanasi uudelleen.",
-"Verify" => "Vahvista"
+"Updating ownCloud to version %s, this may take a while." => "Päivitetään ownCloud versioon %s, tämä saattaa kestää hetken."
);
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index 8cbf5f45adb..39269e43b5d 100644
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@@ -127,8 +127,5 @@
"Log in" => "Connexion",
"prev" => "précédent",
"next" => "suivant",
-"Updating ownCloud to version %s, this may take a while." => "Mise à jour en cours d'ownCloud vers la version %s, cela peut prendre du temps.",
-"Security Warning!" => "Alerte de sécurité !",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Veuillez vérifier votre mot de passe. <br/>Par sécurité il vous sera occasionnellement demandé d'entrer votre mot de passe de nouveau.",
-"Verify" => "Vérification"
+"Updating ownCloud to version %s, this may take a while." => "Mise à jour en cours d'ownCloud vers la version %s, cela peut prendre du temps."
);
diff --git a/core/l10n/gl.php b/core/l10n/gl.php
index bdd1293113c..2642debb288 100644
--- a/core/l10n/gl.php
+++ b/core/l10n/gl.php
@@ -127,8 +127,5 @@
"Log in" => "Conectar",
"prev" => "anterior",
"next" => "seguinte",
-"Updating ownCloud to version %s, this may take a while." => "Actualizando ownCloud a versión %s, esto pode levar un anaco.",
-"Security Warning!" => "Advertencia de seguranza",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Verifique o seu contrasinal.<br/>Por motivos de seguranza pode que ocasionalmente se lle pregunte de novo polo seu contrasinal.",
-"Verify" => "Verificar"
+"Updating ownCloud to version %s, this may take a while." => "Actualizando ownCloud a versión %s, esto pode levar un anaco."
);
diff --git a/core/l10n/he.php b/core/l10n/he.php
index bb6ac48dd92..59eb3ae14d4 100644
--- a/core/l10n/he.php
+++ b/core/l10n/he.php
@@ -127,8 +127,5 @@
"Log in" => "כניסה",
"prev" => "הקודם",
"next" => "הבא",
-"Updating ownCloud to version %s, this may take a while." => "מעדכן את ownCloud אל גרסא %s, זה עלול לקחת זמן מה.",
-"Security Warning!" => "אזהרת אבטחה!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "נא לאמת את הססמה שלך. <br/>מטעמי אבטחה יתכן שתופיע בקשה להזין את הססמה שוב.",
-"Verify" => "אימות"
+"Updating ownCloud to version %s, this may take a while." => "מעדכן את ownCloud אל גרסא %s, זה עלול לקחת זמן מה."
);
diff --git a/core/l10n/hu_HU.php b/core/l10n/hu_HU.php
index fa02064f3d2..a9e20fc6466 100644
--- a/core/l10n/hu_HU.php
+++ b/core/l10n/hu_HU.php
@@ -127,7 +127,5 @@
"Log in" => "Bejelentkezés",
"prev" => "előző",
"next" => "következő",
-"Security Warning!" => "Biztonsági figyelmeztetés!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Kérjük írja be a jelszavát! <br/>Biztonsági okokból néha a bejelentkezést követően is ellenőrzésképpen meg kell adnia a jelszavát.",
-"Verify" => "Ellenőrzés"
+"Updating ownCloud to version %s, this may take a while." => "Owncloud frissítés a %s verzióra folyamatban. Kis türelmet."
);
diff --git a/core/l10n/id.php b/core/l10n/id.php
index d0ba6c694fb..ee5fad95217 100644
--- a/core/l10n/id.php
+++ b/core/l10n/id.php
@@ -101,8 +101,5 @@
"remember" => "selalu login",
"Log in" => "Masuk",
"prev" => "sebelum",
-"next" => "selanjutnya",
-"Security Warning!" => "peringatan keamanan!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "mohon periksa kembali kata kunci anda. <br/>untuk alasan keamanan,anda akan sesekali diminta untuk memasukan kata kunci lagi.",
-"Verify" => "periksa kembali"
+"next" => "selanjutnya"
);
diff --git a/core/l10n/is.php b/core/l10n/is.php
index 0b2b2ce3e9a..e810eb359fd 100644
--- a/core/l10n/is.php
+++ b/core/l10n/is.php
@@ -127,8 +127,5 @@
"Log in" => "<strong>Skrá inn</strong>",
"prev" => "fyrra",
"next" => "næsta",
-"Updating ownCloud to version %s, this may take a while." => "Uppfæri ownCloud í útgáfu %s, það gæti tekið smá stund.",
-"Security Warning!" => "Öryggis aðvörun!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Vinsamlegast staðfestu lykilorðið þitt.<br/>Í öryggisskyni munum við biðja þig um að skipta um lykilorð af og til.",
-"Verify" => "Staðfesta"
+"Updating ownCloud to version %s, this may take a while." => "Uppfæri ownCloud í útgáfu %s, það gæti tekið smá stund."
);
diff --git a/core/l10n/it.php b/core/l10n/it.php
index d868150346a..89b6a7952a9 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -127,8 +127,5 @@
"Log in" => "Accedi",
"prev" => "precedente",
"next" => "successivo",
-"Updating ownCloud to version %s, this may take a while." => "Aggiornamento di ownCloud alla versione %s in corso, potrebbe richiedere del tempo.",
-"Security Warning!" => "Avviso di sicurezza",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Verifica la tua password.<br/>Per motivi di sicurezza, potresti ricevere una richiesta di digitare nuovamente la password.",
-"Verify" => "Verifica"
+"Updating ownCloud to version %s, this may take a while." => "Aggiornamento di ownCloud alla versione %s in corso, potrebbe richiedere del tempo."
);
diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php
index 5efbe05bc56..7d4baf94583 100644
--- a/core/l10n/ja_JP.php
+++ b/core/l10n/ja_JP.php
@@ -127,8 +127,5 @@
"Log in" => "ログイン",
"prev" => "前",
"next" => "次",
-"Updating ownCloud to version %s, this may take a while." => "ownCloud をバージョン %s に更新しています、しばらくお待ち下さい。",
-"Security Warning!" => "セキュリティ警告!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "パスワードの確認<br/>セキュリティ上の理由によりパスワードの再入力をお願いします。",
-"Verify" => "確認"
+"Updating ownCloud to version %s, this may take a while." => "ownCloud をバージョン %s に更新しています、しばらくお待ち下さい。"
);
diff --git a/core/l10n/ka_GE.php b/core/l10n/ka_GE.php
index b002b42cb59..aafdacab4c6 100644
--- a/core/l10n/ka_GE.php
+++ b/core/l10n/ka_GE.php
@@ -99,7 +99,5 @@
"remember" => "დამახსოვრება",
"Log in" => "შესვლა",
"prev" => "წინა",
-"next" => "შემდეგი",
-"Security Warning!" => "უსაფრთხოების გაფრთხილება!",
-"Verify" => "შემოწმება"
+"next" => "შემდეგი"
);
diff --git a/core/l10n/ko.php b/core/l10n/ko.php
index 0faa19865f9..3db5a501173 100644
--- a/core/l10n/ko.php
+++ b/core/l10n/ko.php
@@ -127,8 +127,5 @@
"Log in" => "로그인",
"prev" => "이전",
"next" => "다음",
-"Updating ownCloud to version %s, this may take a while." => "ownCloud 를 버젼 %s로 업데이트 하는 중, 시간이 소요됩니다.",
-"Security Warning!" => "보안 경고!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "암호를 확인해 주십시오.<br/>보안상의 이유로 종종 암호를 물어볼 것입니다.",
-"Verify" => "확인"
+"Updating ownCloud to version %s, this may take a while." => "ownCloud 를 버젼 %s로 업데이트 하는 중, 시간이 소요됩니다."
);
diff --git a/core/l10n/lt_LT.php b/core/l10n/lt_LT.php
index 19826b26c16..ec15c646191 100644
--- a/core/l10n/lt_LT.php
+++ b/core/l10n/lt_LT.php
@@ -105,8 +105,5 @@
"remember" => "prisiminti",
"Log in" => "Prisijungti",
"prev" => "atgal",
-"next" => "kitas",
-"Security Warning!" => "Saugumo pranešimas!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Prašome patvirtinti savo vartotoją.<br/>Dėl saugumo, slaptažodžio patvirtinimas bus reikalaujamas įvesti kas kiek laiko.",
-"Verify" => "Patvirtinti"
+"next" => "kitas"
);
diff --git a/core/l10n/mk.php b/core/l10n/mk.php
index 94c9ee581b1..d8fa16d44f3 100644
--- a/core/l10n/mk.php
+++ b/core/l10n/mk.php
@@ -126,8 +126,5 @@
"remember" => "запамти",
"Log in" => "Најава",
"prev" => "претходно",
-"next" => "следно",
-"Security Warning!" => "Безбедносно предупредување.",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Ве молам потврдете ја вашата лозинка. <br />Од безбедносни причини од време на време може да биде побарано да ја внесете вашата лозинка повторно.",
-"Verify" => "Потврди"
+"next" => "следно"
);
diff --git a/core/l10n/nb_NO.php b/core/l10n/nb_NO.php
index 45ee77e3c17..d985e454b7c 100644
--- a/core/l10n/nb_NO.php
+++ b/core/l10n/nb_NO.php
@@ -101,7 +101,5 @@
"remember" => "husk",
"Log in" => "Logg inn",
"prev" => "forrige",
-"next" => "neste",
-"Security Warning!" => "Sikkerhetsadvarsel!",
-"Verify" => "Verifiser"
+"next" => "neste"
);
diff --git a/core/l10n/nl.php b/core/l10n/nl.php
index b3a43523a76..739d8181d6f 100644
--- a/core/l10n/nl.php
+++ b/core/l10n/nl.php
@@ -127,8 +127,5 @@
"Log in" => "Meld je aan",
"prev" => "vorige",
"next" => "volgende",
-"Updating ownCloud to version %s, this may take a while." => "Updaten ownCloud naar versie %s, dit kan even duren.",
-"Security Warning!" => "Beveiligingswaarschuwing!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Verifieer uw wachtwoord!<br/>Om veiligheidsredenen wordt u regelmatig gevraagd uw wachtwoord in te geven.",
-"Verify" => "Verifieer"
+"Updating ownCloud to version %s, this may take a while." => "Updaten ownCloud naar versie %s, dit kan even duren."
);
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
index 159e5b9caed..3324040209b 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -127,8 +127,5 @@
"Log in" => "Zaloguj",
"prev" => "wstecz",
"next" => "naprzód",
-"Updating ownCloud to version %s, this may take a while." => "Aktualizowanie ownCloud do wersji %s, może to potrwać chwilę.",
-"Security Warning!" => "Ostrzeżenie o zabezpieczeniach!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Sprawdź swoje hasło.<br/>Ze względów bezpieczeństwa możesz zostać czasami poproszony o wprowadzenie hasła ponownie.",
-"Verify" => "Zweryfikowane"
+"Updating ownCloud to version %s, this may take a while." => "Aktualizowanie ownCloud do wersji %s, może to potrwać chwilę."
);
diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php
index a5e21734c3e..3b119650268 100644
--- a/core/l10n/pt_BR.php
+++ b/core/l10n/pt_BR.php
@@ -118,8 +118,5 @@
"remember" => "lembrete",
"Log in" => "Log in",
"prev" => "anterior",
-"next" => "próximo",
-"Security Warning!" => "Aviso de Segurança!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Por favor, verifique a sua senha.<br />Por motivos de segurança, você deverá ser solicitado a muda-la ocasionalmente.",
-"Verify" => "Verificar"
+"next" => "próximo"
);
diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php
index b896dda4003..6e3a558986c 100644
--- a/core/l10n/pt_PT.php
+++ b/core/l10n/pt_PT.php
@@ -127,8 +127,5 @@
"Log in" => "Entrar",
"prev" => "anterior",
"next" => "seguinte",
-"Updating ownCloud to version %s, this may take a while." => "A Actualizar o ownCloud para a versão %s, esta operação pode demorar.",
-"Security Warning!" => "Aviso de Segurança!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Por favor verifique a sua palavra-passe. <br/>Por razões de segurança, pode ser-lhe perguntada, ocasionalmente, a sua palavra-passe de novo.",
-"Verify" => "Verificar"
+"Updating ownCloud to version %s, this may take a while." => "A Actualizar o ownCloud para a versão %s, esta operação pode demorar."
);
diff --git a/core/l10n/ro.php b/core/l10n/ro.php
index 3c47ef0f8ca..c3434706df8 100644
--- a/core/l10n/ro.php
+++ b/core/l10n/ro.php
@@ -110,8 +110,5 @@
"remember" => "amintește",
"Log in" => "Autentificare",
"prev" => "precedentul",
-"next" => "următorul",
-"Security Warning!" => "Advertisment de Securitate",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Te rog verifica parola. <br/>Pentru securitate va poate fi cerut ocazional introducerea parolei din nou",
-"Verify" => "Verifica"
+"next" => "următorul"
);
diff --git a/core/l10n/ru.php b/core/l10n/ru.php
index 9a72986aea4..7434d6af7f8 100644
--- a/core/l10n/ru.php
+++ b/core/l10n/ru.php
@@ -127,8 +127,5 @@
"Log in" => "Войти",
"prev" => "пред",
"next" => "след",
-"Updating ownCloud to version %s, this may take a while." => "Производится обновление ownCloud до версии %s. Это может занять некоторое время.",
-"Security Warning!" => "Предупреждение безопасности!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Пожалуйста, проверьте свой ​​пароль. <br/>По соображениям безопасности, Вам иногда придется вводить свой пароль снова.",
-"Verify" => "Подтвердить"
+"Updating ownCloud to version %s, this may take a while." => "Производится обновление ownCloud до версии %s. Это может занять некоторое время."
);
diff --git a/core/l10n/ru_RU.php b/core/l10n/ru_RU.php
index 400aa3996e4..84bd8f93156 100644
--- a/core/l10n/ru_RU.php
+++ b/core/l10n/ru_RU.php
@@ -126,8 +126,5 @@
"remember" => "запомнить",
"Log in" => "Войти",
"prev" => "предыдущий",
-"next" => "следующий",
-"Security Warning!" => "Предупреждение системы безопасности!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Пожалуйста, проверьте свой ​​пароль. <br/>По соображениям безопасности Вам может быть иногда предложено ввести пароль еще раз.",
-"Verify" => "Проверить"
+"next" => "следующий"
);
diff --git a/core/l10n/sk_SK.php b/core/l10n/sk_SK.php
index f9d1aa14e79..286642ace7a 100644
--- a/core/l10n/sk_SK.php
+++ b/core/l10n/sk_SK.php
@@ -1,4 +1,8 @@
<?php $TRANSLATIONS = array(
+"User %s shared a file with you" => "Používateľ %s zdieľa s Vami súbor",
+"User %s shared a folder with you" => "Používateľ %s zdieľa s Vami adresár",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Používateľ %s zdieľa s Vami súbor \"%s\". Môžete si ho stiahnuť tu: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Používateľ %s zdieľa s Vami adresár \"%s\". Môžete si ho stiahnuť tu: %s",
"Category type not provided." => "Neposkytnutý kategorický typ.",
"No category to add?" => "Žiadna kategória pre pridanie?",
"This category already exists: " => "Táto kategória už existuje:",
@@ -39,6 +43,8 @@
"Share with link" => "Zdieľať cez odkaz",
"Password protect" => "Chrániť heslom",
"Password" => "Heslo",
+"Email link to person" => "Odoslať odkaz osobe e-mailom",
+"Send" => "Odoslať",
"Set expiration date" => "Nastaviť dátum expirácie",
"Expiration date" => "Dátum expirácie",
"Share via email:" => "Zdieľať cez e-mail:",
@@ -55,6 +61,8 @@
"Password protected" => "Chránené heslom",
"Error unsetting expiration date" => "Chyba pri odstraňovaní dátumu vypršania platnosti",
"Error setting expiration date" => "Chyba pri nastavení dátumu vypršania platnosti",
+"Sending ..." => "Odosielam ...",
+"Email sent" => "Email odoslaný",
"ownCloud password reset" => "Obnovenie hesla pre ownCloud",
"Use the following link to reset your password: {link}" => "Použite nasledujúci odkaz pre obnovenie vášho hesla: {link}",
"You will receive a link to reset your password via Email." => "Odkaz pre obnovenie hesla obdržíte e-mailom.",
@@ -119,7 +127,5 @@
"Log in" => "Prihlásiť sa",
"prev" => "späť",
"next" => "ďalej",
-"Security Warning!" => "Bezpečnostné varovanie!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Prosím, overte svoje heslo. <br />Z bezpečnostných dôvodov môžete byť občas požiadaný o jeho opätovné zadanie.",
-"Verify" => "Overenie"
+"Updating ownCloud to version %s, this may take a while." => "Aktualizujem ownCloud na verziu %s, môže to chvíľu trvať."
);
diff --git a/core/l10n/sl.php b/core/l10n/sl.php
index 795c5a89952..b2c924d412e 100644
--- a/core/l10n/sl.php
+++ b/core/l10n/sl.php
@@ -126,8 +126,5 @@
"remember" => "Zapomni si me",
"Log in" => "Prijava",
"prev" => "nazaj",
-"next" => "naprej",
-"Security Warning!" => "Varnostno opozorilo!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Prosimo, če preverite vaše geslo. Iz varnostnih razlogov vas lahko občasno prosimo, da ga ponovno vnesete.",
-"Verify" => "Preveri"
+"next" => "naprej"
);
diff --git a/core/l10n/sr.php b/core/l10n/sr.php
index 1679b9e6ddd..6b64d1957e7 100644
--- a/core/l10n/sr.php
+++ b/core/l10n/sr.php
@@ -118,8 +118,5 @@
"remember" => "упамти",
"Log in" => "Пријава",
"prev" => "претходно",
-"next" => "следеће",
-"Security Warning!" => "Сигурносно упозорење!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Потврдите лозинку. <br />Из сигурносних разлога затрежићемо вам да два пута унесете лозинку.",
-"Verify" => "Потврди"
+"next" => "следеће"
);
diff --git a/core/l10n/sv.php b/core/l10n/sv.php
index 6bb62613048..70a9871be26 100644
--- a/core/l10n/sv.php
+++ b/core/l10n/sv.php
@@ -127,8 +127,5 @@
"Log in" => "Logga in",
"prev" => "föregående",
"next" => "nästa",
-"Updating ownCloud to version %s, this may take a while." => "Uppdaterar ownCloud till version %s, detta kan ta en stund.",
-"Security Warning!" => "Säkerhetsvarning!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Bekräfta ditt lösenord. <br/>Av säkerhetsskäl kan du ibland bli ombedd att ange ditt lösenord igen.",
-"Verify" => "Verifiera"
+"Updating ownCloud to version %s, this may take a while." => "Uppdaterar ownCloud till version %s, detta kan ta en stund."
);
diff --git a/core/l10n/ta_LK.php b/core/l10n/ta_LK.php
index ec5f142ecfb..65cfbbf965d 100644
--- a/core/l10n/ta_LK.php
+++ b/core/l10n/ta_LK.php
@@ -118,8 +118,5 @@
"remember" => "ஞாபகப்படுத்துக",
"Log in" => "புகுபதிகை",
"prev" => "முந்தைய",
-"next" => "அடுத்து",
-"Security Warning!" => "பாதுகாப்பு எச்சரிக்கை!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "உங்களுடைய கடவுச்சொல்லை உறுதிப்படுத்துக. <br/> பாதுகாப்பு காரணங்களுக்காக நீங்கள் எப்போதாவது உங்களுடைய கடவுச்சொல்லை மீண்டும் நுழைக்க கேட்கப்படுவீர்கள்.",
-"Verify" => "உறுதிப்படுத்தல்"
+"next" => "அடுத்து"
);
diff --git a/core/l10n/th_TH.php b/core/l10n/th_TH.php
index 7cbc39dd1e0..bcbd70d03e6 100644
--- a/core/l10n/th_TH.php
+++ b/core/l10n/th_TH.php
@@ -1,4 +1,8 @@
<?php $TRANSLATIONS = array(
+"User %s shared a file with you" => "ผู้ใช้งาน %s ได้แชร์ไฟล์ให้กับคุณ",
+"User %s shared a folder with you" => "ผู้ใช้งาน %s ได้แชร์โฟลเดอร์ให้กับคุณ",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "ผู้ใช้งาน %s ได้แชร์ไฟล์ \"%s\" ให้กับคุณ และคุณสามารถสามารถดาวน์โหลดไฟล์ดังกล่าวได้จากที่นี่: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "ผู้ใช้งาน %s ได้แชร์โฟลเดอร์ \"%s\" ให้กับคุณ และคุณสามารถดาวน์โหลดโฟลเดอร์ดังกล่าวได้จากที่นี่: %s",
"Category type not provided." => "ยังไม่ได้ระบุชนิดของหมวดหมู่",
"No category to add?" => "ไม่มีหมวดหมู่ที่ต้องการเพิ่ม?",
"This category already exists: " => "หมวดหมู่นี้มีอยู่แล้ว: ",
@@ -39,6 +43,8 @@
"Share with link" => "แชร์ด้วยลิงก์",
"Password protect" => "ใส่รหัสผ่านไว้",
"Password" => "รหัสผ่าน",
+"Email link to person" => "ส่งลิงก์ให้ทางอีเมล",
+"Send" => "ส่ง",
"Set expiration date" => "กำหนดวันที่หมดอายุ",
"Expiration date" => "วันที่หมดอายุ",
"Share via email:" => "แชร์ผ่านทางอีเมล",
@@ -55,6 +61,8 @@
"Password protected" => "ใส่รหัสผ่านไว้",
"Error unsetting expiration date" => "เกิดข้อผิดพลาดในการยกเลิกการตั้งค่าวันที่หมดอายุ",
"Error setting expiration date" => "เกิดข้อผิดพลาดในการตั้งค่าวันที่หมดอายุ",
+"Sending ..." => "กำลังส่ง...",
+"Email sent" => "ส่งอีเมล์แล้ว",
"ownCloud password reset" => "รีเซ็ตรหัสผ่าน ownCloud",
"Use the following link to reset your password: {link}" => "ใช้ลิงค์ต่อไปนี้เพื่อเปลี่ยนรหัสผ่านของคุณใหม่: {link}",
"You will receive a link to reset your password via Email." => "คุณจะได้รับลิงค์เพื่อกำหนดรหัสผ่านใหม่ทางอีเมล์",
@@ -119,7 +127,5 @@
"Log in" => "เข้าสู่ระบบ",
"prev" => "ก่อนหน้า",
"next" => "ถัดไป",
-"Security Warning!" => "คำเตือนเพื่อความปลอดภัย!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "กรุณายืนยันรหัสผ่านของคุณ <br/> เพื่อความปลอดภัย คุณจะถูกขอให้กรอกรหัสผ่านอีกครั้ง",
-"Verify" => "ยืนยัน"
+"Updating ownCloud to version %s, this may take a while." => "กำลังอัพเดท ownCloud ไปเป็นรุ่น %s, กรุณารอสักครู่"
);
diff --git a/core/l10n/tr.php b/core/l10n/tr.php
index 1020b61f9b9..58e28a9b3b9 100644
--- a/core/l10n/tr.php
+++ b/core/l10n/tr.php
@@ -1,9 +1,16 @@
<?php $TRANSLATIONS = array(
+"User %s shared a file with you" => "%s kullanıcısı sizinle bir dosyayı paylaştı",
+"User %s shared a folder with you" => "%s kullanıcısı sizinle bir dizini paylaştı",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "%s kullanıcısı \"%s\" dosyasını sizinle paylaştı. %s adresinden indirilebilir",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "%s kullanıcısı \"%s\" dizinini sizinle paylaştı. %s adresinden indirilebilir",
"Category type not provided." => "Kategori türü desteklenmemektedir.",
"No category to add?" => "Eklenecek kategori yok?",
"This category already exists: " => "Bu kategori zaten mevcut: ",
"Object type not provided." => "Nesne türü desteklenmemektedir.",
+"%s ID not provided." => "%s ID belirtilmedi.",
+"Error adding %s to favorites." => "%s favorilere eklenirken hata oluştu",
"No categories selected for deletion." => "Silmek için bir kategori seçilmedi",
+"Error removing %s from favorites." => "%s favorilere çıkarılırken hata oluştu",
"Settings" => "Ayarlar",
"seconds ago" => "saniye önce",
"1 minute ago" => "1 dakika önce",
@@ -25,18 +32,25 @@
"Ok" => "Tamam",
"The object type is not specified." => "Nesne türü belirtilmemiş.",
"Error" => "Hata",
+"The app name is not specified." => "uygulama adı belirtilmedi.",
+"The required file {file} is not installed!" => "İhtiyaç duyulan {file} dosyası kurulu değil.",
"Error while sharing" => "Paylaşım sırasında hata ",
+"Error while unsharing" => "Paylaşım iptal ediliyorken hata",
"Error while changing permissions" => "İzinleri değiştirirken hata oluştu",
+"Shared with you and the group {group} by {owner}" => " {owner} tarafından sizinle ve {group} ile paylaştırılmış",
+"Shared with you by {owner}" => "{owner} trafından sizinle paylaştırıldı",
"Share with" => "ile Paylaş",
"Share with link" => "Bağlantı ile paylaş",
"Password protect" => "Şifre korunması",
"Password" => "Parola",
+"Email link to person" => "Kişiye e-posta linki",
"Send" => "Gönder",
"Set expiration date" => "Son kullanma tarihini ayarla",
"Expiration date" => "Son kullanım tarihi",
"Share via email:" => "Eposta ile paylaş",
"No people found" => "Kişi bulunamadı",
"Resharing is not allowed" => "Tekrar paylaşmaya izin verilmiyor",
+"Shared in {item} with {user}" => " {item} içinde {user} ile paylaşılanlarlar",
"Unshare" => "Paylaşılmayan",
"can edit" => "düzenleyebilir",
"access control" => "erişim kontrolü",
@@ -45,6 +59,8 @@
"delete" => "sil",
"share" => "paylaş",
"Password protected" => "Paralo korumalı",
+"Error unsetting expiration date" => "Geçerlilik tarihi tanımlama kaldırma hatası",
+"Error setting expiration date" => "Geçerlilik tarihi tanımlama hatası",
"Sending ..." => "Gönderiliyor...",
"Email sent" => "Eposta gönderildi",
"ownCloud password reset" => "ownCloud parola sıfırlama",
@@ -68,6 +84,9 @@
"Edit categories" => "Kategorileri düzenle",
"Add" => "Ekle",
"Security Warning" => "Güvenlik Uyarisi",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Güvenli rasgele sayı üreticisi bulunamadı. Lütfen PHP OpenSSL eklentisini etkinleştirin.",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Güvenli rasgele sayı üreticisi olmadan saldırganlar parola sıfırlama simgelerini tahmin edip hesabınızı ele geçirebilir.",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "data dizininiz ve dosyalarınız büyük ihtimalle internet üzerinden erişilebilir. Owncloud tarafından sağlanan .htaccess dosyası çalışmıyor. Web sunucunuzu yapılandırarak data dizinine erişimi kapatmanızı veya data dizinini web sunucu döküman dizini dışına almanızı şiddetle tavsiye ederiz.",
"Create an <strong>admin account</strong>" => "Bir <strong>yönetici hesabı</strong> oluşturun",
"Advanced" => "Gelişmiş",
"Data folder" => "Veri klasörü",
@@ -101,11 +120,12 @@
"web services under your control" => "kontrolünüzdeki web servisleri",
"Log out" => "Çıkış yap",
"Automatic logon rejected!" => "Otomatik oturum açma reddedildi!",
+"If you did not change your password recently, your account may be compromised!" => "Yakın zamanda parolanızı değiştirmedi iseniz hesabınız riske girebilir.",
+"Please change your password to secure your account again." => "Hesabınızı korumak için lütfen parolanızı değiştirin.",
"Lost your password?" => "Parolanızı mı unuttunuz?",
"remember" => "hatırla",
"Log in" => "Giriş yap",
"prev" => "önceki",
"next" => "sonraki",
-"Security Warning!" => "Güvenlik Uyarısı!",
-"Verify" => "Doğrula"
+"Updating ownCloud to version %s, this may take a while." => "Owncloud %s versiyonuna güncelleniyor. Biraz zaman alabilir."
);
diff --git a/core/l10n/uk.php b/core/l10n/uk.php
index c088db6d419..88e18d3eb28 100644
--- a/core/l10n/uk.php
+++ b/core/l10n/uk.php
@@ -127,7 +127,5 @@
"Log in" => "Вхід",
"prev" => "попередній",
"next" => "наступний",
-"Security Warning!" => "Попередження про небезпеку!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Будь ласка, повторно введіть свій пароль. <br/>З питань безпеки, Вам інколи доведеться повторно вводити свій пароль.",
-"Verify" => "Підтвердити"
+"Updating ownCloud to version %s, this may take a while." => "Оновлення ownCloud до версії %s, це може зайняти деякий час."
);
diff --git a/core/l10n/vi.php b/core/l10n/vi.php
index b27600491df..c827dc038e6 100644
--- a/core/l10n/vi.php
+++ b/core/l10n/vi.php
@@ -118,8 +118,5 @@
"remember" => "ghi nhớ",
"Log in" => "Đăng nhập",
"prev" => "Lùi lại",
-"next" => "Kế tiếp",
-"Security Warning!" => "Cảnh báo bảo mật !",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Vui lòng xác nhận mật khẩu của bạn. <br/> Vì lý do bảo mật thỉnh thoảng bạn có thể được yêu cầu nhập lại mật khẩu.",
-"Verify" => "Kiểm tra"
+"next" => "Kế tiếp"
);
diff --git a/core/l10n/zh_CN.GB2312.php b/core/l10n/zh_CN.GB2312.php
index 1f6d5198703..74dd9ad8a3f 100644
--- a/core/l10n/zh_CN.GB2312.php
+++ b/core/l10n/zh_CN.GB2312.php
@@ -107,8 +107,5 @@
"remember" => "备忘",
"Log in" => "登陆",
"prev" => "后退",
-"next" => "前进",
-"Security Warning!" => "安全警告!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "请确认您的密码。<br/>处于安全原因你偶尔也会被要求再次输入您的密码。",
-"Verify" => "确认"
+"next" => "前进"
);
diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php
index 82e80bd000e..626ede4cc70 100644
--- a/core/l10n/zh_CN.php
+++ b/core/l10n/zh_CN.php
@@ -43,6 +43,7 @@
"Share with link" => "共享链接",
"Password protect" => "密码保护",
"Password" => "密码",
+"Email link to person" => "发送链接到个人",
"Send" => "发送",
"Set expiration date" => "设置过期日期",
"Expiration date" => "过期日期",
@@ -126,7 +127,5 @@
"Log in" => "登录",
"prev" => "上一页",
"next" => "下一页",
-"Security Warning!" => "安全警告!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "请验证您的密码。 <br/>出于安全考虑,你可能偶尔会被要求再次输入密码。",
-"Verify" => "验证"
+"Updating ownCloud to version %s, this may take a while." => "更新 ownCloud 到版本 %s,这可能需要一些时间。"
);
diff --git a/core/l10n/zh_TW.php b/core/l10n/zh_TW.php
index de91ba0bd83..7537c764451 100644
--- a/core/l10n/zh_TW.php
+++ b/core/l10n/zh_TW.php
@@ -127,8 +127,5 @@
"Log in" => "登入",
"prev" => "上一頁",
"next" => "下一頁",
-"Updating ownCloud to version %s, this may take a while." => "正在將 Owncloud 升級至版本 %s ,這可能需要一點時間。",
-"Security Warning!" => "安全性警告!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "請輸入您的密碼。<br/>基於安全性的理由,您有時候可能會被要求再次輸入密碼。",
-"Verify" => "驗證"
+"Updating ownCloud to version %s, this may take a while." => "正在將 Owncloud 升級至版本 %s ,這可能需要一點時間。"
);
diff --git a/core/templates/installation.php b/core/templates/installation.php
index 3128c4f2e70..03c580c9b0b 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -1,7 +1,7 @@
-<input type='hidden' id='hasMySQL' value='<?php echo $_['hasMySQL'] ?>'></input>
-<input type='hidden' id='hasSQLite' value='<?php echo $_['hasSQLite'] ?>'></input>
-<input type='hidden' id='hasPostgreSQL' value='<?php echo $_['hasPostgreSQL'] ?>'></input>
-<input type='hidden' id='hasOracle' value='<?php echo $_['hasOracle'] ?>'></input>
+<input type='hidden' id='hasMySQL' value='<?php echo $_['hasMySQL'] ?>'>
+<input type='hidden' id='hasSQLite' value='<?php echo $_['hasSQLite'] ?>'>
+<input type='hidden' id='hasPostgreSQL' value='<?php echo $_['hasPostgreSQL'] ?>'>
+<input type='hidden' id='hasOracle' value='<?php echo $_['hasOracle'] ?>'>
<form action="index.php" method="post">
<input type="hidden" name="install" value="true" />
<?php if(count($_['errors']) > 0): ?>
diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php
index 47f4b423b3e..cb2f9773839 100644
--- a/core/templates/layout.base.php
+++ b/core/templates/layout.base.php
@@ -10,7 +10,6 @@
<script type="text/javascript">
var oc_debug = <?php echo (defined('DEBUG') && DEBUG) ? 'true' : 'false'; ?>;
var oc_webroot = '<?php echo OC::$WEBROOT; ?>';
- var oc_appswebroots = <?php echo $_['apps_paths'] ?>;
var oc_requesttoken = '<?php echo $_['requesttoken']; ?>';
</script>
<?php foreach ($_['jsfiles'] as $jsfile): ?>
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index 8395426e4e4..5b39503474d 100644
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -10,7 +10,6 @@
<script type="text/javascript">
var oc_debug = <?php echo (defined('DEBUG') && DEBUG) ? 'true' : 'false'; ?>;
var oc_webroot = '<?php echo OC::$WEBROOT; ?>';
- var oc_appswebroots = <?php echo $_['apps_paths'] ?>;
var oc_requesttoken = '<?php echo $_['requesttoken']; ?>';
var datepickerFormatDate = <?php echo json_encode($l->l('jsdate', 'jsdate')) ?>;
var dayNames = <?php echo json_encode(array((string)$l->t('Sunday'), (string)$l->t('Monday'), (string)$l->t('Tuesday'), (string)$l->t('Wednesday'), (string)$l->t('Thursday'), (string)$l->t('Friday'), (string)$l->t('Saturday'))) ?>;
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index ba5053edecf..a16d2c9e55d 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -67,8 +67,10 @@
</ul>
</div></nav>
- <div id="content">
- <?php echo $_['content']; ?>
+ <div id="content-wrapper">
+ <div id="content">
+ <?php echo $_['content']; ?>
+ </div>
</div>
</body>
</html>
diff --git a/core/templates/login.php b/core/templates/login.php
index 10093baabf7..43e45997803 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -1,50 +1,50 @@
<!--[if IE 8]><style>input[type="checkbox"]{padding:0;}</style><![endif]-->
<form method="post">
- <fieldset>
- <?php if (!empty($_['redirect_url'])) {
- echo '<input type="hidden" name="redirect_url" value="' . $_['redirect_url'] . '" />';
- } ?>
- <ul>
- <?php if (isset($_['invalidcookie']) && ($_['invalidcookie'])): ?>
- <li class="errors">
- <?php echo $l->t('Automatic logon rejected!'); ?><br>
- <small><?php echo $l->t('If you did not change your password recently, your account may be compromised!'); ?></small>
- <br>
- <small><?php echo $l->t('Please change your password to secure your account again.'); ?></small>
- </li>
- <?php endif; ?>
- <?php if (isset($_['invalidpassword']) && ($_['invalidpassword'])): ?>
- <a href="<?php echo OC_Helper::linkToRoute('core_lostpassword_index') ?>">
- <li class="errors">
- <?php echo $l->t('Lost your password?'); ?>
- </li>
- </a>
- <?php endif; ?>
- </ul>
- <p class="infield grouptop">
- <input type="text" name="user" id="user"
- value="<?php echo $_['username']; ?>"<?php echo $_['user_autofocus'] ? ' autofocus' : ''; ?>
- autocomplete="on" required/>
- <label for="user" class="infield"><?php echo $l->t('Username'); ?></label>
- <img class="svg" src="<?php echo image_path('', 'actions/user.svg'); ?>" alt=""/>
- </p>
+ <fieldset>
+ <?php if (!empty($_['redirect_url'])) {
+ echo '<input type="hidden" name="redirect_url" value="' . $_['redirect_url'] . '" />';
+ } ?>
+ <ul>
+ <?php if (isset($_['invalidcookie']) && ($_['invalidcookie'])): ?>
+ <li class="errors">
+ <?php echo $l->t('Automatic logon rejected!'); ?><br>
+ <small><?php echo $l->t('If you did not change your password recently, your account may be compromised!'); ?></small>
+ <br>
+ <small><?php echo $l->t('Please change your password to secure your account again.'); ?></small>
+ </li>
+ <?php endif; ?>
+ <?php if (isset($_['invalidpassword']) && ($_['invalidpassword'])): ?>
+ <a href="<?php echo OC_Helper::linkToRoute('core_lostpassword_index') ?>">
+ <li class="errors">
+ <?php echo $l->t('Lost your password?'); ?>
+ </li>
+ </a>
+ <?php endif; ?>
+ </ul>
+ <p class="infield grouptop">
+ <input type="text" name="user" id="user"
+ value="<?php echo $_['username']; ?>"<?php echo $_['user_autofocus'] ? ' autofocus' : ''; ?>
+ autocomplete="on" required/>
+ <label for="user" class="infield"><?php echo $l->t('Username'); ?></label>
+ <img class="svg" src="<?php echo image_path('', 'actions/user.svg'); ?>" alt=""/>
+ </p>
- <p class="infield groupbottom">
- <input type="password" name="password" id="password" value=""
- required<?php echo $_['user_autofocus'] ? '' : ' autofocus'; ?> />
- <label for="password" class="infield"><?php echo $l->t('Password'); ?></label>
- <img class="svg" src="<?php echo image_path('', 'actions/password.svg'); ?>" alt=""/>
- </p>
- <input type="checkbox" name="remember_login" value="1" id="remember_login"/><label
- for="remember_login"><?php echo $l->t('remember'); ?></label>
- <input type="hidden" name="timezone-offset" id="timezone-offset"/>
- <input type="submit" id="submit" class="login primary" value="<?php echo $l->t('Log in'); ?>"/>
- </fieldset>
+ <p class="infield groupbottom">
+ <input type="password" name="password" id="password" value=""
+ required<?php echo $_['user_autofocus'] ? '' : ' autofocus'; ?> />
+ <label for="password" class="infield"><?php echo $l->t('Password'); ?></label>
+ <img class="svg" src="<?php echo image_path('', 'actions/password.svg'); ?>" alt=""/>
+ </p>
+ <input type="checkbox" name="remember_login" value="1" id="remember_login"/><label
+ for="remember_login"><?php echo $l->t('remember'); ?></label>
+ <input type="hidden" name="timezone-offset" id="timezone-offset"/>
+ <input type="submit" id="submit" class="login primary" value="<?php echo $l->t('Log in'); ?>"/>
+ </fieldset>
</form>
<script>
- $(document).ready(function () {
- var visitortimezone = (-new Date().getTimezoneOffset() / 60);
- $('#timezone-offset').val(visitortimezone);
- });
+ $(document).ready(function () {
+ var visitortimezone = (-new Date().getTimezoneOffset() / 60);
+ $('#timezone-offset').val(visitortimezone);
+ });
</script>
diff --git a/core/templates/verify.php b/core/templates/verify.php
deleted file mode 100644
index 600eaca05b7..00000000000
--- a/core/templates/verify.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<form method="post">
- <fieldset>
- <ul>
- <li class="errors">
- <?php echo $l->t('Security Warning!'); ?><br>
- <small><?php echo $l->t("Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again."); ?></small>
- </li>
- </ul>
- <p class="infield">
- <input type="text" value="<?php echo $_['username']; ?>" disabled="disabled" />
- </p>
- <p class="infield">
- <label for="password" class="infield"><?php echo $l->t( 'Password' ); ?></label>
- <input type="password" name="password" id="password" value="" required />
- </p>
- <input type="submit" id="submit" class="login" value="<?php echo $l->t( 'Verify' ); ?>" />
- </fieldset>
-</form>
diff --git a/l10n/ar/core.po b/l10n/ar/core.po
index 74243a0cff6..c1497f76a41 100644
--- a/l10n/ar/core.po
+++ b/l10n/ar/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
@@ -209,7 +209,6 @@ msgid "Password protect"
msgstr "حماية كلمة السر"
#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
msgid "Password"
msgstr "كلمة السر"
@@ -566,17 +565,3 @@ msgstr "التالي"
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "تحذير أمان!"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "الرجاء التحقق من كلمة السر. <br/>من الممكن أحياناً أن نطلب منك إعادة إدخال كلمة السر مرة أخرى."
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "تحقيق"
diff --git a/l10n/ar/files.po b/l10n/ar/files.po
index b57cae5c403..121094a24f7 100644
--- a/l10n/ar/files.po
+++ b/l10n/ar/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"POT-Creation-Date: 2013-01-20 00:05+0100\n"
+"PO-Revision-Date: 2013-01-19 23:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
@@ -18,6 +18,11 @@ msgstr ""
"Language: ar\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+#: ajax/delete.php:28 ajax/getstoragestats.php:11 ajax/upload.php:17
+#: ajax/upload.php:76 templates/index.php:18
+msgid "Upload"
+msgstr "إرفع"
+
#: ajax/move.php:17
#, php-format
msgid "Could not move %s - File with this name already exists"
@@ -32,46 +37,46 @@ msgstr ""
msgid "Unable to rename file"
msgstr ""
-#: ajax/upload.php:14
+#: ajax/upload.php:20
msgid "No file was uploaded. Unknown error"
msgstr ""
-#: ajax/upload.php:21
+#: ajax/upload.php:30
msgid "There is no error, the file uploaded with success"
msgstr "تم ترفيع الملفات بنجاح."
-#: ajax/upload.php:22
+#: ajax/upload.php:31
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr ""
-#: ajax/upload.php:24
+#: ajax/upload.php:33
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "حجم الملف الذي تريد ترفيعه أعلى مما MAX_FILE_SIZE يسمح به في واجهة ال HTML."
-#: ajax/upload.php:26
+#: ajax/upload.php:35
msgid "The uploaded file was only partially uploaded"
msgstr "تم ترفيع جزء من الملفات الذي تريد ترفيعها فقط"
-#: ajax/upload.php:27
+#: ajax/upload.php:36
msgid "No file was uploaded"
msgstr "لم يتم ترفيع أي من الملفات"
-#: ajax/upload.php:28
+#: ajax/upload.php:37
msgid "Missing a temporary folder"
msgstr "المجلد المؤقت غير موجود"
-#: ajax/upload.php:29
+#: ajax/upload.php:38
msgid "Failed to write to disk"
msgstr ""
-#: ajax/upload.php:45
+#: ajax/upload.php:57
msgid "Not enough space available"
msgstr ""
-#: ajax/upload.php:69
+#: ajax/upload.php:91
msgid "Invalid directory."
msgstr ""
@@ -127,98 +132,100 @@ msgstr ""
msgid "deleted {files}"
msgstr ""
-#: js/files.js:31
+#: js/files.js:48
msgid "'.' is an invalid file name."
msgstr ""
-#: js/files.js:36
+#: js/files.js:53
msgid "File name cannot be empty."
msgstr ""
-#: js/files.js:45
+#: js/files.js:62
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
+#: js/files.js:204
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
msgstr ""
-#: js/files.js:224
+#: js/files.js:242
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr ""
-#: js/files.js:224
+#: js/files.js:242
msgid "Upload Error"
msgstr ""
-#: js/files.js:241
+#: js/files.js:259
msgid "Close"
msgstr "إغلق"
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:278 js/files.js:397 js/files.js:431
msgid "Pending"
msgstr ""
-#: js/files.js:280
+#: js/files.js:298
msgid "1 file uploading"
msgstr ""
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:301 js/files.js:357 js/files.js:372
msgid "{count} files uploading"
msgstr ""
-#: js/files.js:357 js/files.js:393
+#: js/files.js:376 js/files.js:414
msgid "Upload cancelled."
msgstr ""
-#: js/files.js:464
+#: js/files.js:486
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/files.js:537
+#: js/files.js:559
msgid "URL cannot be empty."
msgstr ""
-#: js/files.js:543
+#: js/files.js:565
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:727
+#: js/files.js:775
msgid "{count} files scanned"
msgstr ""
-#: js/files.js:735
+#: js/files.js:783
msgid "error while scanning"
msgstr ""
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:857 templates/index.php:64
msgid "Name"
msgstr "الاسم"
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:858 templates/index.php:75
msgid "Size"
msgstr "حجم"
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:859 templates/index.php:77
msgid "Modified"
msgstr "معدل"
-#: js/files.js:829
+#: js/files.js:878
msgid "1 folder"
msgstr ""
-#: js/files.js:831
+#: js/files.js:880
msgid "{count} folders"
msgstr ""
-#: js/files.js:839
+#: js/files.js:888
msgid "1 file"
msgstr ""
-#: js/files.js:841
+#: js/files.js:890
msgid "{count} files"
msgstr ""
@@ -270,10 +277,6 @@ msgstr "مجلد"
msgid "From link"
msgstr ""
-#: templates/index.php:18
-msgid "Upload"
-msgstr "إرفع"
-
#: templates/index.php:41
msgid "Cancel upload"
msgstr ""
diff --git a/l10n/ar/files_encryption.po b/l10n/ar/files_encryption.po
index 1d2de3d76f2..a3c4ed89318 100644
--- a/l10n/ar/files_encryption.po
+++ b/l10n/ar/files_encryption.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-13 00:05+0100\n"
-"PO-Revision-Date: 2012-11-12 13:20+0000\n"
-"Last-Translator: TYMAH <hussein-atef@hotmail.com>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,18 +18,66 @@ msgstr ""
"Language: ar\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
msgid "Encryption"
msgstr "التشفير"
-#: templates/settings.php:4
+#: templates/settings.php:67
msgid "Exclude the following file types from encryption"
msgstr "استبعد أنواع الملفات التالية من التشفير"
-#: templates/settings.php:5
+#: templates/settings.php:71
msgid "None"
msgstr "لا شيء"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "تفعيل التشفير"
diff --git a/l10n/ar/files_versions.po b/l10n/ar/files_versions.po
index 3b32ba6301d..8224c627626 100644
--- a/l10n/ar/files_versions.po
+++ b/l10n/ar/files_versions.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-23 00:09+0100\n"
-"PO-Revision-Date: 2012-12-22 19:47+0000\n"
-"Last-Translator: aboodilankaboot <shiningmoon25@gmail.com>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,22 +18,10 @@ msgstr ""
"Language: ar\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-#: js/settings-personal.js:31 templates/settings-personal.php:7
-msgid "Expire all versions"
-msgstr "إنهاء تاريخ الإنتهاء لجميع الإصدارات"
-
#: js/versions.js:16
msgid "History"
msgstr "السجل الزمني"
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "الإصدارات"
-
-#: templates/settings-personal.php:10
-msgid "This will delete all existing backup versions of your files"
-msgstr "هذه العملية ستقوم بإلغاء جميع إصدارات النسخ الاحتياطي للملفات"
-
#: templates/settings.php:3
msgid "Files Versioning"
msgstr "أصدرة الملفات"
diff --git a/l10n/ar/lib.po b/l10n/ar/lib.po
index 6a9cdf2b15b..dbb9b7359cf 100644
--- a/l10n/ar/lib.po
+++ b/l10n/ar/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-24 00:11+0100\n"
-"PO-Revision-Date: 2012-12-23 19:00+0000\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
@@ -17,27 +17,27 @@ msgstr ""
"Language: ar\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-#: app.php:287
+#: app.php:301
msgid "Help"
msgstr "المساعدة"
-#: app.php:294
+#: app.php:308
msgid "Personal"
msgstr "شخصي"
-#: app.php:299
+#: app.php:313
msgid "Settings"
msgstr "تعديلات"
-#: app.php:304
+#: app.php:318
msgid "Users"
msgstr "المستخدمين"
-#: app.php:311
+#: app.php:325
msgid "Apps"
msgstr ""
-#: app.php:313
+#: app.php:327
msgid "Admin"
msgstr ""
@@ -57,11 +57,15 @@ msgstr ""
msgid "Selected files too large to generate zip file."
msgstr ""
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr ""
+
#: json.php:28
msgid "Application is not enabled"
msgstr ""
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
msgstr "لم يتم التأكد من الشخصية بنجاح"
@@ -81,55 +85,55 @@ msgstr "معلومات إضافية"
msgid "Images"
msgstr ""
-#: template.php:103
+#: template.php:113
msgid "seconds ago"
msgstr "منذ ثواني"
-#: template.php:104
+#: template.php:114
msgid "1 minute ago"
msgstr "منذ دقيقة"
-#: template.php:105
+#: template.php:115
#, php-format
msgid "%d minutes ago"
msgstr ""
-#: template.php:106
+#: template.php:116
msgid "1 hour ago"
msgstr ""
-#: template.php:107
+#: template.php:117
#, php-format
msgid "%d hours ago"
msgstr ""
-#: template.php:108
+#: template.php:118
msgid "today"
msgstr "اليوم"
-#: template.php:109
+#: template.php:119
msgid "yesterday"
msgstr ""
-#: template.php:110
+#: template.php:120
#, php-format
msgid "%d days ago"
msgstr ""
-#: template.php:111
+#: template.php:121
msgid "last month"
msgstr ""
-#: template.php:112
+#: template.php:122
#, php-format
msgid "%d months ago"
msgstr ""
-#: template.php:113
+#: template.php:123
msgid "last year"
msgstr ""
-#: template.php:114
+#: template.php:124
msgid "years ago"
msgstr ""
diff --git a/l10n/ar/user_ldap.po b/l10n/ar/user_ldap.po
index 7aaa90abe9a..ab2b79bb6c3 100644
--- a/l10n/ar/user_ldap.po
+++ b/l10n/ar/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-23 00:09+0100\n"
-"PO-Revision-Date: 2012-12-22 19:40+0000\n"
+"POT-Creation-Date: 2013-01-18 00:03+0100\n"
+"PO-Revision-Date: 2013-01-17 21:57+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
@@ -26,8 +26,8 @@ msgstr ""
#: templates/settings.php:11
msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
msgstr ""
#: templates/settings.php:15
@@ -44,6 +44,10 @@ msgid "Base DN"
msgstr ""
#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
@@ -114,10 +118,18 @@ msgstr ""
msgid "Base User Tree"
msgstr ""
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
@@ -180,4 +192,4 @@ msgstr ""
#: templates/settings.php:39
msgid "Help"
-msgstr ""
+msgstr "المساعدة"
diff --git a/l10n/ar/user_webdavauth.po b/l10n/ar/user_webdavauth.po
index ac1aa5b4a5e..92180c70e7e 100644
--- a/l10n/ar/user_webdavauth.po
+++ b/l10n/ar/user_webdavauth.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-23 00:09+0100\n"
-"PO-Revision-Date: 2012-12-22 19:22+0000\n"
-"Last-Translator: aboodilankaboot <shiningmoon25@gmail.com>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,13 +19,17 @@ msgstr ""
"Language: ar\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
#: templates/settings.php:4
msgid "URL: http://"
msgstr "الرابط: http://"
#: templates/settings.php:6
msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
msgstr ""
diff --git a/l10n/bg_BG/core.po b/l10n/bg_BG/core.po
index e00f6c9d1d3..a4addcd1355 100644
--- a/l10n/bg_BG/core.po
+++ b/l10n/bg_BG/core.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
@@ -211,7 +211,6 @@ msgid "Password protect"
msgstr ""
#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
msgid "Password"
msgstr "Парола"
@@ -568,17 +567,3 @@ msgstr ""
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr ""
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr ""
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr ""
diff --git a/l10n/bg_BG/files.po b/l10n/bg_BG/files.po
index 14ac7f3c7b6..9907862b6a1 100644
--- a/l10n/bg_BG/files.po
+++ b/l10n/bg_BG/files.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:05+0000\n"
+"POT-Creation-Date: 2013-01-20 00:05+0100\n"
+"PO-Revision-Date: 2013-01-19 23:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
@@ -19,6 +19,11 @@ msgstr ""
"Language: bg_BG\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/delete.php:28 ajax/getstoragestats.php:11 ajax/upload.php:17
+#: ajax/upload.php:76 templates/index.php:18
+msgid "Upload"
+msgstr "Качване"
+
#: ajax/move.php:17
#, php-format
msgid "Could not move %s - File with this name already exists"
@@ -33,46 +38,46 @@ msgstr ""
msgid "Unable to rename file"
msgstr ""
-#: ajax/upload.php:14
+#: ajax/upload.php:20
msgid "No file was uploaded. Unknown error"
msgstr ""
-#: ajax/upload.php:21
+#: ajax/upload.php:30
msgid "There is no error, the file uploaded with success"
msgstr ""
-#: ajax/upload.php:22
+#: ajax/upload.php:31
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr ""
-#: ajax/upload.php:24
+#: ajax/upload.php:33
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr ""
-#: ajax/upload.php:26
+#: ajax/upload.php:35
msgid "The uploaded file was only partially uploaded"
msgstr ""
-#: ajax/upload.php:27
+#: ajax/upload.php:36
msgid "No file was uploaded"
msgstr ""
-#: ajax/upload.php:28
+#: ajax/upload.php:37
msgid "Missing a temporary folder"
msgstr "Липсва временна папка"
-#: ajax/upload.php:29
+#: ajax/upload.php:38
msgid "Failed to write to disk"
msgstr ""
-#: ajax/upload.php:45
+#: ajax/upload.php:57
msgid "Not enough space available"
msgstr ""
-#: ajax/upload.php:69
+#: ajax/upload.php:91
msgid "Invalid directory."
msgstr ""
@@ -128,98 +133,100 @@ msgstr ""
msgid "deleted {files}"
msgstr ""
-#: js/files.js:31
+#: js/files.js:48
msgid "'.' is an invalid file name."
msgstr ""
-#: js/files.js:36
+#: js/files.js:53
msgid "File name cannot be empty."
msgstr ""
-#: js/files.js:45
+#: js/files.js:62
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
+#: js/files.js:204
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
msgstr ""
-#: js/files.js:224
+#: js/files.js:242
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr ""
-#: js/files.js:224
+#: js/files.js:242
msgid "Upload Error"
msgstr ""
-#: js/files.js:241
+#: js/files.js:259
msgid "Close"
msgstr ""
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:278 js/files.js:397 js/files.js:431
msgid "Pending"
msgstr ""
-#: js/files.js:280
+#: js/files.js:298
msgid "1 file uploading"
msgstr ""
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:301 js/files.js:357 js/files.js:372
msgid "{count} files uploading"
msgstr ""
-#: js/files.js:357 js/files.js:393
+#: js/files.js:376 js/files.js:414
msgid "Upload cancelled."
msgstr "Качването е спряно."
-#: js/files.js:464
+#: js/files.js:486
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/files.js:537
+#: js/files.js:559
msgid "URL cannot be empty."
msgstr ""
-#: js/files.js:543
+#: js/files.js:565
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:727
+#: js/files.js:775
msgid "{count} files scanned"
msgstr ""
-#: js/files.js:735
+#: js/files.js:783
msgid "error while scanning"
msgstr ""
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:857 templates/index.php:64
msgid "Name"
msgstr "Име"
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:858 templates/index.php:75
msgid "Size"
msgstr "Размер"
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:859 templates/index.php:77
msgid "Modified"
msgstr "Променено"
-#: js/files.js:829
+#: js/files.js:878
msgid "1 folder"
msgstr ""
-#: js/files.js:831
+#: js/files.js:880
msgid "{count} folders"
msgstr ""
-#: js/files.js:839
+#: js/files.js:888
msgid "1 file"
msgstr ""
-#: js/files.js:841
+#: js/files.js:890
msgid "{count} files"
msgstr ""
@@ -271,10 +278,6 @@ msgstr "Папка"
msgid "From link"
msgstr ""
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Качване"
-
#: templates/index.php:41
msgid "Cancel upload"
msgstr ""
diff --git a/l10n/bg_BG/files_encryption.po b/l10n/bg_BG/files_encryption.po
index c5aca629edc..8e5aeda0842 100644
--- a/l10n/bg_BG/files_encryption.po
+++ b/l10n/bg_BG/files_encryption.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 20:51+0000\n"
-"Last-Translator: Stefan Ilivanov <ilivanov@gmail.com>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,18 +18,66 @@ msgstr ""
"Language: bg_BG\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
msgid "Encryption"
msgstr "Криптиране"
-#: templates/settings.php:6
-msgid "Enable Encryption"
-msgstr "Включване на криптирането"
+#: templates/settings.php:67
+msgid "Exclude the following file types from encryption"
+msgstr "Изключване на следните файлови типове от криптирането"
-#: templates/settings.php:7
+#: templates/settings.php:71
msgid "None"
msgstr "Няма"
-
-#: templates/settings.php:12
-msgid "Exclude the following file types from encryption"
-msgstr "Изключване на следните файлови типове от криптирането"
diff --git a/l10n/bg_BG/files_versions.po b/l10n/bg_BG/files_versions.po
index 0b1e6c05270..be466434b93 100644
--- a/l10n/bg_BG/files_versions.po
+++ b/l10n/bg_BG/files_versions.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 20:49+0000\n"
-"Last-Translator: Stefan Ilivanov <ilivanov@gmail.com>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,22 +18,10 @@ msgstr ""
"Language: bg_BG\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/settings-personal.js:31 templates/settings-personal.php:7
-msgid "Expire all versions"
-msgstr ""
-
#: js/versions.js:16
msgid "History"
msgstr "История"
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "Версии"
-
-#: templates/settings-personal.php:10
-msgid "This will delete all existing backup versions of your files"
-msgstr "Това действие ще изтрие всички налични архивни версии на Вашите файлове"
-
#: templates/settings.php:3
msgid "Files Versioning"
msgstr ""
diff --git a/l10n/bg_BG/lib.po b/l10n/bg_BG/lib.po
index 516eee347ab..5e238d11362 100644
--- a/l10n/bg_BG/lib.po
+++ b/l10n/bg_BG/lib.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 20:43+0000\n"
-"Last-Translator: Stefan Ilivanov <ilivanov@gmail.com>\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -58,11 +58,15 @@ msgstr "Назад към файловете"
msgid "Selected files too large to generate zip file."
msgstr "Избраните файлове са прекалено големи за генерирането на ZIP архив."
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr ""
+
#: json.php:28
msgid "Application is not enabled"
msgstr "Приложението не е включено."
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
msgstr "Възникна проблем с идентификацията"
@@ -82,55 +86,55 @@ msgstr "Текст"
msgid "Images"
msgstr "Снимки"
-#: template.php:103
+#: template.php:113
msgid "seconds ago"
msgstr "преди секунди"
-#: template.php:104
+#: template.php:114
msgid "1 minute ago"
msgstr "преди 1 минута"
-#: template.php:105
+#: template.php:115
#, php-format
msgid "%d minutes ago"
msgstr "преди %d минути"
-#: template.php:106
+#: template.php:116
msgid "1 hour ago"
msgstr "преди 1 час"
-#: template.php:107
+#: template.php:117
#, php-format
msgid "%d hours ago"
msgstr "преди %d часа"
-#: template.php:108
+#: template.php:118
msgid "today"
msgstr "днес"
-#: template.php:109
+#: template.php:119
msgid "yesterday"
msgstr "вчера"
-#: template.php:110
+#: template.php:120
#, php-format
msgid "%d days ago"
msgstr "преди %d дни"
-#: template.php:111
+#: template.php:121
msgid "last month"
msgstr "последният месец"
-#: template.php:112
+#: template.php:122
#, php-format
msgid "%d months ago"
msgstr "преди %d месеца"
-#: template.php:113
+#: template.php:123
msgid "last year"
msgstr "последната година"
-#: template.php:114
+#: template.php:124
msgid "years ago"
msgstr "последните години"
diff --git a/l10n/bg_BG/settings.po b/l10n/bg_BG/settings.po
index c660334fdfc..4275c1ee1b3 100644
--- a/l10n/bg_BG/settings.po
+++ b/l10n/bg_BG/settings.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 18:49+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
@@ -62,7 +62,7 @@ msgstr ""
#: ajax/setlanguage.php:17 ajax/setlanguage.php:20
msgid "Invalid request"
-msgstr ""
+msgstr "Невалидна заявка"
#: ajax/togglegroups.php:12
msgid "Admins can't remove themself from the admin group"
diff --git a/l10n/bg_BG/user_ldap.po b/l10n/bg_BG/user_ldap.po
index e45d6efc2fb..0ec1c50339e 100644
--- a/l10n/bg_BG/user_ldap.po
+++ b/l10n/bg_BG/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-10 00:04+0100\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 23:20+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -26,8 +26,8 @@ msgstr ""
#: templates/settings.php:11
msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
msgstr ""
#: templates/settings.php:15
@@ -44,6 +44,10 @@ msgid "Base DN"
msgstr ""
#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
@@ -114,10 +118,18 @@ msgstr ""
msgid "Base User Tree"
msgstr ""
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
diff --git a/l10n/bg_BG/user_webdavauth.po b/l10n/bg_BG/user_webdavauth.po
index 05f8507380b..c541db398fd 100644
--- a/l10n/bg_BG/user_webdavauth.po
+++ b/l10n/bg_BG/user_webdavauth.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-09 00:04+0100\n"
-"PO-Revision-Date: 2012-11-09 09:06+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,13 +17,17 @@ msgstr ""
"Language: bg_BG\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
#: templates/settings.php:4
msgid "URL: http://"
msgstr ""
#: templates/settings.php:6
msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
msgstr ""
diff --git a/l10n/bn_BD/core.po b/l10n/bn_BD/core.po
index 4fd2a014324..8c24eb72e22 100644
--- a/l10n/bn_BD/core.po
+++ b/l10n/bn_BD/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
@@ -208,7 +208,6 @@ msgid "Password protect"
msgstr "কূটশব্দ সুরক্ষিত"
#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
msgid "Password"
msgstr "কূটশব্দ"
@@ -565,17 +564,3 @@ msgstr "পরবর্তী"
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
msgstr "%s ভার্সনে ownCloud পরিবর্ধন করা হচ্ছে, এজন্য কিছু সময় প্রয়োজন।"
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "নিরাপত্তাবিষয়ক সতর্কবাণী"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr ""
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "যাচাই কর"
diff --git a/l10n/bn_BD/files.po b/l10n/bn_BD/files.po
index 33908fc14e1..ad10526f601 100644
--- a/l10n/bn_BD/files.po
+++ b/l10n/bn_BD/files.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-11 00:05+0100\n"
-"PO-Revision-Date: 2013-01-10 10:05+0000\n"
-"Last-Translator: Shubhra Paul <paul_shubhra@yahoo.com>\n"
+"POT-Creation-Date: 2013-01-20 00:05+0100\n"
+"PO-Revision-Date: 2013-01-19 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,6 +18,11 @@ msgstr ""
"Language: bn_BD\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/delete.php:28 ajax/getstoragestats.php:11 ajax/upload.php:17
+#: ajax/upload.php:76 templates/index.php:18
+msgid "Upload"
+msgstr "আপলোড"
+
#: ajax/move.php:17
#, php-format
msgid "Could not move %s - File with this name already exists"
@@ -32,46 +37,46 @@ msgstr "%s কে স্থানান্তর করা সম্ভব হ
msgid "Unable to rename file"
msgstr "ফাইলের নাম পরিবর্তন করা সম্ভব হলো না"
-#: ajax/upload.php:14
+#: ajax/upload.php:20
msgid "No file was uploaded. Unknown error"
msgstr "কোন ফাইল আপলোড করা হয় নি। সমস্যা অজ্ঞাত।"
-#: ajax/upload.php:21
+#: ajax/upload.php:30
msgid "There is no error, the file uploaded with success"
msgstr "কোন সমস্যা নেই, ফাইল আপলোড সুসম্পন্ন হয়েছে"
-#: ajax/upload.php:22
+#: ajax/upload.php:31
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr "আপলোড করা ফাইলটি php.ini তে বর্ণিত upload_max_filesize নির্দেশিত আয়তন অতিক্রম করছেঃ"
-#: ajax/upload.php:24
+#: ajax/upload.php:33
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "আপলোড করা ফাইলটি HTML ফর্মে নির্ধারিত MAX_FILE_SIZE নির্দেশিত সর্বোচ্চ আকার অতিক্রম করেছে "
-#: ajax/upload.php:26
+#: ajax/upload.php:35
msgid "The uploaded file was only partially uploaded"
msgstr "আপলোড করা ফাইলটি আংশিক আপলোড করা হয়েছে"
-#: ajax/upload.php:27
+#: ajax/upload.php:36
msgid "No file was uploaded"
msgstr "কোন ফাইল আপলোড করা হয় নি"
-#: ajax/upload.php:28
+#: ajax/upload.php:37
msgid "Missing a temporary folder"
msgstr "অস্থায়ী ফোল্ডার খোয়া গিয়েছে"
-#: ajax/upload.php:29
+#: ajax/upload.php:38
msgid "Failed to write to disk"
msgstr "ডিস্কে লিখতে ব্যর্থ"
-#: ajax/upload.php:45
+#: ajax/upload.php:57
msgid "Not enough space available"
msgstr "যথেষ্ঠ পরিমাণ স্থান নেই"
-#: ajax/upload.php:69
+#: ajax/upload.php:91
msgid "Invalid directory."
msgstr "ভুল ডিরেক্টরি"
@@ -127,98 +132,100 @@ msgstr "{files} ভাগাভাগি বাতিল কর"
msgid "deleted {files}"
msgstr "{files} মুছে ফেলা হয়েছে"
-#: js/files.js:31
+#: js/files.js:48
msgid "'.' is an invalid file name."
msgstr "টি একটি অননুমোদিত নাম।"
-#: js/files.js:36
+#: js/files.js:53
msgid "File name cannot be empty."
msgstr "ফাইলের নামটি ফাঁকা রাখা যাবে না।"
-#: js/files.js:45
+#: js/files.js:62
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "নামটি সঠিক নয়, '\\', '/', '<', '>', ':', '\"', '|', '?' এবং '*' অনুমোদিত নয়।"
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "ZIP- ফাইল তৈরী করা হচ্ছে, এজন্য কিছু সময় আবশ্যক।"
+#: js/files.js:204
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
-#: js/files.js:224
+#: js/files.js:242
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "আপনার ফাইলটি আপলোড করা সম্ভব হলো না, কেননা এটি হয় একটি ফোল্ডার কিংবা এর আকার ০ বাইট"
-#: js/files.js:224
+#: js/files.js:242
msgid "Upload Error"
msgstr "আপলোড করতে সমস্যা "
-#: js/files.js:241
+#: js/files.js:259
msgid "Close"
msgstr "বন্ধ"
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:278 js/files.js:397 js/files.js:431
msgid "Pending"
msgstr "মুলতুবি"
-#: js/files.js:280
+#: js/files.js:298
msgid "1 file uploading"
msgstr "১টি ফাইল আপলোড করা হচ্ছে"
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:301 js/files.js:357 js/files.js:372
msgid "{count} files uploading"
msgstr "{count} টি ফাইল আপলোড করা হচ্ছে"
-#: js/files.js:357 js/files.js:393
+#: js/files.js:376 js/files.js:414
msgid "Upload cancelled."
msgstr "আপলোড বাতিল করা হয়েছে।"
-#: js/files.js:464
+#: js/files.js:486
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "ফাইল আপলোড চলমান। এই পৃষ্ঠা পরিত্যাগ করলে আপলোড বাতিল করা হবে।"
-#: js/files.js:537
+#: js/files.js:559
msgid "URL cannot be empty."
msgstr "URL ফাঁকা রাখা যাবে না।"
-#: js/files.js:543
+#: js/files.js:565
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "ফোল্ডারের নামটি সঠিক নয়। 'ভাগাভাগি করা' শুধুমাত্র Owncloud এর জন্য সংরক্ষিত।"
-#: js/files.js:727
+#: js/files.js:775
msgid "{count} files scanned"
msgstr "{count} টি ফাইল স্ক্যান করা হয়েছে"
-#: js/files.js:735
+#: js/files.js:783
msgid "error while scanning"
msgstr "স্ক্যান করার সময় সমস্যা দেখা দিয়েছে"
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:857 templates/index.php:64
msgid "Name"
msgstr "নাম"
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:858 templates/index.php:75
msgid "Size"
msgstr "আকার"
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:859 templates/index.php:77
msgid "Modified"
msgstr "পরিবর্তিত"
-#: js/files.js:829
+#: js/files.js:878
msgid "1 folder"
msgstr "১টি ফোল্ডার"
-#: js/files.js:831
+#: js/files.js:880
msgid "{count} folders"
msgstr "{count} টি ফোল্ডার"
-#: js/files.js:839
+#: js/files.js:888
msgid "1 file"
msgstr "১টি ফাইল"
-#: js/files.js:841
+#: js/files.js:890
msgid "{count} files"
msgstr "{count} টি ফাইল"
@@ -270,10 +277,6 @@ msgstr "ফোল্ডার"
msgid "From link"
msgstr " লিংক থেকে"
-#: templates/index.php:18
-msgid "Upload"
-msgstr "আপলোড"
-
#: templates/index.php:41
msgid "Cancel upload"
msgstr "আপলোড বাতিল কর"
diff --git a/l10n/bn_BD/files_encryption.po b/l10n/bn_BD/files_encryption.po
index 8c13e55a14a..4be08a9e00f 100644
--- a/l10n/bn_BD/files_encryption.po
+++ b/l10n/bn_BD/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-11 00:05+0100\n"
-"PO-Revision-Date: 2013-01-10 10:15+0000\n"
-"Last-Translator: Shubhra Paul <paul_shubhra@yahoo.com>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,18 +17,66 @@ msgstr ""
"Language: bn_BD\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
msgid "Encryption"
msgstr "সংকেতায়ন"
-#: templates/settings.php:6
-msgid "Enable Encryption"
-msgstr "সংকেতায়ন সক্রিয় কর"
+#: templates/settings.php:67
+msgid "Exclude the following file types from encryption"
+msgstr "সংকেতায়ন থেকে নিম্নোক্ত ধরণসমূহ বাদ দাও"
-#: templates/settings.php:7
+#: templates/settings.php:71
msgid "None"
msgstr "কোনটিই নয়"
-
-#: templates/settings.php:12
-msgid "Exclude the following file types from encryption"
-msgstr "সংকেতায়ন থেকে নিম্নোক্ত ধরণসমূহ বাদ দাও"
diff --git a/l10n/bn_BD/files_versions.po b/l10n/bn_BD/files_versions.po
index 51865f07105..2af1e4efdd9 100644
--- a/l10n/bn_BD/files_versions.po
+++ b/l10n/bn_BD/files_versions.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-11 00:05+0100\n"
-"PO-Revision-Date: 2013-01-10 10:28+0000\n"
-"Last-Translator: Shubhra Paul <paul_shubhra@yahoo.com>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,22 +17,10 @@ msgstr ""
"Language: bn_BD\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/settings-personal.js:31 templates/settings-personal.php:7
-msgid "Expire all versions"
-msgstr "সমস্ত ভার্সন মেয়াদোত্তীর্ণ"
-
#: js/versions.js:16
msgid "History"
msgstr "ইতিহাস"
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "ভার্সন"
-
-#: templates/settings-personal.php:10
-msgid "This will delete all existing backup versions of your files"
-msgstr "এটি আপনার বিদ্যমান ফাইলের সমস্ত ব্যাক-আপ ভার্সন মুছে ফেলবে।"
-
#: templates/settings.php:3
msgid "Files Versioning"
msgstr "ফাইল ভার্সন করা"
diff --git a/l10n/bn_BD/lib.po b/l10n/bn_BD/lib.po
index 0c8865693c2..da90c84c976 100644
--- a/l10n/bn_BD/lib.po
+++ b/l10n/bn_BD/lib.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-11 00:05+0100\n"
-"PO-Revision-Date: 2013-01-10 10:27+0000\n"
-"Last-Translator: Shubhra Paul <paul_shubhra@yahoo.com>\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -57,11 +57,15 @@ msgstr "ফাইলে ফিরে চল"
msgid "Selected files too large to generate zip file."
msgstr "নির্বাচিত ফাইলগুলো এতই বৃহৎ যে জিপ ফাইল তৈরী করা সম্ভব নয়।"
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr ""
+
#: json.php:28
msgid "Application is not enabled"
msgstr "অ্যাপ্লিকেসনটি সক্রিয় নয়"
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
msgstr "অনুমোদন ঘটিত সমস্যা"
@@ -81,55 +85,55 @@ msgstr ""
msgid "Images"
msgstr ""
-#: template.php:103
+#: template.php:113
msgid "seconds ago"
msgstr "সেকেন্ড পূর্বে"
-#: template.php:104
+#: template.php:114
msgid "1 minute ago"
msgstr "১ মিনিট পূর্বে"
-#: template.php:105
+#: template.php:115
#, php-format
msgid "%d minutes ago"
msgstr "%d মিনিট পূর্বে"
-#: template.php:106
+#: template.php:116
msgid "1 hour ago"
msgstr "1 ঘন্টা পূর্বে"
-#: template.php:107
+#: template.php:117
#, php-format
msgid "%d hours ago"
msgstr ""
-#: template.php:108
+#: template.php:118
msgid "today"
msgstr "আজ"
-#: template.php:109
+#: template.php:119
msgid "yesterday"
msgstr "গতকাল"
-#: template.php:110
+#: template.php:120
#, php-format
msgid "%d days ago"
msgstr "%d দিন পূর্বে"
-#: template.php:111
+#: template.php:121
msgid "last month"
msgstr "গত মাস"
-#: template.php:112
+#: template.php:122
#, php-format
msgid "%d months ago"
msgstr ""
-#: template.php:113
+#: template.php:123
msgid "last year"
msgstr "গত বছর"
-#: template.php:114
+#: template.php:124
msgid "years ago"
msgstr "বছর পূর্বে"
diff --git a/l10n/bn_BD/user_ldap.po b/l10n/bn_BD/user_ldap.po
index 75f4261e13f..68b329db2f1 100644
--- a/l10n/bn_BD/user_ldap.po
+++ b/l10n/bn_BD/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-11 00:05+0100\n"
-"PO-Revision-Date: 2013-01-10 10:27+0000\n"
-"Last-Translator: Shubhra Paul <paul_shubhra@yahoo.com>\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 23:20+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -26,8 +26,8 @@ msgstr ""
#: templates/settings.php:11
msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
msgstr ""
#: templates/settings.php:15
@@ -44,6 +44,10 @@ msgid "Base DN"
msgstr "ভিত্তি DN"
#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "সুচারু ট্যঅবে গিয়ে আপনি ব্যবহারকারি এবং গোষ্ঠীসমূহের জন্য ভিত্তি DN নির্ধারণ করতে পারেন।"
@@ -114,10 +118,18 @@ msgstr "পোর্ট"
msgid "Base User Tree"
msgstr "ভিত্তি ব্যবহারকারি বৃক্ষাকারে"
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "ভিত্তি গোষ্ঠী বৃক্ষাকারে"
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
#: templates/settings.php:27
msgid "Group-Member association"
msgstr "গোষ্ঠী-সদস্য সংস্থাপন"
diff --git a/l10n/bn_BD/user_webdavauth.po b/l10n/bn_BD/user_webdavauth.po
index 99d191a99b1..6bf9079f19b 100644
--- a/l10n/bn_BD/user_webdavauth.po
+++ b/l10n/bn_BD/user_webdavauth.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-11 00:05+0100\n"
-"PO-Revision-Date: 2013-01-10 10:07+0000\n"
-"Last-Translator: Shubhra Paul <paul_shubhra@yahoo.com>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,13 +18,17 @@ msgstr ""
"Language: bn_BD\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
#: templates/settings.php:4
msgid "URL: http://"
msgstr "URL:http://"
#: templates/settings.php:6
msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
-msgstr "ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct."
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
+msgstr ""
diff --git a/l10n/ca/core.po b/l10n/ca/core.po
index 94ad3349ff3..a9940eccf88 100644
--- a/l10n/ca/core.po
+++ b/l10n/ca/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
@@ -209,7 +209,6 @@ msgid "Password protect"
msgstr "Protegir amb contrasenya"
#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
msgid "Password"
msgstr "Contrasenya"
@@ -566,17 +565,3 @@ msgstr "següent"
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
msgstr "S'està actualitzant ownCloud a la versió %s, pot trigar una estona."
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "Avís de seguretat!"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "Comproveu la vostra contrasenya. <br/>Per raons de seguretat se us pot demanar escriure de nou la vostra contrasenya."
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "Comprova"
diff --git a/l10n/ca/files.po b/l10n/ca/files.po
index 159d191a912..68ecfef29bc 100644
--- a/l10n/ca/files.po
+++ b/l10n/ca/files.po
@@ -7,14 +7,15 @@
# <joan@montane.cat>, 2012.
# <josep_tomas@hotmail.com>, 2012.
# Josep Tomàs <jtomas.binsoft@gmail.com>, 2012.
+# <rcalvoi@yahoo.com>, 2013.
# <rcalvoi@yahoo.com>, 2011-2013.
# <sacoo2@hotmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-11 00:05+0100\n"
-"PO-Revision-Date: 2013-01-10 07:36+0000\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-21 08:39+0000\n"
"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
@@ -23,6 +24,11 @@ msgstr ""
"Language: ca\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/delete.php:28 ajax/getstoragestats.php:11 ajax/upload.php:17
+#: ajax/upload.php:76 templates/index.php:18
+msgid "Upload"
+msgstr "Puja"
+
#: ajax/move.php:17
#, php-format
msgid "Could not move %s - File with this name already exists"
@@ -37,46 +43,46 @@ msgstr " No s'ha pogut moure %s"
msgid "Unable to rename file"
msgstr "No es pot canviar el nom del fitxer"
-#: ajax/upload.php:14
+#: ajax/upload.php:20
msgid "No file was uploaded. Unknown error"
msgstr "No s'ha carregat cap fitxer. Error desconegut"
-#: ajax/upload.php:21
+#: ajax/upload.php:30
msgid "There is no error, the file uploaded with success"
msgstr "El fitxer s'ha pujat correctament"
-#: ajax/upload.php:22
+#: ajax/upload.php:31
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr "L’arxiu que voleu carregar supera el màxim definit en la directiva upload_max_filesize del php.ini:"
-#: ajax/upload.php:24
+#: ajax/upload.php:33
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "El fitxer de pujada excedeix la directiva MAX_FILE_SIZE especificada al formulari HTML"
-#: ajax/upload.php:26
+#: ajax/upload.php:35
msgid "The uploaded file was only partially uploaded"
msgstr "El fitxer només s'ha pujat parcialment"
-#: ajax/upload.php:27
+#: ajax/upload.php:36
msgid "No file was uploaded"
msgstr "El fitxer no s'ha pujat"
-#: ajax/upload.php:28
+#: ajax/upload.php:37
msgid "Missing a temporary folder"
msgstr "S'ha perdut un fitxer temporal"
-#: ajax/upload.php:29
+#: ajax/upload.php:38
msgid "Failed to write to disk"
msgstr "Ha fallat en escriure al disc"
-#: ajax/upload.php:45
+#: ajax/upload.php:57
msgid "Not enough space available"
msgstr "No hi ha prou espai disponible"
-#: ajax/upload.php:69
+#: ajax/upload.php:91
msgid "Invalid directory."
msgstr "Directori no vàlid."
@@ -132,98 +138,100 @@ msgstr "no compartits {files}"
msgid "deleted {files}"
msgstr "eliminats {files}"
-#: js/files.js:31
+#: js/files.js:48
msgid "'.' is an invalid file name."
msgstr "'.' és un nom no vàlid per un fitxer."
-#: js/files.js:36
+#: js/files.js:53
msgid "File name cannot be empty."
msgstr "El nom del fitxer no pot ser buit."
-#: js/files.js:45
+#: js/files.js:62
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "El nóm no és vàlid, '\\', '/', '<', '>', ':', '\"', '|', '?' i '*' no estan permesos."
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "s'estan generant fitxers ZIP, pot trigar una estona."
+#: js/files.js:204
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr "S'està preparant la baixada. Pot trigar una estona si els fitxers són grans."
-#: js/files.js:224
+#: js/files.js:242
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "No es pot pujar el fitxer perquè és una carpeta o té 0 bytes"
-#: js/files.js:224
+#: js/files.js:242
msgid "Upload Error"
msgstr "Error en la pujada"
-#: js/files.js:241
+#: js/files.js:259
msgid "Close"
msgstr "Tanca"
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:278 js/files.js:397 js/files.js:431
msgid "Pending"
msgstr "Pendents"
-#: js/files.js:280
+#: js/files.js:298
msgid "1 file uploading"
msgstr "1 fitxer pujant"
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:301 js/files.js:357 js/files.js:372
msgid "{count} files uploading"
msgstr "{count} fitxers en pujada"
-#: js/files.js:357 js/files.js:393
+#: js/files.js:376 js/files.js:414
msgid "Upload cancelled."
msgstr "La pujada s'ha cancel·lat."
-#: js/files.js:464
+#: js/files.js:486
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Hi ha una pujada en curs. Si abandoneu la pàgina la pujada es cancel·larà."
-#: js/files.js:537
+#: js/files.js:559
msgid "URL cannot be empty."
msgstr "La URL no pot ser buida"
-#: js/files.js:543
+#: js/files.js:565
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Nom de carpeta no vàlid. L'ús de 'Shared' està reservat per Owncloud"
-#: js/files.js:727
+#: js/files.js:775
msgid "{count} files scanned"
msgstr "{count} fitxers escannejats"
-#: js/files.js:735
+#: js/files.js:783
msgid "error while scanning"
msgstr "error durant l'escaneig"
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:857 templates/index.php:64
msgid "Name"
msgstr "Nom"
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:858 templates/index.php:75
msgid "Size"
msgstr "Mida"
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:859 templates/index.php:77
msgid "Modified"
msgstr "Modificat"
-#: js/files.js:829
+#: js/files.js:878
msgid "1 folder"
msgstr "1 carpeta"
-#: js/files.js:831
+#: js/files.js:880
msgid "{count} folders"
msgstr "{count} carpetes"
-#: js/files.js:839
+#: js/files.js:888
msgid "1 file"
msgstr "1 fitxer"
-#: js/files.js:841
+#: js/files.js:890
msgid "{count} files"
msgstr "{count} fitxers"
@@ -275,10 +283,6 @@ msgstr "Carpeta"
msgid "From link"
msgstr "Des d'enllaç"
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Puja"
-
#: templates/index.php:41
msgid "Cancel upload"
msgstr "Cancel·la la pujada"
diff --git a/l10n/ca/files_encryption.po b/l10n/ca/files_encryption.po
index 98571697a6a..e76e21e1e5b 100644
--- a/l10n/ca/files_encryption.po
+++ b/l10n/ca/files_encryption.po
@@ -8,28 +8,76 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-13 18:30+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: ca\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
msgid "Encryption"
msgstr "Encriptatge"
-#: templates/settings.php:4
+#: templates/settings.php:67
msgid "Exclude the following file types from encryption"
msgstr "Exclou els tipus de fitxers següents de l'encriptatge"
-#: templates/settings.php:5
+#: templates/settings.php:71
msgid "None"
msgstr "Cap"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "Activa l'encriptatge"
diff --git a/l10n/ca/files_versions.po b/l10n/ca/files_versions.po
index 4bd9bdf45c9..0db50601e4c 100644
--- a/l10n/ca/files_versions.po
+++ b/l10n/ca/files_versions.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-10 02:04+0200\n"
-"PO-Revision-Date: 2012-10-09 07:30+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,22 +19,10 @@ msgstr ""
"Language: ca\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "Expira totes les versions"
-
#: js/versions.js:16
msgid "History"
msgstr "Historial"
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "Versions"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "Això eliminarà totes les versions de còpia de seguretat dels vostres fitxers"
-
#: templates/settings.php:3
msgid "Files Versioning"
msgstr "Fitxers de Versions"
diff --git a/l10n/ca/lib.po b/l10n/ca/lib.po
index 0bdb8f916ec..965da96ee31 100644
--- a/l10n/ca/lib.po
+++ b/l10n/ca/lib.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# <rcalvoi@yahoo.com>, 2012.
+# <rcalvoi@yahoo.com>, 2012-2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-17 00:01+0100\n"
-"PO-Revision-Date: 2012-11-16 08:22+0000\n"
+"POT-Creation-Date: 2013-01-18 00:03+0100\n"
+"PO-Revision-Date: 2013-01-17 09:24+0000\n"
"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
@@ -18,51 +18,55 @@ msgstr ""
"Language: ca\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:285
+#: app.php:301
msgid "Help"
msgstr "Ajuda"
-#: app.php:292
+#: app.php:308
msgid "Personal"
msgstr "Personal"
-#: app.php:297
+#: app.php:313
msgid "Settings"
msgstr "Configuració"
-#: app.php:302
+#: app.php:318
msgid "Users"
msgstr "Usuaris"
-#: app.php:309
+#: app.php:325
msgid "Apps"
msgstr "Aplicacions"
-#: app.php:311
+#: app.php:327
msgid "Admin"
msgstr "Administració"
-#: files.php:332
+#: files.php:365
msgid "ZIP download is turned off."
msgstr "La baixada en ZIP està desactivada."
-#: files.php:333
+#: files.php:366
msgid "Files need to be downloaded one by one."
msgstr "Els fitxers s'han de baixar d'un en un."
-#: files.php:333 files.php:358
+#: files.php:366 files.php:391
msgid "Back to Files"
msgstr "Torna a Fitxers"
-#: files.php:357
+#: files.php:390
msgid "Selected files too large to generate zip file."
msgstr "Els fitxers seleccionats son massa grans per generar un fitxer zip."
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr "no s'ha pogut determinar"
+
#: json.php:28
msgid "Application is not enabled"
msgstr "L'aplicació no està habilitada"
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
msgstr "Error d'autenticació"
@@ -82,55 +86,55 @@ msgstr "Text"
msgid "Images"
msgstr "Imatges"
-#: template.php:103
+#: template.php:113
msgid "seconds ago"
msgstr "segons enrere"
-#: template.php:104
+#: template.php:114
msgid "1 minute ago"
msgstr "fa 1 minut"
-#: template.php:105
+#: template.php:115
#, php-format
msgid "%d minutes ago"
msgstr "fa %d minuts"
-#: template.php:106
+#: template.php:116
msgid "1 hour ago"
msgstr "fa 1 hora"
-#: template.php:107
+#: template.php:117
#, php-format
msgid "%d hours ago"
msgstr "fa %d hores"
-#: template.php:108
+#: template.php:118
msgid "today"
msgstr "avui"
-#: template.php:109
+#: template.php:119
msgid "yesterday"
msgstr "ahir"
-#: template.php:110
+#: template.php:120
#, php-format
msgid "%d days ago"
msgstr "fa %d dies"
-#: template.php:111
+#: template.php:121
msgid "last month"
msgstr "el mes passat"
-#: template.php:112
+#: template.php:122
#, php-format
msgid "%d months ago"
msgstr "fa %d mesos"
-#: template.php:113
+#: template.php:123
msgid "last year"
msgstr "l'any passat"
-#: template.php:114
+#: template.php:124
msgid "years ago"
msgstr "fa anys"
diff --git a/l10n/ca/user_ldap.po b/l10n/ca/user_ldap.po
index 10b45cc3214..8cf04dcae1b 100644
--- a/l10n/ca/user_ldap.po
+++ b/l10n/ca/user_ldap.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# <rcalvoi@yahoo.com>, 2012.
+# <rcalvoi@yahoo.com>, 2012-2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-17 00:09+0100\n"
-"PO-Revision-Date: 2012-12-16 09:56+0000\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 07:21+0000\n"
"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
@@ -27,9 +27,9 @@ msgstr "<b>Avís:</b> Les aplicacions user_ldap i user_webdavauth són incompati
#: templates/settings.php:11
msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
-msgstr "<b>Avís:</b> El mòdul PHP LDAP necessari no està instal·lat, el dorsal no funcionarà. Demaneu a l'administrador del sistema que l'instal·li."
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
+msgstr "<b>Avís:</b> El mòdul PHP LDAP no està instal·lat, el dorsal no funcionarà. Demaneu a l'administrador del sistema que l'instal·li."
#: templates/settings.php:15
msgid "Host"
@@ -45,6 +45,10 @@ msgid "Base DN"
msgstr "DN Base"
#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr "Una DN Base per línia"
+
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Podeu especificar DN Base per usuaris i grups a la pestanya Avançat"
@@ -115,10 +119,18 @@ msgstr "Port"
msgid "Base User Tree"
msgstr "Arbre base d'usuaris"
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr "Una DN Base d'Usuari per línia"
+
#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "Arbre base de grups"
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr "Una DN Base de Grup per línia"
+
#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Associació membres-grup"
diff --git a/l10n/ca/user_webdavauth.po b/l10n/ca/user_webdavauth.po
index c7a053911de..bd7df15438f 100644
--- a/l10n/ca/user_webdavauth.po
+++ b/l10n/ca/user_webdavauth.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# <rcalvoi@yahoo.com>, 2012.
+# <rcalvoi@yahoo.com>, 2012-2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-22 00:24+0100\n"
-"PO-Revision-Date: 2012-12-21 09:21+0000\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 07:22+0000\n"
"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
@@ -18,13 +18,17 @@ msgstr ""
"Language: ca\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr "Autenticació WebDAV"
+
#: templates/settings.php:4
msgid "URL: http://"
msgstr "URL: http://"
#: templates/settings.php:6
msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
-msgstr "ownCloud enviarà les credencials d'usuari a aquesta URL. S'interpretarà http 401 i http 403 com a credencials incorrectes i tots els altres codis com a credencials correctes."
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
+msgstr "ownCloud enviarà les credencials d'usuari a aquesta URL. Aquest endollable en comprova la resposta i interpretarà els codis d'estat 401 i 403 com a credencials no vàlides, i qualsevol altra resposta com a credencials vàlides."
diff --git a/l10n/cs_CZ/core.po b/l10n/cs_CZ/core.po
index e6bfba8798c..66b36315f8e 100644
--- a/l10n/cs_CZ/core.po
+++ b/l10n/cs_CZ/core.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
@@ -211,7 +211,6 @@ msgid "Password protect"
msgstr "Chránit heslem"
#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
msgid "Password"
msgstr "Heslo"
@@ -568,17 +567,3 @@ msgstr "následující"
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
msgstr "Aktualizuji ownCloud na verzi %s, bude to chvíli trvat."
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "Bezpečnostní upozornění."
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "Ověřte, prosím, své heslo. <br/>Z bezpečnostních důvodů můžete být občas požádáni o jeho opětovné zadání."
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "Ověřit"
diff --git a/l10n/cs_CZ/files.po b/l10n/cs_CZ/files.po
index c5417ef8688..e9fde9f772e 100644
--- a/l10n/cs_CZ/files.po
+++ b/l10n/cs_CZ/files.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-11 00:05+0100\n"
-"PO-Revision-Date: 2013-01-10 08:32+0000\n"
+"POT-Creation-Date: 2013-01-21 00:04+0100\n"
+"PO-Revision-Date: 2013-01-20 10:48+0000\n"
"Last-Translator: Tomáš Chvátal <tomas.chvatal@gmail.com>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
@@ -20,6 +20,11 @@ msgstr ""
"Language: cs_CZ\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+#: ajax/delete.php:28 ajax/getstoragestats.php:11 ajax/upload.php:17
+#: ajax/upload.php:76 templates/index.php:18
+msgid "Upload"
+msgstr "Odeslat"
+
#: ajax/move.php:17
#, php-format
msgid "Could not move %s - File with this name already exists"
@@ -34,46 +39,46 @@ msgstr "Nelze přesunout %s"
msgid "Unable to rename file"
msgstr "Nelze přejmenovat soubor"
-#: ajax/upload.php:14
+#: ajax/upload.php:20
msgid "No file was uploaded. Unknown error"
msgstr "Soubor nebyl odeslán. Neznámá chyba"
-#: ajax/upload.php:21
+#: ajax/upload.php:30
msgid "There is no error, the file uploaded with success"
msgstr "Soubor byl odeslán úspěšně"
-#: ajax/upload.php:22
+#: ajax/upload.php:31
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr "Odesílaný soubor přesahuje velikost upload_max_filesize povolenou v php.ini:"
-#: ajax/upload.php:24
+#: ajax/upload.php:33
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "Odeslaný soubor přesáhl svou velikostí parametr MAX_FILE_SIZE specifikovaný v formuláři HTML"
-#: ajax/upload.php:26
+#: ajax/upload.php:35
msgid "The uploaded file was only partially uploaded"
msgstr "Soubor byl odeslán pouze částečně"
-#: ajax/upload.php:27
+#: ajax/upload.php:36
msgid "No file was uploaded"
msgstr "Žádný soubor nebyl odeslán"
-#: ajax/upload.php:28
+#: ajax/upload.php:37
msgid "Missing a temporary folder"
msgstr "Chybí adresář pro dočasné soubory"
-#: ajax/upload.php:29
+#: ajax/upload.php:38
msgid "Failed to write to disk"
msgstr "Zápis na disk selhal"
-#: ajax/upload.php:45
+#: ajax/upload.php:57
msgid "Not enough space available"
msgstr "Nedostatek dostupného místa"
-#: ajax/upload.php:69
+#: ajax/upload.php:91
msgid "Invalid directory."
msgstr "Neplatný adresář"
@@ -129,98 +134,100 @@ msgstr "sdílení zrušeno pro {files}"
msgid "deleted {files}"
msgstr "smazáno {files}"
-#: js/files.js:31
+#: js/files.js:48
msgid "'.' is an invalid file name."
msgstr "'.' je neplatným názvem souboru."
-#: js/files.js:36
+#: js/files.js:53
msgid "File name cannot be empty."
msgstr "Název souboru nemůže být prázdný řetězec."
-#: js/files.js:45
+#: js/files.js:62
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Neplatný název, znaky '\\', '/', '<', '>', ':', '\"', '|', '?' a '*' nejsou povoleny."
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "generuji ZIP soubor, může to nějakou dobu trvat."
+#: js/files.js:204
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr "Vaše soubory ke stažení se připravují. Pokud jsou velké může to chvíli trvat."
-#: js/files.js:224
+#: js/files.js:242
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Nelze odeslat Váš soubor, protože je to adresář nebo má velikost 0 bajtů"
-#: js/files.js:224
+#: js/files.js:242
msgid "Upload Error"
msgstr "Chyba odesílání"
-#: js/files.js:241
+#: js/files.js:259
msgid "Close"
msgstr "Zavřít"
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:278 js/files.js:397 js/files.js:431
msgid "Pending"
msgstr "Čekající"
-#: js/files.js:280
+#: js/files.js:298
msgid "1 file uploading"
msgstr "odesílá se 1 soubor"
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:301 js/files.js:357 js/files.js:372
msgid "{count} files uploading"
msgstr "odesílám {count} souborů"
-#: js/files.js:357 js/files.js:393
+#: js/files.js:376 js/files.js:414
msgid "Upload cancelled."
msgstr "Odesílání zrušeno."
-#: js/files.js:464
+#: js/files.js:486
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Probíhá odesílání souboru. Opuštění stránky vyústí ve zrušení nahrávání."
-#: js/files.js:537
+#: js/files.js:559
msgid "URL cannot be empty."
msgstr "URL nemůže být prázdná"
-#: js/files.js:543
+#: js/files.js:565
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Neplatný název složky. Použití 'Shared' je rezervováno pro vnitřní potřeby Owncloud"
-#: js/files.js:727
+#: js/files.js:775
msgid "{count} files scanned"
msgstr "prozkoumáno {count} souborů"
-#: js/files.js:735
+#: js/files.js:783
msgid "error while scanning"
msgstr "chyba při prohledávání"
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:857 templates/index.php:64
msgid "Name"
msgstr "Název"
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:858 templates/index.php:75
msgid "Size"
msgstr "Velikost"
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:859 templates/index.php:77
msgid "Modified"
msgstr "Změněno"
-#: js/files.js:829
+#: js/files.js:878
msgid "1 folder"
msgstr "1 složka"
-#: js/files.js:831
+#: js/files.js:880
msgid "{count} folders"
msgstr "{count} složky"
-#: js/files.js:839
+#: js/files.js:888
msgid "1 file"
msgstr "1 soubor"
-#: js/files.js:841
+#: js/files.js:890
msgid "{count} files"
msgstr "{count} soubory"
@@ -272,10 +279,6 @@ msgstr "Složka"
msgid "From link"
msgstr "Z odkazu"
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Odeslat"
-
#: templates/index.php:41
msgid "Cancel upload"
msgstr "Zrušit odesílání"
diff --git a/l10n/cs_CZ/files_encryption.po b/l10n/cs_CZ/files_encryption.po
index 96298cc2205..4421784cb4d 100644
--- a/l10n/cs_CZ/files_encryption.po
+++ b/l10n/cs_CZ/files_encryption.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-05 13:37+0000\n"
-"Last-Translator: Tomáš Chvátal <tomas.chvatal@gmail.com>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,18 +19,66 @@ msgstr ""
"Language: cs_CZ\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
msgid "Encryption"
msgstr "Šifrování"
-#: templates/settings.php:4
+#: templates/settings.php:67
msgid "Exclude the following file types from encryption"
msgstr "Při šifrování vynechat následující typy souborů"
-#: templates/settings.php:5
+#: templates/settings.php:71
msgid "None"
msgstr "Žádné"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "Povolit šifrování"
diff --git a/l10n/cs_CZ/files_versions.po b/l10n/cs_CZ/files_versions.po
index 2f109044074..3e62a18ee40 100644
--- a/l10n/cs_CZ/files_versions.po
+++ b/l10n/cs_CZ/files_versions.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-23 02:01+0200\n"
-"PO-Revision-Date: 2012-09-22 11:58+0000\n"
-"Last-Translator: Tomáš Chvátal <tomas.chvatal@gmail.com>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,22 +19,10 @@ msgstr ""
"Language: cs_CZ\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "Vypršet všechny verze"
-
#: js/versions.js:16
msgid "History"
msgstr "Historie"
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "Verze"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "Odstraní všechny existující zálohované verze Vašich souborů"
-
#: templates/settings.php:3
msgid "Files Versioning"
msgstr "Verzování souborů"
diff --git a/l10n/cs_CZ/lib.po b/l10n/cs_CZ/lib.po
index dd8693c6c82..55cc3d0f58c 100644
--- a/l10n/cs_CZ/lib.po
+++ b/l10n/cs_CZ/lib.po
@@ -4,13 +4,13 @@
#
# Translators:
# Martin <fireball@atlas.cz>, 2012.
-# Tomáš Chvátal <tomas.chvatal@gmail.com>, 2012.
+# Tomáš Chvátal <tomas.chvatal@gmail.com>, 2012-2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-15 10:08+0000\n"
+"POT-Creation-Date: 2013-01-18 00:03+0100\n"
+"PO-Revision-Date: 2013-01-17 11:01+0000\n"
"Last-Translator: Tomáš Chvátal <tomas.chvatal@gmail.com>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
@@ -19,51 +19,55 @@ msgstr ""
"Language: cs_CZ\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: app.php:285
+#: app.php:301
msgid "Help"
msgstr "Nápověda"
-#: app.php:292
+#: app.php:308
msgid "Personal"
msgstr "Osobní"
-#: app.php:297
+#: app.php:313
msgid "Settings"
msgstr "Nastavení"
-#: app.php:302
+#: app.php:318
msgid "Users"
msgstr "Uživatelé"
-#: app.php:309
+#: app.php:325
msgid "Apps"
msgstr "Aplikace"
-#: app.php:311
+#: app.php:327
msgid "Admin"
msgstr "Administrace"
-#: files.php:332
+#: files.php:365
msgid "ZIP download is turned off."
msgstr "Stahování ZIPu je vypnuto."
-#: files.php:333
+#: files.php:366
msgid "Files need to be downloaded one by one."
msgstr "Soubory musí být stahovány jednotlivě."
-#: files.php:333 files.php:358
+#: files.php:366 files.php:391
msgid "Back to Files"
msgstr "Zpět k souborům"
-#: files.php:357
+#: files.php:390
msgid "Selected files too large to generate zip file."
msgstr "Vybrané soubory jsou příliš velké pro vytvoření zip souboru."
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr "nelze zjistit"
+
#: json.php:28
msgid "Application is not enabled"
msgstr "Aplikace není povolena"
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
msgstr "Chyba ověření"
@@ -83,55 +87,55 @@ msgstr "Text"
msgid "Images"
msgstr "Obrázky"
-#: template.php:103
+#: template.php:113
msgid "seconds ago"
msgstr "před vteřinami"
-#: template.php:104
+#: template.php:114
msgid "1 minute ago"
msgstr "před 1 minutou"
-#: template.php:105
+#: template.php:115
#, php-format
msgid "%d minutes ago"
msgstr "před %d minutami"
-#: template.php:106
+#: template.php:116
msgid "1 hour ago"
msgstr "před hodinou"
-#: template.php:107
+#: template.php:117
#, php-format
msgid "%d hours ago"
msgstr "před %d hodinami"
-#: template.php:108
+#: template.php:118
msgid "today"
msgstr "dnes"
-#: template.php:109
+#: template.php:119
msgid "yesterday"
msgstr "včera"
-#: template.php:110
+#: template.php:120
#, php-format
msgid "%d days ago"
msgstr "před %d dny"
-#: template.php:111
+#: template.php:121
msgid "last month"
msgstr "minulý měsíc"
-#: template.php:112
+#: template.php:122
#, php-format
msgid "%d months ago"
msgstr "Před %d měsíci"
-#: template.php:113
+#: template.php:123
msgid "last year"
msgstr "loni"
-#: template.php:114
+#: template.php:124
msgid "years ago"
msgstr "před lety"
diff --git a/l10n/cs_CZ/user_ldap.po b/l10n/cs_CZ/user_ldap.po
index 89d650bf77d..225c039f836 100644
--- a/l10n/cs_CZ/user_ldap.po
+++ b/l10n/cs_CZ/user_ldap.po
@@ -4,13 +4,13 @@
#
# Translators:
# Martin <fireball@atlas.cz>, 2012.
-# Tomáš Chvátal <tomas.chvatal@gmail.com>, 2012.
+# Tomáš Chvátal <tomas.chvatal@gmail.com>, 2012-2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-16 00:11+0100\n"
-"PO-Revision-Date: 2012-12-15 15:30+0000\n"
+"POT-Creation-Date: 2013-01-18 00:03+0100\n"
+"PO-Revision-Date: 2013-01-17 11:09+0000\n"
"Last-Translator: Tomáš Chvátal <tomas.chvatal@gmail.com>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
@@ -28,8 +28,8 @@ msgstr "<b>Varování:</b> Aplikace user_ldap a user_webdavauth nejsou kompatibi
#: templates/settings.php:11
msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
msgstr "<b>Varování:</b> není nainstalován LDAP modul pro PHP, podpůrná vrstva nebude fungovat. Požádejte, prosím, správce systému aby jej nainstaloval."
#: templates/settings.php:15
@@ -46,6 +46,10 @@ msgid "Base DN"
msgstr "Základní DN"
#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr "Jedna základní DN na řádku"
+
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "V rozšířeném nastavení můžete určit základní DN pro uživatele a skupiny"
@@ -116,10 +120,18 @@ msgstr "Port"
msgid "Base User Tree"
msgstr "Základní uživatelský strom"
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr "Jedna uživatelská základní DN na řádku"
+
#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "Základní skupinový strom"
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr "Jedna skupinová základní DN na řádku"
+
#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Asociace člena skupiny"
diff --git a/l10n/cs_CZ/user_webdavauth.po b/l10n/cs_CZ/user_webdavauth.po
index 3545665816d..28b3d2f8f19 100644
--- a/l10n/cs_CZ/user_webdavauth.po
+++ b/l10n/cs_CZ/user_webdavauth.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Tomáš Chvátal <tomas.chvatal@gmail.com>, 2012.
+# Tomáš Chvátal <tomas.chvatal@gmail.com>, 2012-2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-21 00:10+0100\n"
-"PO-Revision-Date: 2012-12-20 19:51+0000\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 09:06+0000\n"
"Last-Translator: Tomáš Chvátal <tomas.chvatal@gmail.com>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
@@ -18,13 +18,17 @@ msgstr ""
"Language: cs_CZ\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr "Ověření WebDAV"
+
#: templates/settings.php:4
msgid "URL: http://"
msgstr "URL: http://"
#: templates/settings.php:6
msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
-msgstr "ownCloud odešle přihlašovací údaje uživatele na URL a z návratové hodnoty určí stav přihlášení. Http 401 a 403 vyhodnotí jako neplatné údaje a všechny ostatní jako úspěšné přihlášení."
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
+msgstr "ownCloud odešle uživatelské údaje na zadanou URL. Plugin zkontroluje odpověď a považuje návratovou hodnotu HTTP 401 a 403 za neplatné údaje a všechny ostatní hodnoty jako platné přihlašovací údaje."
diff --git a/l10n/da/core.po b/l10n/da/core.po
index 2c249dec308..421994c63c8 100644
--- a/l10n/da/core.po
+++ b/l10n/da/core.po
@@ -15,8 +15,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
@@ -215,7 +215,6 @@ msgid "Password protect"
msgstr "Beskyt med adgangskode"
#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
msgid "Password"
msgstr "Kodeord"
@@ -572,17 +571,3 @@ msgstr "næste"
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "Sikkerhedsadvarsel!"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "Verificer din adgangskode.<br/>Af sikkerhedsårsager kan du lejlighedsvist blive bedt om at indtaste din adgangskode igen."
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "Verificer"
diff --git a/l10n/da/files.po b/l10n/da/files.po
index b2d80372d34..f7bd3b92597 100644
--- a/l10n/da/files.po
+++ b/l10n/da/files.po
@@ -15,8 +15,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"POT-Creation-Date: 2013-01-20 00:05+0100\n"
+"PO-Revision-Date: 2013-01-19 23:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
@@ -25,6 +25,11 @@ msgstr ""
"Language: da\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/delete.php:28 ajax/getstoragestats.php:11 ajax/upload.php:17
+#: ajax/upload.php:76 templates/index.php:18
+msgid "Upload"
+msgstr "Upload"
+
#: ajax/move.php:17
#, php-format
msgid "Could not move %s - File with this name already exists"
@@ -39,46 +44,46 @@ msgstr ""
msgid "Unable to rename file"
msgstr ""
-#: ajax/upload.php:14
+#: ajax/upload.php:20
msgid "No file was uploaded. Unknown error"
msgstr "Ingen fil blev uploadet. Ukendt fejl."
-#: ajax/upload.php:21
+#: ajax/upload.php:30
msgid "There is no error, the file uploaded with success"
msgstr "Der er ingen fejl, filen blev uploadet med success"
-#: ajax/upload.php:22
+#: ajax/upload.php:31
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr "Den uploadede fil overstiger upload_max_filesize direktivet i php.ini"
-#: ajax/upload.php:24
+#: ajax/upload.php:33
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "Den uploadede fil overskrider MAX_FILE_SIZE -direktivet som er specificeret i HTML-formularen"
-#: ajax/upload.php:26
+#: ajax/upload.php:35
msgid "The uploaded file was only partially uploaded"
msgstr "Den uploadede file blev kun delvist uploadet"
-#: ajax/upload.php:27
+#: ajax/upload.php:36
msgid "No file was uploaded"
msgstr "Ingen fil blev uploadet"
-#: ajax/upload.php:28
+#: ajax/upload.php:37
msgid "Missing a temporary folder"
msgstr "Mangler en midlertidig mappe"
-#: ajax/upload.php:29
+#: ajax/upload.php:38
msgid "Failed to write to disk"
msgstr "Fejl ved skrivning til disk."
-#: ajax/upload.php:45
+#: ajax/upload.php:57
msgid "Not enough space available"
msgstr ""
-#: ajax/upload.php:69
+#: ajax/upload.php:91
msgid "Invalid directory."
msgstr ""
@@ -134,98 +139,100 @@ msgstr "ikke delte {files}"
msgid "deleted {files}"
msgstr "slettede {files}"
-#: js/files.js:31
+#: js/files.js:48
msgid "'.' is an invalid file name."
msgstr ""
-#: js/files.js:36
+#: js/files.js:53
msgid "File name cannot be empty."
msgstr ""
-#: js/files.js:45
+#: js/files.js:62
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Ugyldigt navn, '\\', '/', '<', '>', ':' | '?', '\"', '', og '*' er ikke tilladt."
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "genererer ZIP-fil, det kan tage lidt tid."
+#: js/files.js:204
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
-#: js/files.js:224
+#: js/files.js:242
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Kunne ikke uploade din fil, da det enten er en mappe eller er tom"
-#: js/files.js:224
+#: js/files.js:242
msgid "Upload Error"
msgstr "Fejl ved upload"
-#: js/files.js:241
+#: js/files.js:259
msgid "Close"
msgstr "Luk"
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:278 js/files.js:397 js/files.js:431
msgid "Pending"
msgstr "Afventer"
-#: js/files.js:280
+#: js/files.js:298
msgid "1 file uploading"
msgstr "1 fil uploades"
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:301 js/files.js:357 js/files.js:372
msgid "{count} files uploading"
msgstr "{count} filer uploades"
-#: js/files.js:357 js/files.js:393
+#: js/files.js:376 js/files.js:414
msgid "Upload cancelled."
msgstr "Upload afbrudt."
-#: js/files.js:464
+#: js/files.js:486
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Fil upload kører. Hvis du forlader siden nu, vil uploadet blive annuleret."
-#: js/files.js:537
+#: js/files.js:559
msgid "URL cannot be empty."
msgstr "URLen kan ikke være tom."
-#: js/files.js:543
+#: js/files.js:565
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:727
+#: js/files.js:775
msgid "{count} files scanned"
msgstr "{count} filer skannet"
-#: js/files.js:735
+#: js/files.js:783
msgid "error while scanning"
msgstr "fejl under scanning"
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:857 templates/index.php:64
msgid "Name"
msgstr "Navn"
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:858 templates/index.php:75
msgid "Size"
msgstr "Størrelse"
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:859 templates/index.php:77
msgid "Modified"
msgstr "Ændret"
-#: js/files.js:829
+#: js/files.js:878
msgid "1 folder"
msgstr "1 mappe"
-#: js/files.js:831
+#: js/files.js:880
msgid "{count} folders"
msgstr "{count} mapper"
-#: js/files.js:839
+#: js/files.js:888
msgid "1 file"
msgstr "1 fil"
-#: js/files.js:841
+#: js/files.js:890
msgid "{count} files"
msgstr "{count} filer"
@@ -277,10 +284,6 @@ msgstr "Mappe"
msgid "From link"
msgstr "Fra link"
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Upload"
-
#: templates/index.php:41
msgid "Cancel upload"
msgstr "Fortryd upload"
diff --git a/l10n/da/files_encryption.po b/l10n/da/files_encryption.po
index bd1c9864514..14b94d9d7ae 100644
--- a/l10n/da/files_encryption.po
+++ b/l10n/da/files_encryption.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-14 02:01+0200\n"
-"PO-Revision-Date: 2012-09-13 09:42+0000\n"
-"Last-Translator: osos <osos@openeyes.dk>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,18 +18,66 @@ msgstr ""
"Language: da\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
msgid "Encryption"
msgstr "Kryptering"
-#: templates/settings.php:4
+#: templates/settings.php:67
msgid "Exclude the following file types from encryption"
msgstr "Ekskluder følgende filtyper fra kryptering"
-#: templates/settings.php:5
+#: templates/settings.php:71
msgid "None"
msgstr "Ingen"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "Aktivér kryptering"
diff --git a/l10n/da/files_versions.po b/l10n/da/files_versions.po
index 3e6898ddd45..847d3bda8aa 100644
--- a/l10n/da/files_versions.po
+++ b/l10n/da/files_versions.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-26 02:02+0200\n"
-"PO-Revision-Date: 2012-09-25 14:07+0000\n"
-"Last-Translator: Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,22 +19,10 @@ msgstr ""
"Language: da\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "Lad alle versioner udløbe"
-
#: js/versions.js:16
msgid "History"
msgstr "Historik"
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "Versioner"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "Dette vil slette alle eksisterende backupversioner af dine filer"
-
#: templates/settings.php:3
msgid "Files Versioning"
msgstr "Versionering af filer"
diff --git a/l10n/da/lib.po b/l10n/da/lib.po
index 187d797c533..c1bdc6f0b94 100644
--- a/l10n/da/lib.po
+++ b/l10n/da/lib.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-24 00:11+0100\n"
-"PO-Revision-Date: 2012-12-23 21:58+0000\n"
-"Last-Translator: cronner <cronner@gmail.com>\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,27 +20,27 @@ msgstr ""
"Language: da\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:287
+#: app.php:301
msgid "Help"
msgstr "Hjælp"
-#: app.php:294
+#: app.php:308
msgid "Personal"
msgstr "Personlig"
-#: app.php:299
+#: app.php:313
msgid "Settings"
msgstr "Indstillinger"
-#: app.php:304
+#: app.php:318
msgid "Users"
msgstr "Brugere"
-#: app.php:311
+#: app.php:325
msgid "Apps"
msgstr "Apps"
-#: app.php:313
+#: app.php:327
msgid "Admin"
msgstr "Admin"
@@ -60,11 +60,15 @@ msgstr "Tilbage til Filer"
msgid "Selected files too large to generate zip file."
msgstr "De markerede filer er for store til at generere en ZIP-fil."
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr ""
+
#: json.php:28
msgid "Application is not enabled"
msgstr "Programmet er ikke aktiveret"
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
msgstr "Adgangsfejl"
@@ -84,55 +88,55 @@ msgstr "SMS"
msgid "Images"
msgstr "Billeder"
-#: template.php:103
+#: template.php:113
msgid "seconds ago"
msgstr "sekunder siden"
-#: template.php:104
+#: template.php:114
msgid "1 minute ago"
msgstr "1 minut siden"
-#: template.php:105
+#: template.php:115
#, php-format
msgid "%d minutes ago"
msgstr "%d minutter siden"
-#: template.php:106
+#: template.php:116
msgid "1 hour ago"
msgstr "1 time siden"
-#: template.php:107
+#: template.php:117
#, php-format
msgid "%d hours ago"
msgstr "%d timer siden"
-#: template.php:108
+#: template.php:118
msgid "today"
msgstr "I dag"
-#: template.php:109
+#: template.php:119
msgid "yesterday"
msgstr "I går"
-#: template.php:110
+#: template.php:120
#, php-format
msgid "%d days ago"
msgstr "%d dage siden"
-#: template.php:111
+#: template.php:121
msgid "last month"
msgstr "Sidste måned"
-#: template.php:112
+#: template.php:122
#, php-format
msgid "%d months ago"
msgstr "%d måneder siden"
-#: template.php:113
+#: template.php:123
msgid "last year"
msgstr "Sidste år"
-#: template.php:114
+#: template.php:124
msgid "years ago"
msgstr "år siden"
diff --git a/l10n/da/user_ldap.po b/l10n/da/user_ldap.po
index 0aab1f40519..a0d0e27bed6 100644
--- a/l10n/da/user_ldap.po
+++ b/l10n/da/user_ldap.po
@@ -12,9 +12,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-26 00:10+0100\n"
-"PO-Revision-Date: 2012-12-25 19:52+0000\n"
-"Last-Translator: Daraiko <blah@blacksunset.dk>\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 23:19+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -31,8 +31,8 @@ msgstr ""
#: templates/settings.php:11
msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
msgstr ""
#: templates/settings.php:15
@@ -49,6 +49,10 @@ msgid "Base DN"
msgstr "Base DN"
#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "You can specify Base DN for users and groups in the Advanced tab"
@@ -119,10 +123,18 @@ msgstr "Port"
msgid "Base User Tree"
msgstr "Base Bruger Træ"
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "Base Group Tree"
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Group-Member association"
diff --git a/l10n/da/user_webdavauth.po b/l10n/da/user_webdavauth.po
index 73cb352861f..16782a7f125 100644
--- a/l10n/da/user_webdavauth.po
+++ b/l10n/da/user_webdavauth.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-24 00:10+0100\n"
-"PO-Revision-Date: 2012-12-23 22:14+0000\n"
-"Last-Translator: cronner <cronner@gmail.com>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,13 +18,17 @@ msgstr ""
"Language: da\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
#: templates/settings.php:4
msgid "URL: http://"
msgstr "URL: http://"
#: templates/settings.php:6
msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
-msgstr "ownCloud vil sende brugeroplysningerne til denne webadresse er fortolker http 401 og http 403 som brugeroplysninger forkerte og alle andre koder som brugeroplysninger korrekte."
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
+msgstr ""
diff --git a/l10n/de/core.po b/l10n/de/core.po
index 4eecaa3b813..2210b4b29e2 100644
--- a/l10n/de/core.po
+++ b/l10n/de/core.po
@@ -23,8 +23,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
"MIME-Version: 1.0\n"
@@ -223,7 +223,6 @@ msgid "Password protect"
msgstr "Passwortschutz"
#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
msgid "Password"
msgstr "Passwort"
@@ -580,17 +579,3 @@ msgstr "Weiter"
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
msgstr "Aktualisiere ownCloud auf Version %s. Dies könnte eine Weile dauern."
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "Sicherheitswarnung!"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "Bitte bestätige Dein Passwort. <br/> Aus Sicherheitsgründen wirst Du hierbei gebeten, Dein Passwort erneut einzugeben."
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "Bestätigen"
diff --git a/l10n/de/files.po b/l10n/de/files.po
index c68bff2ed63..0ee39b9a487 100644
--- a/l10n/de/files.po
+++ b/l10n/de/files.po
@@ -12,7 +12,7 @@
# Jan-Christoph Borchardt <jan@unhosted.org>, 2011.
# <lukas@statuscode.ch>, 2012.
# <mail@felixmoeller.de>, 2012.
-# Marcel Kühlhorn <susefan93@gmx.de>, 2012.
+# Marcel Kühlhorn <susefan93@gmx.de>, 2012-2013.
# <markus.thiel@desico.de>, 2013.
# Michael Krell <m4dmike.mni@gmail.com>, 2012.
# <nelsonfritsch@gmail.com>, 2012.
@@ -27,9 +27,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 13:32+0000\n"
-"Last-Translator: thiel <markus.thiel@desico.de>\n"
+"POT-Creation-Date: 2013-01-21 00:04+0100\n"
+"PO-Revision-Date: 2013-01-20 03:38+0000\n"
+"Last-Translator: Marcel Kühlhorn <susefan93@gmx.de>\n"
"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -37,6 +37,11 @@ msgstr ""
"Language: de\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/delete.php:28 ajax/getstoragestats.php:11 ajax/upload.php:17
+#: ajax/upload.php:76 templates/index.php:18
+msgid "Upload"
+msgstr "Hochladen"
+
#: ajax/move.php:17
#, php-format
msgid "Could not move %s - File with this name already exists"
@@ -51,46 +56,46 @@ msgstr "Konnte %s nicht verschieben"
msgid "Unable to rename file"
msgstr "Konnte Datei nicht umbenennen"
-#: ajax/upload.php:14
+#: ajax/upload.php:20
msgid "No file was uploaded. Unknown error"
msgstr "Keine Datei hochgeladen. Unbekannter Fehler"
-#: ajax/upload.php:21
+#: ajax/upload.php:30
msgid "There is no error, the file uploaded with success"
msgstr "Datei fehlerfrei hochgeladen."
-#: ajax/upload.php:22
+#: ajax/upload.php:31
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr "Die hochgeladene Datei überschreitet die upload_max_filesize Vorgabe in php.ini"
-#: ajax/upload.php:24
+#: ajax/upload.php:33
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "Die Größe der hochzuladenden Datei überschreitet die MAX_FILE_SIZE-Richtlinie, die im HTML-Formular angegeben wurde"
-#: ajax/upload.php:26
+#: ajax/upload.php:35
msgid "The uploaded file was only partially uploaded"
msgstr "Die Datei wurde nur teilweise hochgeladen."
-#: ajax/upload.php:27
+#: ajax/upload.php:36
msgid "No file was uploaded"
msgstr "Es wurde keine Datei hochgeladen."
-#: ajax/upload.php:28
+#: ajax/upload.php:37
msgid "Missing a temporary folder"
msgstr "Temporärer Ordner fehlt."
-#: ajax/upload.php:29
+#: ajax/upload.php:38
msgid "Failed to write to disk"
msgstr "Fehler beim Schreiben auf die Festplatte"
-#: ajax/upload.php:45
+#: ajax/upload.php:57
msgid "Not enough space available"
msgstr "Nicht genug Speicherplatz verfügbar"
-#: ajax/upload.php:69
+#: ajax/upload.php:91
msgid "Invalid directory."
msgstr "Ungültiges Verzeichnis"
@@ -146,98 +151,100 @@ msgstr "Freigabe von {files} aufgehoben"
msgid "deleted {files}"
msgstr "{files} gelöscht"
-#: js/files.js:31
+#: js/files.js:48
msgid "'.' is an invalid file name."
msgstr "'.' ist kein gültiger Dateiname"
-#: js/files.js:36
+#: js/files.js:53
msgid "File name cannot be empty."
msgstr "Der Dateiname darf nicht leer sein"
-#: js/files.js:45
+#: js/files.js:62
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Ungültiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig."
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "Erstelle ZIP-Datei. Dies kann eine Weile dauern."
+#: js/files.js:204
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr "Dein Download wird vorbereitet. Dies kann bei größeren Dateien etwas dauern."
-#: js/files.js:224
+#: js/files.js:242
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Deine Datei kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist."
-#: js/files.js:224
+#: js/files.js:242
msgid "Upload Error"
msgstr "Fehler beim Upload"
-#: js/files.js:241
+#: js/files.js:259
msgid "Close"
msgstr "Schließen"
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:278 js/files.js:397 js/files.js:431
msgid "Pending"
msgstr "Ausstehend"
-#: js/files.js:280
+#: js/files.js:298
msgid "1 file uploading"
msgstr "Eine Datei wird hoch geladen"
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:301 js/files.js:357 js/files.js:372
msgid "{count} files uploading"
msgstr "{count} Dateien werden hochgeladen"
-#: js/files.js:357 js/files.js:393
+#: js/files.js:376 js/files.js:414
msgid "Upload cancelled."
msgstr "Upload abgebrochen."
-#: js/files.js:464
+#: js/files.js:486
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Dateiupload läuft. Wenn Du die Seite jetzt verlässt, wird der Upload abgebrochen."
-#: js/files.js:537
+#: js/files.js:559
msgid "URL cannot be empty."
msgstr "Die URL darf nicht leer sein"
-#: js/files.js:543
+#: js/files.js:565
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Ungültiger Verzeichnisname. Die Nutzung von \"Shared\" ist ownCloud vorbehalten."
-#: js/files.js:727
+#: js/files.js:775
msgid "{count} files scanned"
msgstr "{count} Dateien wurden gescannt"
-#: js/files.js:735
+#: js/files.js:783
msgid "error while scanning"
msgstr "Fehler beim Scannen"
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:857 templates/index.php:64
msgid "Name"
msgstr "Name"
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:858 templates/index.php:75
msgid "Size"
msgstr "Größe"
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:859 templates/index.php:77
msgid "Modified"
msgstr "Bearbeitet"
-#: js/files.js:829
+#: js/files.js:878
msgid "1 folder"
msgstr "1 Ordner"
-#: js/files.js:831
+#: js/files.js:880
msgid "{count} folders"
msgstr "{count} Ordner"
-#: js/files.js:839
+#: js/files.js:888
msgid "1 file"
msgstr "1 Datei"
-#: js/files.js:841
+#: js/files.js:890
msgid "{count} files"
msgstr "{count} Dateien"
@@ -289,10 +296,6 @@ msgstr "Ordner"
msgid "From link"
msgstr "Von einem Link"
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Hochladen"
-
#: templates/index.php:41
msgid "Cancel upload"
msgstr "Upload abbrechen"
diff --git a/l10n/de/files_encryption.po b/l10n/de/files_encryption.po
index 2231e6ffdf9..ba08625264e 100644
--- a/l10n/de/files_encryption.po
+++ b/l10n/de/files_encryption.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-02 23:16+0200\n"
-"PO-Revision-Date: 2012-10-02 09:06+0000\n"
-"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,18 +18,66 @@ msgstr ""
"Language: de\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
msgid "Encryption"
msgstr "Verschlüsselung"
-#: templates/settings.php:4
+#: templates/settings.php:67
msgid "Exclude the following file types from encryption"
msgstr "Die folgenden Dateitypen von der Verschlüsselung ausnehmen"
-#: templates/settings.php:5
+#: templates/settings.php:71
msgid "None"
msgstr "Keine"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "Verschlüsselung aktivieren"
diff --git a/l10n/de/files_versions.po b/l10n/de/files_versions.po
index 464f1fe302c..a3e251c142c 100644
--- a/l10n/de/files_versions.po
+++ b/l10n/de/files_versions.po
@@ -12,9 +12,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-02 23:16+0200\n"
-"PO-Revision-Date: 2012-10-02 09:08+0000\n"
-"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -22,22 +22,10 @@ msgstr ""
"Language: de\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "Alle Versionen löschen"
-
#: js/versions.js:16
msgid "History"
msgstr "Historie"
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "Versionen"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "Dies löscht alle vorhandenen Sicherungsversionen Deiner Dateien."
-
#: templates/settings.php:3
msgid "Files Versioning"
msgstr "Dateiversionierung"
diff --git a/l10n/de/lib.po b/l10n/de/lib.po
index d572145c29a..d27f2e0504b 100644
--- a/l10n/de/lib.po
+++ b/l10n/de/lib.po
@@ -6,7 +6,7 @@
# <blobbyjj@ymail.com>, 2012.
# I Robot <thomas.mueller@tmit.eu>, 2012.
# Jan-Christoph Borchardt <hey@jancborchardt.net>, 2012.
-# Marcel Kühlhorn <susefan93@gmx.de>, 2012.
+# Marcel Kühlhorn <susefan93@gmx.de>, 2012-2013.
# Phi Lieb <>, 2012.
# <thomas.mueller@tmit.eu>, 2012.
# <transifex.3.mensaje@spamgourmet.com>, 2012.
@@ -14,9 +14,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-12 00:13+0100\n"
-"PO-Revision-Date: 2012-12-11 09:31+0000\n"
-"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
+"POT-Creation-Date: 2013-01-21 00:04+0100\n"
+"PO-Revision-Date: 2013-01-20 03:39+0000\n"
+"Last-Translator: Marcel Kühlhorn <susefan93@gmx.de>\n"
"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -24,51 +24,55 @@ msgstr ""
"Language: de\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:287
+#: app.php:301
msgid "Help"
msgstr "Hilfe"
-#: app.php:294
+#: app.php:308
msgid "Personal"
msgstr "Persönlich"
-#: app.php:299
+#: app.php:313
msgid "Settings"
msgstr "Einstellungen"
-#: app.php:304
+#: app.php:318
msgid "Users"
msgstr "Benutzer"
-#: app.php:311
+#: app.php:325
msgid "Apps"
msgstr "Apps"
-#: app.php:313
+#: app.php:327
msgid "Admin"
msgstr "Administrator"
-#: files.php:361
+#: files.php:365
msgid "ZIP download is turned off."
msgstr "Der ZIP-Download ist deaktiviert."
-#: files.php:362
+#: files.php:366
msgid "Files need to be downloaded one by one."
msgstr "Die Dateien müssen einzeln heruntergeladen werden."
-#: files.php:362 files.php:387
+#: files.php:366 files.php:391
msgid "Back to Files"
msgstr "Zurück zu \"Dateien\""
-#: files.php:386
+#: files.php:390
msgid "Selected files too large to generate zip file."
msgstr "Die gewählten Dateien sind zu groß, um eine ZIP-Datei zu erstellen."
+#: helper.php:229
+msgid "couldn't be determined"
+msgstr "Konnte nicht festgestellt werden"
+
#: json.php:28
msgid "Application is not enabled"
msgstr "Die Anwendung ist nicht aktiviert"
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
msgstr "Authentifizierungs-Fehler"
@@ -88,55 +92,55 @@ msgstr "Text"
msgid "Images"
msgstr "Bilder"
-#: template.php:103
+#: template.php:113
msgid "seconds ago"
msgstr "Gerade eben"
-#: template.php:104
+#: template.php:114
msgid "1 minute ago"
msgstr "Vor einer Minute"
-#: template.php:105
+#: template.php:115
#, php-format
msgid "%d minutes ago"
msgstr "Vor %d Minuten"
-#: template.php:106
+#: template.php:116
msgid "1 hour ago"
msgstr "Vor einer Stunde"
-#: template.php:107
+#: template.php:117
#, php-format
msgid "%d hours ago"
msgstr "Vor %d Stunden"
-#: template.php:108
+#: template.php:118
msgid "today"
msgstr "Heute"
-#: template.php:109
+#: template.php:119
msgid "yesterday"
msgstr "Gestern"
-#: template.php:110
+#: template.php:120
#, php-format
msgid "%d days ago"
msgstr "Vor %d Tag(en)"
-#: template.php:111
+#: template.php:121
msgid "last month"
msgstr "Letzten Monat"
-#: template.php:112
+#: template.php:122
#, php-format
msgid "%d months ago"
msgstr "Vor %d Monaten"
-#: template.php:113
+#: template.php:123
msgid "last year"
msgstr "Letztes Jahr"
-#: template.php:114
+#: template.php:124
msgid "years ago"
msgstr "Vor Jahren"
diff --git a/l10n/de/user_ldap.po b/l10n/de/user_ldap.po
index 7e83a5b2043..b706cd2fe26 100644
--- a/l10n/de/user_ldap.po
+++ b/l10n/de/user_ldap.po
@@ -15,9 +15,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-23 00:09+0100\n"
-"PO-Revision-Date: 2012-12-22 14:04+0000\n"
-"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 23:20+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -34,9 +34,9 @@ msgstr "<b>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkom
#: templates/settings.php:11
msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
-msgstr "<b>Warnung:</b> Das PHP-Modul, das LDAP benöntigt, ist nicht installiert. Das Backend wird nicht funktionieren. Bitte deinen Systemadministrator das Modul zu installieren."
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
+msgstr ""
#: templates/settings.php:15
msgid "Host"
@@ -52,6 +52,10 @@ msgid "Base DN"
msgstr "Basis-DN"
#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Du kannst Basis-DN für Benutzer und Gruppen in dem \"Erweitert\"-Reiter konfigurieren"
@@ -122,10 +126,18 @@ msgstr "Port"
msgid "Base User Tree"
msgstr "Basis-Benutzerbaum"
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "Basis-Gruppenbaum"
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Assoziation zwischen Gruppe und Benutzer"
diff --git a/l10n/de/user_webdavauth.po b/l10n/de/user_webdavauth.po
index 392938e5f92..3bc6180a309 100644
--- a/l10n/de/user_webdavauth.po
+++ b/l10n/de/user_webdavauth.po
@@ -4,14 +4,15 @@
#
# Translators:
# <blobbyjj@ymail.com>, 2012.
+# <mibunrui@gmx.de>, 2013.
# <seeed@freenet.de>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-23 00:09+0100\n"
-"PO-Revision-Date: 2012-12-22 14:08+0000\n"
-"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 00:30+0000\n"
+"Last-Translator: AndryXY <mibunrui@gmx.de>\n"
"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,13 +20,17 @@ msgstr ""
"Language: de\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr "WebDAV Authentifikation"
+
#: templates/settings.php:4
msgid "URL: http://"
msgstr "URL: http://"
#: templates/settings.php:6
msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
-msgstr "ownCloud wird die Logindaten zu dieser URL senden. http 401 und http 403 werden als falsche Logindaten interpretiert und alle anderen Codes als korrekte Logindaten."
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
+msgstr "ownCloud wird die Benutzer-Anmeldedaten an diese URL schicken. Dieses Plugin prüft die Anmeldedaten auf ihre Gültigkeit und interpretiert die HTTP Statusfehler 401 und 403 als ungültige, sowie alle Anderen als gültige Anmeldedaten."
diff --git a/l10n/de_DE/core.po b/l10n/de_DE/core.po
index 9fea0180068..9f9775ff12e 100644
--- a/l10n/de_DE/core.po
+++ b/l10n/de_DE/core.po
@@ -23,9 +23,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-01-18 00:03+0100\n"
+"PO-Revision-Date: 2013-01-17 21:11+0000\n"
+"Last-Translator: a.tangemann <a.tangemann@web.de>\n"
"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -99,55 +99,55 @@ msgstr "Fehler beim Entfernen von %s von den Favoriten."
msgid "Settings"
msgstr "Einstellungen"
-#: js/js.js:711
+#: js/js.js:706
msgid "seconds ago"
msgstr "Gerade eben"
-#: js/js.js:712
+#: js/js.js:707
msgid "1 minute ago"
msgstr "Vor 1 Minute"
-#: js/js.js:713
+#: js/js.js:708
msgid "{minutes} minutes ago"
msgstr "Vor {minutes} Minuten"
-#: js/js.js:714
+#: js/js.js:709
msgid "1 hour ago"
msgstr "Vor einer Stunde"
-#: js/js.js:715
+#: js/js.js:710
msgid "{hours} hours ago"
msgstr "Vor {hours} Stunden"
-#: js/js.js:716
+#: js/js.js:711
msgid "today"
msgstr "Heute"
-#: js/js.js:717
+#: js/js.js:712
msgid "yesterday"
msgstr "Gestern"
-#: js/js.js:718
+#: js/js.js:713
msgid "{days} days ago"
msgstr "Vor {days} Tag(en)"
-#: js/js.js:719
+#: js/js.js:714
msgid "last month"
msgstr "Letzten Monat"
-#: js/js.js:720
+#: js/js.js:715
msgid "{months} months ago"
msgstr "Vor {months} Monaten"
-#: js/js.js:721
+#: js/js.js:716
msgid "months ago"
msgstr "Vor Monaten"
-#: js/js.js:722
+#: js/js.js:717
msgid "last year"
msgstr "Letztes Jahr"
-#: js/js.js:723
+#: js/js.js:718
msgid "years ago"
msgstr "Vor Jahren"
@@ -223,7 +223,6 @@ msgid "Password protect"
msgstr "Passwortschutz"
#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
msgid "Password"
msgstr "Passwort"
@@ -580,17 +579,3 @@ msgstr "Weiter"
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
msgstr "Aktualisiere ownCloud auf Version %s. Dies könnte eine Weile dauern."
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "Sicherheitshinweis!"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "Bitte überprüfen Sie Ihr Passwort. <br/>Aus Sicherheitsgründen werden Sie gelegentlich aufgefordert, Ihr Passwort erneut einzugeben."
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "Überprüfen"
diff --git a/l10n/de_DE/files.po b/l10n/de_DE/files.po
index ca3e44187b1..99ea2d6f096 100644
--- a/l10n/de_DE/files.po
+++ b/l10n/de_DE/files.po
@@ -13,7 +13,7 @@
# Jan-Christoph Borchardt <jan@unhosted.org>, 2011.
# <lukas@statuscode.ch>, 2012.
# <mail@felixmoeller.de>, 2012.
-# Marcel Kühlhorn <susefan93@gmx.de>, 2012.
+# Marcel Kühlhorn <susefan93@gmx.de>, 2012-2013.
# <markus.thiel@desico.de>, 2013.
# Michael Krell <m4dmike.mni@gmail.com>, 2012.
# <nelsonfritsch@gmail.com>, 2012.
@@ -27,9 +27,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 13:29+0000\n"
-"Last-Translator: thiel <markus.thiel@desico.de>\n"
+"POT-Creation-Date: 2013-01-21 00:04+0100\n"
+"PO-Revision-Date: 2013-01-20 03:24+0000\n"
+"Last-Translator: Marcel Kühlhorn <susefan93@gmx.de>\n"
"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -37,6 +37,11 @@ msgstr ""
"Language: de_DE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/delete.php:28 ajax/getstoragestats.php:11 ajax/upload.php:17
+#: ajax/upload.php:76 templates/index.php:18
+msgid "Upload"
+msgstr "Hochladen"
+
#: ajax/move.php:17
#, php-format
msgid "Could not move %s - File with this name already exists"
@@ -51,46 +56,46 @@ msgstr "Konnte %s nicht verschieben"
msgid "Unable to rename file"
msgstr "Konnte Datei nicht umbenennen"
-#: ajax/upload.php:14
+#: ajax/upload.php:20
msgid "No file was uploaded. Unknown error"
msgstr "Keine Datei hochgeladen. Unbekannter Fehler"
-#: ajax/upload.php:21
+#: ajax/upload.php:30
msgid "There is no error, the file uploaded with success"
msgstr "Es sind keine Fehler aufgetreten. Die Datei wurde erfolgreich hochgeladen."
-#: ajax/upload.php:22
+#: ajax/upload.php:31
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr "Die hochgeladene Datei überschreitet die upload_max_filesize Vorgabe in php.ini"
-#: ajax/upload.php:24
+#: ajax/upload.php:33
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "Die Größe der hochzuladenden Datei überschreitet die MAX_FILE_SIZE-Richtlinie, die im HTML-Formular angegeben wurde"
-#: ajax/upload.php:26
+#: ajax/upload.php:35
msgid "The uploaded file was only partially uploaded"
msgstr "Die Datei wurde nur teilweise hochgeladen."
-#: ajax/upload.php:27
+#: ajax/upload.php:36
msgid "No file was uploaded"
msgstr "Es wurde keine Datei hochgeladen."
-#: ajax/upload.php:28
+#: ajax/upload.php:37
msgid "Missing a temporary folder"
msgstr "Der temporäre Ordner fehlt."
-#: ajax/upload.php:29
+#: ajax/upload.php:38
msgid "Failed to write to disk"
msgstr "Fehler beim Schreiben auf die Festplatte"
-#: ajax/upload.php:45
+#: ajax/upload.php:57
msgid "Not enough space available"
msgstr "Nicht genügend Speicherplatz verfügbar"
-#: ajax/upload.php:69
+#: ajax/upload.php:91
msgid "Invalid directory."
msgstr "Ungültiges Verzeichnis."
@@ -146,98 +151,100 @@ msgstr "Freigabe für {files} beendet"
msgid "deleted {files}"
msgstr "{files} gelöscht"
-#: js/files.js:31
+#: js/files.js:48
msgid "'.' is an invalid file name."
msgstr "'.' ist kein gültiger Dateiname."
-#: js/files.js:36
+#: js/files.js:53
msgid "File name cannot be empty."
msgstr "Der Dateiname darf nicht leer sein."
-#: js/files.js:45
+#: js/files.js:62
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Ungültiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig."
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "Erstelle ZIP-Datei. Dies kann eine Weile dauern."
+#: js/files.js:204
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr "Ihr Download wird vorbereitet. Dies kann bei größeren Dateien einen Moment dauern."
-#: js/files.js:224
+#: js/files.js:242
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Ihre Datei kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist."
-#: js/files.js:224
+#: js/files.js:242
msgid "Upload Error"
msgstr "Fehler beim Upload"
-#: js/files.js:241
+#: js/files.js:259
msgid "Close"
msgstr "Schließen"
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:278 js/files.js:397 js/files.js:431
msgid "Pending"
msgstr "Ausstehend"
-#: js/files.js:280
+#: js/files.js:298
msgid "1 file uploading"
msgstr "1 Datei wird hochgeladen"
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:301 js/files.js:357 js/files.js:372
msgid "{count} files uploading"
msgstr "{count} Dateien wurden hochgeladen"
-#: js/files.js:357 js/files.js:393
+#: js/files.js:376 js/files.js:414
msgid "Upload cancelled."
msgstr "Upload abgebrochen."
-#: js/files.js:464
+#: js/files.js:486
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Der Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen."
-#: js/files.js:537
+#: js/files.js:559
msgid "URL cannot be empty."
msgstr "Die URL darf nicht leer sein."
-#: js/files.js:543
+#: js/files.js:565
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Ungültiger Verzeichnisname. Die Nutzung von \"Shared\" ist ownCloud vorbehalten"
-#: js/files.js:727
+#: js/files.js:775
msgid "{count} files scanned"
msgstr "{count} Dateien wurden gescannt"
-#: js/files.js:735
+#: js/files.js:783
msgid "error while scanning"
msgstr "Fehler beim Scannen"
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:857 templates/index.php:64
msgid "Name"
msgstr "Name"
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:858 templates/index.php:75
msgid "Size"
msgstr "Größe"
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:859 templates/index.php:77
msgid "Modified"
msgstr "Bearbeitet"
-#: js/files.js:829
+#: js/files.js:878
msgid "1 folder"
msgstr "1 Ordner"
-#: js/files.js:831
+#: js/files.js:880
msgid "{count} folders"
msgstr "{count} Ordner"
-#: js/files.js:839
+#: js/files.js:888
msgid "1 file"
msgstr "1 Datei"
-#: js/files.js:841
+#: js/files.js:890
msgid "{count} files"
msgstr "{count} Dateien"
@@ -289,10 +296,6 @@ msgstr "Ordner"
msgid "From link"
msgstr "Von einem Link"
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Hochladen"
-
#: templates/index.php:41
msgid "Cancel upload"
msgstr "Upload abbrechen"
diff --git a/l10n/de_DE/files_encryption.po b/l10n/de_DE/files_encryption.po
index 52f9f34a774..749067c3bbc 100644
--- a/l10n/de_DE/files_encryption.po
+++ b/l10n/de_DE/files_encryption.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-20 02:02+0200\n"
-"PO-Revision-Date: 2012-10-19 21:33+0000\n"
-"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,18 +18,66 @@ msgstr ""
"Language: de_DE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
msgid "Encryption"
msgstr "Verschlüsselung"
-#: templates/settings.php:4
+#: templates/settings.php:67
msgid "Exclude the following file types from encryption"
msgstr "Die folgenden Dateitypen von der Verschlüsselung ausnehmen"
-#: templates/settings.php:5
+#: templates/settings.php:71
msgid "None"
msgstr "Keine"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "Verschlüsselung aktivieren"
diff --git a/l10n/de_DE/files_versions.po b/l10n/de_DE/files_versions.po
index c9f8e08c2e5..bef0ee6b762 100644
--- a/l10n/de_DE/files_versions.po
+++ b/l10n/de_DE/files_versions.po
@@ -12,9 +12,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-20 02:02+0200\n"
-"PO-Revision-Date: 2012-10-19 21:36+0000\n"
-"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -22,22 +22,10 @@ msgstr ""
"Language: de_DE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "Alle Versionen löschen"
-
#: js/versions.js:16
msgid "History"
msgstr "Historie"
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "Versionen"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "Dies löscht alle vorhandenen Sicherungsversionen Ihrer Dateien."
-
#: templates/settings.php:3
msgid "Files Versioning"
msgstr "Dateiversionierung"
diff --git a/l10n/de_DE/lib.po b/l10n/de_DE/lib.po
index 3c9177f17ed..851e152e2d5 100644
--- a/l10n/de_DE/lib.po
+++ b/l10n/de_DE/lib.po
@@ -3,6 +3,7 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Andreas Tangemann <a.tangemann@web.de>, 2013.
# <a.tangemann@web.de>, 2012.
# <blobbyjj@ymail.com>, 2012.
# Jan-Christoph Borchardt <hey@jancborchardt.net>, 2012.
@@ -14,9 +15,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-11 00:04+0100\n"
-"PO-Revision-Date: 2012-12-10 13:49+0000\n"
-"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
+"POT-Creation-Date: 2013-01-18 00:03+0100\n"
+"PO-Revision-Date: 2013-01-17 21:16+0000\n"
+"Last-Translator: a.tangemann <a.tangemann@web.de>\n"
"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -24,51 +25,55 @@ msgstr ""
"Language: de_DE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:287
+#: app.php:301
msgid "Help"
msgstr "Hilfe"
-#: app.php:294
+#: app.php:308
msgid "Personal"
msgstr "Persönlich"
-#: app.php:299
+#: app.php:313
msgid "Settings"
msgstr "Einstellungen"
-#: app.php:304
+#: app.php:318
msgid "Users"
msgstr "Benutzer"
-#: app.php:311
+#: app.php:325
msgid "Apps"
msgstr "Apps"
-#: app.php:313
+#: app.php:327
msgid "Admin"
msgstr "Administrator"
-#: files.php:361
+#: files.php:365
msgid "ZIP download is turned off."
msgstr "Der ZIP-Download ist deaktiviert."
-#: files.php:362
+#: files.php:366
msgid "Files need to be downloaded one by one."
msgstr "Die Dateien müssen einzeln heruntergeladen werden."
-#: files.php:362 files.php:387
+#: files.php:366 files.php:391
msgid "Back to Files"
msgstr "Zurück zu \"Dateien\""
-#: files.php:386
+#: files.php:390
msgid "Selected files too large to generate zip file."
msgstr "Die gewählten Dateien sind zu groß, um eine ZIP-Datei zu erstellen."
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr "konnte nicht ermittelt werden"
+
#: json.php:28
msgid "Application is not enabled"
msgstr "Die Anwendung ist nicht aktiviert"
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
msgstr "Authentifizierungs-Fehler"
@@ -88,55 +93,55 @@ msgstr "Text"
msgid "Images"
msgstr "Bilder"
-#: template.php:103
+#: template.php:113
msgid "seconds ago"
msgstr "Gerade eben"
-#: template.php:104
+#: template.php:114
msgid "1 minute ago"
msgstr "Vor einer Minute"
-#: template.php:105
+#: template.php:115
#, php-format
msgid "%d minutes ago"
msgstr "Vor %d Minuten"
-#: template.php:106
+#: template.php:116
msgid "1 hour ago"
msgstr "Vor einer Stunde"
-#: template.php:107
+#: template.php:117
#, php-format
msgid "%d hours ago"
msgstr "Vor %d Stunden"
-#: template.php:108
+#: template.php:118
msgid "today"
msgstr "Heute"
-#: template.php:109
+#: template.php:119
msgid "yesterday"
msgstr "Gestern"
-#: template.php:110
+#: template.php:120
#, php-format
msgid "%d days ago"
msgstr "Vor %d Tag(en)"
-#: template.php:111
+#: template.php:121
msgid "last month"
msgstr "Letzten Monat"
-#: template.php:112
+#: template.php:122
#, php-format
msgid "%d months ago"
msgstr "Vor %d Monaten"
-#: template.php:113
+#: template.php:123
msgid "last year"
msgstr "Letztes Jahr"
-#: template.php:114
+#: template.php:124
msgid "years ago"
msgstr "Vor Jahren"
diff --git a/l10n/de_DE/user_ldap.po b/l10n/de_DE/user_ldap.po
index 843b2e80f4d..440d30ce2bc 100644
--- a/l10n/de_DE/user_ldap.po
+++ b/l10n/de_DE/user_ldap.po
@@ -3,6 +3,7 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Andreas Tangemann <a.tangemann@web.de>, 2013.
# <blobbyjj@ymail.com>, 2012.
# I Robot <thomas.mueller@tmit.eu>, 2012.
# Maurice Preuß <>, 2012.
@@ -14,9 +15,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-23 00:09+0100\n"
-"PO-Revision-Date: 2012-12-22 14:04+0000\n"
-"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
+"POT-Creation-Date: 2013-01-19 00:04+0100\n"
+"PO-Revision-Date: 2013-01-18 21:26+0000\n"
+"Last-Translator: a.tangemann <a.tangemann@web.de>\n"
"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -33,9 +34,9 @@ msgstr "<b>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkom
#: templates/settings.php:11
msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
-msgstr "<b>Warnung:</b> Das PHP-Modul, das LDAP benöntigt, ist nicht installiert. Das Backend wird nicht funktionieren. Bitten Sie Ihren Systemadministrator das Modul zu installieren."
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
+msgstr "<b>Warnung:</b> Da das PHP-Modul für LDAP nicht installiert ist, wird das Backend nicht funktionieren. Bitten Sie Ihren Systemadministrator das Modul zu installieren."
#: templates/settings.php:15
msgid "Host"
@@ -51,6 +52,10 @@ msgid "Base DN"
msgstr "Basis-DN"
#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr "Ein Base DN pro Zeile"
+
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Sie können Basis-DN für Benutzer und Gruppen in dem \"Erweitert\"-Reiter konfigurieren"
@@ -121,10 +126,18 @@ msgstr "Port"
msgid "Base User Tree"
msgstr "Basis-Benutzerbaum"
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr "Ein Benutzer Base DN pro Zeile"
+
#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "Basis-Gruppenbaum"
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr "Ein Gruppen Base DN pro Zeile"
+
#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Assoziation zwischen Gruppe und Benutzer"
diff --git a/l10n/de_DE/user_webdavauth.po b/l10n/de_DE/user_webdavauth.po
index aabd937409d..2d01d1e91e1 100644
--- a/l10n/de_DE/user_webdavauth.po
+++ b/l10n/de_DE/user_webdavauth.po
@@ -3,15 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# <a.tangemann@web.de>, 2012.
+# <a.tangemann@web.de>, 2012-2013.
# <multimill@gmail.com>, 2012.
# <transifex-2.7.mensaje@spamgourmet.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-04 13:22+0100\n"
-"PO-Revision-Date: 2013-01-03 16:07+0000\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 22:23+0000\n"
"Last-Translator: a.tangemann <a.tangemann@web.de>\n"
"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
"MIME-Version: 1.0\n"
@@ -20,13 +20,17 @@ msgstr ""
"Language: de_DE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr "WebDAV Authentifizierung"
+
#: templates/settings.php:4
msgid "URL: http://"
msgstr "URL: http://"
#: templates/settings.php:6
msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
-msgstr "ownCloud "
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
+msgstr "ownCloud sendet die Benutzerdaten an diese URL. Dieses Plugin prüft die Antwort und wird die Statuscodes 401 und 403 als ungültige Daten interpretieren und alle anderen Antworten als gültige Daten."
diff --git a/l10n/el/core.po b/l10n/el/core.po
index 2c0853779a1..9f541a6eda9 100644
--- a/l10n/el/core.po
+++ b/l10n/el/core.po
@@ -10,13 +10,14 @@
# Marios Bekatoros <>, 2012.
# <petros.kyladitis@gmail.com>, 2011.
# Petros Kyladitis <petros.kyladitis@gmail.com>, 2011-2012.
+# <vagelis@cyberdest.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-01-18 00:03+0100\n"
+"PO-Revision-Date: 2013-01-17 20:33+0000\n"
+"Last-Translator: xneo1 <vagelis@cyberdest.com>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -90,55 +91,55 @@ msgstr "Σφάλμα αφαίρεσης %s από τα αγαπημένα."
msgid "Settings"
msgstr "Ρυθμίσεις"
-#: js/js.js:711
+#: js/js.js:706
msgid "seconds ago"
msgstr "δευτερόλεπτα πριν"
-#: js/js.js:712
+#: js/js.js:707
msgid "1 minute ago"
msgstr "1 λεπτό πριν"
-#: js/js.js:713
+#: js/js.js:708
msgid "{minutes} minutes ago"
msgstr "{minutes} λεπτά πριν"
-#: js/js.js:714
+#: js/js.js:709
msgid "1 hour ago"
msgstr "1 ώρα πριν"
-#: js/js.js:715
+#: js/js.js:710
msgid "{hours} hours ago"
msgstr "{hours} ώρες πριν"
-#: js/js.js:716
+#: js/js.js:711
msgid "today"
msgstr "σήμερα"
-#: js/js.js:717
+#: js/js.js:712
msgid "yesterday"
msgstr "χτες"
-#: js/js.js:718
+#: js/js.js:713
msgid "{days} days ago"
msgstr "{days} ημέρες πριν"
-#: js/js.js:719
+#: js/js.js:714
msgid "last month"
msgstr "τελευταίο μήνα"
-#: js/js.js:720
+#: js/js.js:715
msgid "{months} months ago"
msgstr "{months} μήνες πριν"
-#: js/js.js:721
+#: js/js.js:716
msgid "months ago"
msgstr "μήνες πριν"
-#: js/js.js:722
+#: js/js.js:717
msgid "last year"
msgstr "τελευταίο χρόνο"
-#: js/js.js:723
+#: js/js.js:718
msgid "years ago"
msgstr "χρόνια πριν"
@@ -214,7 +215,6 @@ msgid "Password protect"
msgstr "Προστασία συνθηματικού"
#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
msgid "Password"
msgstr "Συνθηματικό"
@@ -570,18 +570,4 @@ msgstr "επόμενο"
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
-msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "Προειδοποίηση Ασφαλείας!"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "Παρακαλώ επιβεβαιώστε το συνθηματικό σας. <br/>Για λόγους ασφαλείας μπορεί να ερωτάστε να εισάγετε ξανά το συνθηματικό σας."
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "Επαλήθευση"
+msgstr "Ενημερώνοντας το ownCloud στην έκδοση %s,μπορεί να πάρει λίγο χρόνο."
diff --git a/l10n/el/files.po b/l10n/el/files.po
index 6dbee32887a..d98fff41fb7 100644
--- a/l10n/el/files.po
+++ b/l10n/el/files.po
@@ -4,7 +4,8 @@
#
# Translators:
# Dimitris M. <monopatis@gmail.com>, 2012.
-# Efstathios Iosifidis <diamond_gr@freemail.gr>, 2012.
+# Efstathios Iosifidis <diamond_gr@freemail.gr>, 2012-2013.
+# Efstathios Iosifidis <iefstathios@gmail.com>, 2013.
# Efstathios Iosifidis <iosifidis@opensuse.org>, 2012.
# Konstantinos Tzanidis <tzanidis@gmail.com>, 2012.
# Marios Bekatoros <>, 2012.
@@ -14,9 +15,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 12:10+0000\n"
+"Last-Translator: Efstathios Iosifidis <iefstathios@gmail.com>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -24,62 +25,67 @@ msgstr ""
"Language: el\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/delete.php:28 ajax/getstoragestats.php:11 ajax/upload.php:17
+#: ajax/upload.php:76 templates/index.php:18
+msgid "Upload"
+msgstr "Αποστολή"
+
#: ajax/move.php:17
#, php-format
msgid "Could not move %s - File with this name already exists"
-msgstr ""
+msgstr "Αδυναμία μετακίνησης του %s - υπάρχει ήδη αρχείο με αυτό το όνομα"
#: ajax/move.php:24
#, php-format
msgid "Could not move %s"
-msgstr ""
+msgstr "Αδυναμία μετακίνησης του %s"
#: ajax/rename.php:19
msgid "Unable to rename file"
-msgstr ""
+msgstr "Αδυναμία μετονομασίας αρχείου"
-#: ajax/upload.php:14
+#: ajax/upload.php:20
msgid "No file was uploaded. Unknown error"
msgstr "Δεν ανέβηκε κάποιο αρχείο. Άγνωστο σφάλμα"
-#: ajax/upload.php:21
+#: ajax/upload.php:30
msgid "There is no error, the file uploaded with success"
msgstr "Δεν υπάρχει σφάλμα, το αρχείο εστάλει επιτυχώς"
-#: ajax/upload.php:22
+#: ajax/upload.php:31
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr "Το απεσταλμένο αρχείο ξεπερνά την οδηγία upload_max_filesize στο php.ini:"
-#: ajax/upload.php:24
+#: ajax/upload.php:33
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "Το αρχείο υπερβαίνει την οδηγία μέγιστου επιτρεπτού μεγέθους \"MAX_FILE_SIZE\" που έχει οριστεί στην HTML φόρμα"
-#: ajax/upload.php:26
+#: ajax/upload.php:35
msgid "The uploaded file was only partially uploaded"
msgstr "Το αρχείο εστάλει μόνο εν μέρει"
-#: ajax/upload.php:27
+#: ajax/upload.php:36
msgid "No file was uploaded"
msgstr "Κανένα αρχείο δεν στάλθηκε"
-#: ajax/upload.php:28
+#: ajax/upload.php:37
msgid "Missing a temporary folder"
msgstr "Λείπει ο προσωρινός φάκελος"
-#: ajax/upload.php:29
+#: ajax/upload.php:38
msgid "Failed to write to disk"
msgstr "Αποτυχία εγγραφής στο δίσκο"
-#: ajax/upload.php:45
+#: ajax/upload.php:57
msgid "Not enough space available"
-msgstr ""
+msgstr "Δεν υπάρχει αρκετός διαθέσιμος χώρος"
-#: ajax/upload.php:69
+#: ajax/upload.php:91
msgid "Invalid directory."
-msgstr ""
+msgstr "Μη έγκυρος φάκελος."
#: appinfo/app.php:10
msgid "Files"
@@ -133,98 +139,100 @@ msgstr "μη διαμοιρασμένα {files}"
msgid "deleted {files}"
msgstr "διαγραμμένα {files}"
-#: js/files.js:31
+#: js/files.js:48
msgid "'.' is an invalid file name."
-msgstr ""
+msgstr "'.' είναι μη έγκυρο όνομα αρχείου."
-#: js/files.js:36
+#: js/files.js:53
msgid "File name cannot be empty."
-msgstr ""
+msgstr "Το όνομα αρχείου δεν πρέπει να είναι κενό."
-#: js/files.js:45
+#: js/files.js:62
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Μη έγκυρο όνομα, '\\', '/', '<', '>', ':', '\"', '|', '?' και '*' δεν επιτρέπονται."
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "παραγωγή αρχείου ZIP, ίσως διαρκέσει αρκετά."
+#: js/files.js:204
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr "Η λήψη προετοιμάζεται. Αυτό μπορεί να πάρει ώρα εάν τα αρχεία έχουν μεγάλο μέγεθος."
-#: js/files.js:224
+#: js/files.js:242
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Αδυναμία στην αποστολή του αρχείου σας αφού είναι φάκελος ή έχει 0 bytes"
-#: js/files.js:224
+#: js/files.js:242
msgid "Upload Error"
msgstr "Σφάλμα Αποστολής"
-#: js/files.js:241
+#: js/files.js:259
msgid "Close"
msgstr "Κλείσιμο"
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:278 js/files.js:397 js/files.js:431
msgid "Pending"
msgstr "Εκκρεμεί"
-#: js/files.js:280
+#: js/files.js:298
msgid "1 file uploading"
msgstr "1 αρχείο ανεβαίνει"
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:301 js/files.js:357 js/files.js:372
msgid "{count} files uploading"
msgstr "{count} αρχεία ανεβαίνουν"
-#: js/files.js:357 js/files.js:393
+#: js/files.js:376 js/files.js:414
msgid "Upload cancelled."
msgstr "Η αποστολή ακυρώθηκε."
-#: js/files.js:464
+#: js/files.js:486
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Η αποστολή του αρχείου βρίσκεται σε εξέλιξη. Το κλείσιμο της σελίδας θα ακυρώσει την αποστολή."
-#: js/files.js:537
+#: js/files.js:559
msgid "URL cannot be empty."
msgstr "Η URL δεν πρέπει να είναι κενή."
-#: js/files.js:543
+#: js/files.js:565
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
+msgstr "Μη έγκυρο όνομα φακέλου. Η χρήση του 'Κοινόχρηστος' χρησιμοποιείται από ο Owncloud"
-#: js/files.js:727
+#: js/files.js:775
msgid "{count} files scanned"
msgstr "{count} αρχεία ανιχνεύτηκαν"
-#: js/files.js:735
+#: js/files.js:783
msgid "error while scanning"
msgstr "σφάλμα κατά την ανίχνευση"
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:857 templates/index.php:64
msgid "Name"
msgstr "Όνομα"
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:858 templates/index.php:75
msgid "Size"
msgstr "Μέγεθος"
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:859 templates/index.php:77
msgid "Modified"
msgstr "Τροποποιήθηκε"
-#: js/files.js:829
+#: js/files.js:878
msgid "1 folder"
msgstr "1 φάκελος"
-#: js/files.js:831
+#: js/files.js:880
msgid "{count} folders"
msgstr "{count} φάκελοι"
-#: js/files.js:839
+#: js/files.js:888
msgid "1 file"
msgstr "1 αρχείο"
-#: js/files.js:841
+#: js/files.js:890
msgid "{count} files"
msgstr "{count} αρχεία"
@@ -276,10 +284,6 @@ msgstr "Φάκελος"
msgid "From link"
msgstr "Από σύνδεσμο"
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Αποστολή"
-
#: templates/index.php:41
msgid "Cancel upload"
msgstr "Ακύρωση αποστολής"
diff --git a/l10n/el/files_encryption.po b/l10n/el/files_encryption.po
index 6d54cf8abcf..2ece2edcaf7 100644
--- a/l10n/el/files_encryption.po
+++ b/l10n/el/files_encryption.po
@@ -8,28 +8,76 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-24 02:02+0200\n"
-"PO-Revision-Date: 2012-08-23 13:34+0000\n"
-"Last-Translator: Efstathios Iosifidis <diamond_gr@freemail.gr>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: el\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
msgid "Encryption"
msgstr "Κρυπτογράφηση"
-#: templates/settings.php:4
+#: templates/settings.php:67
msgid "Exclude the following file types from encryption"
msgstr "Εξαίρεση των παρακάτω τύπων αρχείων από την κρυπτογράφηση"
-#: templates/settings.php:5
+#: templates/settings.php:71
msgid "None"
msgstr "Καμία"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "Ενεργοποίηση Κρυπτογράφησης"
diff --git a/l10n/el/files_versions.po b/l10n/el/files_versions.po
index a79674e946a..3812c4bda0d 100644
--- a/l10n/el/files_versions.po
+++ b/l10n/el/files_versions.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-28 23:34+0200\n"
-"PO-Revision-Date: 2012-09-28 01:26+0000\n"
-"Last-Translator: Dimitris M. <monopatis@gmail.com>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,22 +20,10 @@ msgstr ""
"Language: el\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "Λήξη όλων των εκδόσεων"
-
#: js/versions.js:16
msgid "History"
msgstr "Ιστορικό"
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "Εκδόσεις"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "Αυτό θα διαγράψει όλες τις υπάρχουσες εκδόσεις των αντιγράφων ασφαλείας των αρχείων σας"
-
#: templates/settings.php:3
msgid "Files Versioning"
msgstr "Εκδόσεις Αρχείων"
diff --git a/l10n/el/lib.po b/l10n/el/lib.po
index c58bb7b0af6..27ef72f2eb2 100644
--- a/l10n/el/lib.po
+++ b/l10n/el/lib.po
@@ -4,13 +4,14 @@
#
# Translators:
# Efstathios Iosifidis <iosifidis@opensuse.org>, 2012.
+# <vagelis@cyberdest.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-17 00:01+0100\n"
-"PO-Revision-Date: 2012-11-16 17:32+0000\n"
-"Last-Translator: Efstathios Iosifidis <diamond_gr@freemail.gr>\n"
+"POT-Creation-Date: 2013-01-18 00:03+0100\n"
+"PO-Revision-Date: 2013-01-17 20:39+0000\n"
+"Last-Translator: xneo1 <vagelis@cyberdest.com>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,51 +19,55 @@ msgstr ""
"Language: el\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:285
+#: app.php:301
msgid "Help"
msgstr "Βοήθεια"
-#: app.php:292
+#: app.php:308
msgid "Personal"
msgstr "Προσωπικά"
-#: app.php:297
+#: app.php:313
msgid "Settings"
msgstr "Ρυθμίσεις"
-#: app.php:302
+#: app.php:318
msgid "Users"
msgstr "Χρήστες"
-#: app.php:309
+#: app.php:325
msgid "Apps"
msgstr "Εφαρμογές"
-#: app.php:311
+#: app.php:327
msgid "Admin"
msgstr "Διαχειριστής"
-#: files.php:332
+#: files.php:365
msgid "ZIP download is turned off."
msgstr "Η λήψη ZIP απενεργοποιήθηκε."
-#: files.php:333
+#: files.php:366
msgid "Files need to be downloaded one by one."
msgstr "Τα αρχεία πρέπει να ληφθούν ένα-ένα."
-#: files.php:333 files.php:358
+#: files.php:366 files.php:391
msgid "Back to Files"
msgstr "Πίσω στα Αρχεία"
-#: files.php:357
+#: files.php:390
msgid "Selected files too large to generate zip file."
msgstr "Τα επιλεγμένα αρχεία είναι μεγάλα ώστε να δημιουργηθεί αρχείο zip."
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr "δεν μπορούσε να προσδιορισθεί"
+
#: json.php:28
msgid "Application is not enabled"
msgstr "Δεν ενεργοποιήθηκε η εφαρμογή"
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
msgstr "Σφάλμα πιστοποίησης"
@@ -82,55 +87,55 @@ msgstr "Κείμενο"
msgid "Images"
msgstr "Εικόνες"
-#: template.php:103
+#: template.php:113
msgid "seconds ago"
msgstr "δευτερόλεπτα πριν"
-#: template.php:104
+#: template.php:114
msgid "1 minute ago"
msgstr "1 λεπτό πριν"
-#: template.php:105
+#: template.php:115
#, php-format
msgid "%d minutes ago"
msgstr "%d λεπτά πριν"
-#: template.php:106
+#: template.php:116
msgid "1 hour ago"
msgstr "1 ώρα πριν"
-#: template.php:107
+#: template.php:117
#, php-format
msgid "%d hours ago"
msgstr "%d ώρες πριν"
-#: template.php:108
+#: template.php:118
msgid "today"
msgstr "σήμερα"
-#: template.php:109
+#: template.php:119
msgid "yesterday"
msgstr "χθές"
-#: template.php:110
+#: template.php:120
#, php-format
msgid "%d days ago"
msgstr "%d ημέρες πριν"
-#: template.php:111
+#: template.php:121
msgid "last month"
msgstr "τον προηγούμενο μήνα"
-#: template.php:112
+#: template.php:122
#, php-format
msgid "%d months ago"
msgstr "%d μήνες πριν"
-#: template.php:113
+#: template.php:123
msgid "last year"
msgstr "τον προηγούμενο χρόνο"
-#: template.php:114
+#: template.php:124
msgid "years ago"
msgstr "χρόνια πριν"
diff --git a/l10n/el/settings.po b/l10n/el/settings.po
index d20f3ef368c..f06ddb07858 100644
--- a/l10n/el/settings.po
+++ b/l10n/el/settings.po
@@ -13,14 +13,15 @@
# <petros.kyladitis@gmail.com>, 2011.
# <petros.kyladitis@gmail.com>, 2011.
# Petros Kyladitis <petros.kyladitis@gmail.com>, 2011-2012.
+# <vagelis@cyberdest.com>, 2013.
# Γιάννης Ανθυμίδης <yannanth@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-01-18 00:03+0100\n"
+"PO-Revision-Date: 2013-01-17 20:41+0000\n"
+"Last-Translator: xneo1 <vagelis@cyberdest.com>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -251,11 +252,11 @@ msgstr "Δημιουργία"
#: templates/users.php:35
msgid "Default Storage"
-msgstr ""
+msgstr "Προκαθορισμένη Αποθήκευση "
#: templates/users.php:42 templates/users.php:138
msgid "Unlimited"
-msgstr ""
+msgstr "Απεριόριστο"
#: templates/users.php:60 templates/users.php:153
msgid "Other"
@@ -267,11 +268,11 @@ msgstr "Ομάδα Διαχειριστών"
#: templates/users.php:87
msgid "Storage"
-msgstr ""
+msgstr "Αποθήκευση"
#: templates/users.php:133
msgid "Default"
-msgstr ""
+msgstr "Προκαθορισμένο"
#: templates/users.php:161
msgid "Delete"
diff --git a/l10n/el/user_ldap.po b/l10n/el/user_ldap.po
index 14b7e75c710..9edcb771d61 100644
--- a/l10n/el/user_ldap.po
+++ b/l10n/el/user_ldap.po
@@ -12,9 +12,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-28 00:20+0100\n"
-"PO-Revision-Date: 2012-12-27 14:12+0000\n"
-"Last-Translator: Konstantinos Tzanidis <tzanidis@gmail.com>\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 23:20+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -31,9 +31,9 @@ msgstr "<b>Προσοχή:</b> Οι εφαρμογές user_ldap και user_web
#: templates/settings.php:11
msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
-msgstr "<b>Προσοχή:</b> Το PHP LDAP module που απαιτείται δεν είναι εγκατεστημένο και ο μηχανισμός δεν θα λειτουργήσει. Παρακαλώ ζητήστε από τον διαχειριστή του συστήματος να το εγκαταστήσει."
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
+msgstr ""
#: templates/settings.php:15
msgid "Host"
@@ -49,6 +49,10 @@ msgid "Base DN"
msgstr "Base DN"
#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Μπορείτε να καθορίσετε το Base DN για χρήστες και ομάδες από την καρτέλα Προηγμένες ρυθμίσεις"
@@ -119,10 +123,18 @@ msgstr "Θύρα"
msgid "Base User Tree"
msgstr "Base User Tree"
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "Base Group Tree"
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Group-Member association"
diff --git a/l10n/el/user_webdavauth.po b/l10n/el/user_webdavauth.po
index dff8dd88f35..ae9fa402bf8 100644
--- a/l10n/el/user_webdavauth.po
+++ b/l10n/el/user_webdavauth.po
@@ -6,13 +6,14 @@
# Dimitris M. <monopatis@gmail.com>, 2012.
# Efstathios Iosifidis <diamond_gr@freemail.gr>, 2012.
# Konstantinos Tzanidis <tzanidis@gmail.com>, 2012.
+# Marios Bekatoros <>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-28 00:20+0100\n"
-"PO-Revision-Date: 2012-12-27 13:55+0000\n"
-"Last-Translator: Konstantinos Tzanidis <tzanidis@gmail.com>\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 08:10+0000\n"
+"Last-Translator: Marios Bekatoros <>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,13 +21,17 @@ msgstr ""
"Language: el\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr "Αυθεντικοποίηση μέσω WebDAV "
+
#: templates/settings.php:4
msgid "URL: http://"
msgstr "URL: http://"
#: templates/settings.php:6
msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
-msgstr "Το ownCloud θα στείλει τα συνθηματικά χρήστη σε αυτό το URL, μεταφράζοντας τα http 401 και http 403 ως λανθασμένα συνθηματικά και όλους τους άλλους κωδικούς ως σωστά συνθηματικά."
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
+msgstr "Το ownCloud θα στείλει τα διαπιστευτήρια χρήστη σε αυτό το URL. Αυτό το plugin ελέγχει την απάντηση και την μετατρέπει σε HTTP κωδικό κατάστασης 401 και 403 για μη έγκυρα, όλες οι υπόλοιπες απαντήσεις είναι έγκυρες."
diff --git a/l10n/eo/core.po b/l10n/eo/core.po
index c400f1a7d6e..27efa5db63f 100644
--- a/l10n/eo/core.po
+++ b/l10n/eo/core.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
@@ -210,7 +210,6 @@ msgid "Password protect"
msgstr "Protekti per pasvorto"
#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
msgid "Password"
msgstr "Pasvorto"
@@ -567,17 +566,3 @@ msgstr "jena"
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "Sekureca averto!"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "Bonvolu kontroli vian pasvorton. <br/>Pro sekureco, oni okaze povas peti al vi enigi vian pasvorton ree."
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "Kontroli"
diff --git a/l10n/eo/files.po b/l10n/eo/files.po
index 9989b6eb9b5..25a028204e9 100644
--- a/l10n/eo/files.po
+++ b/l10n/eo/files.po
@@ -3,15 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Mariano <mstreet@kde.org.ar>, 2013.
# Mariano <mstreet@kde.org.ar>, 2012.
# <mstreet@kde.org.ar>, 2011, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-01-21 00:04+0100\n"
+"PO-Revision-Date: 2013-01-20 01:38+0000\n"
+"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,62 +20,67 @@ msgstr ""
"Language: eo\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/delete.php:28 ajax/getstoragestats.php:11 ajax/upload.php:17
+#: ajax/upload.php:76 templates/index.php:18
+msgid "Upload"
+msgstr "Alŝuti"
+
#: ajax/move.php:17
#, php-format
msgid "Could not move %s - File with this name already exists"
-msgstr ""
+msgstr "Ne eblis movi %s: dosiero kun ĉi tiu nomo jam ekzistas"
#: ajax/move.php:24
#, php-format
msgid "Could not move %s"
-msgstr ""
+msgstr "Ne eblis movi %s"
#: ajax/rename.php:19
msgid "Unable to rename file"
-msgstr ""
+msgstr "Ne eblis alinomigi dosieron"
-#: ajax/upload.php:14
+#: ajax/upload.php:20
msgid "No file was uploaded. Unknown error"
msgstr "Neniu dosiero alŝutiĝis. Nekonata eraro."
-#: ajax/upload.php:21
+#: ajax/upload.php:30
msgid "There is no error, the file uploaded with success"
msgstr "Ne estas eraro, la dosiero alŝutiĝis sukcese"
-#: ajax/upload.php:22
+#: ajax/upload.php:31
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr "La dosiero alŝutita superas la regulon upload_max_filesize el php.ini: "
-#: ajax/upload.php:24
+#: ajax/upload.php:33
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "La dosiero alŝutita superas la regulon MAX_FILE_SIZE, kiu estas difinita en la HTML-formularo"
-#: ajax/upload.php:26
+#: ajax/upload.php:35
msgid "The uploaded file was only partially uploaded"
msgstr "La alŝutita dosiero nur parte alŝutiĝis"
-#: ajax/upload.php:27
+#: ajax/upload.php:36
msgid "No file was uploaded"
msgstr "Neniu dosiero estas alŝutita"
-#: ajax/upload.php:28
+#: ajax/upload.php:37
msgid "Missing a temporary folder"
msgstr "Mankas tempa dosierujo"
-#: ajax/upload.php:29
+#: ajax/upload.php:38
msgid "Failed to write to disk"
msgstr "Malsukcesis skribo al disko"
-#: ajax/upload.php:45
+#: ajax/upload.php:57
msgid "Not enough space available"
-msgstr ""
+msgstr "Ne haveblas sufiĉa spaco"
-#: ajax/upload.php:69
+#: ajax/upload.php:91
msgid "Invalid directory."
-msgstr ""
+msgstr "Nevalida dosierujo."
#: appinfo/app.php:10
msgid "Files"
@@ -128,98 +134,100 @@ msgstr "malkunhaviĝis {files}"
msgid "deleted {files}"
msgstr "foriĝis {files}"
-#: js/files.js:31
+#: js/files.js:48
msgid "'.' is an invalid file name."
-msgstr ""
+msgstr "'.' ne estas valida dosiernomo."
-#: js/files.js:36
+#: js/files.js:53
msgid "File name cannot be empty."
-msgstr ""
+msgstr "Dosiernomo devas ne malpleni."
-#: js/files.js:45
+#: js/files.js:62
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Nevalida nomo: “\\”, “/”, “<”, “>”, “:”, “\"”, “|”, “?” kaj “*” ne permesatas."
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "generanta ZIP-dosiero, ĝi povas daŭri iom da tempo"
+#: js/files.js:204
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr "Via elŝuto pretiĝatas. Ĉi tio povas daŭri iom da tempo se la dosieroj grandas."
-#: js/files.js:224
+#: js/files.js:242
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Ne eblis alŝuti vian dosieron ĉar ĝi estas dosierujo aŭ havas 0 duumokojn"
-#: js/files.js:224
+#: js/files.js:242
msgid "Upload Error"
msgstr "Alŝuta eraro"
-#: js/files.js:241
+#: js/files.js:259
msgid "Close"
msgstr "Fermi"
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:278 js/files.js:397 js/files.js:431
msgid "Pending"
msgstr "Traktotaj"
-#: js/files.js:280
+#: js/files.js:298
msgid "1 file uploading"
msgstr "1 dosiero estas alŝutata"
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:301 js/files.js:357 js/files.js:372
msgid "{count} files uploading"
msgstr "{count} dosieroj alŝutatas"
-#: js/files.js:357 js/files.js:393
+#: js/files.js:376 js/files.js:414
msgid "Upload cancelled."
msgstr "La alŝuto nuliĝis."
-#: js/files.js:464
+#: js/files.js:486
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Dosieralŝuto plenumiĝas. Lasi la paĝon nun nuligus la alŝuton."
-#: js/files.js:537
+#: js/files.js:559
msgid "URL cannot be empty."
msgstr "URL ne povas esti malplena."
-#: js/files.js:543
+#: js/files.js:565
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
+msgstr "Nevalida dosierujnomo. Uzo de “Shared” rezervatas de Owncloud."
-#: js/files.js:727
+#: js/files.js:775
msgid "{count} files scanned"
msgstr "{count} dosieroj skaniĝis"
-#: js/files.js:735
+#: js/files.js:783
msgid "error while scanning"
msgstr "eraro dum skano"
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:857 templates/index.php:64
msgid "Name"
msgstr "Nomo"
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:858 templates/index.php:75
msgid "Size"
msgstr "Grando"
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:859 templates/index.php:77
msgid "Modified"
msgstr "Modifita"
-#: js/files.js:829
+#: js/files.js:878
msgid "1 folder"
msgstr "1 dosierujo"
-#: js/files.js:831
+#: js/files.js:880
msgid "{count} folders"
msgstr "{count} dosierujoj"
-#: js/files.js:839
+#: js/files.js:888
msgid "1 file"
msgstr "1 dosiero"
-#: js/files.js:841
+#: js/files.js:890
msgid "{count} files"
msgstr "{count} dosierujoj"
@@ -271,10 +279,6 @@ msgstr "Dosierujo"
msgid "From link"
msgstr "El ligilo"
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Alŝuti"
-
#: templates/index.php:41
msgid "Cancel upload"
msgstr "Nuligi alŝuton"
diff --git a/l10n/eo/files_encryption.po b/l10n/eo/files_encryption.po
index dbcedb1a56a..ee8d61876c1 100644
--- a/l10n/eo/files_encryption.po
+++ b/l10n/eo/files_encryption.po
@@ -8,28 +8,76 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-15 19:41+0000\n"
-"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: eo\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
msgid "Encryption"
msgstr "Ĉifrado"
-#: templates/settings.php:4
+#: templates/settings.php:67
msgid "Exclude the following file types from encryption"
msgstr "Malinkluzivigi la jenajn dosiertipojn el ĉifrado"
-#: templates/settings.php:5
+#: templates/settings.php:71
msgid "None"
msgstr "Nenio"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "Kapabligi ĉifradon"
diff --git a/l10n/eo/files_versions.po b/l10n/eo/files_versions.po
index 64415603319..53a59b49120 100644
--- a/l10n/eo/files_versions.po
+++ b/l10n/eo/files_versions.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-14 02:05+0200\n"
-"PO-Revision-Date: 2012-10-13 02:50+0000\n"
-"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,22 +18,10 @@ msgstr ""
"Language: eo\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "Eksvalidigi ĉiujn eldonojn"
-
#: js/versions.js:16
msgid "History"
msgstr "Historio"
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "Eldonoj"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "Ĉi tio forigos ĉiujn estantajn sekurkopiajn eldonojn de viaj dosieroj"
-
#: templates/settings.php:3
msgid "Files Versioning"
msgstr "Dosiereldonigo"
diff --git a/l10n/eo/lib.po b/l10n/eo/lib.po
index b4a219e21a2..05fd08aa22b 100644
--- a/l10n/eo/lib.po
+++ b/l10n/eo/lib.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-03 00:04+0100\n"
-"PO-Revision-Date: 2012-12-02 21:42+0000\n"
-"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,51 +18,55 @@ msgstr ""
"Language: eo\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:285
+#: app.php:301
msgid "Help"
msgstr "Helpo"
-#: app.php:292
+#: app.php:308
msgid "Personal"
msgstr "Persona"
-#: app.php:297
+#: app.php:313
msgid "Settings"
msgstr "Agordo"
-#: app.php:302
+#: app.php:318
msgid "Users"
msgstr "Uzantoj"
-#: app.php:309
+#: app.php:325
msgid "Apps"
msgstr "Aplikaĵoj"
-#: app.php:311
+#: app.php:327
msgid "Admin"
msgstr "Administranto"
-#: files.php:361
+#: files.php:365
msgid "ZIP download is turned off."
msgstr "ZIP-elŝuto estas malkapabligita."
-#: files.php:362
+#: files.php:366
msgid "Files need to be downloaded one by one."
msgstr "Dosieroj devas elŝutiĝi unuope."
-#: files.php:362 files.php:387
+#: files.php:366 files.php:391
msgid "Back to Files"
msgstr "Reen al la dosieroj"
-#: files.php:386
+#: files.php:390
msgid "Selected files too large to generate zip file."
msgstr "La elektitaj dosieroj tro grandas por genero de ZIP-dosiero."
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr ""
+
#: json.php:28
msgid "Application is not enabled"
msgstr "La aplikaĵo ne estas kapabligita"
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
msgstr "Aŭtentiga eraro"
@@ -82,55 +86,55 @@ msgstr "Teksto"
msgid "Images"
msgstr "Bildoj"
-#: template.php:103
+#: template.php:113
msgid "seconds ago"
msgstr "sekundojn antaŭe"
-#: template.php:104
+#: template.php:114
msgid "1 minute ago"
msgstr "antaŭ 1 minuto"
-#: template.php:105
+#: template.php:115
#, php-format
msgid "%d minutes ago"
msgstr "antaŭ %d minutoj"
-#: template.php:106
+#: template.php:116
msgid "1 hour ago"
msgstr "antaŭ 1 horo"
-#: template.php:107
+#: template.php:117
#, php-format
msgid "%d hours ago"
msgstr "antaŭ %d horoj"
-#: template.php:108
+#: template.php:118
msgid "today"
msgstr "hodiaŭ"
-#: template.php:109
+#: template.php:119
msgid "yesterday"
msgstr "hieraŭ"
-#: template.php:110
+#: template.php:120
#, php-format
msgid "%d days ago"
msgstr "antaŭ %d tagoj"
-#: template.php:111
+#: template.php:121
msgid "last month"
msgstr "lasta monato"
-#: template.php:112
+#: template.php:122
#, php-format
msgid "%d months ago"
msgstr "antaŭ %d monatoj"
-#: template.php:113
+#: template.php:123
msgid "last year"
msgstr "lasta jaro"
-#: template.php:114
+#: template.php:124
msgid "years ago"
msgstr "jarojn antaŭe"
diff --git a/l10n/eo/settings.po b/l10n/eo/settings.po
index 4c160cd36f5..2be0270b28b 100644
--- a/l10n/eo/settings.po
+++ b/l10n/eo/settings.po
@@ -3,15 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Mariano <mstreet@kde.org.ar>, 2013.
# Mariano <mstreet@kde.org.ar>, 2012.
# <mstreet@kde.org.ar>, 2011, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-01-21 00:04+0100\n"
+"PO-Revision-Date: 2013-01-20 01:30+0000\n"
+"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -115,27 +116,27 @@ msgstr "<span class=\"licence\"</span>-permesilhavigita de <span class=\"author\
#: templates/help.php:3
msgid "User Documentation"
-msgstr ""
+msgstr "Dokumentaro por uzantoj"
#: templates/help.php:4
msgid "Administrator Documentation"
-msgstr ""
+msgstr "Dokumentaro por administrantoj"
#: templates/help.php:6
msgid "Online Documentation"
-msgstr ""
+msgstr "Reta dokumentaro"
#: templates/help.php:7
msgid "Forum"
-msgstr ""
+msgstr "Forumo"
#: templates/help.php:9
msgid "Bugtracker"
-msgstr ""
+msgstr "Cimoraportejo"
#: templates/help.php:11
msgid "Commercial Support"
-msgstr ""
+msgstr "Komerca subteno"
#: templates/personal.php:8
#, php-format
@@ -148,15 +149,15 @@ msgstr "Klientoj"
#: templates/personal.php:13
msgid "Download Desktop Clients"
-msgstr ""
+msgstr "Elŝuti labortablajn klientojn"
#: templates/personal.php:14
msgid "Download Android Client"
-msgstr ""
+msgstr "Elŝuti Android-klienton"
#: templates/personal.php:15
msgid "Download iOS Client"
-msgstr ""
+msgstr "Elŝuti iOS-klienton"
#: templates/personal.php:21 templates/users.php:23 templates/users.php:82
msgid "Password"
@@ -208,15 +209,15 @@ msgstr "Helpu traduki"
#: templates/personal.php:52
msgid "WebDAV"
-msgstr ""
+msgstr "WebDAV"
#: templates/personal.php:54
msgid "Use this address to connect to your ownCloud in your file manager"
-msgstr ""
+msgstr "Uzu ĉi tiun adreson por konekti al via ownCloud vian dosieradministrilon"
#: templates/personal.php:63
msgid "Version"
-msgstr ""
+msgstr "Eldono"
#: templates/personal.php:65
msgid ""
@@ -242,11 +243,11 @@ msgstr "Krei"
#: templates/users.php:35
msgid "Default Storage"
-msgstr ""
+msgstr "Defaŭlta konservejo"
#: templates/users.php:42 templates/users.php:138
msgid "Unlimited"
-msgstr ""
+msgstr "Senlima"
#: templates/users.php:60 templates/users.php:153
msgid "Other"
@@ -258,11 +259,11 @@ msgstr "Grupadministranto"
#: templates/users.php:87
msgid "Storage"
-msgstr ""
+msgstr "Konservejo"
#: templates/users.php:133
msgid "Default"
-msgstr ""
+msgstr "Defaŭlta"
#: templates/users.php:161
msgid "Delete"
diff --git a/l10n/eo/user_ldap.po b/l10n/eo/user_ldap.po
index 419be520bc0..39f84ca0391 100644
--- a/l10n/eo/user_ldap.po
+++ b/l10n/eo/user_ldap.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Mariano <mstreet@kde.org.ar>, 2013.
# Mariano <mstreet@kde.org.ar>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-01-21 00:04+0100\n"
+"PO-Revision-Date: 2013-01-20 01:34+0000\n"
+"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -27,8 +28,8 @@ msgstr ""
#: templates/settings.php:11
msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
msgstr ""
#: templates/settings.php:15
@@ -42,7 +43,11 @@ msgstr "Vi povas neglekti la protokolon, escepte se vi bezonas SSL-on. Tiuokaze,
#: templates/settings.php:16
msgid "Base DN"
-msgstr "Baz-DN"
+msgstr "Bazo-DN"
+
+#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
@@ -115,10 +120,18 @@ msgstr "Pordo"
msgid "Base User Tree"
msgstr "Baza uzantarbo"
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "Baza gruparbo"
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Asocio de grupo kaj membro"
diff --git a/l10n/eo/user_webdavauth.po b/l10n/eo/user_webdavauth.po
index 60a766ad4c7..d9f66ba5177 100644
--- a/l10n/eo/user_webdavauth.po
+++ b/l10n/eo/user_webdavauth.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Mariano <mstreet@kde.org.ar>, 2013.
# Mariano <mstreet@kde.org.ar>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-28 00:20+0100\n"
-"PO-Revision-Date: 2012-12-27 03:35+0000\n"
+"POT-Creation-Date: 2013-01-21 00:04+0100\n"
+"PO-Revision-Date: 2013-01-20 01:16+0000\n"
"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
@@ -18,13 +19,17 @@ msgstr ""
"Language: eo\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr "WebDAV-aŭtentigo"
+
#: templates/settings.php:4
msgid "URL: http://"
msgstr "URL: http://"
#: templates/settings.php:6
msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
msgstr ""
diff --git a/l10n/es/core.po b/l10n/es/core.po
index 9428f0db049..099b2839a0f 100644
--- a/l10n/es/core.po
+++ b/l10n/es/core.po
@@ -18,8 +18,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
@@ -218,7 +218,6 @@ msgid "Password protect"
msgstr "Protegido por contraseña"
#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
msgid "Password"
msgstr "Contraseña"
@@ -575,17 +574,3 @@ msgstr "siguiente"
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
msgstr "Actualizando ownCloud a la versión %s, esto puede demorar un tiempo."
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "¡Advertencia de seguridad!"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "Por favor verifique su contraseña. <br/>Por razones de seguridad se le puede volver a preguntar ocasionalmente la contraseña."
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "Verificar"
diff --git a/l10n/es/files.po b/l10n/es/files.po
index 1275e717a26..e8258968172 100644
--- a/l10n/es/files.po
+++ b/l10n/es/files.po
@@ -16,9 +16,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 07:26+0000\n"
-"Last-Translator: karv <karvayoEdgar@gmail.com>\n"
+"POT-Creation-Date: 2013-01-21 00:04+0100\n"
+"PO-Revision-Date: 2013-01-20 02:53+0000\n"
+"Last-Translator: Agustin Ferrario <agustin.ferrario@hotmail.com.ar>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -26,6 +26,11 @@ msgstr ""
"Language: es\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/delete.php:28 ajax/getstoragestats.php:11 ajax/upload.php:17
+#: ajax/upload.php:76 templates/index.php:18
+msgid "Upload"
+msgstr "Subir"
+
#: ajax/move.php:17
#, php-format
msgid "Could not move %s - File with this name already exists"
@@ -40,46 +45,46 @@ msgstr "No se puede mover %s"
msgid "Unable to rename file"
msgstr "No se puede renombrar el archivo"
-#: ajax/upload.php:14
+#: ajax/upload.php:20
msgid "No file was uploaded. Unknown error"
msgstr "Fallo no se subió el fichero"
-#: ajax/upload.php:21
+#: ajax/upload.php:30
msgid "There is no error, the file uploaded with success"
msgstr "No se ha producido ningún error, el archivo se ha subido con éxito"
-#: ajax/upload.php:22
+#: ajax/upload.php:31
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr "El archivo que intentas subir sobrepasa el tamaño definido por la variable upload_max_filesize en php.ini"
-#: ajax/upload.php:24
+#: ajax/upload.php:33
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "El archivo que intentas subir sobrepasa el tamaño definido por la variable MAX_FILE_SIZE especificada en el formulario HTML"
-#: ajax/upload.php:26
+#: ajax/upload.php:35
msgid "The uploaded file was only partially uploaded"
msgstr "El archivo que intentas subir solo se subió parcialmente"
-#: ajax/upload.php:27
+#: ajax/upload.php:36
msgid "No file was uploaded"
msgstr "No se ha subido ningún archivo"
-#: ajax/upload.php:28
+#: ajax/upload.php:37
msgid "Missing a temporary folder"
msgstr "Falta un directorio temporal"
-#: ajax/upload.php:29
+#: ajax/upload.php:38
msgid "Failed to write to disk"
msgstr "La escritura en disco ha fallado"
-#: ajax/upload.php:45
+#: ajax/upload.php:57
msgid "Not enough space available"
msgstr "No hay suficiente espacio disponible"
-#: ajax/upload.php:69
+#: ajax/upload.php:91
msgid "Invalid directory."
msgstr "Directorio invalido."
@@ -135,98 +140,100 @@ msgstr "{files} descompartidos"
msgid "deleted {files}"
msgstr "{files} eliminados"
-#: js/files.js:31
+#: js/files.js:48
msgid "'.' is an invalid file name."
msgstr "'.' es un nombre de archivo inválido."
-#: js/files.js:36
+#: js/files.js:53
msgid "File name cannot be empty."
msgstr "El nombre de archivo no puede estar vacío."
-#: js/files.js:45
+#: js/files.js:62
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Nombre Invalido, \"\\\", \"/\", \"<\", \">\", \":\", \"\", \"|\" \"?\" y \"*\" no están permitidos "
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "generando un fichero ZIP, puede llevar un tiempo."
+#: js/files.js:204
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr "Tu descarga esta siendo preparada. Esto puede tardar algun tiempo si los archivos son muy grandes."
-#: js/files.js:224
+#: js/files.js:242
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "No ha sido posible subir tu archivo porque es un directorio o tiene 0 bytes"
-#: js/files.js:224
+#: js/files.js:242
msgid "Upload Error"
msgstr "Error al subir el archivo"
-#: js/files.js:241
+#: js/files.js:259
msgid "Close"
msgstr "cerrrar"
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:278 js/files.js:397 js/files.js:431
msgid "Pending"
msgstr "Pendiente"
-#: js/files.js:280
+#: js/files.js:298
msgid "1 file uploading"
msgstr "subiendo 1 archivo"
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:301 js/files.js:357 js/files.js:372
msgid "{count} files uploading"
msgstr "Subiendo {count} archivos"
-#: js/files.js:357 js/files.js:393
+#: js/files.js:376 js/files.js:414
msgid "Upload cancelled."
msgstr "Subida cancelada."
-#: js/files.js:464
+#: js/files.js:486
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "La subida del archivo está en proceso. Salir de la página ahora cancelará la subida."
-#: js/files.js:537
+#: js/files.js:559
msgid "URL cannot be empty."
msgstr "La URL no puede estar vacía."
-#: js/files.js:543
+#: js/files.js:565
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
+msgstr "Nombre de carpeta invalido. El uso de \"Shared\" esta reservado para Owncloud"
-#: js/files.js:727
+#: js/files.js:775
msgid "{count} files scanned"
msgstr "{count} archivos escaneados"
-#: js/files.js:735
+#: js/files.js:783
msgid "error while scanning"
msgstr "error escaneando"
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:857 templates/index.php:64
msgid "Name"
msgstr "Nombre"
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:858 templates/index.php:75
msgid "Size"
msgstr "Tamaño"
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:859 templates/index.php:77
msgid "Modified"
msgstr "Modificado"
-#: js/files.js:829
+#: js/files.js:878
msgid "1 folder"
msgstr "1 carpeta"
-#: js/files.js:831
+#: js/files.js:880
msgid "{count} folders"
msgstr "{count} carpetas"
-#: js/files.js:839
+#: js/files.js:888
msgid "1 file"
msgstr "1 archivo"
-#: js/files.js:841
+#: js/files.js:890
msgid "{count} files"
msgstr "{count} archivos"
@@ -278,10 +285,6 @@ msgstr "Carpeta"
msgid "From link"
msgstr "Desde el enlace"
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Subir"
-
#: templates/index.php:41
msgid "Cancel upload"
msgstr "Cancelar subida"
diff --git a/l10n/es/files_encryption.po b/l10n/es/files_encryption.po
index 9b75acf31d7..c58884a970d 100644
--- a/l10n/es/files_encryption.po
+++ b/l10n/es/files_encryption.po
@@ -8,28 +8,76 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-28 02:01+0200\n"
-"PO-Revision-Date: 2012-08-27 05:27+0000\n"
-"Last-Translator: juanman <juanma@kde.org.ar>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: es\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
msgid "Encryption"
msgstr "Cifrado"
-#: templates/settings.php:4
+#: templates/settings.php:67
msgid "Exclude the following file types from encryption"
msgstr "Excluir del cifrado los siguientes tipos de archivo"
-#: templates/settings.php:5
+#: templates/settings.php:71
msgid "None"
msgstr "Ninguno"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "Habilitar cifrado"
diff --git a/l10n/es/files_versions.po b/l10n/es/files_versions.po
index b928098bf8c..41ca2e67dad 100644
--- a/l10n/es/files_versions.po
+++ b/l10n/es/files_versions.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-26 13:19+0200\n"
-"PO-Revision-Date: 2012-09-26 05:59+0000\n"
-"Last-Translator: scambra <sergio@entrecables.com>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -21,22 +21,10 @@ msgstr ""
"Language: es\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "Expirar todas las versiones"
-
#: js/versions.js:16
msgid "History"
msgstr "Historial"
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "Versiones"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "Esto eliminará todas las versiones guardadas como copia de seguridad de tus archivos"
-
#: templates/settings.php:3
msgid "Files Versioning"
msgstr "Versionado de archivos"
diff --git a/l10n/es/lib.po b/l10n/es/lib.po
index 179b6bff7d6..38c6ee28554 100644
--- a/l10n/es/lib.po
+++ b/l10n/es/lib.po
@@ -3,6 +3,7 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2013.
# <juanma@kde.org.ar>, 2012.
# Raul Fernandez Garcia <raulfg3@gmail.com>, 2012.
# Rubén Trujillo <rubentrf@gmail.com>, 2012.
@@ -11,9 +12,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-18 00:01+0100\n"
-"PO-Revision-Date: 2012-11-17 08:43+0000\n"
-"Last-Translator: Raul Fernandez Garcia <raulfg3@gmail.com>\n"
+"POT-Creation-Date: 2013-01-21 00:04+0100\n"
+"PO-Revision-Date: 2013-01-20 02:14+0000\n"
+"Last-Translator: Agustin Ferrario <agustin.ferrario@hotmail.com.ar>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -21,51 +22,55 @@ msgstr ""
"Language: es\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:285
+#: app.php:301
msgid "Help"
msgstr "Ayuda"
-#: app.php:292
+#: app.php:308
msgid "Personal"
msgstr "Personal"
-#: app.php:297
+#: app.php:313
msgid "Settings"
msgstr "Ajustes"
-#: app.php:302
+#: app.php:318
msgid "Users"
msgstr "Usuarios"
-#: app.php:309
+#: app.php:325
msgid "Apps"
msgstr "Aplicaciones"
-#: app.php:311
+#: app.php:327
msgid "Admin"
msgstr "Administración"
-#: files.php:332
+#: files.php:365
msgid "ZIP download is turned off."
msgstr "La descarga en ZIP está desactivada."
-#: files.php:333
+#: files.php:366
msgid "Files need to be downloaded one by one."
msgstr "Los archivos deben ser descargados uno por uno."
-#: files.php:333 files.php:358
+#: files.php:366 files.php:391
msgid "Back to Files"
msgstr "Volver a Archivos"
-#: files.php:357
+#: files.php:390
msgid "Selected files too large to generate zip file."
msgstr "Los archivos seleccionados son demasiado grandes para generar el archivo zip."
+#: helper.php:229
+msgid "couldn't be determined"
+msgstr "no pudo ser determinado"
+
#: json.php:28
msgid "Application is not enabled"
msgstr "La aplicación no está habilitada"
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
msgstr "Error de autenticación"
@@ -85,55 +90,55 @@ msgstr "Texto"
msgid "Images"
msgstr "Imágenes"
-#: template.php:103
+#: template.php:113
msgid "seconds ago"
msgstr "hace segundos"
-#: template.php:104
+#: template.php:114
msgid "1 minute ago"
msgstr "hace 1 minuto"
-#: template.php:105
+#: template.php:115
#, php-format
msgid "%d minutes ago"
msgstr "hace %d minutos"
-#: template.php:106
+#: template.php:116
msgid "1 hour ago"
msgstr "Hace 1 hora"
-#: template.php:107
+#: template.php:117
#, php-format
msgid "%d hours ago"
msgstr "Hace %d horas"
-#: template.php:108
+#: template.php:118
msgid "today"
msgstr "hoy"
-#: template.php:109
+#: template.php:119
msgid "yesterday"
msgstr "ayer"
-#: template.php:110
+#: template.php:120
#, php-format
msgid "%d days ago"
msgstr "hace %d días"
-#: template.php:111
+#: template.php:121
msgid "last month"
msgstr "este mes"
-#: template.php:112
+#: template.php:122
#, php-format
msgid "%d months ago"
msgstr "Hace %d meses"
-#: template.php:113
+#: template.php:123
msgid "last year"
msgstr "este año"
-#: template.php:114
+#: template.php:124
msgid "years ago"
msgstr "hace años"
diff --git a/l10n/es/user_ldap.po b/l10n/es/user_ldap.po
index 32c72e60755..8a1cee622dd 100644
--- a/l10n/es/user_ldap.po
+++ b/l10n/es/user_ldap.po
@@ -13,9 +13,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-19 00:03+0100\n"
-"PO-Revision-Date: 2012-12-18 00:58+0000\n"
-"Last-Translator: valarauco <manudeloz86@gmail.com>\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 23:20+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -32,9 +32,9 @@ msgstr "<b>Advertencia:</b> Los Apps user_ldap y user_webdavauth son incompatibl
#: templates/settings.php:11
msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
-msgstr "<b>Advertencia:</b> El módulo PHP LDAP necesario no está instalado, el sistema no funcionará. Pregunte al administrador del sistema para instalarlo."
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
+msgstr ""
#: templates/settings.php:15
msgid "Host"
@@ -50,6 +50,10 @@ msgid "Base DN"
msgstr "DN base"
#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Puede especificar el DN base para usuarios y grupos en la pestaña Avanzado"
@@ -120,10 +124,18 @@ msgstr "Puerto"
msgid "Base User Tree"
msgstr "Árbol base de usuario"
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "Árbol base de grupo"
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Asociación Grupo-Miembro"
diff --git a/l10n/es/user_webdavauth.po b/l10n/es/user_webdavauth.po
index 8eec33bde17..c3d87548a9b 100644
--- a/l10n/es/user_webdavauth.po
+++ b/l10n/es/user_webdavauth.po
@@ -3,15 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2013.
# Art O. Pal <artopal@fastmail.fm>, 2012.
# <pggx999@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-30 00:04+0100\n"
-"PO-Revision-Date: 2012-12-29 19:17+0000\n"
-"Last-Translator: pggx999 <pggx999@gmail.com>\n"
+"POT-Creation-Date: 2013-01-21 00:04+0100\n"
+"PO-Revision-Date: 2013-01-20 02:31+0000\n"
+"Last-Translator: Agustin Ferrario <agustin.ferrario@hotmail.com.ar>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,13 +20,17 @@ msgstr ""
"Language: es\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr "Autenticación de WevDAV"
+
#: templates/settings.php:4
msgid "URL: http://"
msgstr "URL: http://"
#: templates/settings.php:6
msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
-msgstr "ownCloud enviará al usuario las interpretaciones 401 y 403 a esta URL como incorrectas y todas las otras credenciales como correctas"
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
+msgstr "onwCloud enviará las credenciales de usuario a esta URL. Este complemento verifica la respuesta e interpretará los códigos de respuesta HTTP 401 y 403 como credenciales inválidas y todas las otras respuestas como credenciales válidas."
diff --git a/l10n/es_AR/core.po b/l10n/es_AR/core.po
index 7eea07cc00b..c38985419c0 100644
--- a/l10n/es_AR/core.po
+++ b/l10n/es_AR/core.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# <claudio.tessone@gmail.com>, 2012.
+# <claudio.tessone@gmail.com>, 2012-2013.
# <javierkaiser@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
@@ -209,7 +209,6 @@ msgid "Password protect"
msgstr "Proteger con contraseña "
#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
msgid "Password"
msgstr "Contraseña"
@@ -565,18 +564,4 @@ msgstr "siguiente"
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
-msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "¡Advertencia de seguridad!"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "Por favor, verificá tu contraseña. <br/>Por razones de seguridad, puede ser que que te pregunte ocasionalmente la contraseña."
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "Verificar"
+msgstr "Actualizando ownCloud a la versión %s, puede domorar un rato."
diff --git a/l10n/es_AR/files.po b/l10n/es_AR/files.po
index d3f2c7ebc15..4f9ef6d1b56 100644
--- a/l10n/es_AR/files.po
+++ b/l10n/es_AR/files.po
@@ -4,14 +4,14 @@
#
# Translators:
# Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2012-2013.
-# <claudio.tessone@gmail.com>, 2012.
+# <claudio.tessone@gmail.com>, 2012-2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-01-21 00:04+0100\n"
+"PO-Revision-Date: 2013-01-20 02:53+0000\n"
+"Last-Translator: Agustin Ferrario <agustin.ferrario@hotmail.com.ar>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,60 +19,65 @@ msgstr ""
"Language: es_AR\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/delete.php:28 ajax/getstoragestats.php:11 ajax/upload.php:17
+#: ajax/upload.php:76 templates/index.php:18
+msgid "Upload"
+msgstr "Subir"
+
#: ajax/move.php:17
#, php-format
msgid "Could not move %s - File with this name already exists"
-msgstr ""
+msgstr "No se pudo mover %s - Un archivo con este nombre ya existe"
#: ajax/move.php:24
#, php-format
msgid "Could not move %s"
-msgstr ""
+msgstr "No se pudo mover %s "
#: ajax/rename.php:19
msgid "Unable to rename file"
-msgstr ""
+msgstr "No fue posible cambiar el nombre al archivo"
-#: ajax/upload.php:14
+#: ajax/upload.php:20
msgid "No file was uploaded. Unknown error"
msgstr "El archivo no fue subido. Error desconocido"
-#: ajax/upload.php:21
+#: ajax/upload.php:30
msgid "There is no error, the file uploaded with success"
msgstr "No se han producido errores, el archivo se ha subido con éxito"
-#: ajax/upload.php:22
+#: ajax/upload.php:31
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr "El archivo que intentás subir excede el tamaño definido por upload_max_filesize en el php.ini:"
-#: ajax/upload.php:24
+#: ajax/upload.php:33
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "El archivo que intentás subir sobrepasa el tamaño definido por la variable MAX_FILE_SIZE especificada en el formulario HTML"
-#: ajax/upload.php:26
+#: ajax/upload.php:35
msgid "The uploaded file was only partially uploaded"
msgstr "El archivo que intentás subir solo se subió parcialmente"
-#: ajax/upload.php:27
+#: ajax/upload.php:36
msgid "No file was uploaded"
msgstr "El archivo no fue subido"
-#: ajax/upload.php:28
+#: ajax/upload.php:37
msgid "Missing a temporary folder"
msgstr "Falta un directorio temporal"
-#: ajax/upload.php:29
+#: ajax/upload.php:38
msgid "Failed to write to disk"
msgstr "Error al escribir en el disco"
-#: ajax/upload.php:45
+#: ajax/upload.php:57
msgid "Not enough space available"
msgstr "No hay suficiente espacio disponible"
-#: ajax/upload.php:69
+#: ajax/upload.php:91
msgid "Invalid directory."
msgstr "Directorio invalido."
@@ -128,98 +133,100 @@ msgstr "{files} se dejaron de compartir"
msgid "deleted {files}"
msgstr "{files} borrados"
-#: js/files.js:31
+#: js/files.js:48
msgid "'.' is an invalid file name."
-msgstr ""
+msgstr "'.' es un nombre de archivo inválido."
-#: js/files.js:36
+#: js/files.js:53
msgid "File name cannot be empty."
-msgstr ""
+msgstr "El nombre del archivo no puede quedar vacío."
-#: js/files.js:45
+#: js/files.js:62
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Nombre invalido, '\\', '/', '<', '>', ':', '\"', '|', '?' y '*' no están permitidos."
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "generando un archivo ZIP, puede llevar un tiempo."
+#: js/files.js:204
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr "Tu descarga esta siendo preparada. Esto puede tardar algun tiempo si los archivos son muy grandes."
-#: js/files.js:224
+#: js/files.js:242
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "No fue posible subir el archivo porque es un directorio o porque su tamaño es 0 bytes"
-#: js/files.js:224
+#: js/files.js:242
msgid "Upload Error"
msgstr "Error al subir el archivo"
-#: js/files.js:241
+#: js/files.js:259
msgid "Close"
msgstr "Cerrar"
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:278 js/files.js:397 js/files.js:431
msgid "Pending"
msgstr "Pendiente"
-#: js/files.js:280
+#: js/files.js:298
msgid "1 file uploading"
msgstr "Subiendo 1 archivo"
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:301 js/files.js:357 js/files.js:372
msgid "{count} files uploading"
msgstr "Subiendo {count} archivos"
-#: js/files.js:357 js/files.js:393
+#: js/files.js:376 js/files.js:414
msgid "Upload cancelled."
msgstr "La subida fue cancelada"
-#: js/files.js:464
+#: js/files.js:486
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "La subida del archivo está en proceso. Si salís de la página ahora, la subida se cancelará."
-#: js/files.js:537
+#: js/files.js:559
msgid "URL cannot be empty."
msgstr "La URL no puede estar vacía"
-#: js/files.js:543
+#: js/files.js:565
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
+msgstr "Nombre de carpeta inválido. El uso de 'Shared' está reservado por ownCloud"
-#: js/files.js:727
+#: js/files.js:775
msgid "{count} files scanned"
msgstr "{count} archivos escaneados"
-#: js/files.js:735
+#: js/files.js:783
msgid "error while scanning"
msgstr "error mientras se escaneaba"
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:857 templates/index.php:64
msgid "Name"
msgstr "Nombre"
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:858 templates/index.php:75
msgid "Size"
msgstr "Tamaño"
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:859 templates/index.php:77
msgid "Modified"
msgstr "Modificado"
-#: js/files.js:829
+#: js/files.js:878
msgid "1 folder"
msgstr "1 directorio"
-#: js/files.js:831
+#: js/files.js:880
msgid "{count} folders"
msgstr "{count} directorios"
-#: js/files.js:839
+#: js/files.js:888
msgid "1 file"
msgstr "1 archivo"
-#: js/files.js:841
+#: js/files.js:890
msgid "{count} files"
msgstr "{count} archivos"
@@ -271,10 +278,6 @@ msgstr "Carpeta"
msgid "From link"
msgstr "Desde enlace"
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Subir"
-
#: templates/index.php:41
msgid "Cancel upload"
msgstr "Cancelar subida"
diff --git a/l10n/es_AR/files_encryption.po b/l10n/es_AR/files_encryption.po
index 16b134f329d..63c4ec00584 100644
--- a/l10n/es_AR/files_encryption.po
+++ b/l10n/es_AR/files_encryption.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-25 02:02+0200\n"
-"PO-Revision-Date: 2012-09-24 04:41+0000\n"
-"Last-Translator: cjtess <claudio.tessone@gmail.com>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,18 +18,66 @@ msgstr ""
"Language: es_AR\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
msgid "Encryption"
msgstr "Encriptación"
-#: templates/settings.php:4
+#: templates/settings.php:67
msgid "Exclude the following file types from encryption"
msgstr "Exceptuar de la encriptación los siguientes tipos de archivo"
-#: templates/settings.php:5
+#: templates/settings.php:71
msgid "None"
msgstr "Ninguno"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "Habilitar encriptación"
diff --git a/l10n/es_AR/files_versions.po b/l10n/es_AR/files_versions.po
index 51e4552b000..6ab1eed54d3 100644
--- a/l10n/es_AR/files_versions.po
+++ b/l10n/es_AR/files_versions.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-25 02:02+0200\n"
-"PO-Revision-Date: 2012-09-24 04:28+0000\n"
-"Last-Translator: cjtess <claudio.tessone@gmail.com>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,22 +18,10 @@ msgstr ""
"Language: es_AR\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "Expirar todas las versiones"
-
#: js/versions.js:16
msgid "History"
msgstr "Historia"
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "Versiones"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "Hacer estom borrará todas las versiones guardadas como copia de seguridad de tus archivos"
-
#: templates/settings.php:3
msgid "Files Versioning"
msgstr "Versionado de archivos"
diff --git a/l10n/es_AR/lib.po b/l10n/es_AR/lib.po
index d7c4a911766..0b6fd72855b 100644
--- a/l10n/es_AR/lib.po
+++ b/l10n/es_AR/lib.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2013.
# <claudio.tessone@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-22 00:01+0100\n"
-"PO-Revision-Date: 2012-11-21 09:56+0000\n"
-"Last-Translator: cjtess <claudio.tessone@gmail.com>\n"
+"POT-Creation-Date: 2013-01-21 00:04+0100\n"
+"PO-Revision-Date: 2013-01-20 03:00+0000\n"
+"Last-Translator: Agustin Ferrario <agustin.ferrario@hotmail.com.ar>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,51 +19,55 @@ msgstr ""
"Language: es_AR\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:285
+#: app.php:301
msgid "Help"
msgstr "Ayuda"
-#: app.php:292
+#: app.php:308
msgid "Personal"
msgstr "Personal"
-#: app.php:297
+#: app.php:313
msgid "Settings"
msgstr "Ajustes"
-#: app.php:302
+#: app.php:318
msgid "Users"
msgstr "Usuarios"
-#: app.php:309
+#: app.php:325
msgid "Apps"
msgstr "Aplicaciones"
-#: app.php:311
+#: app.php:327
msgid "Admin"
msgstr "Administración"
-#: files.php:361
+#: files.php:365
msgid "ZIP download is turned off."
msgstr "La descarga en ZIP está desactivada."
-#: files.php:362
+#: files.php:366
msgid "Files need to be downloaded one by one."
msgstr "Los archivos deben ser descargados de a uno."
-#: files.php:362 files.php:387
+#: files.php:366 files.php:391
msgid "Back to Files"
msgstr "Volver a archivos"
-#: files.php:386
+#: files.php:390
msgid "Selected files too large to generate zip file."
msgstr "Los archivos seleccionados son demasiado grandes para generar el archivo zip."
+#: helper.php:229
+msgid "couldn't be determined"
+msgstr "no pudo ser determinado"
+
#: json.php:28
msgid "Application is not enabled"
msgstr "La aplicación no está habilitada"
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
msgstr "Error de autenticación"
@@ -82,55 +87,55 @@ msgstr "Texto"
msgid "Images"
msgstr "Imágenes"
-#: template.php:103
+#: template.php:113
msgid "seconds ago"
msgstr "hace unos segundos"
-#: template.php:104
+#: template.php:114
msgid "1 minute ago"
msgstr "hace 1 minuto"
-#: template.php:105
+#: template.php:115
#, php-format
msgid "%d minutes ago"
msgstr "hace %d minutos"
-#: template.php:106
+#: template.php:116
msgid "1 hour ago"
msgstr "1 hora atrás"
-#: template.php:107
+#: template.php:117
#, php-format
msgid "%d hours ago"
msgstr "%d horas atrás"
-#: template.php:108
+#: template.php:118
msgid "today"
msgstr "hoy"
-#: template.php:109
+#: template.php:119
msgid "yesterday"
msgstr "ayer"
-#: template.php:110
+#: template.php:120
#, php-format
msgid "%d days ago"
msgstr "hace %d días"
-#: template.php:111
+#: template.php:121
msgid "last month"
msgstr "este mes"
-#: template.php:112
+#: template.php:122
#, php-format
msgid "%d months ago"
msgstr "%d meses atrás"
-#: template.php:113
+#: template.php:123
msgid "last year"
msgstr "este año"
-#: template.php:114
+#: template.php:124
msgid "years ago"
msgstr "hace años"
diff --git a/l10n/es_AR/user_ldap.po b/l10n/es_AR/user_ldap.po
index 4ceff26caa1..a3b11101f5b 100644
--- a/l10n/es_AR/user_ldap.po
+++ b/l10n/es_AR/user_ldap.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-04 13:22+0100\n"
-"PO-Revision-Date: 2013-01-04 05:53+0000\n"
-"Last-Translator: Agustin Ferrario <agustin.ferrario@hotmail.com.ar>\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 23:20+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -28,9 +28,9 @@ msgstr "<b>Advertencia:</b> Los Apps user_ldap y user_webdavauth son incompatibl
#: templates/settings.php:11
msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
-msgstr "<b>Advertencia:</b> El módulo PHP LDAP necesario no está instalado, el sistema no funcionará. Pregunte al administrador del sistema para instalarlo."
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
+msgstr ""
#: templates/settings.php:15
msgid "Host"
@@ -46,6 +46,10 @@ msgid "Base DN"
msgstr "DN base"
#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Podés especificar el DN base para usuarios y grupos en la pestaña \"Avanzado\""
@@ -116,10 +120,18 @@ msgstr "Puerto"
msgid "Base User Tree"
msgstr "Árbol base de usuario"
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "Árbol base de grupo"
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Asociación Grupo-Miembro"
diff --git a/l10n/es_AR/user_webdavauth.po b/l10n/es_AR/user_webdavauth.po
index 5eb7c5b084b..429680ee8c6 100644
--- a/l10n/es_AR/user_webdavauth.po
+++ b/l10n/es_AR/user_webdavauth.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-30 00:04+0100\n"
-"PO-Revision-Date: 2012-12-29 21:34+0000\n"
-"Last-Translator: Agustin Ferrario <agustin.ferrario@hotmail.com.ar>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,13 +19,17 @@ msgstr ""
"Language: es_AR\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
#: templates/settings.php:4
msgid "URL: http://"
msgstr "URL: http://"
#: templates/settings.php:6
msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
-msgstr "ownCloud enviará las credenciales a esta dirección, si son interpretadas como http 401 o http 403 las credenciales son erroneas; todos los otros códigos indican que las credenciales son correctas."
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
+msgstr ""
diff --git a/l10n/et_EE/core.po b/l10n/et_EE/core.po
index 929be2741d6..ba615076133 100644
--- a/l10n/et_EE/core.po
+++ b/l10n/et_EE/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
@@ -208,7 +208,6 @@ msgid "Password protect"
msgstr "Parooliga kaitstud"
#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
msgid "Password"
msgstr "Parool"
@@ -565,17 +564,3 @@ msgstr "järgm"
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "turvahoiatus!"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr ""
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "Kinnita"
diff --git a/l10n/et_EE/files.po b/l10n/et_EE/files.po
index 444a31d0214..08842493045 100644
--- a/l10n/et_EE/files.po
+++ b/l10n/et_EE/files.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"POT-Creation-Date: 2013-01-20 00:05+0100\n"
+"PO-Revision-Date: 2013-01-19 23:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
@@ -19,6 +19,11 @@ msgstr ""
"Language: et_EE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/delete.php:28 ajax/getstoragestats.php:11 ajax/upload.php:17
+#: ajax/upload.php:76 templates/index.php:18
+msgid "Upload"
+msgstr "Lae üles"
+
#: ajax/move.php:17
#, php-format
msgid "Could not move %s - File with this name already exists"
@@ -33,46 +38,46 @@ msgstr ""
msgid "Unable to rename file"
msgstr ""
-#: ajax/upload.php:14
+#: ajax/upload.php:20
msgid "No file was uploaded. Unknown error"
msgstr "Ühtegi faili ei laetud üles. Tundmatu viga"
-#: ajax/upload.php:21
+#: ajax/upload.php:30
msgid "There is no error, the file uploaded with success"
msgstr "Ühtegi viga pole, fail on üles laetud"
-#: ajax/upload.php:22
+#: ajax/upload.php:31
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr ""
-#: ajax/upload.php:24
+#: ajax/upload.php:33
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "Üles laetud faili suurus ületab HTML vormis määratud upload_max_filesize suuruse"
-#: ajax/upload.php:26
+#: ajax/upload.php:35
msgid "The uploaded file was only partially uploaded"
msgstr "Fail laeti üles ainult osaliselt"
-#: ajax/upload.php:27
+#: ajax/upload.php:36
msgid "No file was uploaded"
msgstr "Ühtegi faili ei laetud üles"
-#: ajax/upload.php:28
+#: ajax/upload.php:37
msgid "Missing a temporary folder"
msgstr "Ajutiste failide kaust puudub"
-#: ajax/upload.php:29
+#: ajax/upload.php:38
msgid "Failed to write to disk"
msgstr "Kettale kirjutamine ebaõnnestus"
-#: ajax/upload.php:45
+#: ajax/upload.php:57
msgid "Not enough space available"
msgstr ""
-#: ajax/upload.php:69
+#: ajax/upload.php:91
msgid "Invalid directory."
msgstr ""
@@ -128,98 +133,100 @@ msgstr "jagamata {files}"
msgid "deleted {files}"
msgstr "kustutatud {files}"
-#: js/files.js:31
+#: js/files.js:48
msgid "'.' is an invalid file name."
msgstr ""
-#: js/files.js:36
+#: js/files.js:53
msgid "File name cannot be empty."
msgstr ""
-#: js/files.js:45
+#: js/files.js:62
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Vigane nimi, '\\', '/', '<', '>', ':', '\"', '|', '?' ja '*' pole lubatud."
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "ZIP-faili loomine, see võib veidi aega võtta."
+#: js/files.js:204
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
-#: js/files.js:224
+#: js/files.js:242
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Sinu faili üleslaadimine ebaõnnestus, kuna see on kaust või selle suurus on 0 baiti"
-#: js/files.js:224
+#: js/files.js:242
msgid "Upload Error"
msgstr "Üleslaadimise viga"
-#: js/files.js:241
+#: js/files.js:259
msgid "Close"
msgstr "Sulge"
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:278 js/files.js:397 js/files.js:431
msgid "Pending"
msgstr "Ootel"
-#: js/files.js:280
+#: js/files.js:298
msgid "1 file uploading"
msgstr "1 faili üleslaadimisel"
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:301 js/files.js:357 js/files.js:372
msgid "{count} files uploading"
msgstr "{count} faili üleslaadimist"
-#: js/files.js:357 js/files.js:393
+#: js/files.js:376 js/files.js:414
msgid "Upload cancelled."
msgstr "Üleslaadimine tühistati."
-#: js/files.js:464
+#: js/files.js:486
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Faili üleslaadimine on töös. Lehelt lahkumine katkestab selle üleslaadimise."
-#: js/files.js:537
+#: js/files.js:559
msgid "URL cannot be empty."
msgstr "URL ei saa olla tühi."
-#: js/files.js:543
+#: js/files.js:565
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:727
+#: js/files.js:775
msgid "{count} files scanned"
msgstr "{count} faili skännitud"
-#: js/files.js:735
+#: js/files.js:783
msgid "error while scanning"
msgstr "viga skännimisel"
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:857 templates/index.php:64
msgid "Name"
msgstr "Nimi"
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:858 templates/index.php:75
msgid "Size"
msgstr "Suurus"
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:859 templates/index.php:77
msgid "Modified"
msgstr "Muudetud"
-#: js/files.js:829
+#: js/files.js:878
msgid "1 folder"
msgstr "1 kaust"
-#: js/files.js:831
+#: js/files.js:880
msgid "{count} folders"
msgstr "{count} kausta"
-#: js/files.js:839
+#: js/files.js:888
msgid "1 file"
msgstr "1 fail"
-#: js/files.js:841
+#: js/files.js:890
msgid "{count} files"
msgstr "{count} faili"
@@ -271,10 +278,6 @@ msgstr "Kaust"
msgid "From link"
msgstr "Allikast"
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Lae üles"
-
#: templates/index.php:41
msgid "Cancel upload"
msgstr "Tühista üleslaadimine"
diff --git a/l10n/et_EE/files_encryption.po b/l10n/et_EE/files_encryption.po
index 8a0593fa337..eb1004d7bef 100644
--- a/l10n/et_EE/files_encryption.po
+++ b/l10n/et_EE/files_encryption.po
@@ -8,28 +8,76 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-19 02:02+0200\n"
-"PO-Revision-Date: 2012-08-18 06:39+0000\n"
-"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: et_EE\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
msgid "Encryption"
msgstr "Krüpteerimine"
-#: templates/settings.php:4
+#: templates/settings.php:67
msgid "Exclude the following file types from encryption"
msgstr "Järgnevaid failitüüpe ära krüpteeri"
-#: templates/settings.php:5
+#: templates/settings.php:71
msgid "None"
msgstr "Pole"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "Luba krüpteerimine"
diff --git a/l10n/et_EE/files_versions.po b/l10n/et_EE/files_versions.po
index a0d4710bcd4..a0309a22fc6 100644
--- a/l10n/et_EE/files_versions.po
+++ b/l10n/et_EE/files_versions.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-21 02:03+0200\n"
-"PO-Revision-Date: 2012-10-20 20:09+0000\n"
-"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,22 +18,10 @@ msgstr ""
"Language: et_EE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "Kõikide versioonide aegumine"
-
#: js/versions.js:16
msgid "History"
msgstr "Ajalugu"
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "Versioonid"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "See kustutab kõik sinu failidest tehtud varuversiooni"
-
#: templates/settings.php:3
msgid "Files Versioning"
msgstr "Failide versioonihaldus"
diff --git a/l10n/et_EE/lib.po b/l10n/et_EE/lib.po
index f617ebc7835..a137f08e4a3 100644
--- a/l10n/et_EE/lib.po
+++ b/l10n/et_EE/lib.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-14 23:13+0000\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
@@ -18,51 +18,55 @@ msgstr ""
"Language: et_EE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:285
+#: app.php:301
msgid "Help"
msgstr "Abiinfo"
-#: app.php:292
+#: app.php:308
msgid "Personal"
msgstr "Isiklik"
-#: app.php:297
+#: app.php:313
msgid "Settings"
msgstr "Seaded"
-#: app.php:302
+#: app.php:318
msgid "Users"
msgstr "Kasutajad"
-#: app.php:309
+#: app.php:325
msgid "Apps"
msgstr "Rakendused"
-#: app.php:311
+#: app.php:327
msgid "Admin"
msgstr "Admin"
-#: files.php:332
+#: files.php:365
msgid "ZIP download is turned off."
msgstr "ZIP-ina allalaadimine on välja lülitatud."
-#: files.php:333
+#: files.php:366
msgid "Files need to be downloaded one by one."
msgstr "Failid tuleb alla laadida ükshaaval."
-#: files.php:333 files.php:358
+#: files.php:366 files.php:391
msgid "Back to Files"
msgstr "Tagasi failide juurde"
-#: files.php:357
+#: files.php:390
msgid "Selected files too large to generate zip file."
msgstr "Valitud failid on ZIP-faili loomiseks liiga suured."
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr ""
+
#: json.php:28
msgid "Application is not enabled"
msgstr "Rakendus pole sisse lülitatud"
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
msgstr "Autentimise viga"
@@ -82,55 +86,55 @@ msgstr "Tekst"
msgid "Images"
msgstr "Pildid"
-#: template.php:103
+#: template.php:113
msgid "seconds ago"
msgstr "sekundit tagasi"
-#: template.php:104
+#: template.php:114
msgid "1 minute ago"
msgstr "1 minut tagasi"
-#: template.php:105
+#: template.php:115
#, php-format
msgid "%d minutes ago"
msgstr "%d minutit tagasi"
-#: template.php:106
+#: template.php:116
msgid "1 hour ago"
msgstr ""
-#: template.php:107
+#: template.php:117
#, php-format
msgid "%d hours ago"
msgstr ""
-#: template.php:108
+#: template.php:118
msgid "today"
msgstr "täna"
-#: template.php:109
+#: template.php:119
msgid "yesterday"
msgstr "eile"
-#: template.php:110
+#: template.php:120
#, php-format
msgid "%d days ago"
msgstr "%d päeva tagasi"
-#: template.php:111
+#: template.php:121
msgid "last month"
msgstr "eelmisel kuul"
-#: template.php:112
+#: template.php:122
#, php-format
msgid "%d months ago"
msgstr ""
-#: template.php:113
+#: template.php:123
msgid "last year"
msgstr "eelmisel aastal"
-#: template.php:114
+#: template.php:124
msgid "years ago"
msgstr "aastat tagasi"
diff --git a/l10n/et_EE/user_ldap.po b/l10n/et_EE/user_ldap.po
index c8207cb0467..f0bcf31f96a 100644
--- a/l10n/et_EE/user_ldap.po
+++ b/l10n/et_EE/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 23:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
@@ -27,8 +27,8 @@ msgstr ""
#: templates/settings.php:11
msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
msgstr ""
#: templates/settings.php:15
@@ -45,6 +45,10 @@ msgid "Base DN"
msgstr "Baas DN"
#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Sa saad kasutajate ja gruppide baas DN-i määrata lisavalikute vahekaardilt"
@@ -115,10 +119,18 @@ msgstr "Port"
msgid "Base User Tree"
msgstr "Baaskasutaja puu"
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "Baasgrupi puu"
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Grupiliikme seotus"
diff --git a/l10n/et_EE/user_webdavauth.po b/l10n/et_EE/user_webdavauth.po
index 2e1b479cbe8..a2ccf77cee8 100644
--- a/l10n/et_EE/user_webdavauth.po
+++ b/l10n/et_EE/user_webdavauth.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-20 00:11+0100\n"
-"PO-Revision-Date: 2012-12-19 23:12+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
@@ -18,13 +18,17 @@ msgstr ""
"Language: et_EE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
#: templates/settings.php:4
msgid "URL: http://"
msgstr ""
#: templates/settings.php:6
msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
msgstr ""
diff --git a/l10n/eu/core.po b/l10n/eu/core.po
index ace5f9e642e..74900de6d94 100644
--- a/l10n/eu/core.po
+++ b/l10n/eu/core.po
@@ -3,6 +3,7 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <asieriko@gmail.com>, 2013.
# <asieriko@gmail.com>, 2012.
# Asier Urio Larrea <asieriko@gmail.com>, 2011.
# Piarres Beobide <pi@beobide.net>, 2012.
@@ -10,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-01-20 00:05+0100\n"
+"PO-Revision-Date: 2013-01-19 00:07+0000\n"
+"Last-Translator: asieriko <asieriko@gmail.com>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -86,55 +87,55 @@ msgstr "Errorea gertatu da %s gogokoetatik ezabatzean."
msgid "Settings"
msgstr "Ezarpenak"
-#: js/js.js:711
+#: js/js.js:706
msgid "seconds ago"
msgstr "segundu"
-#: js/js.js:712
+#: js/js.js:707
msgid "1 minute ago"
msgstr "orain dela minutu 1"
-#: js/js.js:713
+#: js/js.js:708
msgid "{minutes} minutes ago"
msgstr "orain dela {minutes} minutu"
-#: js/js.js:714
+#: js/js.js:709
msgid "1 hour ago"
msgstr "orain dela ordu bat"
-#: js/js.js:715
+#: js/js.js:710
msgid "{hours} hours ago"
msgstr "orain dela {hours} ordu"
-#: js/js.js:716
+#: js/js.js:711
msgid "today"
msgstr "gaur"
-#: js/js.js:717
+#: js/js.js:712
msgid "yesterday"
msgstr "atzo"
-#: js/js.js:718
+#: js/js.js:713
msgid "{days} days ago"
msgstr "orain dela {days} egun"
-#: js/js.js:719
+#: js/js.js:714
msgid "last month"
msgstr "joan den hilabetean"
-#: js/js.js:720
+#: js/js.js:715
msgid "{months} months ago"
msgstr "orain dela {months} hilabete"
-#: js/js.js:721
+#: js/js.js:716
msgid "months ago"
msgstr "hilabete"
-#: js/js.js:722
+#: js/js.js:717
msgid "last year"
msgstr "joan den urtean"
-#: js/js.js:723
+#: js/js.js:718
msgid "years ago"
msgstr "urte"
@@ -210,7 +211,6 @@ msgid "Password protect"
msgstr "Babestu pasahitzarekin"
#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
msgid "Password"
msgstr "Pasahitza"
@@ -566,18 +566,4 @@ msgstr "hurrengoa"
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
-msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "Segurtasun abisua"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "Mesedez egiaztatu zure pasahitza. <br/>Segurtasun arrazoiengatik noizbehinka zure pasahitza berriz sartzea eska diezazukegu."
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "Egiaztatu"
+msgstr "ownCloud %s bertsiora eguneratzen, denbora har dezake."
diff --git a/l10n/eu/files.po b/l10n/eu/files.po
index 0cc98cedbd1..ac12e78e77e 100644
--- a/l10n/eu/files.po
+++ b/l10n/eu/files.po
@@ -3,6 +3,7 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <asieriko@gmail.com>, 2013.
# <asieriko@gmail.com>, 2012.
# Asier Urio Larrea <asieriko@gmail.com>, 2011.
# Piarres Beobide <pi@beobide.net>, 2012.
@@ -10,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"POT-Creation-Date: 2013-01-20 00:05+0100\n"
+"PO-Revision-Date: 2013-01-19 23:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
@@ -20,62 +21,67 @@ msgstr ""
"Language: eu\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/delete.php:28 ajax/getstoragestats.php:11 ajax/upload.php:17
+#: ajax/upload.php:76 templates/index.php:18
+msgid "Upload"
+msgstr "Igo"
+
#: ajax/move.php:17
#, php-format
msgid "Could not move %s - File with this name already exists"
-msgstr ""
+msgstr "Ezin da %s mugitu - Izen hau duen fitxategia dagoeneko existitzen da"
#: ajax/move.php:24
#, php-format
msgid "Could not move %s"
-msgstr ""
+msgstr "Ezin dira fitxategiak mugitu %s"
#: ajax/rename.php:19
msgid "Unable to rename file"
-msgstr ""
+msgstr "Ezin izan da fitxategia berrizendatu"
-#: ajax/upload.php:14
+#: ajax/upload.php:20
msgid "No file was uploaded. Unknown error"
msgstr "Ez da fitxategirik igo. Errore ezezaguna"
-#: ajax/upload.php:21
+#: ajax/upload.php:30
msgid "There is no error, the file uploaded with success"
msgstr "Ez da arazorik izan, fitxategia ongi igo da"
-#: ajax/upload.php:22
+#: ajax/upload.php:31
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr "Igotako fitxategiak php.ini fitxategian ezarritako upload_max_filesize muga gainditu du:"
-#: ajax/upload.php:24
+#: ajax/upload.php:33
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "Igotako fitxategiaren tamaina HTML inprimakiko MAX_FILESIZE direktiban adierazitakoa baino handiagoa da"
-#: ajax/upload.php:26
+#: ajax/upload.php:35
msgid "The uploaded file was only partially uploaded"
msgstr "Igotako fitxategiaren zati bat baino gehiago ez da igo"
-#: ajax/upload.php:27
+#: ajax/upload.php:36
msgid "No file was uploaded"
msgstr "Ez da fitxategirik igo"
-#: ajax/upload.php:28
+#: ajax/upload.php:37
msgid "Missing a temporary folder"
msgstr "Aldi baterako karpeta falta da"
-#: ajax/upload.php:29
+#: ajax/upload.php:38
msgid "Failed to write to disk"
msgstr "Errore bat izan da diskoan idazterakoan"
-#: ajax/upload.php:45
+#: ajax/upload.php:57
msgid "Not enough space available"
-msgstr ""
+msgstr "Ez dago leku nahikorik."
-#: ajax/upload.php:69
+#: ajax/upload.php:91
msgid "Invalid directory."
-msgstr ""
+msgstr "Baliogabeko karpeta."
#: appinfo/app.php:10
msgid "Files"
@@ -129,98 +135,100 @@ msgstr "elkarbanaketa utzita {files}"
msgid "deleted {files}"
msgstr "ezabatuta {files}"
-#: js/files.js:31
+#: js/files.js:48
msgid "'.' is an invalid file name."
-msgstr ""
+msgstr "'.' ez da fitxategi izen baliogarria."
-#: js/files.js:36
+#: js/files.js:53
msgid "File name cannot be empty."
-msgstr ""
+msgstr "Fitxategi izena ezin da hutsa izan."
-#: js/files.js:45
+#: js/files.js:62
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "IZen aliogabea, '\\', '/', '<', '>', ':', '\"', '|', '?' eta '*' ez daude baimenduta."
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "ZIP-fitxategia sortzen ari da, denbora har dezake"
+#: js/files.js:204
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
-#: js/files.js:224
+#: js/files.js:242
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Ezin da zure fitxategia igo, karpeta bat da edo 0 byt ditu"
-#: js/files.js:224
+#: js/files.js:242
msgid "Upload Error"
msgstr "Igotzean errore bat suertatu da"
-#: js/files.js:241
+#: js/files.js:259
msgid "Close"
msgstr "Itxi"
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:278 js/files.js:397 js/files.js:431
msgid "Pending"
msgstr "Zain"
-#: js/files.js:280
+#: js/files.js:298
msgid "1 file uploading"
msgstr "fitxategi 1 igotzen"
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:301 js/files.js:357 js/files.js:372
msgid "{count} files uploading"
msgstr "{count} fitxategi igotzen"
-#: js/files.js:357 js/files.js:393
+#: js/files.js:376 js/files.js:414
msgid "Upload cancelled."
msgstr "Igoera ezeztatuta"
-#: js/files.js:464
+#: js/files.js:486
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Fitxategien igoera martxan da. Orria orain uzteak igoera ezeztatutko du."
-#: js/files.js:537
+#: js/files.js:559
msgid "URL cannot be empty."
msgstr "URLa ezin da hutsik egon."
-#: js/files.js:543
+#: js/files.js:565
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
+msgstr "Baliogabeako karpeta izena. 'Shared' izena Owncloudek erreserbatzen du"
-#: js/files.js:727
+#: js/files.js:775
msgid "{count} files scanned"
msgstr "{count} fitxategi eskaneatuta"
-#: js/files.js:735
+#: js/files.js:783
msgid "error while scanning"
msgstr "errore bat egon da eskaneatzen zen bitartean"
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:857 templates/index.php:64
msgid "Name"
msgstr "Izena"
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:858 templates/index.php:75
msgid "Size"
msgstr "Tamaina"
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:859 templates/index.php:77
msgid "Modified"
msgstr "Aldatuta"
-#: js/files.js:829
+#: js/files.js:878
msgid "1 folder"
msgstr "karpeta bat"
-#: js/files.js:831
+#: js/files.js:880
msgid "{count} folders"
msgstr "{count} karpeta"
-#: js/files.js:839
+#: js/files.js:888
msgid "1 file"
msgstr "fitxategi bat"
-#: js/files.js:841
+#: js/files.js:890
msgid "{count} files"
msgstr "{count} fitxategi"
@@ -272,10 +280,6 @@ msgstr "Karpeta"
msgid "From link"
msgstr "Estekatik"
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Igo"
-
#: templates/index.php:41
msgid "Cancel upload"
msgstr "Ezeztatu igoera"
diff --git a/l10n/eu/files_encryption.po b/l10n/eu/files_encryption.po
index cd97e58a497..deacd189bf8 100644
--- a/l10n/eu/files_encryption.po
+++ b/l10n/eu/files_encryption.po
@@ -8,28 +8,76 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-28 02:01+0200\n"
-"PO-Revision-Date: 2012-08-27 09:08+0000\n"
-"Last-Translator: asieriko <asieriko@gmail.com>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: eu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
msgid "Encryption"
msgstr "Enkriptazioa"
-#: templates/settings.php:4
+#: templates/settings.php:67
msgid "Exclude the following file types from encryption"
msgstr "Ez enkriptatu hurrengo fitxategi motak"
-#: templates/settings.php:5
+#: templates/settings.php:71
msgid "None"
msgstr "Bat ere ez"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "Gaitu enkriptazioa"
diff --git a/l10n/eu/files_versions.po b/l10n/eu/files_versions.po
index 471bd1ee586..64844cd7adf 100644
--- a/l10n/eu/files_versions.po
+++ b/l10n/eu/files_versions.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-25 02:02+0200\n"
-"PO-Revision-Date: 2012-09-24 13:25+0000\n"
-"Last-Translator: asieriko <asieriko@gmail.com>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,22 +18,10 @@ msgstr ""
"Language: eu\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "Iraungi bertsio guztiak"
-
#: js/versions.js:16
msgid "History"
msgstr "Historia"
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "Bertsioak"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "Honek zure fitxategien bertsio guztiak ezabatuko ditu"
-
#: templates/settings.php:3
msgid "Files Versioning"
msgstr "Fitxategien Bertsioak"
diff --git a/l10n/eu/lib.po b/l10n/eu/lib.po
index 9442caf83a9..9ba6d45bb6d 100644
--- a/l10n/eu/lib.po
+++ b/l10n/eu/lib.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <asieriko@gmail.com>, 2013.
# <asieriko@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-27 00:10+0100\n"
-"PO-Revision-Date: 2012-11-25 23:10+0000\n"
+"POT-Creation-Date: 2013-01-20 00:05+0100\n"
+"PO-Revision-Date: 2013-01-19 00:06+0000\n"
"Last-Translator: asieriko <asieriko@gmail.com>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
@@ -18,51 +19,55 @@ msgstr ""
"Language: eu\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:285
+#: app.php:301
msgid "Help"
msgstr "Laguntza"
-#: app.php:292
+#: app.php:308
msgid "Personal"
msgstr "Pertsonala"
-#: app.php:297
+#: app.php:313
msgid "Settings"
msgstr "Ezarpenak"
-#: app.php:302
+#: app.php:318
msgid "Users"
msgstr "Erabiltzaileak"
-#: app.php:309
+#: app.php:325
msgid "Apps"
msgstr "Aplikazioak"
-#: app.php:311
+#: app.php:327
msgid "Admin"
msgstr "Admin"
-#: files.php:361
+#: files.php:365
msgid "ZIP download is turned off."
msgstr "ZIP deskarga ez dago gaituta."
-#: files.php:362
+#: files.php:366
msgid "Files need to be downloaded one by one."
msgstr "Fitxategiak banan-banan deskargatu behar dira."
-#: files.php:362 files.php:387
+#: files.php:366 files.php:391
msgid "Back to Files"
msgstr "Itzuli fitxategietara"
-#: files.php:386
+#: files.php:390
msgid "Selected files too large to generate zip file."
msgstr "Hautatuko fitxategiak oso handiak dira zip fitxategia sortzeko."
+#: helper.php:229
+msgid "couldn't be determined"
+msgstr "ezin izan da zehaztu"
+
#: json.php:28
msgid "Application is not enabled"
msgstr "Aplikazioa ez dago gaituta"
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
msgstr "Autentikazio errorea"
@@ -82,55 +87,55 @@ msgstr "Testua"
msgid "Images"
msgstr "Irudiak"
-#: template.php:103
+#: template.php:113
msgid "seconds ago"
msgstr "orain dela segundu batzuk"
-#: template.php:104
+#: template.php:114
msgid "1 minute ago"
msgstr "orain dela minutu 1"
-#: template.php:105
+#: template.php:115
#, php-format
msgid "%d minutes ago"
msgstr "orain dela %d minutu"
-#: template.php:106
+#: template.php:116
msgid "1 hour ago"
msgstr "orain dela ordu bat"
-#: template.php:107
+#: template.php:117
#, php-format
msgid "%d hours ago"
msgstr "orain dela %d ordu"
-#: template.php:108
+#: template.php:118
msgid "today"
msgstr "gaur"
-#: template.php:109
+#: template.php:119
msgid "yesterday"
msgstr "atzo"
-#: template.php:110
+#: template.php:120
#, php-format
msgid "%d days ago"
msgstr "orain dela %d egun"
-#: template.php:111
+#: template.php:121
msgid "last month"
msgstr "joan den hilabetea"
-#: template.php:112
+#: template.php:122
#, php-format
msgid "%d months ago"
msgstr "orain dela %d hilabete"
-#: template.php:113
+#: template.php:123
msgid "last year"
msgstr "joan den urtea"
-#: template.php:114
+#: template.php:124
msgid "years ago"
msgstr "orain dela urte batzuk"
diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po
index b696af989de..dff5792f80e 100644
--- a/l10n/eu/settings.po
+++ b/l10n/eu/settings.po
@@ -3,6 +3,7 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <asieriko@gmail.com>, 2013.
# <asieriko@gmail.com>, 2012.
# Asier Urio Larrea <asieriko@gmail.com>, 2011.
# Piarres Beobide <pi@beobide.net>, 2012.
@@ -10,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-01-20 00:05+0100\n"
+"PO-Revision-Date: 2013-01-19 00:06+0000\n"
+"Last-Translator: asieriko <asieriko@gmail.com>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -243,11 +244,11 @@ msgstr "Sortu"
#: templates/users.php:35
msgid "Default Storage"
-msgstr ""
+msgstr "Lehenetsitako Biltegiratzea"
#: templates/users.php:42 templates/users.php:138
msgid "Unlimited"
-msgstr ""
+msgstr "Mugarik gabe"
#: templates/users.php:60 templates/users.php:153
msgid "Other"
@@ -259,11 +260,11 @@ msgstr "Talde administradorea"
#: templates/users.php:87
msgid "Storage"
-msgstr ""
+msgstr "Biltegiratzea"
#: templates/users.php:133
msgid "Default"
-msgstr ""
+msgstr "Lehenetsia"
#: templates/users.php:161
msgid "Delete"
diff --git a/l10n/eu/user_ldap.po b/l10n/eu/user_ldap.po
index 6184b2abf9d..546e28b0d75 100644
--- a/l10n/eu/user_ldap.po
+++ b/l10n/eu/user_ldap.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <asieriko@gmail.com>, 2013.
# <asieriko@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-28 00:20+0100\n"
-"PO-Revision-Date: 2012-12-27 20:38+0000\n"
+"POT-Creation-Date: 2013-01-20 00:05+0100\n"
+"PO-Revision-Date: 2013-01-19 00:01+0000\n"
"Last-Translator: asieriko <asieriko@gmail.com>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
@@ -27,8 +28,8 @@ msgstr "<b>Abisua:</b> user_ldap eta user_webdavauth aplikazioak bateraezinak di
#: templates/settings.php:11
msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
msgstr "<b>Abisua:</b> PHPk behar duen LDAP modulua ez dago instalaturik, motorrak ez du funtzionatuko. Mesedez eskatu zure sistema kudeatzaileari instala dezan."
#: templates/settings.php:15
@@ -45,6 +46,10 @@ msgid "Base DN"
msgstr "Oinarrizko DN"
#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr "DN Oinarri bat lerroko"
+
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Erabiltzaile eta taldeentzako Oinarrizko DN zehaztu dezakezu Aurreratu fitxan"
@@ -115,10 +120,18 @@ msgstr "Portua"
msgid "Base User Tree"
msgstr "Oinarrizko Erabiltzaile Zuhaitza"
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr "Erabiltzaile DN Oinarri bat lerroko"
+
#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "Oinarrizko Talde Zuhaitza"
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr "Talde DN Oinarri bat lerroko"
+
#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Talde-Kide elkarketak"
diff --git a/l10n/eu/user_webdavauth.po b/l10n/eu/user_webdavauth.po
index 0f039352404..ada89a92f4d 100644
--- a/l10n/eu/user_webdavauth.po
+++ b/l10n/eu/user_webdavauth.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <asieriko@gmail.com>, 2013.
# <asieriko@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-28 00:20+0100\n"
-"PO-Revision-Date: 2012-12-27 20:58+0000\n"
+"POT-Creation-Date: 2013-01-20 00:05+0100\n"
+"PO-Revision-Date: 2013-01-18 23:47+0000\n"
"Last-Translator: asieriko <asieriko@gmail.com>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
@@ -18,13 +19,17 @@ msgstr ""
"Language: eu\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr "WebDAV Autentikazioa"
+
#: templates/settings.php:4
msgid "URL: http://"
msgstr "URL: http://"
#: templates/settings.php:6
msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
-msgstr "ownCloud erabiltzailearen kredentzialak helbide honetara bidaliko ditu. http 401 eta http 403 kredentzial ez zuzenak bezala hartuko dira eta beste kode guztiak kredentzial zuzentzat hartuko dira."
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
+msgstr "ownCloudek erabiltzailearen kredentzialak URL honetara bidaliko ditu. Plugin honek erantzuna aztertzen du eta HTTP 401 eta 403 egoera kodeak baliogabezko kredentzialtzat hartuko ditu, beste erantzunak kredentzial egokitzat hartuko dituelarik."
diff --git a/l10n/fa/core.po b/l10n/fa/core.po
index 80b891d17b2..363c28a30ab 100644
--- a/l10n/fa/core.po
+++ b/l10n/fa/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-21 08:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
@@ -84,55 +84,55 @@ msgstr ""
msgid "Settings"
msgstr "تنظیمات"
-#: js/js.js:711
+#: js/js.js:706
msgid "seconds ago"
msgstr "ثانیه‌ها پیش"
-#: js/js.js:712
+#: js/js.js:707
msgid "1 minute ago"
msgstr "1 دقیقه پیش"
-#: js/js.js:713
+#: js/js.js:708
msgid "{minutes} minutes ago"
msgstr ""
-#: js/js.js:714
+#: js/js.js:709
msgid "1 hour ago"
msgstr ""
-#: js/js.js:715
+#: js/js.js:710
msgid "{hours} hours ago"
msgstr ""
-#: js/js.js:716
+#: js/js.js:711
msgid "today"
msgstr "امروز"
-#: js/js.js:717
+#: js/js.js:712
msgid "yesterday"
msgstr "دیروز"
-#: js/js.js:718
+#: js/js.js:713
msgid "{days} days ago"
msgstr ""
-#: js/js.js:719
+#: js/js.js:714
msgid "last month"
msgstr "ماه قبل"
-#: js/js.js:720
+#: js/js.js:715
msgid "{months} months ago"
msgstr ""
-#: js/js.js:721
+#: js/js.js:716
msgid "months ago"
msgstr "ماه‌های قبل"
-#: js/js.js:722
+#: js/js.js:717
msgid "last year"
msgstr "سال قبل"
-#: js/js.js:723
+#: js/js.js:718
msgid "years ago"
msgstr "سال‌های قبل"
@@ -208,7 +208,6 @@ msgid "Password protect"
msgstr ""
#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
msgid "Password"
msgstr "گذرواژه"
@@ -246,7 +245,7 @@ msgstr ""
#: js/share.js:296
msgid "Unshare"
-msgstr ""
+msgstr "لغو اشتراک"
#: js/share.js:308
msgid "can edit"
@@ -443,83 +442,83 @@ msgstr "هاست پایگاه داده"
msgid "Finish setup"
msgstr "اتمام نصب"
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:15 templates/layout.user.php:17
msgid "Sunday"
msgstr "یکشنبه"
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:15 templates/layout.user.php:17
msgid "Monday"
msgstr "دوشنبه"
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:15 templates/layout.user.php:17
msgid "Tuesday"
msgstr "سه شنبه"
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:15 templates/layout.user.php:17
msgid "Wednesday"
msgstr "چهارشنبه"
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:15 templates/layout.user.php:17
msgid "Thursday"
msgstr "پنجشنبه"
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:15 templates/layout.user.php:17
msgid "Friday"
msgstr "جمعه"
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:15 templates/layout.user.php:17
msgid "Saturday"
msgstr "شنبه"
-#: templates/layout.guest.php:17 templates/layout.user.php:18
+#: templates/layout.guest.php:16 templates/layout.user.php:18
msgid "January"
msgstr "ژانویه"
-#: templates/layout.guest.php:17 templates/layout.user.php:18
+#: templates/layout.guest.php:16 templates/layout.user.php:18
msgid "February"
msgstr "فبریه"
-#: templates/layout.guest.php:17 templates/layout.user.php:18
+#: templates/layout.guest.php:16 templates/layout.user.php:18
msgid "March"
msgstr "مارس"
-#: templates/layout.guest.php:17 templates/layout.user.php:18
+#: templates/layout.guest.php:16 templates/layout.user.php:18
msgid "April"
msgstr "آوریل"
-#: templates/layout.guest.php:17 templates/layout.user.php:18
+#: templates/layout.guest.php:16 templates/layout.user.php:18
msgid "May"
msgstr "می"
-#: templates/layout.guest.php:17 templates/layout.user.php:18
+#: templates/layout.guest.php:16 templates/layout.user.php:18
msgid "June"
msgstr "ژوئن"
-#: templates/layout.guest.php:17 templates/layout.user.php:18
+#: templates/layout.guest.php:16 templates/layout.user.php:18
msgid "July"
msgstr "جولای"
-#: templates/layout.guest.php:17 templates/layout.user.php:18
+#: templates/layout.guest.php:16 templates/layout.user.php:18
msgid "August"
msgstr "آگوست"
-#: templates/layout.guest.php:17 templates/layout.user.php:18
+#: templates/layout.guest.php:16 templates/layout.user.php:18
msgid "September"
msgstr "سپتامبر"
-#: templates/layout.guest.php:17 templates/layout.user.php:18
+#: templates/layout.guest.php:16 templates/layout.user.php:18
msgid "October"
msgstr "اکتبر"
-#: templates/layout.guest.php:17 templates/layout.user.php:18
+#: templates/layout.guest.php:16 templates/layout.user.php:18
msgid "November"
msgstr "نوامبر"
-#: templates/layout.guest.php:17 templates/layout.user.php:18
+#: templates/layout.guest.php:16 templates/layout.user.php:18
msgid "December"
msgstr "دسامبر"
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:41
msgid "web services under your control"
msgstr "سرویس وب تحت کنترل شما"
@@ -565,17 +564,3 @@ msgstr "بعدی"
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr ""
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr ""
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr ""
diff --git a/l10n/fa/files.po b/l10n/fa/files.po
index ea5bfc082a3..287637e3398 100644
--- a/l10n/fa/files.po
+++ b/l10n/fa/files.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-21 08:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
@@ -20,6 +20,11 @@ msgstr ""
"Language: fa\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#: ajax/delete.php:28 ajax/getstoragestats.php:11 ajax/upload.php:17
+#: ajax/upload.php:76 templates/index.php:18
+msgid "Upload"
+msgstr "بارگذاری"
+
#: ajax/move.php:17
#, php-format
msgid "Could not move %s - File with this name already exists"
@@ -34,46 +39,46 @@ msgstr ""
msgid "Unable to rename file"
msgstr ""
-#: ajax/upload.php:14
+#: ajax/upload.php:20
msgid "No file was uploaded. Unknown error"
msgstr "هیچ فایلی آپلود نشد.خطای ناشناس"
-#: ajax/upload.php:21
+#: ajax/upload.php:30
msgid "There is no error, the file uploaded with success"
msgstr "هیچ خطایی وجود ندارد فایل با موفقیت بار گذاری شد"
-#: ajax/upload.php:22
+#: ajax/upload.php:31
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr ""
-#: ajax/upload.php:24
+#: ajax/upload.php:33
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "حداکثر حجم مجاز برای بارگذاری از طریق HTML \nMAX_FILE_SIZE"
-#: ajax/upload.php:26
+#: ajax/upload.php:35
msgid "The uploaded file was only partially uploaded"
msgstr "مقدار کمی از فایل بارگذاری شده"
-#: ajax/upload.php:27
+#: ajax/upload.php:36
msgid "No file was uploaded"
msgstr "هیچ فایلی بارگذاری نشده"
-#: ajax/upload.php:28
+#: ajax/upload.php:37
msgid "Missing a temporary folder"
msgstr "یک پوشه موقت گم شده است"
-#: ajax/upload.php:29
+#: ajax/upload.php:38
msgid "Failed to write to disk"
msgstr "نوشتن بر روی دیسک سخت ناموفق بود"
-#: ajax/upload.php:45
+#: ajax/upload.php:57
msgid "Not enough space available"
msgstr ""
-#: ajax/upload.php:69
+#: ajax/upload.php:91
msgid "Invalid directory."
msgstr ""
@@ -83,7 +88,7 @@ msgstr "فایل ها"
#: js/fileactions.js:117 templates/index.php:82 templates/index.php:83
msgid "Unshare"
-msgstr ""
+msgstr "لغو اشتراک"
#: js/fileactions.js:119 templates/index.php:88 templates/index.php:89
msgid "Delete"
@@ -129,98 +134,100 @@ msgstr ""
msgid "deleted {files}"
msgstr ""
-#: js/files.js:31
+#: js/files.js:48
msgid "'.' is an invalid file name."
msgstr ""
-#: js/files.js:36
+#: js/files.js:53
msgid "File name cannot be empty."
msgstr ""
-#: js/files.js:45
+#: js/files.js:62
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "در حال ساخت فایل فشرده ممکن است زمان زیادی به طول بیانجامد"
+#: js/files.js:204
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
-#: js/files.js:224
+#: js/files.js:242
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "ناتوان در بارگذاری یا فایل یک پوشه است یا 0بایت دارد"
-#: js/files.js:224
+#: js/files.js:242
msgid "Upload Error"
msgstr "خطا در بار گذاری"
-#: js/files.js:241
+#: js/files.js:259
msgid "Close"
msgstr "بستن"
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:278 js/files.js:397 js/files.js:431
msgid "Pending"
msgstr "در انتظار"
-#: js/files.js:280
+#: js/files.js:298
msgid "1 file uploading"
msgstr ""
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:301 js/files.js:357 js/files.js:372
msgid "{count} files uploading"
msgstr ""
-#: js/files.js:357 js/files.js:393
+#: js/files.js:376 js/files.js:414
msgid "Upload cancelled."
msgstr "بار گذاری لغو شد"
-#: js/files.js:464
+#: js/files.js:486
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/files.js:537
+#: js/files.js:559
msgid "URL cannot be empty."
msgstr ""
-#: js/files.js:543
+#: js/files.js:565
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:727
+#: js/files.js:775
msgid "{count} files scanned"
msgstr ""
-#: js/files.js:735
+#: js/files.js:783
msgid "error while scanning"
msgstr ""
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:857 templates/index.php:64
msgid "Name"
msgstr "نام"
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:858 templates/index.php:75
msgid "Size"
msgstr "اندازه"
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:859 templates/index.php:77
msgid "Modified"
msgstr "تغییر یافته"
-#: js/files.js:829
+#: js/files.js:878
msgid "1 folder"
msgstr ""
-#: js/files.js:831
+#: js/files.js:880
msgid "{count} folders"
msgstr ""
-#: js/files.js:839
+#: js/files.js:888
msgid "1 file"
msgstr ""
-#: js/files.js:841
+#: js/files.js:890
msgid "{count} files"
msgstr ""
@@ -272,10 +279,6 @@ msgstr "پوشه"
msgid "From link"
msgstr ""
-#: templates/index.php:18
-msgid "Upload"
-msgstr "بارگذاری"
-
#: templates/index.php:41
msgid "Cancel upload"
msgstr "متوقف کردن بار گذاری"
diff --git a/l10n/fa/files_encryption.po b/l10n/fa/files_encryption.po
index 74f153d436e..b5ac04c90a9 100644
--- a/l10n/fa/files_encryption.po
+++ b/l10n/fa/files_encryption.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-15 00:02+0100\n"
-"PO-Revision-Date: 2012-11-14 08:31+0000\n"
-"Last-Translator: basir <basir.jafarzadeh@gmail.com>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,18 +19,66 @@ msgstr ""
"Language: fa\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
msgid "Encryption"
msgstr "رمزگذاری"
-#: templates/settings.php:4
+#: templates/settings.php:67
msgid "Exclude the following file types from encryption"
msgstr "نادیده گرفتن فایل های زیر برای رمز گذاری"
-#: templates/settings.php:5
+#: templates/settings.php:71
msgid "None"
msgstr "هیچ‌کدام"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "فعال کردن رمزگذاری"
diff --git a/l10n/fa/files_versions.po b/l10n/fa/files_versions.po
index b7da17a8178..7e657a47ca6 100644
--- a/l10n/fa/files_versions.po
+++ b/l10n/fa/files_versions.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-22 01:14+0200\n"
-"PO-Revision-Date: 2012-09-21 23:15+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,22 +18,10 @@ msgstr ""
"Language: fa\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "انقضای تمامی نسخه‌ها"
-
#: js/versions.js:16
msgid "History"
msgstr ""
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr ""
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr ""
-
#: templates/settings.php:3
msgid "Files Versioning"
msgstr ""
diff --git a/l10n/fa/lib.po b/l10n/fa/lib.po
index 44408cc66f7..52e8d62eef4 100644
--- a/l10n/fa/lib.po
+++ b/l10n/fa/lib.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-14 23:13+0000\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
@@ -18,51 +18,55 @@ msgstr ""
"Language: fa\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: app.php:285
+#: app.php:301
msgid "Help"
msgstr "راه‌نما"
-#: app.php:292
+#: app.php:308
msgid "Personal"
msgstr "شخصی"
-#: app.php:297
+#: app.php:313
msgid "Settings"
msgstr "تنظیمات"
-#: app.php:302
+#: app.php:318
msgid "Users"
msgstr "کاربران"
-#: app.php:309
+#: app.php:325
msgid "Apps"
msgstr ""
-#: app.php:311
+#: app.php:327
msgid "Admin"
msgstr "مدیر"
-#: files.php:332
+#: files.php:365
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:333
+#: files.php:366
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:333 files.php:358
+#: files.php:366 files.php:391
msgid "Back to Files"
msgstr ""
-#: files.php:357
+#: files.php:390
msgid "Selected files too large to generate zip file."
msgstr ""
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr ""
+
#: json.php:28
msgid "Application is not enabled"
msgstr ""
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
msgstr "خطا در اعتبار سنجی"
@@ -82,55 +86,55 @@ msgstr "متن"
msgid "Images"
msgstr ""
-#: template.php:103
+#: template.php:113
msgid "seconds ago"
msgstr "ثانیه‌ها پیش"
-#: template.php:104
+#: template.php:114
msgid "1 minute ago"
msgstr "1 دقیقه پیش"
-#: template.php:105
+#: template.php:115
#, php-format
msgid "%d minutes ago"
msgstr "%d دقیقه پیش"
-#: template.php:106
+#: template.php:116
msgid "1 hour ago"
msgstr ""
-#: template.php:107
+#: template.php:117
#, php-format
msgid "%d hours ago"
msgstr ""
-#: template.php:108
+#: template.php:118
msgid "today"
msgstr "امروز"
-#: template.php:109
+#: template.php:119
msgid "yesterday"
msgstr "دیروز"
-#: template.php:110
+#: template.php:120
#, php-format
msgid "%d days ago"
msgstr ""
-#: template.php:111
+#: template.php:121
msgid "last month"
msgstr "ماه قبل"
-#: template.php:112
+#: template.php:122
#, php-format
msgid "%d months ago"
msgstr ""
-#: template.php:113
+#: template.php:123
msgid "last year"
msgstr "سال قبل"
-#: template.php:114
+#: template.php:124
msgid "years ago"
msgstr "سال‌های قبل"
diff --git a/l10n/fa/user_ldap.po b/l10n/fa/user_ldap.po
index f7e8c607e27..b9a2a147546 100644
--- a/l10n/fa/user_ldap.po
+++ b/l10n/fa/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 23:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
@@ -27,8 +27,8 @@ msgstr ""
#: templates/settings.php:11
msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
msgstr ""
#: templates/settings.php:15
@@ -45,6 +45,10 @@ msgid "Base DN"
msgstr ""
#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
@@ -115,10 +119,18 @@ msgstr ""
msgid "Base User Tree"
msgstr ""
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
diff --git a/l10n/fa/user_webdavauth.po b/l10n/fa/user_webdavauth.po
index 2987a7b6bdb..e4088da32dd 100644
--- a/l10n/fa/user_webdavauth.po
+++ b/l10n/fa/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-20 00:11+0100\n"
-"PO-Revision-Date: 2012-12-19 23:12+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
@@ -17,13 +17,17 @@ msgstr ""
"Language: fa\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
#: templates/settings.php:4
msgid "URL: http://"
msgstr ""
#: templates/settings.php:6
msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
msgstr ""
diff --git a/l10n/fi_FI/core.po b/l10n/fi_FI/core.po
index cdcdcda1522..7aa46f13517 100644
--- a/l10n/fi_FI/core.po
+++ b/l10n/fi_FI/core.po
@@ -14,8 +14,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-13 00:08+0100\n"
-"PO-Revision-Date: 2013-01-12 16:33+0000\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 09:13+0000\n"
"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
@@ -75,7 +75,7 @@ msgstr ""
#: ajax/vcategories/addToFavorites.php:35
#, php-format
msgid "Error adding %s to favorites."
-msgstr ""
+msgstr "Virhe lisätessä kohdetta %s suosikkeihin."
#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
msgid "No categories selected for deletion."
@@ -84,7 +84,7 @@ msgstr "Luokkia ei valittu poistettavaksi."
#: ajax/vcategories/removeFromFavorites.php:35
#, php-format
msgid "Error removing %s from favorites."
-msgstr ""
+msgstr "Virhe poistaessa kohdetta %s suosikeista."
#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
msgid "Settings"
@@ -195,15 +195,15 @@ msgstr "Virhe oikeuksia muuttaessa"
#: js/share.js:151
msgid "Shared with you and the group {group} by {owner}"
-msgstr ""
+msgstr "Jaettu sinun ja ryhmän {group} kanssa käyttäjän {owner} toimesta"
#: js/share.js:153
msgid "Shared with you by {owner}"
-msgstr ""
+msgstr "Jaettu kanssasi käyttäjän {owner} toimesta"
#: js/share.js:158
msgid "Share with"
-msgstr ""
+msgstr "Jaa"
#: js/share.js:163
msgid "Share with link"
@@ -214,7 +214,6 @@ msgid "Password protect"
msgstr "Suojaa salasanalla"
#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
msgid "Password"
msgstr "Salasana"
@@ -571,17 +570,3 @@ msgstr "seuraava"
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
msgstr "Päivitetään ownCloud versioon %s, tämä saattaa kestää hetken."
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "Turvallisuusvaroitus!"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "Vahvista salasanasi. <br/>Turvallisuussyistä sinulta saatetaan ajoittain kysyä salasanasi uudelleen."
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "Vahvista"
diff --git a/l10n/fi_FI/files.po b/l10n/fi_FI/files.po
index cf08585d92b..a0d18954d98 100644
--- a/l10n/fi_FI/files.po
+++ b/l10n/fi_FI/files.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-11 00:05+0100\n"
-"PO-Revision-Date: 2013-01-10 19:12+0000\n"
+"POT-Creation-Date: 2013-01-21 00:04+0100\n"
+"PO-Revision-Date: 2013-01-20 11:41+0000\n"
"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
@@ -22,6 +22,11 @@ msgstr ""
"Language: fi_FI\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/delete.php:28 ajax/getstoragestats.php:11 ajax/upload.php:17
+#: ajax/upload.php:76 templates/index.php:18
+msgid "Upload"
+msgstr "Lähetä"
+
#: ajax/move.php:17
#, php-format
msgid "Could not move %s - File with this name already exists"
@@ -36,46 +41,46 @@ msgstr "Kohteen %s siirto ei onnistunut"
msgid "Unable to rename file"
msgstr "Tiedoston nimeäminen uudelleen ei onnistunut"
-#: ajax/upload.php:14
+#: ajax/upload.php:20
msgid "No file was uploaded. Unknown error"
msgstr "Tiedostoa ei lähetetty. Tuntematon virhe"
-#: ajax/upload.php:21
+#: ajax/upload.php:30
msgid "There is no error, the file uploaded with success"
msgstr "Ei virheitä, tiedosto lähetettiin onnistuneesti"
-#: ajax/upload.php:22
+#: ajax/upload.php:31
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr ""
-#: ajax/upload.php:24
+#: ajax/upload.php:33
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "Lähetetty tiedosto ylittää HTML-lomakkeessa määritetyn MAX_FILE_SIZE-arvon ylärajan"
-#: ajax/upload.php:26
+#: ajax/upload.php:35
msgid "The uploaded file was only partially uploaded"
msgstr "Tiedoston lähetys onnistui vain osittain"
-#: ajax/upload.php:27
+#: ajax/upload.php:36
msgid "No file was uploaded"
msgstr "Yhtäkään tiedostoa ei lähetetty"
-#: ajax/upload.php:28
+#: ajax/upload.php:37
msgid "Missing a temporary folder"
msgstr "Väliaikaiskansiota ei ole olemassa"
-#: ajax/upload.php:29
+#: ajax/upload.php:38
msgid "Failed to write to disk"
msgstr "Levylle kirjoitus epäonnistui"
-#: ajax/upload.php:45
+#: ajax/upload.php:57
msgid "Not enough space available"
msgstr "Tilaa ei ole riittävästi"
-#: ajax/upload.php:69
+#: ajax/upload.php:91
msgid "Invalid directory."
msgstr "Virheellinen kansio."
@@ -131,98 +136,100 @@ msgstr ""
msgid "deleted {files}"
msgstr ""
-#: js/files.js:31
+#: js/files.js:48
msgid "'.' is an invalid file name."
msgstr "'.' on virheellinen nimi tiedostolle."
-#: js/files.js:36
+#: js/files.js:53
msgid "File name cannot be empty."
msgstr "Tiedoston nimi ei voi olla tyhjä."
-#: js/files.js:45
+#: js/files.js:62
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Virheellinen nimi, merkit '\\', '/', '<', '>', ':', '\"', '|', '?' ja '*' eivät ole sallittuja."
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "luodaan ZIP-tiedostoa, tämä saattaa kestää hetken."
+#: js/files.js:204
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr "Lataustasi valmistellaan. Tämä saattaa kestää hetken, jos tiedostot ovat suuria kooltaan."
-#: js/files.js:224
+#: js/files.js:242
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Tiedoston lähetys epäonnistui, koska sen koko on 0 tavua tai kyseessä on kansio"
-#: js/files.js:224
+#: js/files.js:242
msgid "Upload Error"
msgstr "Lähetysvirhe."
-#: js/files.js:241
+#: js/files.js:259
msgid "Close"
msgstr "Sulje"
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:278 js/files.js:397 js/files.js:431
msgid "Pending"
msgstr "Odottaa"
-#: js/files.js:280
+#: js/files.js:298
msgid "1 file uploading"
msgstr ""
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:301 js/files.js:357 js/files.js:372
msgid "{count} files uploading"
msgstr ""
-#: js/files.js:357 js/files.js:393
+#: js/files.js:376 js/files.js:414
msgid "Upload cancelled."
msgstr "Lähetys peruttu."
-#: js/files.js:464
+#: js/files.js:486
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Tiedoston lähetys on meneillään. Sivulta poistuminen nyt peruu tiedoston lähetyksen."
-#: js/files.js:537
+#: js/files.js:559
msgid "URL cannot be empty."
msgstr "Verkko-osoite ei voi olla tyhjä"
-#: js/files.js:543
+#: js/files.js:565
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:727
+#: js/files.js:775
msgid "{count} files scanned"
msgstr ""
-#: js/files.js:735
+#: js/files.js:783
msgid "error while scanning"
msgstr ""
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:857 templates/index.php:64
msgid "Name"
msgstr "Nimi"
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:858 templates/index.php:75
msgid "Size"
msgstr "Koko"
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:859 templates/index.php:77
msgid "Modified"
msgstr "Muutettu"
-#: js/files.js:829
+#: js/files.js:878
msgid "1 folder"
msgstr "1 kansio"
-#: js/files.js:831
+#: js/files.js:880
msgid "{count} folders"
msgstr "{count} kansiota"
-#: js/files.js:839
+#: js/files.js:888
msgid "1 file"
msgstr "1 tiedosto"
-#: js/files.js:841
+#: js/files.js:890
msgid "{count} files"
msgstr "{count} tiedostoa"
@@ -274,10 +281,6 @@ msgstr "Kansio"
msgid "From link"
msgstr "Linkistä"
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Lähetä"
-
#: templates/index.php:41
msgid "Cancel upload"
msgstr "Peru lähetys"
diff --git a/l10n/fi_FI/files_encryption.po b/l10n/fi_FI/files_encryption.po
index 89ad916e382..5f635937590 100644
--- a/l10n/fi_FI/files_encryption.po
+++ b/l10n/fi_FI/files_encryption.po
@@ -8,28 +8,76 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-17 00:44+0200\n"
-"PO-Revision-Date: 2012-08-16 10:56+0000\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: fi_FI\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
msgid "Encryption"
msgstr "Salaus"
-#: templates/settings.php:4
+#: templates/settings.php:67
msgid "Exclude the following file types from encryption"
msgstr "Jätä seuraavat tiedostotyypit salaamatta"
-#: templates/settings.php:5
+#: templates/settings.php:71
msgid "None"
msgstr "Ei mitään"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "Käytä salausta"
diff --git a/l10n/fi_FI/files_versions.po b/l10n/fi_FI/files_versions.po
index ab692d6056c..4a04a540a90 100644
--- a/l10n/fi_FI/files_versions.po
+++ b/l10n/fi_FI/files_versions.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-27 02:01+0200\n"
-"PO-Revision-Date: 2012-09-26 12:22+0000\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,22 +18,10 @@ msgstr ""
"Language: fi_FI\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "Vanhenna kaikki versiot"
-
#: js/versions.js:16
msgid "History"
msgstr "Historia"
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "Versiot"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "Tämä poistaa kaikki tiedostojesi olemassa olevat varmuuskopioversiot"
-
#: templates/settings.php:3
msgid "Files Versioning"
msgstr "Tiedostojen versiointi"
diff --git a/l10n/fi_FI/lib.po b/l10n/fi_FI/lib.po
index 0669c281cf6..7b90f23c2cd 100644
--- a/l10n/fi_FI/lib.po
+++ b/l10n/fi_FI/lib.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Jiri Grönroos <jiri.gronroos@iki.fi>, 2012.
+# Jiri Grönroos <jiri.gronroos@iki.fi>, 2012-2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-15 20:58+0000\n"
+"POT-Creation-Date: 2013-01-18 00:03+0100\n"
+"PO-Revision-Date: 2013-01-17 08:40+0000\n"
"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
@@ -18,51 +18,55 @@ msgstr ""
"Language: fi_FI\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:285
+#: app.php:301
msgid "Help"
msgstr "Ohje"
-#: app.php:292
+#: app.php:308
msgid "Personal"
msgstr "Henkilökohtainen"
-#: app.php:297
+#: app.php:313
msgid "Settings"
msgstr "Asetukset"
-#: app.php:302
+#: app.php:318
msgid "Users"
msgstr "Käyttäjät"
-#: app.php:309
+#: app.php:325
msgid "Apps"
msgstr "Sovellukset"
-#: app.php:311
+#: app.php:327
msgid "Admin"
msgstr "Ylläpitäjä"
-#: files.php:332
+#: files.php:365
msgid "ZIP download is turned off."
msgstr "ZIP-lataus on poistettu käytöstä."
-#: files.php:333
+#: files.php:366
msgid "Files need to be downloaded one by one."
msgstr "Tiedostot on ladattava yksittäin."
-#: files.php:333 files.php:358
+#: files.php:366 files.php:391
msgid "Back to Files"
msgstr "Takaisin tiedostoihin"
-#: files.php:357
+#: files.php:390
msgid "Selected files too large to generate zip file."
msgstr "Valitut tiedostot ovat liian suurikokoisia mahtuakseen zip-tiedostoon."
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr "ei voitu määrittää"
+
#: json.php:28
msgid "Application is not enabled"
msgstr "Sovellusta ei ole otettu käyttöön"
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
msgstr "Todennusvirhe"
@@ -82,55 +86,55 @@ msgstr "Teksti"
msgid "Images"
msgstr "Kuvat"
-#: template.php:103
+#: template.php:113
msgid "seconds ago"
msgstr "sekuntia sitten"
-#: template.php:104
+#: template.php:114
msgid "1 minute ago"
msgstr "1 minuutti sitten"
-#: template.php:105
+#: template.php:115
#, php-format
msgid "%d minutes ago"
msgstr "%d minuuttia sitten"
-#: template.php:106
+#: template.php:116
msgid "1 hour ago"
msgstr "1 tunti sitten"
-#: template.php:107
+#: template.php:117
#, php-format
msgid "%d hours ago"
msgstr "%d tuntia sitten"
-#: template.php:108
+#: template.php:118
msgid "today"
msgstr "tänään"
-#: template.php:109
+#: template.php:119
msgid "yesterday"
msgstr "eilen"
-#: template.php:110
+#: template.php:120
#, php-format
msgid "%d days ago"
msgstr "%d päivää sitten"
-#: template.php:111
+#: template.php:121
msgid "last month"
msgstr "viime kuussa"
-#: template.php:112
+#: template.php:122
#, php-format
msgid "%d months ago"
msgstr "%d kuukautta sitten"
-#: template.php:113
+#: template.php:123
msgid "last year"
msgstr "viime vuonna"
-#: template.php:114
+#: template.php:124
msgid "years ago"
msgstr "vuotta sitten"
diff --git a/l10n/fi_FI/user_ldap.po b/l10n/fi_FI/user_ldap.po
index 6f821f095c1..94f7ad7b4bb 100644
--- a/l10n/fi_FI/user_ldap.po
+++ b/l10n/fi_FI/user_ldap.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 23:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
@@ -29,8 +29,8 @@ msgstr ""
#: templates/settings.php:11
msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
msgstr ""
#: templates/settings.php:15
@@ -47,6 +47,10 @@ msgid "Base DN"
msgstr "Oletus DN"
#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Voit määrittää käyttäjien ja ryhmien oletus DN:n (distinguished name) 'tarkemmat asetukset'-välilehdeltä "
@@ -117,10 +121,18 @@ msgstr "Portti"
msgid "Base User Tree"
msgstr "Oletuskäyttäjäpuu"
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "Ryhmien juuri"
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Ryhmän ja jäsenen assosiaatio (yhteys)"
diff --git a/l10n/fi_FI/user_webdavauth.po b/l10n/fi_FI/user_webdavauth.po
index 1bf07546c14..c42c6d288e6 100644
--- a/l10n/fi_FI/user_webdavauth.po
+++ b/l10n/fi_FI/user_webdavauth.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-20 00:11+0100\n"
-"PO-Revision-Date: 2012-12-19 23:12+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
@@ -18,13 +18,17 @@ msgstr ""
"Language: fi_FI\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
#: templates/settings.php:4
msgid "URL: http://"
msgstr ""
#: templates/settings.php:6
msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
msgstr ""
diff --git a/l10n/fr/core.po b/l10n/fr/core.po
index ae26555f77a..512141ccb68 100644
--- a/l10n/fr/core.po
+++ b/l10n/fr/core.po
@@ -18,8 +18,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
@@ -218,7 +218,6 @@ msgid "Password protect"
msgstr "Protéger par un mot de passe"
#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
msgid "Password"
msgstr "Mot de passe"
@@ -575,17 +574,3 @@ msgstr "suivant"
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
msgstr "Mise à jour en cours d'ownCloud vers la version %s, cela peut prendre du temps."
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "Alerte de sécurité !"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "Veuillez vérifier votre mot de passe. <br/>Par sécurité il vous sera occasionnellement demandé d'entrer votre mot de passe de nouveau."
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "Vérification"
diff --git a/l10n/fr/files.po b/l10n/fr/files.po
index cd05b6ab167..ca272a1b288 100644
--- a/l10n/fr/files.po
+++ b/l10n/fr/files.po
@@ -19,9 +19,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-11 00:05+0100\n"
-"PO-Revision-Date: 2013-01-09 23:40+0000\n"
-"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
+"POT-Creation-Date: 2013-01-20 00:05+0100\n"
+"PO-Revision-Date: 2013-01-19 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -29,6 +29,11 @@ msgstr ""
"Language: fr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+#: ajax/delete.php:28 ajax/getstoragestats.php:11 ajax/upload.php:17
+#: ajax/upload.php:76 templates/index.php:18
+msgid "Upload"
+msgstr "Envoyer"
+
#: ajax/move.php:17
#, php-format
msgid "Could not move %s - File with this name already exists"
@@ -43,46 +48,46 @@ msgstr "Impossible de déplacer %s"
msgid "Unable to rename file"
msgstr "Impossible de renommer le fichier"
-#: ajax/upload.php:14
+#: ajax/upload.php:20
msgid "No file was uploaded. Unknown error"
msgstr "Aucun fichier n'a été chargé. Erreur inconnue"
-#: ajax/upload.php:21
+#: ajax/upload.php:30
msgid "There is no error, the file uploaded with success"
msgstr "Aucune erreur, le fichier a été téléversé avec succès"
-#: ajax/upload.php:22
+#: ajax/upload.php:31
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr "Le fichier envoyé dépasse la valeur upload_max_filesize située dans le fichier php.ini:"
-#: ajax/upload.php:24
+#: ajax/upload.php:33
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "Le fichier téléversé excède la valeur de MAX_FILE_SIZE spécifiée dans le formulaire HTML"
-#: ajax/upload.php:26
+#: ajax/upload.php:35
msgid "The uploaded file was only partially uploaded"
msgstr "Le fichier n'a été que partiellement téléversé"
-#: ajax/upload.php:27
+#: ajax/upload.php:36
msgid "No file was uploaded"
msgstr "Aucun fichier n'a été téléversé"
-#: ajax/upload.php:28
+#: ajax/upload.php:37
msgid "Missing a temporary folder"
msgstr "Il manque un répertoire temporaire"
-#: ajax/upload.php:29
+#: ajax/upload.php:38
msgid "Failed to write to disk"
msgstr "Erreur d'écriture sur le disque"
-#: ajax/upload.php:45
+#: ajax/upload.php:57
msgid "Not enough space available"
msgstr "Espace disponible insuffisant"
-#: ajax/upload.php:69
+#: ajax/upload.php:91
msgid "Invalid directory."
msgstr "Dossier invalide."
@@ -138,98 +143,100 @@ msgstr "Fichiers non partagés : {files}"
msgid "deleted {files}"
msgstr "Fichiers supprimés : {files}"
-#: js/files.js:31
+#: js/files.js:48
msgid "'.' is an invalid file name."
msgstr "'.' n'est pas un nom de fichier valide."
-#: js/files.js:36
+#: js/files.js:53
msgid "File name cannot be empty."
msgstr "Le nom de fichier ne peut être vide."
-#: js/files.js:45
+#: js/files.js:62
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Nom invalide, les caractères '\\', '/', '<', '>', ':', '\"', '|', '?' et '*' ne sont pas autorisés."
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "Fichier ZIP en cours d'assemblage ; cela peut prendre du temps."
+#: js/files.js:204
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
-#: js/files.js:224
+#: js/files.js:242
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Impossible de charger vos fichiers car il s'agit d'un dossier ou le fichier fait 0 octet."
-#: js/files.js:224
+#: js/files.js:242
msgid "Upload Error"
msgstr "Erreur de chargement"
-#: js/files.js:241
+#: js/files.js:259
msgid "Close"
msgstr "Fermer"
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:278 js/files.js:397 js/files.js:431
msgid "Pending"
msgstr "En cours"
-#: js/files.js:280
+#: js/files.js:298
msgid "1 file uploading"
msgstr "1 fichier en cours de téléchargement"
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:301 js/files.js:357 js/files.js:372
msgid "{count} files uploading"
msgstr "{count} fichiers téléversés"
-#: js/files.js:357 js/files.js:393
+#: js/files.js:376 js/files.js:414
msgid "Upload cancelled."
msgstr "Chargement annulé."
-#: js/files.js:464
+#: js/files.js:486
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "L'envoi du fichier est en cours. Quitter cette page maintenant annulera l'envoi du fichier."
-#: js/files.js:537
+#: js/files.js:559
msgid "URL cannot be empty."
msgstr "L'URL ne peut-être vide"
-#: js/files.js:543
+#: js/files.js:565
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Nom de dossier invalide. L'utilisation du mot 'Shared' est réservée à Owncloud"
-#: js/files.js:727
+#: js/files.js:775
msgid "{count} files scanned"
msgstr "{count} fichiers indexés"
-#: js/files.js:735
+#: js/files.js:783
msgid "error while scanning"
msgstr "erreur lors de l'indexation"
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:857 templates/index.php:64
msgid "Name"
msgstr "Nom"
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:858 templates/index.php:75
msgid "Size"
msgstr "Taille"
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:859 templates/index.php:77
msgid "Modified"
msgstr "Modifié"
-#: js/files.js:829
+#: js/files.js:878
msgid "1 folder"
msgstr "1 dossier"
-#: js/files.js:831
+#: js/files.js:880
msgid "{count} folders"
msgstr "{count} dossiers"
-#: js/files.js:839
+#: js/files.js:888
msgid "1 file"
msgstr "1 fichier"
-#: js/files.js:841
+#: js/files.js:890
msgid "{count} files"
msgstr "{count} fichiers"
@@ -281,10 +288,6 @@ msgstr "Dossier"
msgid "From link"
msgstr "Depuis le lien"
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Envoyer"
-
#: templates/index.php:41
msgid "Cancel upload"
msgstr "Annuler l'envoi"
diff --git a/l10n/fr/files_encryption.po b/l10n/fr/files_encryption.po
index cbad09601fc..8c8754a7a81 100644
--- a/l10n/fr/files_encryption.po
+++ b/l10n/fr/files_encryption.po
@@ -8,28 +8,76 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-15 02:02+0200\n"
-"PO-Revision-Date: 2012-08-14 16:26+0000\n"
-"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: fr\n"
-"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
msgid "Encryption"
msgstr "Chiffrement"
-#: templates/settings.php:4
+#: templates/settings.php:67
msgid "Exclude the following file types from encryption"
msgstr "Ne pas chiffrer les fichiers dont les types sont les suivants"
-#: templates/settings.php:5
+#: templates/settings.php:71
msgid "None"
msgstr "Aucun"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "Activer le chiffrement"
diff --git a/l10n/fr/files_versions.po b/l10n/fr/files_versions.po
index a88cc9a369b..1fb4fdb1de2 100644
--- a/l10n/fr/files_versions.po
+++ b/l10n/fr/files_versions.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-25 02:02+0200\n"
-"PO-Revision-Date: 2012-09-24 14:20+0000\n"
-"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,22 +18,10 @@ msgstr ""
"Language: fr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "Supprimer les versions intermédiaires"
-
#: js/versions.js:16
msgid "History"
msgstr "Historique"
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "Versions"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "Cette opération va effacer toutes les versions intermédiaires de vos fichiers (et ne garder que la dernière version en date)."
-
#: templates/settings.php:3
msgid "Files Versioning"
msgstr "Versionnage des fichiers"
diff --git a/l10n/fr/lib.po b/l10n/fr/lib.po
index 7617ac30e7d..07fd3669c49 100644
--- a/l10n/fr/lib.po
+++ b/l10n/fr/lib.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-26 00:01+0100\n"
-"PO-Revision-Date: 2012-11-25 00:56+0000\n"
-"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,51 +19,55 @@ msgstr ""
"Language: fr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: app.php:285
+#: app.php:301
msgid "Help"
msgstr "Aide"
-#: app.php:292
+#: app.php:308
msgid "Personal"
msgstr "Personnel"
-#: app.php:297
+#: app.php:313
msgid "Settings"
msgstr "Paramètres"
-#: app.php:302
+#: app.php:318
msgid "Users"
msgstr "Utilisateurs"
-#: app.php:309
+#: app.php:325
msgid "Apps"
msgstr "Applications"
-#: app.php:311
+#: app.php:327
msgid "Admin"
msgstr "Administration"
-#: files.php:361
+#: files.php:365
msgid "ZIP download is turned off."
msgstr "Téléchargement ZIP désactivé."
-#: files.php:362
+#: files.php:366
msgid "Files need to be downloaded one by one."
msgstr "Les fichiers nécessitent d'être téléchargés un par un."
-#: files.php:362 files.php:387
+#: files.php:366 files.php:391
msgid "Back to Files"
msgstr "Retour aux Fichiers"
-#: files.php:386
+#: files.php:390
msgid "Selected files too large to generate zip file."
msgstr "Les fichiers sélectionnés sont trop volumineux pour être compressés."
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr ""
+
#: json.php:28
msgid "Application is not enabled"
msgstr "L'application n'est pas activée"
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
msgstr "Erreur d'authentification"
@@ -83,55 +87,55 @@ msgstr "Texte"
msgid "Images"
msgstr "Images"
-#: template.php:103
+#: template.php:113
msgid "seconds ago"
msgstr "à l'instant"
-#: template.php:104
+#: template.php:114
msgid "1 minute ago"
msgstr "il y a 1 minute"
-#: template.php:105
+#: template.php:115
#, php-format
msgid "%d minutes ago"
msgstr "il y a %d minutes"
-#: template.php:106
+#: template.php:116
msgid "1 hour ago"
msgstr "Il y a une heure"
-#: template.php:107
+#: template.php:117
#, php-format
msgid "%d hours ago"
msgstr "Il y a %d heures"
-#: template.php:108
+#: template.php:118
msgid "today"
msgstr "aujourd'hui"
-#: template.php:109
+#: template.php:119
msgid "yesterday"
msgstr "hier"
-#: template.php:110
+#: template.php:120
#, php-format
msgid "%d days ago"
msgstr "il y a %d jours"
-#: template.php:111
+#: template.php:121
msgid "last month"
msgstr "le mois dernier"
-#: template.php:112
+#: template.php:122
#, php-format
msgid "%d months ago"
msgstr "Il y a %d mois"
-#: template.php:113
+#: template.php:123
msgid "last year"
msgstr "l'année dernière"
-#: template.php:114
+#: template.php:124
msgid "years ago"
msgstr "il y a plusieurs années"
diff --git a/l10n/fr/user_ldap.po b/l10n/fr/user_ldap.po
index d435d3b77ce..c437634e5ed 100644
--- a/l10n/fr/user_ldap.po
+++ b/l10n/fr/user_ldap.po
@@ -13,9 +13,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-25 00:10+0100\n"
-"PO-Revision-Date: 2012-12-24 14:18+0000\n"
-"Last-Translator: mishka <mishka.lazzlo@gmail.com>\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 23:20+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -32,9 +32,9 @@ msgstr "<b>Avertissement:</b> Les applications user_ldap et user_webdavauth sont
#: templates/settings.php:11
msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
-msgstr "<b>Avertissement:</b> Le module PHP LDAP requis n'est pas installé, l'application ne marchera pas. Contactez votre administrateur système pour qu'il l'installe."
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
+msgstr ""
#: templates/settings.php:15
msgid "Host"
@@ -50,6 +50,10 @@ msgid "Base DN"
msgstr "DN Racine"
#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Vous pouvez détailler les DN Racines de vos utilisateurs et groupes dans l'onglet Avancé"
@@ -120,10 +124,18 @@ msgstr "Port"
msgid "Base User Tree"
msgstr "DN racine de l'arbre utilisateurs"
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "DN racine de l'arbre groupes"
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Association groupe-membre"
diff --git a/l10n/fr/user_webdavauth.po b/l10n/fr/user_webdavauth.po
index d99b5eb69dc..ec81f76c54d 100644
--- a/l10n/fr/user_webdavauth.po
+++ b/l10n/fr/user_webdavauth.po
@@ -12,9 +12,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-13 00:08+0100\n"
-"PO-Revision-Date: 2013-01-12 17:09+0000\n"
-"Last-Translator: mishka <mishka.lazzlo@gmail.com>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -22,13 +22,17 @@ msgstr ""
"Language: fr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
#: templates/settings.php:4
msgid "URL: http://"
msgstr "URL : http://"
#: templates/settings.php:6
msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
-msgstr "ownCloud "
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
+msgstr ""
diff --git a/l10n/gl/core.po b/l10n/gl/core.po
index 01745599b05..de2454855f0 100644
--- a/l10n/gl/core.po
+++ b/l10n/gl/core.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-14 00:17+0100\n"
-"PO-Revision-Date: 2013-01-13 10:51+0000\n"
-"Last-Translator: Xosé M. Lamas <correo.xmgz@gmail.com>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -210,7 +210,6 @@ msgid "Password protect"
msgstr "Protexido con contrasinais"
#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
msgid "Password"
msgstr "Contrasinal"
@@ -567,17 +566,3 @@ msgstr "seguinte"
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
msgstr "Actualizando ownCloud a versión %s, esto pode levar un anaco."
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "Advertencia de seguranza"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "Verifique o seu contrasinal.<br/>Por motivos de seguranza pode que ocasionalmente se lle pregunte de novo polo seu contrasinal."
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "Verificar"
diff --git a/l10n/gl/files.po b/l10n/gl/files.po
index 2387a6610f3..d7711dff1bf 100644
--- a/l10n/gl/files.po
+++ b/l10n/gl/files.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-14 00:17+0100\n"
-"PO-Revision-Date: 2013-01-13 10:49+0000\n"
-"Last-Translator: Xosé M. Lamas <correo.xmgz@gmail.com>\n"
+"POT-Creation-Date: 2013-01-20 00:05+0100\n"
+"PO-Revision-Date: 2013-01-19 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,6 +19,11 @@ msgstr ""
"Language: gl\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/delete.php:28 ajax/getstoragestats.php:11 ajax/upload.php:17
+#: ajax/upload.php:76 templates/index.php:18
+msgid "Upload"
+msgstr "Enviar"
+
#: ajax/move.php:17
#, php-format
msgid "Could not move %s - File with this name already exists"
@@ -33,46 +38,46 @@ msgstr "Non se puido mover %s"
msgid "Unable to rename file"
msgstr "Non se pode renomear o ficheiro"
-#: ajax/upload.php:14
+#: ajax/upload.php:20
msgid "No file was uploaded. Unknown error"
msgstr "Non se subiu ningún ficheiro. Erro descoñecido."
-#: ajax/upload.php:21
+#: ajax/upload.php:30
msgid "There is no error, the file uploaded with success"
msgstr "Non hai erros. O ficheiro enviouse correctamente"
-#: ajax/upload.php:22
+#: ajax/upload.php:31
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr "O ficheiro subido excede a directiva indicada polo tamaño_máximo_de_subida de php.ini"
-#: ajax/upload.php:24
+#: ajax/upload.php:33
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "O ficheiro enviado supera a directiva MAX_FILE_SIZE que foi indicada no formulario HTML"
-#: ajax/upload.php:26
+#: ajax/upload.php:35
msgid "The uploaded file was only partially uploaded"
msgstr "O ficheiro enviado foi só parcialmente enviado"
-#: ajax/upload.php:27
+#: ajax/upload.php:36
msgid "No file was uploaded"
msgstr "Non se enviou ningún ficheiro"
-#: ajax/upload.php:28
+#: ajax/upload.php:37
msgid "Missing a temporary folder"
msgstr "Falta un cartafol temporal"
-#: ajax/upload.php:29
+#: ajax/upload.php:38
msgid "Failed to write to disk"
msgstr "Erro ao escribir no disco"
-#: ajax/upload.php:45
+#: ajax/upload.php:57
msgid "Not enough space available"
msgstr "O espazo dispoñíbel é insuficiente"
-#: ajax/upload.php:69
+#: ajax/upload.php:91
msgid "Invalid directory."
msgstr "O directorio é incorrecto."
@@ -128,98 +133,100 @@ msgstr "{files} sen compartir"
msgid "deleted {files}"
msgstr "{files} eliminados"
-#: js/files.js:31
+#: js/files.js:48
msgid "'.' is an invalid file name."
msgstr "'.' é un nonme de ficheiro non válido"
-#: js/files.js:36
+#: js/files.js:53
msgid "File name cannot be empty."
msgstr "O nome de ficheiro non pode estar baldeiro"
-#: js/files.js:45
+#: js/files.js:62
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Nome non válido, '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' non se permiten."
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "xerando un ficheiro ZIP, o que pode levar un anaco."
+#: js/files.js:204
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
-#: js/files.js:224
+#: js/files.js:242
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Non se puido subir o ficheiro pois ou é un directorio ou ten 0 bytes"
-#: js/files.js:224
+#: js/files.js:242
msgid "Upload Error"
msgstr "Erro na subida"
-#: js/files.js:241
+#: js/files.js:259
msgid "Close"
msgstr "Pechar"
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:278 js/files.js:397 js/files.js:431
msgid "Pending"
msgstr "Pendentes"
-#: js/files.js:280
+#: js/files.js:298
msgid "1 file uploading"
msgstr "1 ficheiro subíndose"
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:301 js/files.js:357 js/files.js:372
msgid "{count} files uploading"
msgstr "{count} ficheiros subíndose"
-#: js/files.js:357 js/files.js:393
+#: js/files.js:376 js/files.js:414
msgid "Upload cancelled."
msgstr "Subida cancelada."
-#: js/files.js:464
+#: js/files.js:486
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "A subida do ficheiro está en curso. Saír agora da páxina cancelará a subida."
-#: js/files.js:537
+#: js/files.js:559
msgid "URL cannot be empty."
msgstr "URL non pode quedar baleiro."
-#: js/files.js:543
+#: js/files.js:565
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Nome de cartafol non válido. O uso de 'Shared' está reservado por Owncloud"
-#: js/files.js:727
+#: js/files.js:775
msgid "{count} files scanned"
msgstr "{count} ficheiros escaneados"
-#: js/files.js:735
+#: js/files.js:783
msgid "error while scanning"
msgstr "erro mentres analizaba"
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:857 templates/index.php:64
msgid "Name"
msgstr "Nome"
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:858 templates/index.php:75
msgid "Size"
msgstr "Tamaño"
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:859 templates/index.php:77
msgid "Modified"
msgstr "Modificado"
-#: js/files.js:829
+#: js/files.js:878
msgid "1 folder"
msgstr "1 cartafol"
-#: js/files.js:831
+#: js/files.js:880
msgid "{count} folders"
msgstr "{count} cartafoles"
-#: js/files.js:839
+#: js/files.js:888
msgid "1 file"
msgstr "1 ficheiro"
-#: js/files.js:841
+#: js/files.js:890
msgid "{count} files"
msgstr "{count} ficheiros"
@@ -271,10 +278,6 @@ msgstr "Cartafol"
msgid "From link"
msgstr "Dende a ligazón"
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Enviar"
-
#: templates/index.php:41
msgid "Cancel upload"
msgstr "Cancelar a subida"
diff --git a/l10n/gl/files_encryption.po b/l10n/gl/files_encryption.po
index 367cd2cd063..ba0a8e899da 100644
--- a/l10n/gl/files_encryption.po
+++ b/l10n/gl/files_encryption.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-21 00:01+0100\n"
-"PO-Revision-Date: 2012-11-20 22:19+0000\n"
-"Last-Translator: Miguel Branco <mgl.branco@gmail.com>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,18 +18,66 @@ msgstr ""
"Language: gl\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
msgid "Encryption"
msgstr "Cifrado"
-#: templates/settings.php:4
+#: templates/settings.php:67
msgid "Exclude the following file types from encryption"
msgstr "Excluír os seguintes tipos de ficheiro do cifrado"
-#: templates/settings.php:5
+#: templates/settings.php:71
msgid "None"
msgstr "Nada"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "Activar o cifrado"
diff --git a/l10n/gl/files_versions.po b/l10n/gl/files_versions.po
index aeb062c08df..c0ac98462b7 100644
--- a/l10n/gl/files_versions.po
+++ b/l10n/gl/files_versions.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-30 00:03+0100\n"
-"PO-Revision-Date: 2012-11-29 16:08+0000\n"
-"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,22 +20,10 @@ msgstr ""
"Language: gl\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "Caducan todas as versións"
-
#: js/versions.js:16
msgid "History"
msgstr "Historial"
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "Versións"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "Isto eliminará todas as copias de seguranza que haxa dos seus ficheiros"
-
#: templates/settings.php:3
msgid "Files Versioning"
msgstr "Sistema de versión de ficheiros"
diff --git a/l10n/gl/lib.po b/l10n/gl/lib.po
index 739b0ba67ff..c6fc161311a 100644
--- a/l10n/gl/lib.po
+++ b/l10n/gl/lib.po
@@ -5,14 +5,14 @@
# Translators:
# <mbouzada@gmail.com>, 2012.
# Miguel Branco <mgl.branco@gmail.com>, 2012.
-# Xosé M. Lamas <correo.xmgz@gmail.com>, 2012.
+# Xosé M. Lamas <correo.xmgz@gmail.com>, 2012-2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-08 00:10+0100\n"
-"PO-Revision-Date: 2012-12-06 11:56+0000\n"
-"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 06:11+0000\n"
+"Last-Translator: Xosé M. Lamas <correo.xmgz@gmail.com>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,51 +20,55 @@ msgstr ""
"Language: gl\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:287
+#: app.php:301
msgid "Help"
msgstr "Axuda"
-#: app.php:294
+#: app.php:308
msgid "Personal"
msgstr "Persoal"
-#: app.php:299
+#: app.php:313
msgid "Settings"
msgstr "Configuracións"
-#: app.php:304
+#: app.php:318
msgid "Users"
msgstr "Usuarios"
-#: app.php:311
+#: app.php:325
msgid "Apps"
msgstr "Aplicativos"
-#: app.php:313
+#: app.php:327
msgid "Admin"
msgstr "Administración"
-#: files.php:361
+#: files.php:365
msgid "ZIP download is turned off."
msgstr "As descargas ZIP están desactivadas"
-#: files.php:362
+#: files.php:366
msgid "Files need to be downloaded one by one."
msgstr "Os ficheiros necesitan seren descargados de un en un."
-#: files.php:362 files.php:387
+#: files.php:366 files.php:391
msgid "Back to Files"
msgstr "Volver aos ficheiros"
-#: files.php:386
+#: files.php:390
msgid "Selected files too large to generate zip file."
msgstr "Os ficheiros seleccionados son demasiado grandes como para xerar un ficheiro zip."
+#: helper.php:229
+msgid "couldn't be determined"
+msgstr "non puido ser determinado"
+
#: json.php:28
msgid "Application is not enabled"
msgstr "O aplicativo non está activado"
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
msgstr "Produciuse un erro na autenticación"
@@ -84,55 +88,55 @@ msgstr "Texto"
msgid "Images"
msgstr "Imaxes"
-#: template.php:103
+#: template.php:113
msgid "seconds ago"
msgstr "hai segundos"
-#: template.php:104
+#: template.php:114
msgid "1 minute ago"
msgstr "hai 1 minuto"
-#: template.php:105
+#: template.php:115
#, php-format
msgid "%d minutes ago"
msgstr "hai %d minutos"
-#: template.php:106
+#: template.php:116
msgid "1 hour ago"
msgstr "Vai 1 hora"
-#: template.php:107
+#: template.php:117
#, php-format
msgid "%d hours ago"
msgstr "Vai %d horas"
-#: template.php:108
+#: template.php:118
msgid "today"
msgstr "hoxe"
-#: template.php:109
+#: template.php:119
msgid "yesterday"
msgstr "onte"
-#: template.php:110
+#: template.php:120
#, php-format
msgid "%d days ago"
msgstr "hai %d días"
-#: template.php:111
+#: template.php:121
msgid "last month"
msgstr "último mes"
-#: template.php:112
+#: template.php:122
#, php-format
msgid "%d months ago"
msgstr "Vai %d meses"
-#: template.php:113
+#: template.php:123
msgid "last year"
msgstr "último ano"
-#: template.php:114
+#: template.php:124
msgid "years ago"
msgstr "anos atrás"
diff --git a/l10n/gl/user_ldap.po b/l10n/gl/user_ldap.po
index 024f611c187..66d3c446382 100644
--- a/l10n/gl/user_ldap.po
+++ b/l10n/gl/user_ldap.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-01 00:04+0100\n"
-"PO-Revision-Date: 2012-12-31 08:48+0000\n"
-"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 23:20+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -28,9 +28,9 @@ msgstr "<b>Aviso:</b> Os aplicativos user_ldap e user_webdavauth son incompatíb
#: templates/settings.php:11
msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
-msgstr "<b>Aviso:</b> O módulo PHP LDAP é necesario e non está instalado, a infraestrutura non funcionará. Consulte co administrador do sistema para instalalo."
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
+msgstr ""
#: templates/settings.php:15
msgid "Host"
@@ -46,6 +46,10 @@ msgid "Base DN"
msgstr "DN base"
#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Pode especificar a DN base para usuarios e grupos na lapela de «Avanzado»"
@@ -116,10 +120,18 @@ msgstr "Porto"
msgid "Base User Tree"
msgstr "Base da árbore de usuarios"
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "Base da árbore de grupo"
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Asociación de grupos e membros"
diff --git a/l10n/gl/user_webdavauth.po b/l10n/gl/user_webdavauth.po
index 5630c82c50e..2004bb9b3c3 100644
--- a/l10n/gl/user_webdavauth.po
+++ b/l10n/gl/user_webdavauth.po
@@ -5,13 +5,14 @@
# Translators:
# <mbouzada@gmail.com>, 2012.
# Miguel Branco, 2012.
+# Xosé M. Lamas <correo.xmgz@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-01 00:04+0100\n"
-"PO-Revision-Date: 2012-12-31 08:22+0000\n"
-"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
+"POT-Creation-Date: 2013-01-19 00:04+0100\n"
+"PO-Revision-Date: 2013-01-18 06:15+0000\n"
+"Last-Translator: Xosé M. Lamas <correo.xmgz@gmail.com>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,13 +20,17 @@ msgstr ""
"Language: gl\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr "Autenticación WebDAV"
+
#: templates/settings.php:4
msgid "URL: http://"
msgstr "URL: http://"
#: templates/settings.php:6
msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
-msgstr "ownCloud enviará as credenciais do usuario a este URL, http 401 e http 403 interpretanse como credenciais incorrectas e todos os outros códigos como credenciais correctas."
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
+msgstr "ownCloud enviará as credenciais do usuario a esta URL. Este conector comproba a resposta e interpretará os códigos de estado 401 e 403 como credenciais non válidas, e todas as outras respostas como credenciais válidas."
diff --git a/l10n/he/core.po b/l10n/he/core.po
index a573946604b..78ebe7d5f2d 100644
--- a/l10n/he/core.po
+++ b/l10n/he/core.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
@@ -212,7 +212,6 @@ msgid "Password protect"
msgstr "הגנה בססמה"
#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
msgid "Password"
msgstr "ססמה"
@@ -569,17 +568,3 @@ msgstr "הבא"
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
msgstr "מעדכן את ownCloud אל גרסא %s, זה עלול לקחת זמן מה."
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "אזהרת אבטחה!"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "נא לאמת את הססמה שלך. <br/>מטעמי אבטחה יתכן שתופיע בקשה להזין את הססמה שוב."
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "אימות"
diff --git a/l10n/he/files.po b/l10n/he/files.po
index cbf762beda7..f3c44d37861 100644
--- a/l10n/he/files.po
+++ b/l10n/he/files.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"POT-Creation-Date: 2013-01-20 00:05+0100\n"
+"PO-Revision-Date: 2013-01-19 23:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
@@ -21,6 +21,11 @@ msgstr ""
"Language: he\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/delete.php:28 ajax/getstoragestats.php:11 ajax/upload.php:17
+#: ajax/upload.php:76 templates/index.php:18
+msgid "Upload"
+msgstr "העלאה"
+
#: ajax/move.php:17
#, php-format
msgid "Could not move %s - File with this name already exists"
@@ -35,46 +40,46 @@ msgstr ""
msgid "Unable to rename file"
msgstr ""
-#: ajax/upload.php:14
+#: ajax/upload.php:20
msgid "No file was uploaded. Unknown error"
msgstr "לא הועלה קובץ. טעות בלתי מזוהה."
-#: ajax/upload.php:21
+#: ajax/upload.php:30
msgid "There is no error, the file uploaded with success"
msgstr "לא אירעה תקלה, הקבצים הועלו בהצלחה"
-#: ajax/upload.php:22
+#: ajax/upload.php:31
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr "הקבצים שנשלחו חורגים מהגודל שצוין בהגדרה upload_max_filesize שבקובץ php.ini:"
-#: ajax/upload.php:24
+#: ajax/upload.php:33
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "הקובץ שהועלה חרג מההנחיה MAX_FILE_SIZE שצוינה בטופס ה־HTML"
-#: ajax/upload.php:26
+#: ajax/upload.php:35
msgid "The uploaded file was only partially uploaded"
msgstr "הקובץ שהועלה הועלה בצורה חלקית"
-#: ajax/upload.php:27
+#: ajax/upload.php:36
msgid "No file was uploaded"
msgstr "לא הועלו קבצים"
-#: ajax/upload.php:28
+#: ajax/upload.php:37
msgid "Missing a temporary folder"
msgstr "תיקייה זמנית חסרה"
-#: ajax/upload.php:29
+#: ajax/upload.php:38
msgid "Failed to write to disk"
msgstr "הכתיבה לכונן נכשלה"
-#: ajax/upload.php:45
+#: ajax/upload.php:57
msgid "Not enough space available"
msgstr ""
-#: ajax/upload.php:69
+#: ajax/upload.php:91
msgid "Invalid directory."
msgstr ""
@@ -130,98 +135,100 @@ msgstr "בוטל שיתופם של {files}"
msgid "deleted {files}"
msgstr "{files} נמחקו"
-#: js/files.js:31
+#: js/files.js:48
msgid "'.' is an invalid file name."
msgstr ""
-#: js/files.js:36
+#: js/files.js:53
msgid "File name cannot be empty."
msgstr ""
-#: js/files.js:45
+#: js/files.js:62
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "השם שגוי, אסור להשתמש בתווים '\\', '/', '<', '>', ':', '\"', '|', '?' ו־'*'."
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "יוצר קובץ ZIP, אנא המתן."
+#: js/files.js:204
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
-#: js/files.js:224
+#: js/files.js:242
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "לא יכול להעלות את הקובץ מכיוון שזו תקיה או שמשקל הקובץ 0 בתים"
-#: js/files.js:224
+#: js/files.js:242
msgid "Upload Error"
msgstr "שגיאת העלאה"
-#: js/files.js:241
+#: js/files.js:259
msgid "Close"
msgstr "סגירה"
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:278 js/files.js:397 js/files.js:431
msgid "Pending"
msgstr "ממתין"
-#: js/files.js:280
+#: js/files.js:298
msgid "1 file uploading"
msgstr "קובץ אחד נשלח"
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:301 js/files.js:357 js/files.js:372
msgid "{count} files uploading"
msgstr "{count} קבצים נשלחים"
-#: js/files.js:357 js/files.js:393
+#: js/files.js:376 js/files.js:414
msgid "Upload cancelled."
msgstr "ההעלאה בוטלה."
-#: js/files.js:464
+#: js/files.js:486
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "מתבצעת כעת העלאת קבצים. עזיבה של העמוד תבטל את ההעלאה."
-#: js/files.js:537
+#: js/files.js:559
msgid "URL cannot be empty."
msgstr "קישור אינו יכול להיות ריק."
-#: js/files.js:543
+#: js/files.js:565
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:727
+#: js/files.js:775
msgid "{count} files scanned"
msgstr "{count} קבצים נסרקו"
-#: js/files.js:735
+#: js/files.js:783
msgid "error while scanning"
msgstr "אירעה שגיאה במהלך הסריקה"
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:857 templates/index.php:64
msgid "Name"
msgstr "שם"
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:858 templates/index.php:75
msgid "Size"
msgstr "גודל"
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:859 templates/index.php:77
msgid "Modified"
msgstr "זמן שינוי"
-#: js/files.js:829
+#: js/files.js:878
msgid "1 folder"
msgstr "תיקייה אחת"
-#: js/files.js:831
+#: js/files.js:880
msgid "{count} folders"
msgstr "{count} תיקיות"
-#: js/files.js:839
+#: js/files.js:888
msgid "1 file"
msgstr "קובץ אחד"
-#: js/files.js:841
+#: js/files.js:890
msgid "{count} files"
msgstr "{count} קבצים"
@@ -273,10 +280,6 @@ msgstr "תיקייה"
msgid "From link"
msgstr "מקישור"
-#: templates/index.php:18
-msgid "Upload"
-msgstr "העלאה"
-
#: templates/index.php:41
msgid "Cancel upload"
msgstr "ביטול ההעלאה"
diff --git a/l10n/he/files_encryption.po b/l10n/he/files_encryption.po
index 860989631c4..cd62f06daf7 100644
--- a/l10n/he/files_encryption.po
+++ b/l10n/he/files_encryption.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-27 00:04+0100\n"
-"PO-Revision-Date: 2012-12-26 17:21+0000\n"
-"Last-Translator: Gilad Naaman <gilad.doom@gmail.com>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,18 +18,66 @@ msgstr ""
"Language: he\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
msgid "Encryption"
msgstr "הצפנה"
-#: templates/settings.php:6
-msgid "Enable Encryption"
-msgstr "הפעל הצפנה"
+#: templates/settings.php:67
+msgid "Exclude the following file types from encryption"
+msgstr "הוצא את סוגי הקבצים הבאים מהצפנה"
-#: templates/settings.php:7
+#: templates/settings.php:71
msgid "None"
msgstr "כלום"
-
-#: templates/settings.php:12
-msgid "Exclude the following file types from encryption"
-msgstr "הוצא את סוגי הקבצים הבאים מהצפנה"
diff --git a/l10n/he/files_versions.po b/l10n/he/files_versions.po
index 6c4367359de..15bb3e971b3 100644
--- a/l10n/he/files_versions.po
+++ b/l10n/he/files_versions.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-02 00:02+0100\n"
-"PO-Revision-Date: 2012-12-01 07:21+0000\n"
-"Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,22 +19,10 @@ msgstr ""
"Language: he\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "הפגת תוקף כל הגרסאות"
-
#: js/versions.js:16
msgid "History"
msgstr "היסטוריה"
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "גרסאות"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "פעולה זו תמחק את כל גיבויי הגרסאות הקיימים של הקבצים שלך"
-
#: templates/settings.php:3
msgid "Files Versioning"
msgstr "שמירת הבדלי גרסאות של קבצים"
diff --git a/l10n/he/lib.po b/l10n/he/lib.po
index de97f2df884..8383f3ccc95 100644
--- a/l10n/he/lib.po
+++ b/l10n/he/lib.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-02 00:02+0100\n"
-"PO-Revision-Date: 2012-12-01 06:32+0000\n"
-"Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,51 +19,55 @@ msgstr ""
"Language: he\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:285
+#: app.php:301
msgid "Help"
msgstr "עזרה"
-#: app.php:292
+#: app.php:308
msgid "Personal"
msgstr "אישי"
-#: app.php:297
+#: app.php:313
msgid "Settings"
msgstr "הגדרות"
-#: app.php:302
+#: app.php:318
msgid "Users"
msgstr "משתמשים"
-#: app.php:309
+#: app.php:325
msgid "Apps"
msgstr "יישומים"
-#: app.php:311
+#: app.php:327
msgid "Admin"
msgstr "מנהל"
-#: files.php:361
+#: files.php:365
msgid "ZIP download is turned off."
msgstr "הורדת ZIP כבויה"
-#: files.php:362
+#: files.php:366
msgid "Files need to be downloaded one by one."
msgstr "יש להוריד את הקבצים אחד אחרי השני."
-#: files.php:362 files.php:387
+#: files.php:366 files.php:391
msgid "Back to Files"
msgstr "חזרה לקבצים"
-#: files.php:386
+#: files.php:390
msgid "Selected files too large to generate zip file."
msgstr "הקבצים הנבחרים גדולים מידי ליצירת קובץ zip."
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr ""
+
#: json.php:28
msgid "Application is not enabled"
msgstr "יישומים אינם מופעלים"
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
msgstr "שגיאת הזדהות"
@@ -83,55 +87,55 @@ msgstr "טקסט"
msgid "Images"
msgstr "תמונות"
-#: template.php:103
+#: template.php:113
msgid "seconds ago"
msgstr "שניות"
-#: template.php:104
+#: template.php:114
msgid "1 minute ago"
msgstr "לפני דקה אחת"
-#: template.php:105
+#: template.php:115
#, php-format
msgid "%d minutes ago"
msgstr "לפני %d דקות"
-#: template.php:106
+#: template.php:116
msgid "1 hour ago"
msgstr "לפני שעה"
-#: template.php:107
+#: template.php:117
#, php-format
msgid "%d hours ago"
msgstr "לפני %d שעות"
-#: template.php:108
+#: template.php:118
msgid "today"
msgstr "היום"
-#: template.php:109
+#: template.php:119
msgid "yesterday"
msgstr "אתמול"
-#: template.php:110
+#: template.php:120
#, php-format
msgid "%d days ago"
msgstr "לפני %d ימים"
-#: template.php:111
+#: template.php:121
msgid "last month"
msgstr "חודש שעבר"
-#: template.php:112
+#: template.php:122
#, php-format
msgid "%d months ago"
msgstr "לפני %d חודשים"
-#: template.php:113
+#: template.php:123
msgid "last year"
msgstr "שנה שעברה"
-#: template.php:114
+#: template.php:124
msgid "years ago"
msgstr "שנים"
diff --git a/l10n/he/user_ldap.po b/l10n/he/user_ldap.po
index 72b23d85881..ec42e5a0854 100644
--- a/l10n/he/user_ldap.po
+++ b/l10n/he/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 10:25+0000\n"
-"Last-Translator: Gilad Naaman <gilad.doom@gmail.com>\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 23:20+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -27,8 +27,8 @@ msgstr ""
#: templates/settings.php:11
msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
msgstr ""
#: templates/settings.php:15
@@ -45,6 +45,10 @@ msgid "Base DN"
msgstr ""
#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
@@ -115,10 +119,18 @@ msgstr ""
msgid "Base User Tree"
msgstr ""
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
diff --git a/l10n/he/user_webdavauth.po b/l10n/he/user_webdavauth.po
index e9a1a74eb85..65a279ed44f 100644
--- a/l10n/he/user_webdavauth.po
+++ b/l10n/he/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-20 00:11+0100\n"
-"PO-Revision-Date: 2012-12-19 23:12+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
@@ -17,13 +17,17 @@ msgstr ""
"Language: he\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
#: templates/settings.php:4
msgid "URL: http://"
msgstr ""
#: templates/settings.php:6
msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
msgstr ""
diff --git a/l10n/hi/core.po b/l10n/hi/core.po
index a8ef62c1352..637cb66cc8d 100644
--- a/l10n/hi/core.po
+++ b/l10n/hi/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
@@ -209,7 +209,6 @@ msgid "Password protect"
msgstr ""
#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
msgid "Password"
msgstr "पासवर्ड"
@@ -566,17 +565,3 @@ msgstr "अगला"
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr ""
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr ""
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr ""
diff --git a/l10n/hi/files.po b/l10n/hi/files.po
index c555c20841b..7e4cd2a3e6e 100644
--- a/l10n/hi/files.po
+++ b/l10n/hi/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"POT-Creation-Date: 2013-01-20 00:05+0100\n"
+"PO-Revision-Date: 2013-01-19 23:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,11 @@ msgstr ""
"Language: hi\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/delete.php:28 ajax/getstoragestats.php:11 ajax/upload.php:17
+#: ajax/upload.php:76 templates/index.php:18
+msgid "Upload"
+msgstr ""
+
#: ajax/move.php:17
#, php-format
msgid "Could not move %s - File with this name already exists"
@@ -31,46 +36,46 @@ msgstr ""
msgid "Unable to rename file"
msgstr ""
-#: ajax/upload.php:14
+#: ajax/upload.php:20
msgid "No file was uploaded. Unknown error"
msgstr ""
-#: ajax/upload.php:21
+#: ajax/upload.php:30
msgid "There is no error, the file uploaded with success"
msgstr ""
-#: ajax/upload.php:22
+#: ajax/upload.php:31
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr ""
-#: ajax/upload.php:24
+#: ajax/upload.php:33
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr ""
-#: ajax/upload.php:26
+#: ajax/upload.php:35
msgid "The uploaded file was only partially uploaded"
msgstr ""
-#: ajax/upload.php:27
+#: ajax/upload.php:36
msgid "No file was uploaded"
msgstr ""
-#: ajax/upload.php:28
+#: ajax/upload.php:37
msgid "Missing a temporary folder"
msgstr ""
-#: ajax/upload.php:29
+#: ajax/upload.php:38
msgid "Failed to write to disk"
msgstr ""
-#: ajax/upload.php:45
+#: ajax/upload.php:57
msgid "Not enough space available"
msgstr ""
-#: ajax/upload.php:69
+#: ajax/upload.php:91
msgid "Invalid directory."
msgstr ""
@@ -126,98 +131,100 @@ msgstr ""
msgid "deleted {files}"
msgstr ""
-#: js/files.js:31
+#: js/files.js:48
msgid "'.' is an invalid file name."
msgstr ""
-#: js/files.js:36
+#: js/files.js:53
msgid "File name cannot be empty."
msgstr ""
-#: js/files.js:45
+#: js/files.js:62
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
+#: js/files.js:204
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
msgstr ""
-#: js/files.js:224
+#: js/files.js:242
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr ""
-#: js/files.js:224
+#: js/files.js:242
msgid "Upload Error"
msgstr ""
-#: js/files.js:241
+#: js/files.js:259
msgid "Close"
msgstr ""
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:278 js/files.js:397 js/files.js:431
msgid "Pending"
msgstr ""
-#: js/files.js:280
+#: js/files.js:298
msgid "1 file uploading"
msgstr ""
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:301 js/files.js:357 js/files.js:372
msgid "{count} files uploading"
msgstr ""
-#: js/files.js:357 js/files.js:393
+#: js/files.js:376 js/files.js:414
msgid "Upload cancelled."
msgstr ""
-#: js/files.js:464
+#: js/files.js:486
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/files.js:537
+#: js/files.js:559
msgid "URL cannot be empty."
msgstr ""
-#: js/files.js:543
+#: js/files.js:565
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:727
+#: js/files.js:775
msgid "{count} files scanned"
msgstr ""
-#: js/files.js:735
+#: js/files.js:783
msgid "error while scanning"
msgstr ""
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:857 templates/index.php:64
msgid "Name"
msgstr ""
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:858 templates/index.php:75
msgid "Size"
msgstr ""
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:859 templates/index.php:77
msgid "Modified"
msgstr ""
-#: js/files.js:829
+#: js/files.js:878
msgid "1 folder"
msgstr ""
-#: js/files.js:831
+#: js/files.js:880
msgid "{count} folders"
msgstr ""
-#: js/files.js:839
+#: js/files.js:888
msgid "1 file"
msgstr ""
-#: js/files.js:841
+#: js/files.js:890
msgid "{count} files"
msgstr ""
@@ -269,10 +276,6 @@ msgstr ""
msgid "From link"
msgstr ""
-#: templates/index.php:18
-msgid "Upload"
-msgstr ""
-
#: templates/index.php:41
msgid "Cancel upload"
msgstr ""
diff --git a/l10n/hi/files_encryption.po b/l10n/hi/files_encryption.po
index e6ff91a68b5..83154bdbcbf 100644
--- a/l10n/hi/files_encryption.po
+++ b/l10n/hi/files_encryption.po
@@ -7,28 +7,76 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: hi\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings.php:3
-msgid "Encryption"
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
msgstr ""
-#: templates/settings.php:4
-msgid "Exclude the following file types from encryption"
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
msgstr ""
-#: templates/settings.php:5
-msgid "None"
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
msgstr ""
#: templates/settings.php:10
-msgid "Enable Encryption"
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:67
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:71
+msgid "None"
msgstr ""
diff --git a/l10n/hi/files_versions.po b/l10n/hi/files_versions.po
index 1f21f8aca78..293e4b558a7 100644
--- a/l10n/hi/files_versions.po
+++ b/l10n/hi/files_versions.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-22 01:14+0200\n"
-"PO-Revision-Date: 2012-09-21 23:15+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,22 +17,10 @@ msgstr ""
"Language: hi\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr ""
-
#: js/versions.js:16
msgid "History"
msgstr ""
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr ""
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr ""
-
#: templates/settings.php:3
msgid "Files Versioning"
msgstr ""
diff --git a/l10n/hi/lib.po b/l10n/hi/lib.po
index 310d410a6e9..9cb97532356 100644
--- a/l10n/hi/lib.po
+++ b/l10n/hi/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-14 23:13+0000\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
@@ -17,51 +17,55 @@ msgstr ""
"Language: hi\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:285
+#: app.php:301
msgid "Help"
msgstr ""
-#: app.php:292
+#: app.php:308
msgid "Personal"
msgstr ""
-#: app.php:297
+#: app.php:313
msgid "Settings"
msgstr ""
-#: app.php:302
+#: app.php:318
msgid "Users"
msgstr ""
-#: app.php:309
+#: app.php:325
msgid "Apps"
msgstr ""
-#: app.php:311
+#: app.php:327
msgid "Admin"
msgstr ""
-#: files.php:332
+#: files.php:365
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:333
+#: files.php:366
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:333 files.php:358
+#: files.php:366 files.php:391
msgid "Back to Files"
msgstr ""
-#: files.php:357
+#: files.php:390
msgid "Selected files too large to generate zip file."
msgstr ""
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr ""
+
#: json.php:28
msgid "Application is not enabled"
msgstr ""
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
msgstr ""
@@ -81,55 +85,55 @@ msgstr ""
msgid "Images"
msgstr ""
-#: template.php:103
+#: template.php:113
msgid "seconds ago"
msgstr ""
-#: template.php:104
+#: template.php:114
msgid "1 minute ago"
msgstr ""
-#: template.php:105
+#: template.php:115
#, php-format
msgid "%d minutes ago"
msgstr ""
-#: template.php:106
+#: template.php:116
msgid "1 hour ago"
msgstr ""
-#: template.php:107
+#: template.php:117
#, php-format
msgid "%d hours ago"
msgstr ""
-#: template.php:108
+#: template.php:118
msgid "today"
msgstr ""
-#: template.php:109
+#: template.php:119
msgid "yesterday"
msgstr ""
-#: template.php:110
+#: template.php:120
#, php-format
msgid "%d days ago"
msgstr ""
-#: template.php:111
+#: template.php:121
msgid "last month"
msgstr ""
-#: template.php:112
+#: template.php:122
#, php-format
msgid "%d months ago"
msgstr ""
-#: template.php:113
+#: template.php:123
msgid "last year"
msgstr ""
-#: template.php:114
+#: template.php:124
msgid "years ago"
msgstr ""
diff --git a/l10n/hi/user_ldap.po b/l10n/hi/user_ldap.po
index ae9f03b0212..012f8d3f3aa 100644
--- a/l10n/hi/user_ldap.po
+++ b/l10n/hi/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 23:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
@@ -26,8 +26,8 @@ msgstr ""
#: templates/settings.php:11
msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
msgstr ""
#: templates/settings.php:15
@@ -44,6 +44,10 @@ msgid "Base DN"
msgstr ""
#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
@@ -114,10 +118,18 @@ msgstr ""
msgid "Base User Tree"
msgstr ""
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
diff --git a/l10n/hi/user_webdavauth.po b/l10n/hi/user_webdavauth.po
index aa784d7aad0..cc71e94d7f6 100644
--- a/l10n/hi/user_webdavauth.po
+++ b/l10n/hi/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-20 00:11+0100\n"
-"PO-Revision-Date: 2012-12-19 23:12+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
@@ -17,13 +17,17 @@ msgstr ""
"Language: hi\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
#: templates/settings.php:4
msgid "URL: http://"
msgstr ""
#: templates/settings.php:6
msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
msgstr ""
diff --git a/l10n/hr/core.po b/l10n/hr/core.po
index 236b80b891d..5d5b9d249ff 100644
--- a/l10n/hr/core.po
+++ b/l10n/hr/core.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -211,7 +211,6 @@ msgid "Password protect"
msgstr "Zaštiti lozinkom"
#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
msgid "Password"
msgstr "Lozinka"
@@ -568,17 +567,3 @@ msgstr "sljedeći"
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr ""
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr ""
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr ""
diff --git a/l10n/hr/files.po b/l10n/hr/files.po
index e69aea6cf78..317b0aa768d 100644
--- a/l10n/hr/files.po
+++ b/l10n/hr/files.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"POT-Creation-Date: 2013-01-20 00:05+0100\n"
+"PO-Revision-Date: 2013-01-19 23:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -20,6 +20,11 @@ msgstr ""
"Language: hr\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+#: ajax/delete.php:28 ajax/getstoragestats.php:11 ajax/upload.php:17
+#: ajax/upload.php:76 templates/index.php:18
+msgid "Upload"
+msgstr "Pošalji"
+
#: ajax/move.php:17
#, php-format
msgid "Could not move %s - File with this name already exists"
@@ -34,46 +39,46 @@ msgstr ""
msgid "Unable to rename file"
msgstr ""
-#: ajax/upload.php:14
+#: ajax/upload.php:20
msgid "No file was uploaded. Unknown error"
msgstr ""
-#: ajax/upload.php:21
+#: ajax/upload.php:30
msgid "There is no error, the file uploaded with success"
msgstr "Datoteka je poslana uspješno i bez pogrešaka"
-#: ajax/upload.php:22
+#: ajax/upload.php:31
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr ""
-#: ajax/upload.php:24
+#: ajax/upload.php:33
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "Poslana datoteka izlazi iz okvira MAX_FILE_SIZE direktive postavljene u HTML obrascu"
-#: ajax/upload.php:26
+#: ajax/upload.php:35
msgid "The uploaded file was only partially uploaded"
msgstr "Datoteka je poslana samo djelomično"
-#: ajax/upload.php:27
+#: ajax/upload.php:36
msgid "No file was uploaded"
msgstr "Ni jedna datoteka nije poslana"
-#: ajax/upload.php:28
+#: ajax/upload.php:37
msgid "Missing a temporary folder"
msgstr "Nedostaje privremena mapa"
-#: ajax/upload.php:29
+#: ajax/upload.php:38
msgid "Failed to write to disk"
msgstr "Neuspjelo pisanje na disk"
-#: ajax/upload.php:45
+#: ajax/upload.php:57
msgid "Not enough space available"
msgstr ""
-#: ajax/upload.php:69
+#: ajax/upload.php:91
msgid "Invalid directory."
msgstr ""
@@ -129,98 +134,100 @@ msgstr ""
msgid "deleted {files}"
msgstr ""
-#: js/files.js:31
+#: js/files.js:48
msgid "'.' is an invalid file name."
msgstr ""
-#: js/files.js:36
+#: js/files.js:53
msgid "File name cannot be empty."
msgstr ""
-#: js/files.js:45
+#: js/files.js:62
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "generiranje ZIP datoteke, ovo može potrajati."
+#: js/files.js:204
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
-#: js/files.js:224
+#: js/files.js:242
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Nemoguće poslati datoteku jer je prazna ili je direktorij"
-#: js/files.js:224
+#: js/files.js:242
msgid "Upload Error"
msgstr "Pogreška pri slanju"
-#: js/files.js:241
+#: js/files.js:259
msgid "Close"
msgstr "Zatvori"
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:278 js/files.js:397 js/files.js:431
msgid "Pending"
msgstr "U tijeku"
-#: js/files.js:280
+#: js/files.js:298
msgid "1 file uploading"
msgstr "1 datoteka se učitava"
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:301 js/files.js:357 js/files.js:372
msgid "{count} files uploading"
msgstr ""
-#: js/files.js:357 js/files.js:393
+#: js/files.js:376 js/files.js:414
msgid "Upload cancelled."
msgstr "Slanje poništeno."
-#: js/files.js:464
+#: js/files.js:486
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Učitavanje datoteke. Napuštanjem stranice će prekinuti učitavanje."
-#: js/files.js:537
+#: js/files.js:559
msgid "URL cannot be empty."
msgstr ""
-#: js/files.js:543
+#: js/files.js:565
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:727
+#: js/files.js:775
msgid "{count} files scanned"
msgstr ""
-#: js/files.js:735
+#: js/files.js:783
msgid "error while scanning"
msgstr "grečka prilikom skeniranja"
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:857 templates/index.php:64
msgid "Name"
msgstr "Naziv"
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:858 templates/index.php:75
msgid "Size"
msgstr "Veličina"
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:859 templates/index.php:77
msgid "Modified"
msgstr "Zadnja promjena"
-#: js/files.js:829
+#: js/files.js:878
msgid "1 folder"
msgstr ""
-#: js/files.js:831
+#: js/files.js:880
msgid "{count} folders"
msgstr ""
-#: js/files.js:839
+#: js/files.js:888
msgid "1 file"
msgstr ""
-#: js/files.js:841
+#: js/files.js:890
msgid "{count} files"
msgstr ""
@@ -272,10 +279,6 @@ msgstr "mapa"
msgid "From link"
msgstr ""
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Pošalji"
-
#: templates/index.php:41
msgid "Cancel upload"
msgstr "Prekini upload"
diff --git a/l10n/hr/files_encryption.po b/l10n/hr/files_encryption.po
index d2734fd9fd2..d284b962472 100644
--- a/l10n/hr/files_encryption.po
+++ b/l10n/hr/files_encryption.po
@@ -7,28 +7,76 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: hr\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-#: templates/settings.php:3
-msgid "Encryption"
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
msgstr ""
-#: templates/settings.php:4
-msgid "Exclude the following file types from encryption"
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
msgstr ""
-#: templates/settings.php:5
-msgid "None"
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
msgstr ""
#: templates/settings.php:10
-msgid "Enable Encryption"
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:67
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:71
+msgid "None"
msgstr ""
diff --git a/l10n/hr/files_versions.po b/l10n/hr/files_versions.po
index 557b2117806..0425c2dc568 100644
--- a/l10n/hr/files_versions.po
+++ b/l10n/hr/files_versions.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-22 01:14+0200\n"
-"PO-Revision-Date: 2012-09-21 23:15+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,22 +17,10 @@ msgstr ""
"Language: hr\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr ""
-
#: js/versions.js:16
msgid "History"
msgstr ""
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr ""
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr ""
-
#: templates/settings.php:3
msgid "Files Versioning"
msgstr ""
diff --git a/l10n/hr/lib.po b/l10n/hr/lib.po
index 80301078e43..28ed5873c33 100644
--- a/l10n/hr/lib.po
+++ b/l10n/hr/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-14 23:13+0000\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -17,51 +17,55 @@ msgstr ""
"Language: hr\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-#: app.php:285
+#: app.php:301
msgid "Help"
msgstr "Pomoć"
-#: app.php:292
+#: app.php:308
msgid "Personal"
msgstr "Osobno"
-#: app.php:297
+#: app.php:313
msgid "Settings"
msgstr "Postavke"
-#: app.php:302
+#: app.php:318
msgid "Users"
msgstr "Korisnici"
-#: app.php:309
+#: app.php:325
msgid "Apps"
msgstr ""
-#: app.php:311
+#: app.php:327
msgid "Admin"
msgstr ""
-#: files.php:332
+#: files.php:365
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:333
+#: files.php:366
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:333 files.php:358
+#: files.php:366 files.php:391
msgid "Back to Files"
msgstr ""
-#: files.php:357
+#: files.php:390
msgid "Selected files too large to generate zip file."
msgstr ""
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr ""
+
#: json.php:28
msgid "Application is not enabled"
msgstr ""
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
msgstr "Greška kod autorizacije"
@@ -81,55 +85,55 @@ msgstr "Tekst"
msgid "Images"
msgstr ""
-#: template.php:103
+#: template.php:113
msgid "seconds ago"
msgstr "sekundi prije"
-#: template.php:104
+#: template.php:114
msgid "1 minute ago"
msgstr ""
-#: template.php:105
+#: template.php:115
#, php-format
msgid "%d minutes ago"
msgstr ""
-#: template.php:106
+#: template.php:116
msgid "1 hour ago"
msgstr ""
-#: template.php:107
+#: template.php:117
#, php-format
msgid "%d hours ago"
msgstr ""
-#: template.php:108
+#: template.php:118
msgid "today"
msgstr "danas"
-#: template.php:109
+#: template.php:119
msgid "yesterday"
msgstr "jučer"
-#: template.php:110
+#: template.php:120
#, php-format
msgid "%d days ago"
msgstr ""
-#: template.php:111
+#: template.php:121
msgid "last month"
msgstr "prošli mjesec"
-#: template.php:112
+#: template.php:122
#, php-format
msgid "%d months ago"
msgstr ""
-#: template.php:113
+#: template.php:123
msgid "last year"
msgstr "prošlu godinu"
-#: template.php:114
+#: template.php:124
msgid "years ago"
msgstr "godina"
diff --git a/l10n/hr/user_ldap.po b/l10n/hr/user_ldap.po
index 5861922d336..25cb374e51f 100644
--- a/l10n/hr/user_ldap.po
+++ b/l10n/hr/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"POT-Creation-Date: 2013-01-18 00:03+0100\n"
+"PO-Revision-Date: 2013-01-17 21:57+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -26,8 +26,8 @@ msgstr ""
#: templates/settings.php:11
msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
msgstr ""
#: templates/settings.php:15
@@ -44,6 +44,10 @@ msgid "Base DN"
msgstr ""
#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
@@ -114,10 +118,18 @@ msgstr ""
msgid "Base User Tree"
msgstr ""
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
@@ -180,4 +192,4 @@ msgstr ""
#: templates/settings.php:39
msgid "Help"
-msgstr ""
+msgstr "Pomoć"
diff --git a/l10n/hr/user_webdavauth.po b/l10n/hr/user_webdavauth.po
index ec8c6a5f26a..d33ff57a3a1 100644
--- a/l10n/hr/user_webdavauth.po
+++ b/l10n/hr/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-20 00:11+0100\n"
-"PO-Revision-Date: 2012-12-19 23:12+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -17,13 +17,17 @@ msgstr ""
"Language: hr\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
#: templates/settings.php:4
msgid "URL: http://"
msgstr ""
#: templates/settings.php:6
msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
msgstr ""
diff --git a/l10n/hu/core.po b/l10n/hu/core.po
index e74a69fb8d0..d2bfb48813a 100644
--- a/l10n/hu/core.po
+++ b/l10n/hu/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hungarian (http://www.transifex.com/projects/p/owncloud/language/hu/)\n"
"MIME-Version: 1.0\n"
@@ -207,7 +207,6 @@ msgid "Password protect"
msgstr ""
#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
msgid "Password"
msgstr ""
@@ -564,17 +563,3 @@ msgstr ""
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr ""
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr ""
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr ""
diff --git a/l10n/hu/files.po b/l10n/hu/files.po
index 4956069f94d..bcba1270024 100644
--- a/l10n/hu/files.po
+++ b/l10n/hu/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:05+0000\n"
+"POT-Creation-Date: 2013-01-20 00:05+0100\n"
+"PO-Revision-Date: 2013-01-19 23:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hungarian (http://www.transifex.com/projects/p/owncloud/language/hu/)\n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,11 @@ msgstr ""
"Language: hu\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/delete.php:28 ajax/getstoragestats.php:11 ajax/upload.php:17
+#: ajax/upload.php:76 templates/index.php:18
+msgid "Upload"
+msgstr ""
+
#: ajax/move.php:17
#, php-format
msgid "Could not move %s - File with this name already exists"
@@ -31,46 +36,46 @@ msgstr ""
msgid "Unable to rename file"
msgstr ""
-#: ajax/upload.php:14
+#: ajax/upload.php:20
msgid "No file was uploaded. Unknown error"
msgstr ""
-#: ajax/upload.php:21
+#: ajax/upload.php:30
msgid "There is no error, the file uploaded with success"
msgstr ""
-#: ajax/upload.php:22
+#: ajax/upload.php:31
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr ""
-#: ajax/upload.php:24
+#: ajax/upload.php:33
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr ""
-#: ajax/upload.php:26
+#: ajax/upload.php:35
msgid "The uploaded file was only partially uploaded"
msgstr ""
-#: ajax/upload.php:27
+#: ajax/upload.php:36
msgid "No file was uploaded"
msgstr ""
-#: ajax/upload.php:28
+#: ajax/upload.php:37
msgid "Missing a temporary folder"
msgstr ""
-#: ajax/upload.php:29
+#: ajax/upload.php:38
msgid "Failed to write to disk"
msgstr ""
-#: ajax/upload.php:45
+#: ajax/upload.php:57
msgid "Not enough space available"
msgstr ""
-#: ajax/upload.php:69
+#: ajax/upload.php:91
msgid "Invalid directory."
msgstr ""
@@ -126,98 +131,100 @@ msgstr ""
msgid "deleted {files}"
msgstr ""
-#: js/files.js:31
+#: js/files.js:48
msgid "'.' is an invalid file name."
msgstr ""
-#: js/files.js:36
+#: js/files.js:53
msgid "File name cannot be empty."
msgstr ""
-#: js/files.js:45
+#: js/files.js:62
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
+#: js/files.js:204
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
msgstr ""
-#: js/files.js:224
+#: js/files.js:242
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr ""
-#: js/files.js:224
+#: js/files.js:242
msgid "Upload Error"
msgstr ""
-#: js/files.js:241
+#: js/files.js:259
msgid "Close"
msgstr ""
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:278 js/files.js:397 js/files.js:431
msgid "Pending"
msgstr ""
-#: js/files.js:280
+#: js/files.js:298
msgid "1 file uploading"
msgstr ""
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:301 js/files.js:357 js/files.js:372
msgid "{count} files uploading"
msgstr ""
-#: js/files.js:357 js/files.js:393
+#: js/files.js:376 js/files.js:414
msgid "Upload cancelled."
msgstr ""
-#: js/files.js:464
+#: js/files.js:486
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/files.js:537
+#: js/files.js:559
msgid "URL cannot be empty."
msgstr ""
-#: js/files.js:543
+#: js/files.js:565
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:727
+#: js/files.js:775
msgid "{count} files scanned"
msgstr ""
-#: js/files.js:735
+#: js/files.js:783
msgid "error while scanning"
msgstr ""
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:857 templates/index.php:64
msgid "Name"
msgstr ""
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:858 templates/index.php:75
msgid "Size"
msgstr ""
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:859 templates/index.php:77
msgid "Modified"
msgstr ""
-#: js/files.js:829
+#: js/files.js:878
msgid "1 folder"
msgstr ""
-#: js/files.js:831
+#: js/files.js:880
msgid "{count} folders"
msgstr ""
-#: js/files.js:839
+#: js/files.js:888
msgid "1 file"
msgstr ""
-#: js/files.js:841
+#: js/files.js:890
msgid "{count} files"
msgstr ""
@@ -269,10 +276,6 @@ msgstr ""
msgid "From link"
msgstr ""
-#: templates/index.php:18
-msgid "Upload"
-msgstr ""
-
#: templates/index.php:41
msgid "Cancel upload"
msgstr ""
diff --git a/l10n/hu/files_versions.po b/l10n/hu/files_versions.po
index 8fb51cf6202..6f8e34c98c3 100644
--- a/l10n/hu/files_versions.po
+++ b/l10n/hu/files_versions.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-03 00:04+0100\n"
-"PO-Revision-Date: 2012-08-12 22:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hungarian (http://www.transifex.com/projects/p/owncloud/language/hu/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,22 +17,10 @@ msgstr ""
"Language: hu\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/settings-personal.js:31 templates/settings-personal.php:7
-msgid "Expire all versions"
-msgstr ""
-
#: js/versions.js:16
msgid "History"
msgstr ""
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr ""
-
-#: templates/settings-personal.php:10
-msgid "This will delete all existing backup versions of your files"
-msgstr ""
-
#: templates/settings.php:3
msgid "Files Versioning"
msgstr ""
diff --git a/l10n/hu/lib.po b/l10n/hu/lib.po
index 0dc080f7db0..dc349f094e9 100644
--- a/l10n/hu/lib.po
+++ b/l10n/hu/lib.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-03 00:04+0100\n"
-"PO-Revision-Date: 2012-07-27 22:23+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hungarian (http://www.transifex.com/projects/p/owncloud/language/hu/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,27 +17,27 @@ msgstr ""
"Language: hu\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:287
+#: app.php:301
msgid "Help"
msgstr ""
-#: app.php:294
+#: app.php:308
msgid "Personal"
msgstr ""
-#: app.php:299
+#: app.php:313
msgid "Settings"
msgstr ""
-#: app.php:304
+#: app.php:318
msgid "Users"
msgstr ""
-#: app.php:311
+#: app.php:325
msgid "Apps"
msgstr ""
-#: app.php:313
+#: app.php:327
msgid "Admin"
msgstr ""
@@ -57,11 +57,15 @@ msgstr ""
msgid "Selected files too large to generate zip file."
msgstr ""
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr ""
+
#: json.php:28
msgid "Application is not enabled"
msgstr ""
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
msgstr ""
@@ -81,55 +85,55 @@ msgstr ""
msgid "Images"
msgstr ""
-#: template.php:103
+#: template.php:113
msgid "seconds ago"
msgstr ""
-#: template.php:104
+#: template.php:114
msgid "1 minute ago"
msgstr ""
-#: template.php:105
+#: template.php:115
#, php-format
msgid "%d minutes ago"
msgstr ""
-#: template.php:106
+#: template.php:116
msgid "1 hour ago"
msgstr ""
-#: template.php:107
+#: template.php:117
#, php-format
msgid "%d hours ago"
msgstr ""
-#: template.php:108
+#: template.php:118
msgid "today"
msgstr ""
-#: template.php:109
+#: template.php:119
msgid "yesterday"
msgstr ""
-#: template.php:110
+#: template.php:120
#, php-format
msgid "%d days ago"
msgstr ""
-#: template.php:111
+#: template.php:121
msgid "last month"
msgstr ""
-#: template.php:112
+#: template.php:122
#, php-format
msgid "%d months ago"
msgstr ""
-#: template.php:113
+#: template.php:123
msgid "last year"
msgstr ""
-#: template.php:114
+#: template.php:124
msgid "years ago"
msgstr ""
diff --git a/l10n/hu/user_ldap.po b/l10n/hu/user_ldap.po
index e2abecc29af..2c265cccc0e 100644
--- a/l10n/hu/user_ldap.po
+++ b/l10n/hu/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-03 00:04+0100\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 23:20+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hungarian (http://www.transifex.com/projects/p/owncloud/language/hu/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -26,8 +26,8 @@ msgstr ""
#: templates/settings.php:11
msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
msgstr ""
#: templates/settings.php:15
@@ -44,6 +44,10 @@ msgid "Base DN"
msgstr ""
#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
@@ -114,10 +118,18 @@ msgstr ""
msgid "Base User Tree"
msgstr ""
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
diff --git a/l10n/hu/user_webdavauth.po b/l10n/hu/user_webdavauth.po
index d6235e0472c..87b7d322df8 100644
--- a/l10n/hu/user_webdavauth.po
+++ b/l10n/hu/user_webdavauth.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-03 00:04+0100\n"
-"PO-Revision-Date: 2012-11-09 09:06+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hungarian (http://www.transifex.com/projects/p/owncloud/language/hu/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,13 +17,17 @@ msgstr ""
"Language: hu\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
#: templates/settings.php:4
msgid "URL: http://"
msgstr ""
#: templates/settings.php:6
msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
msgstr ""
diff --git a/l10n/hu_HU/core.po b/l10n/hu_HU/core.po
index fa290171a2f..891c8694dd7 100644
--- a/l10n/hu_HU/core.po
+++ b/l10n/hu_HU/core.po
@@ -6,13 +6,14 @@
# Adam Toth <adazlord@gmail.com>, 2012.
# <mail@tamas-nagy.net>, 2011.
# Peter Borsa <peter.borsa@gmail.com>, 2012.
+# Tamas Nagy <mail@tamas-nagy.net>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-01-20 00:05+0100\n"
+"PO-Revision-Date: 2013-01-19 08:13+0000\n"
+"Last-Translator: Tamas Nagy <mail@tamas-nagy.net>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -86,55 +87,55 @@ msgstr "Nem sikerült a kedvencekből törölni ezt: %s"
msgid "Settings"
msgstr "Beállítások"
-#: js/js.js:711
+#: js/js.js:706
msgid "seconds ago"
msgstr "pár másodperce"
-#: js/js.js:712
+#: js/js.js:707
msgid "1 minute ago"
msgstr "1 perce"
-#: js/js.js:713
+#: js/js.js:708
msgid "{minutes} minutes ago"
msgstr "{minutes} perce"
-#: js/js.js:714
+#: js/js.js:709
msgid "1 hour ago"
msgstr "1 órája"
-#: js/js.js:715
+#: js/js.js:710
msgid "{hours} hours ago"
msgstr "{hours} órája"
-#: js/js.js:716
+#: js/js.js:711
msgid "today"
msgstr "ma"
-#: js/js.js:717
+#: js/js.js:712
msgid "yesterday"
msgstr "tegnap"
-#: js/js.js:718
+#: js/js.js:713
msgid "{days} days ago"
msgstr "{days} napja"
-#: js/js.js:719
+#: js/js.js:714
msgid "last month"
msgstr "múlt hónapban"
-#: js/js.js:720
+#: js/js.js:715
msgid "{months} months ago"
msgstr "{months} hónapja"
-#: js/js.js:721
+#: js/js.js:716
msgid "months ago"
msgstr "több hónapja"
-#: js/js.js:722
+#: js/js.js:717
msgid "last year"
msgstr "tavaly"
-#: js/js.js:723
+#: js/js.js:718
msgid "years ago"
msgstr "több éve"
@@ -210,7 +211,6 @@ msgid "Password protect"
msgstr "Jelszóval is védem"
#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
msgid "Password"
msgstr "Jelszó (tetszőleges)"
@@ -566,18 +566,4 @@ msgstr "következő"
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
-msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "Biztonsági figyelmeztetés!"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "Kérjük írja be a jelszavát! <br/>Biztonsági okokból néha a bejelentkezést követően is ellenőrzésképpen meg kell adnia a jelszavát."
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "Ellenőrzés"
+msgstr "Owncloud frissítés a %s verzióra folyamatban. Kis türelmet."
diff --git a/l10n/hu_HU/files.po b/l10n/hu_HU/files.po
index bf6a28272e1..99731539f86 100644
--- a/l10n/hu_HU/files.po
+++ b/l10n/hu_HU/files.po
@@ -4,6 +4,7 @@
#
# Translators:
# Adam Toth <adazlord@gmail.com>, 2012.
+# <gyonkibendeguz@gmail.com>, 2013.
# <gyonkibendeguz@gmail.com>, 2013.
# <mail@tamas-nagy.net>, 2011.
# Peter Borsa <peter.borsa@gmail.com>, 2011.
@@ -11,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"POT-Creation-Date: 2013-01-20 00:05+0100\n"
+"PO-Revision-Date: 2013-01-19 23:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
@@ -21,60 +22,65 @@ msgstr ""
"Language: hu_HU\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/delete.php:28 ajax/getstoragestats.php:11 ajax/upload.php:17
+#: ajax/upload.php:76 templates/index.php:18
+msgid "Upload"
+msgstr "Feltöltés"
+
#: ajax/move.php:17
#, php-format
msgid "Could not move %s - File with this name already exists"
-msgstr ""
+msgstr "%s áthelyezése nem sikerült - már létezik másik fájl ezzel a névvel"
#: ajax/move.php:24
#, php-format
msgid "Could not move %s"
-msgstr ""
+msgstr "Nem sikerült %s áthelyezése"
#: ajax/rename.php:19
msgid "Unable to rename file"
-msgstr ""
+msgstr "Nem lehet átnevezni a fájlt"
-#: ajax/upload.php:14
+#: ajax/upload.php:20
msgid "No file was uploaded. Unknown error"
msgstr "Nem történt feltöltés. Ismeretlen hiba"
-#: ajax/upload.php:21
+#: ajax/upload.php:30
msgid "There is no error, the file uploaded with success"
msgstr "A fájlt sikerült feltölteni"
-#: ajax/upload.php:22
+#: ajax/upload.php:31
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr "A feltöltött fájl mérete meghaladja a php.ini állományban megadott upload_max_filesize paraméter értékét."
-#: ajax/upload.php:24
+#: ajax/upload.php:33
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "A feltöltött fájl mérete meghaladja a MAX_FILE_SIZE paramétert, ami a HTML formban került megadásra."
-#: ajax/upload.php:26
+#: ajax/upload.php:35
msgid "The uploaded file was only partially uploaded"
msgstr "Az eredeti fájlt csak részben sikerült feltölteni."
-#: ajax/upload.php:27
+#: ajax/upload.php:36
msgid "No file was uploaded"
msgstr "Nem töltődött fel semmi"
-#: ajax/upload.php:28
+#: ajax/upload.php:37
msgid "Missing a temporary folder"
msgstr "Hiányzik egy ideiglenes mappa"
-#: ajax/upload.php:29
+#: ajax/upload.php:38
msgid "Failed to write to disk"
msgstr "Nem sikerült a lemezre történő írás"
-#: ajax/upload.php:45
+#: ajax/upload.php:57
msgid "Not enough space available"
msgstr "Nincs elég szabad hely"
-#: ajax/upload.php:69
+#: ajax/upload.php:91
msgid "Invalid directory."
msgstr "Érvénytelen mappa."
@@ -130,98 +136,100 @@ msgstr "{files} fájl megosztása visszavonva"
msgid "deleted {files}"
msgstr "{files} fájl törölve"
-#: js/files.js:31
+#: js/files.js:48
msgid "'.' is an invalid file name."
msgstr "'.' fájlnév érvénytelen."
-#: js/files.js:36
+#: js/files.js:53
msgid "File name cannot be empty."
msgstr "A fájlnév nem lehet semmi."
-#: js/files.js:45
+#: js/files.js:62
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Érvénytelen elnevezés. Ezek a karakterek nem használhatók: '\\', '/', '<', '>', ':', '\"', '|', '?' és '*'"
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "ZIP-fájl generálása, ez eltarthat egy ideig."
+#: js/files.js:204
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
-#: js/files.js:224
+#: js/files.js:242
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Nem tölthető fel, mert mappa volt, vagy 0 byte méretű"
-#: js/files.js:224
+#: js/files.js:242
msgid "Upload Error"
msgstr "Feltöltési hiba"
-#: js/files.js:241
+#: js/files.js:259
msgid "Close"
msgstr "Bezárás"
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:278 js/files.js:397 js/files.js:431
msgid "Pending"
msgstr "Folyamatban"
-#: js/files.js:280
+#: js/files.js:298
msgid "1 file uploading"
msgstr "1 fájl töltődik föl"
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:301 js/files.js:357 js/files.js:372
msgid "{count} files uploading"
msgstr "{count} fájl töltődik föl"
-#: js/files.js:357 js/files.js:393
+#: js/files.js:376 js/files.js:414
msgid "Upload cancelled."
msgstr "A feltöltést megszakítottuk."
-#: js/files.js:464
+#: js/files.js:486
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Fájlfeltöltés van folyamatban. Az oldal elhagyása megszakítja a feltöltést."
-#: js/files.js:537
+#: js/files.js:559
msgid "URL cannot be empty."
msgstr "Az URL nem lehet semmi."
-#: js/files.js:543
+#: js/files.js:565
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
+msgstr "Érvénytelen mappanév. A név használata csak a Owncloud számára lehetséges."
-#: js/files.js:727
+#: js/files.js:775
msgid "{count} files scanned"
msgstr "{count} fájlt találtunk"
-#: js/files.js:735
+#: js/files.js:783
msgid "error while scanning"
msgstr "Hiba a fájllista-ellenőrzés során"
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:857 templates/index.php:64
msgid "Name"
msgstr "Név"
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:858 templates/index.php:75
msgid "Size"
msgstr "Méret"
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:859 templates/index.php:77
msgid "Modified"
msgstr "Módosítva"
-#: js/files.js:829
+#: js/files.js:878
msgid "1 folder"
msgstr "1 mappa"
-#: js/files.js:831
+#: js/files.js:880
msgid "{count} folders"
msgstr "{count} mappa"
-#: js/files.js:839
+#: js/files.js:888
msgid "1 file"
msgstr "1 fájl"
-#: js/files.js:841
+#: js/files.js:890
msgid "{count} files"
msgstr "{count} fájl"
@@ -273,10 +281,6 @@ msgstr "Mappa"
msgid "From link"
msgstr "Feltöltés linkről"
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Feltöltés"
-
#: templates/index.php:41
msgid "Cancel upload"
msgstr "A feltöltés megszakítása"
diff --git a/l10n/hu_HU/files_encryption.po b/l10n/hu_HU/files_encryption.po
index 896e96e2c73..4aea6abf217 100644
--- a/l10n/hu_HU/files_encryption.po
+++ b/l10n/hu_HU/files_encryption.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-31 00:04+0100\n"
-"PO-Revision-Date: 2012-12-30 17:43+0000\n"
-"Last-Translator: Laszlo Tornoci <torlasz@gmail.com>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,18 +18,66 @@ msgstr ""
"Language: hu_HU\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
msgid "Encryption"
msgstr "Titkosítás"
-#: templates/settings.php:6
-msgid "Enable Encryption"
-msgstr "A titkosítás engedélyezése"
+#: templates/settings.php:67
+msgid "Exclude the following file types from encryption"
+msgstr "A következő fájltípusok kizárása a titkosításból"
-#: templates/settings.php:7
+#: templates/settings.php:71
msgid "None"
msgstr "Egyik sem"
-
-#: templates/settings.php:12
-msgid "Exclude the following file types from encryption"
-msgstr "A következő fájltípusok kizárása a titkosításból"
diff --git a/l10n/hu_HU/files_versions.po b/l10n/hu_HU/files_versions.po
index 0a39722ad7f..d5db4ac6033 100644
--- a/l10n/hu_HU/files_versions.po
+++ b/l10n/hu_HU/files_versions.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-31 00:04+0100\n"
-"PO-Revision-Date: 2012-12-30 17:24+0000\n"
-"Last-Translator: Laszlo Tornoci <torlasz@gmail.com>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,22 +17,10 @@ msgstr ""
"Language: hu_HU\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/settings-personal.js:31 templates/settings-personal.php:7
-msgid "Expire all versions"
-msgstr "Az összes korábbi változat törlése"
-
#: js/versions.js:16
msgid "History"
msgstr "Korábbi változatok"
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "Az állományok korábbi változatai"
-
-#: templates/settings-personal.php:10
-msgid "This will delete all existing backup versions of your files"
-msgstr "Itt törölni tudja állományainak összes korábbi verzióját"
-
#: templates/settings.php:3
msgid "Files Versioning"
msgstr "Az állományok verzionálása"
diff --git a/l10n/hu_HU/lib.po b/l10n/hu_HU/lib.po
index 1a78f30958a..2db700bdfcf 100644
--- a/l10n/hu_HU/lib.po
+++ b/l10n/hu_HU/lib.po
@@ -4,12 +4,14 @@
#
# Translators:
# Adam Toth <adazlord@gmail.com>, 2012.
+# <gyonkibendeguz@gmail.com>, 2013.
+# Laszlo Tornoci <torlasz@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-31 00:04+0100\n"
-"PO-Revision-Date: 2012-12-30 09:34+0000\n"
+"POT-Creation-Date: 2013-01-20 00:05+0100\n"
+"PO-Revision-Date: 2013-01-19 13:13+0000\n"
"Last-Translator: Laszlo Tornoci <torlasz@gmail.com>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
@@ -18,27 +20,27 @@ msgstr ""
"Language: hu_HU\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:287
+#: app.php:301
msgid "Help"
msgstr "Súgó"
-#: app.php:294
+#: app.php:308
msgid "Personal"
msgstr "Személyes"
-#: app.php:299
+#: app.php:313
msgid "Settings"
msgstr "Beállítások"
-#: app.php:304
+#: app.php:318
msgid "Users"
msgstr "Felhasználók"
-#: app.php:311
+#: app.php:325
msgid "Apps"
msgstr "Alkalmazások"
-#: app.php:313
+#: app.php:327
msgid "Admin"
msgstr "Admin"
@@ -56,13 +58,17 @@ msgstr "Vissza a Fájlokhoz"
#: files.php:390
msgid "Selected files too large to generate zip file."
-msgstr "A kiválasztott fájlok túl nagy a zip tömörítéshez."
+msgstr "A kiválasztott fájlok túl nagyok a zip tömörítéshez."
+
+#: helper.php:229
+msgid "couldn't be determined"
+msgstr "nem sikerült azonosítani"
#: json.php:28
msgid "Application is not enabled"
msgstr "Az alkalmazás nincs engedélyezve"
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
msgstr "Hitelesítési hiba"
@@ -82,55 +88,55 @@ msgstr "Szöveg"
msgid "Images"
msgstr "Képek"
-#: template.php:103
+#: template.php:113
msgid "seconds ago"
msgstr "másodperce"
-#: template.php:104
+#: template.php:114
msgid "1 minute ago"
msgstr "1 perce"
-#: template.php:105
+#: template.php:115
#, php-format
msgid "%d minutes ago"
msgstr "%d perce"
-#: template.php:106
+#: template.php:116
msgid "1 hour ago"
msgstr "1 órája"
-#: template.php:107
+#: template.php:117
#, php-format
msgid "%d hours ago"
msgstr "%d órája"
-#: template.php:108
+#: template.php:118
msgid "today"
msgstr "ma"
-#: template.php:109
+#: template.php:119
msgid "yesterday"
msgstr "tegnap"
-#: template.php:110
+#: template.php:120
#, php-format
msgid "%d days ago"
msgstr "%d napja"
-#: template.php:111
+#: template.php:121
msgid "last month"
msgstr "múlt hónapban"
-#: template.php:112
+#: template.php:122
#, php-format
msgid "%d months ago"
msgstr "%d hónapja"
-#: template.php:113
+#: template.php:123
msgid "last year"
msgstr "tavaly"
-#: template.php:114
+#: template.php:124
msgid "years ago"
msgstr "éve"
diff --git a/l10n/hu_HU/user_ldap.po b/l10n/hu_HU/user_ldap.po
index 3e8274293c3..86496480614 100644
--- a/l10n/hu_HU/user_ldap.po
+++ b/l10n/hu_HU/user_ldap.po
@@ -4,13 +4,14 @@
#
# Translators:
# <gyonkibendeguz@gmail.com>, 2013.
+# Laszlo Tornoci <torlasz@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-09 00:04+0100\n"
-"PO-Revision-Date: 2013-01-08 16:35+0000\n"
-"Last-Translator: gyeben <gyonkibendeguz@gmail.com>\n"
+"POT-Creation-Date: 2013-01-20 00:05+0100\n"
+"PO-Revision-Date: 2013-01-19 15:57+0000\n"
+"Last-Translator: Laszlo Tornoci <torlasz@gmail.com>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -27,9 +28,9 @@ msgstr "<b>Figyelem:</b> a user_ldap és user_webdavauth alkalmazások nem kompa
#: templates/settings.php:11
msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
-msgstr "<b>Figyelem:</b> a szükséges PHP LDAP modul nincs telepítve. Enélkül az LDAP azonosítás nem fog működni. Kérje meg a rendszergazdát, hogy telepítse a szükséges modult!"
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
+msgstr "<b>Figyelmeztetés:</b> Az LDAP PHP modul nincs telepítve, ezért ez az alrendszer nem fog működni. Kérje meg a rendszergazdát, hogy telepítse!"
#: templates/settings.php:15
msgid "Host"
@@ -45,6 +46,10 @@ msgid "Base DN"
msgstr "DN-gyökér"
#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr "Soronként egy DN-gyökér"
+
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "A Haladó fülre kattintva külön DN-gyökér állítható be a felhasználók és a csoportok számára"
@@ -57,7 +62,7 @@ msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
-msgstr ""
+msgstr "Annak a felhasználónak a DN-je, akinek a nevében bejelentkezve kapcsolódunk a kiszolgálóhoz, pl. uid=agent,dc=example,dc=com. Bejelentkezés nélküli eléréshez ne töltse ki a DN és Jelszó mezőket!"
#: templates/settings.php:18
msgid "Password"
@@ -115,10 +120,18 @@ msgstr "Port"
msgid "Base User Tree"
msgstr "A felhasználói fa gyökere"
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr "Soronként egy felhasználói fa gyökerét adhatjuk meg"
+
#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "A csoportfa gyökere"
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr "Soronként egy csoportfa gyökerét adhatjuk meg"
+
#: templates/settings.php:27
msgid "Group-Member association"
msgstr "A csoporttagság attribútuma"
diff --git a/l10n/hu_HU/user_webdavauth.po b/l10n/hu_HU/user_webdavauth.po
index 5d89219034f..e7f281281b7 100644
--- a/l10n/hu_HU/user_webdavauth.po
+++ b/l10n/hu_HU/user_webdavauth.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-31 00:04+0100\n"
-"PO-Revision-Date: 2012-12-30 20:47+0000\n"
-"Last-Translator: Laszlo Tornoci <torlasz@gmail.com>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,13 +17,17 @@ msgstr ""
"Language: hu_HU\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
#: templates/settings.php:4
msgid "URL: http://"
msgstr "URL: http://"
#: templates/settings.php:6
msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
-msgstr "Az ownCloud rendszer erre a címre fogja elküldeni a felhasználók bejelentkezési adatait. Ha 401-es vagy 403-as http kódot kap vissza, azt sikertelen azonosításként fogja értelmezni, minden más kódot sikeresnek fog tekinteni."
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
+msgstr ""
diff --git a/l10n/ia/core.po b/l10n/ia/core.po
index 1973b2c0d96..984f28fcdf4 100644
--- a/l10n/ia/core.po
+++ b/l10n/ia/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
@@ -208,7 +208,6 @@ msgid "Password protect"
msgstr ""
#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
msgid "Password"
msgstr "Contrasigno"
@@ -565,17 +564,3 @@ msgstr "prox"
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr ""
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr ""
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr ""
diff --git a/l10n/ia/files.po b/l10n/ia/files.po
index 48fee82947c..c99fb7952dd 100644
--- a/l10n/ia/files.po
+++ b/l10n/ia/files.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"POT-Creation-Date: 2013-01-20 00:05+0100\n"
+"PO-Revision-Date: 2013-01-19 23:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
@@ -19,6 +19,11 @@ msgstr ""
"Language: ia\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/delete.php:28 ajax/getstoragestats.php:11 ajax/upload.php:17
+#: ajax/upload.php:76 templates/index.php:18
+msgid "Upload"
+msgstr "Incargar"
+
#: ajax/move.php:17
#, php-format
msgid "Could not move %s - File with this name already exists"
@@ -33,46 +38,46 @@ msgstr ""
msgid "Unable to rename file"
msgstr ""
-#: ajax/upload.php:14
+#: ajax/upload.php:20
msgid "No file was uploaded. Unknown error"
msgstr ""
-#: ajax/upload.php:21
+#: ajax/upload.php:30
msgid "There is no error, the file uploaded with success"
msgstr ""
-#: ajax/upload.php:22
+#: ajax/upload.php:31
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr ""
-#: ajax/upload.php:24
+#: ajax/upload.php:33
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr ""
-#: ajax/upload.php:26
+#: ajax/upload.php:35
msgid "The uploaded file was only partially uploaded"
msgstr "Le file incargate solmente esseva incargate partialmente"
-#: ajax/upload.php:27
+#: ajax/upload.php:36
msgid "No file was uploaded"
msgstr "Nulle file esseva incargate"
-#: ajax/upload.php:28
+#: ajax/upload.php:37
msgid "Missing a temporary folder"
msgstr "Manca un dossier temporari"
-#: ajax/upload.php:29
+#: ajax/upload.php:38
msgid "Failed to write to disk"
msgstr ""
-#: ajax/upload.php:45
+#: ajax/upload.php:57
msgid "Not enough space available"
msgstr ""
-#: ajax/upload.php:69
+#: ajax/upload.php:91
msgid "Invalid directory."
msgstr ""
@@ -128,98 +133,100 @@ msgstr ""
msgid "deleted {files}"
msgstr ""
-#: js/files.js:31
+#: js/files.js:48
msgid "'.' is an invalid file name."
msgstr ""
-#: js/files.js:36
+#: js/files.js:53
msgid "File name cannot be empty."
msgstr ""
-#: js/files.js:45
+#: js/files.js:62
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
+#: js/files.js:204
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
msgstr ""
-#: js/files.js:224
+#: js/files.js:242
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr ""
-#: js/files.js:224
+#: js/files.js:242
msgid "Upload Error"
msgstr ""
-#: js/files.js:241
+#: js/files.js:259
msgid "Close"
msgstr "Clauder"
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:278 js/files.js:397 js/files.js:431
msgid "Pending"
msgstr ""
-#: js/files.js:280
+#: js/files.js:298
msgid "1 file uploading"
msgstr ""
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:301 js/files.js:357 js/files.js:372
msgid "{count} files uploading"
msgstr ""
-#: js/files.js:357 js/files.js:393
+#: js/files.js:376 js/files.js:414
msgid "Upload cancelled."
msgstr ""
-#: js/files.js:464
+#: js/files.js:486
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/files.js:537
+#: js/files.js:559
msgid "URL cannot be empty."
msgstr ""
-#: js/files.js:543
+#: js/files.js:565
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:727
+#: js/files.js:775
msgid "{count} files scanned"
msgstr ""
-#: js/files.js:735
+#: js/files.js:783
msgid "error while scanning"
msgstr ""
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:857 templates/index.php:64
msgid "Name"
msgstr "Nomine"
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:858 templates/index.php:75
msgid "Size"
msgstr "Dimension"
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:859 templates/index.php:77
msgid "Modified"
msgstr "Modificate"
-#: js/files.js:829
+#: js/files.js:878
msgid "1 folder"
msgstr ""
-#: js/files.js:831
+#: js/files.js:880
msgid "{count} folders"
msgstr ""
-#: js/files.js:839
+#: js/files.js:888
msgid "1 file"
msgstr ""
-#: js/files.js:841
+#: js/files.js:890
msgid "{count} files"
msgstr ""
@@ -271,10 +278,6 @@ msgstr "Dossier"
msgid "From link"
msgstr ""
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Incargar"
-
#: templates/index.php:41
msgid "Cancel upload"
msgstr ""
diff --git a/l10n/ia/files_encryption.po b/l10n/ia/files_encryption.po
index 8b85b14f5c1..bd7a38a6b19 100644
--- a/l10n/ia/files_encryption.po
+++ b/l10n/ia/files_encryption.po
@@ -7,28 +7,76 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: ia\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings.php:3
-msgid "Encryption"
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
msgstr ""
-#: templates/settings.php:4
-msgid "Exclude the following file types from encryption"
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
msgstr ""
-#: templates/settings.php:5
-msgid "None"
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
msgstr ""
#: templates/settings.php:10
-msgid "Enable Encryption"
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:67
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:71
+msgid "None"
msgstr ""
diff --git a/l10n/ia/files_versions.po b/l10n/ia/files_versions.po
index d0287f45fff..7b2dbb7efe9 100644
--- a/l10n/ia/files_versions.po
+++ b/l10n/ia/files_versions.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-22 01:14+0200\n"
-"PO-Revision-Date: 2012-09-21 23:15+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,22 +17,10 @@ msgstr ""
"Language: ia\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr ""
-
#: js/versions.js:16
msgid "History"
msgstr ""
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr ""
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr ""
-
#: templates/settings.php:3
msgid "Files Versioning"
msgstr ""
diff --git a/l10n/ia/lib.po b/l10n/ia/lib.po
index ac4ffabd499..2e638284821 100644
--- a/l10n/ia/lib.po
+++ b/l10n/ia/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-14 23:13+0000\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
@@ -17,51 +17,55 @@ msgstr ""
"Language: ia\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:285
+#: app.php:301
msgid "Help"
msgstr "Adjuta"
-#: app.php:292
+#: app.php:308
msgid "Personal"
msgstr "Personal"
-#: app.php:297
+#: app.php:313
msgid "Settings"
msgstr "Configurationes"
-#: app.php:302
+#: app.php:318
msgid "Users"
msgstr "Usatores"
-#: app.php:309
+#: app.php:325
msgid "Apps"
msgstr ""
-#: app.php:311
+#: app.php:327
msgid "Admin"
msgstr ""
-#: files.php:332
+#: files.php:365
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:333
+#: files.php:366
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:333 files.php:358
+#: files.php:366 files.php:391
msgid "Back to Files"
msgstr ""
-#: files.php:357
+#: files.php:390
msgid "Selected files too large to generate zip file."
msgstr ""
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr ""
+
#: json.php:28
msgid "Application is not enabled"
msgstr ""
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
msgstr ""
@@ -81,55 +85,55 @@ msgstr "Texto"
msgid "Images"
msgstr ""
-#: template.php:103
+#: template.php:113
msgid "seconds ago"
msgstr ""
-#: template.php:104
+#: template.php:114
msgid "1 minute ago"
msgstr ""
-#: template.php:105
+#: template.php:115
#, php-format
msgid "%d minutes ago"
msgstr ""
-#: template.php:106
+#: template.php:116
msgid "1 hour ago"
msgstr ""
-#: template.php:107
+#: template.php:117
#, php-format
msgid "%d hours ago"
msgstr ""
-#: template.php:108
+#: template.php:118
msgid "today"
msgstr ""
-#: template.php:109
+#: template.php:119
msgid "yesterday"
msgstr ""
-#: template.php:110
+#: template.php:120
#, php-format
msgid "%d days ago"
msgstr ""
-#: template.php:111
+#: template.php:121
msgid "last month"
msgstr ""
-#: template.php:112
+#: template.php:122
#, php-format
msgid "%d months ago"
msgstr ""
-#: template.php:113
+#: template.php:123
msgid "last year"
msgstr ""
-#: template.php:114
+#: template.php:124
msgid "years ago"
msgstr ""
diff --git a/l10n/ia/user_ldap.po b/l10n/ia/user_ldap.po
index cae53dce374..6a131310437 100644
--- a/l10n/ia/user_ldap.po
+++ b/l10n/ia/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"POT-Creation-Date: 2013-01-18 00:03+0100\n"
+"PO-Revision-Date: 2013-01-17 21:57+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
@@ -26,8 +26,8 @@ msgstr ""
#: templates/settings.php:11
msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
msgstr ""
#: templates/settings.php:15
@@ -44,6 +44,10 @@ msgid "Base DN"
msgstr ""
#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
@@ -114,10 +118,18 @@ msgstr ""
msgid "Base User Tree"
msgstr ""
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
@@ -180,4 +192,4 @@ msgstr ""
#: templates/settings.php:39
msgid "Help"
-msgstr ""
+msgstr "Adjuta"
diff --git a/l10n/ia/user_webdavauth.po b/l10n/ia/user_webdavauth.po
index d14ab08ef72..cee575b4381 100644
--- a/l10n/ia/user_webdavauth.po
+++ b/l10n/ia/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-20 00:11+0100\n"
-"PO-Revision-Date: 2012-12-19 23:12+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
@@ -17,13 +17,17 @@ msgstr ""
"Language: ia\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
#: templates/settings.php:4
msgid "URL: http://"
msgstr ""
#: templates/settings.php:6
msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
msgstr ""
diff --git a/l10n/id/core.po b/l10n/id/core.po
index 4ae22894b17..0bf675c92b8 100644
--- a/l10n/id/core.po
+++ b/l10n/id/core.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
@@ -211,7 +211,6 @@ msgid "Password protect"
msgstr "lindungi dengan kata kunci"
#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
msgid "Password"
msgstr "Password"
@@ -568,17 +567,3 @@ msgstr "selanjutnya"
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "peringatan keamanan!"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "mohon periksa kembali kata kunci anda. <br/>untuk alasan keamanan,anda akan sesekali diminta untuk memasukan kata kunci lagi."
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "periksa kembali"
diff --git a/l10n/id/files.po b/l10n/id/files.po
index cd2442d53bd..31ff4ad0fe8 100644
--- a/l10n/id/files.po
+++ b/l10n/id/files.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"POT-Creation-Date: 2013-01-20 00:05+0100\n"
+"PO-Revision-Date: 2013-01-19 23:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
@@ -20,6 +20,11 @@ msgstr ""
"Language: id\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#: ajax/delete.php:28 ajax/getstoragestats.php:11 ajax/upload.php:17
+#: ajax/upload.php:76 templates/index.php:18
+msgid "Upload"
+msgstr "Unggah"
+
#: ajax/move.php:17
#, php-format
msgid "Could not move %s - File with this name already exists"
@@ -34,46 +39,46 @@ msgstr ""
msgid "Unable to rename file"
msgstr ""
-#: ajax/upload.php:14
+#: ajax/upload.php:20
msgid "No file was uploaded. Unknown error"
msgstr ""
-#: ajax/upload.php:21
+#: ajax/upload.php:30
msgid "There is no error, the file uploaded with success"
msgstr "Tidak ada galat, berkas sukses diunggah"
-#: ajax/upload.php:22
+#: ajax/upload.php:31
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr ""
-#: ajax/upload.php:24
+#: ajax/upload.php:33
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "File yang diunggah melampaui directive MAX_FILE_SIZE yang disebutan dalam form HTML."
-#: ajax/upload.php:26
+#: ajax/upload.php:35
msgid "The uploaded file was only partially uploaded"
msgstr "Berkas hanya diunggah sebagian"
-#: ajax/upload.php:27
+#: ajax/upload.php:36
msgid "No file was uploaded"
msgstr "Tidak ada berkas yang diunggah"
-#: ajax/upload.php:28
+#: ajax/upload.php:37
msgid "Missing a temporary folder"
msgstr "Kehilangan folder temporer"
-#: ajax/upload.php:29
+#: ajax/upload.php:38
msgid "Failed to write to disk"
msgstr "Gagal menulis ke disk"
-#: ajax/upload.php:45
+#: ajax/upload.php:57
msgid "Not enough space available"
msgstr ""
-#: ajax/upload.php:69
+#: ajax/upload.php:91
msgid "Invalid directory."
msgstr ""
@@ -129,98 +134,100 @@ msgstr ""
msgid "deleted {files}"
msgstr ""
-#: js/files.js:31
+#: js/files.js:48
msgid "'.' is an invalid file name."
msgstr ""
-#: js/files.js:36
+#: js/files.js:53
msgid "File name cannot be empty."
msgstr ""
-#: js/files.js:45
+#: js/files.js:62
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "membuat berkas ZIP, ini mungkin memakan waktu."
+#: js/files.js:204
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
-#: js/files.js:224
+#: js/files.js:242
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Gagal mengunggah berkas anda karena berupa direktori atau mempunyai ukuran 0 byte"
-#: js/files.js:224
+#: js/files.js:242
msgid "Upload Error"
msgstr "Terjadi Galat Pengunggahan"
-#: js/files.js:241
+#: js/files.js:259
msgid "Close"
msgstr "tutup"
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:278 js/files.js:397 js/files.js:431
msgid "Pending"
msgstr "Menunggu"
-#: js/files.js:280
+#: js/files.js:298
msgid "1 file uploading"
msgstr ""
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:301 js/files.js:357 js/files.js:372
msgid "{count} files uploading"
msgstr ""
-#: js/files.js:357 js/files.js:393
+#: js/files.js:376 js/files.js:414
msgid "Upload cancelled."
msgstr "Pengunggahan dibatalkan."
-#: js/files.js:464
+#: js/files.js:486
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/files.js:537
+#: js/files.js:559
msgid "URL cannot be empty."
msgstr "tautan tidak boleh kosong"
-#: js/files.js:543
+#: js/files.js:565
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:727
+#: js/files.js:775
msgid "{count} files scanned"
msgstr ""
-#: js/files.js:735
+#: js/files.js:783
msgid "error while scanning"
msgstr ""
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:857 templates/index.php:64
msgid "Name"
msgstr "Nama"
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:858 templates/index.php:75
msgid "Size"
msgstr "Ukuran"
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:859 templates/index.php:77
msgid "Modified"
msgstr "Dimodifikasi"
-#: js/files.js:829
+#: js/files.js:878
msgid "1 folder"
msgstr ""
-#: js/files.js:831
+#: js/files.js:880
msgid "{count} folders"
msgstr ""
-#: js/files.js:839
+#: js/files.js:888
msgid "1 file"
msgstr ""
-#: js/files.js:841
+#: js/files.js:890
msgid "{count} files"
msgstr ""
@@ -272,10 +279,6 @@ msgstr "Folder"
msgid "From link"
msgstr ""
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Unggah"
-
#: templates/index.php:41
msgid "Cancel upload"
msgstr "Batal mengunggah"
diff --git a/l10n/id/files_encryption.po b/l10n/id/files_encryption.po
index 5ab924354cb..d6d66e61e07 100644
--- a/l10n/id/files_encryption.po
+++ b/l10n/id/files_encryption.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-21 02:03+0200\n"
-"PO-Revision-Date: 2012-10-20 23:08+0000\n"
-"Last-Translator: elmakong <mr.pige_ina@yahoo.co.id>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,18 +18,66 @@ msgstr ""
"Language: id\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
msgid "Encryption"
msgstr "enkripsi"
-#: templates/settings.php:4
+#: templates/settings.php:67
msgid "Exclude the following file types from encryption"
msgstr "pengecualian untuk tipe file berikut dari enkripsi"
-#: templates/settings.php:5
+#: templates/settings.php:71
msgid "None"
msgstr "tidak ada"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "aktifkan enkripsi"
diff --git a/l10n/id/files_versions.po b/l10n/id/files_versions.po
index 5b9201c347e..7b9d5d18745 100644
--- a/l10n/id/files_versions.po
+++ b/l10n/id/files_versions.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-21 02:03+0200\n"
-"PO-Revision-Date: 2012-10-20 23:40+0000\n"
-"Last-Translator: elmakong <mr.pige_ina@yahoo.co.id>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,22 +18,10 @@ msgstr ""
"Language: id\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "kadaluarsakan semua versi"
-
#: js/versions.js:16
msgid "History"
msgstr "riwayat"
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "versi"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "ini akan menghapus semua versi backup yang ada dari file anda"
-
#: templates/settings.php:3
msgid "Files Versioning"
msgstr "pembuatan versi file"
diff --git a/l10n/id/lib.po b/l10n/id/lib.po
index ce05e57c124..013ed9d846c 100644
--- a/l10n/id/lib.po
+++ b/l10n/id/lib.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-14 00:17+0100\n"
-"PO-Revision-Date: 2013-01-13 01:26+0000\n"
-"Last-Translator: Mohamad Hasan Al Banna <se7entime@gmail.com>\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -59,11 +59,15 @@ msgstr "kembali ke daftar file"
msgid "Selected files too large to generate zip file."
msgstr "file yang dipilih terlalu besar untuk membuat file zip"
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr ""
+
#: json.php:28
msgid "Application is not enabled"
msgstr "aplikasi tidak diaktifkan"
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
msgstr "autentikasi bermasalah"
@@ -83,55 +87,55 @@ msgstr "teks"
msgid "Images"
msgstr "Gambar"
-#: template.php:103
+#: template.php:113
msgid "seconds ago"
msgstr "beberapa detik yang lalu"
-#: template.php:104
+#: template.php:114
msgid "1 minute ago"
msgstr "1 menit lalu"
-#: template.php:105
+#: template.php:115
#, php-format
msgid "%d minutes ago"
msgstr "%d menit lalu"
-#: template.php:106
+#: template.php:116
msgid "1 hour ago"
msgstr "1 jam yang lalu"
-#: template.php:107
+#: template.php:117
#, php-format
msgid "%d hours ago"
msgstr "%d jam yang lalu"
-#: template.php:108
+#: template.php:118
msgid "today"
msgstr "hari ini"
-#: template.php:109
+#: template.php:119
msgid "yesterday"
msgstr "kemarin"
-#: template.php:110
+#: template.php:120
#, php-format
msgid "%d days ago"
msgstr "%d hari lalu"
-#: template.php:111
+#: template.php:121
msgid "last month"
msgstr "bulan kemarin"
-#: template.php:112
+#: template.php:122
#, php-format
msgid "%d months ago"
msgstr "%d bulan yang lalu"
-#: template.php:113
+#: template.php:123
msgid "last year"
msgstr "tahun kemarin"
-#: template.php:114
+#: template.php:124
msgid "years ago"
msgstr "beberapa tahun lalu"
diff --git a/l10n/id/user_ldap.po b/l10n/id/user_ldap.po
index 193df390395..d1b6b34abf1 100644
--- a/l10n/id/user_ldap.po
+++ b/l10n/id/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 23:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
@@ -27,8 +27,8 @@ msgstr ""
#: templates/settings.php:11
msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
msgstr ""
#: templates/settings.php:15
@@ -45,6 +45,10 @@ msgid "Base DN"
msgstr ""
#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
@@ -115,10 +119,18 @@ msgstr "port"
msgid "Base User Tree"
msgstr ""
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
diff --git a/l10n/id/user_webdavauth.po b/l10n/id/user_webdavauth.po
index fc5b698ce72..409d046d03e 100644
--- a/l10n/id/user_webdavauth.po
+++ b/l10n/id/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-20 00:11+0100\n"
-"PO-Revision-Date: 2012-12-19 23:12+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
@@ -17,13 +17,17 @@ msgstr ""
"Language: id\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
#: templates/settings.php:4
msgid "URL: http://"
msgstr ""
#: templates/settings.php:6
msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
msgstr ""
diff --git a/l10n/is/core.po b/l10n/is/core.po
index d07f7133071..a575a9992a8 100644
--- a/l10n/is/core.po
+++ b/l10n/is/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
@@ -209,7 +209,6 @@ msgid "Password protect"
msgstr "Verja með lykilorði"
#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
msgid "Password"
msgstr "Lykilorð"
@@ -566,17 +565,3 @@ msgstr "næsta"
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
msgstr "Uppfæri ownCloud í útgáfu %s, það gæti tekið smá stund."
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "Öryggis aðvörun!"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "Vinsamlegast staðfestu lykilorðið þitt.<br/>Í öryggisskyni munum við biðja þig um að skipta um lykilorð af og til."
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "Staðfesta"
diff --git a/l10n/is/files.po b/l10n/is/files.po
index f1c7c6d6dd1..6501754dbc6 100644
--- a/l10n/is/files.po
+++ b/l10n/is/files.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-11 00:05+0100\n"
-"PO-Revision-Date: 2013-01-10 22:46+0000\n"
-"Last-Translator: sveinn <sveinng@gmail.com>\n"
+"POT-Creation-Date: 2013-01-20 00:05+0100\n"
+"PO-Revision-Date: 2013-01-19 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,6 +18,11 @@ msgstr ""
"Language: is\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/delete.php:28 ajax/getstoragestats.php:11 ajax/upload.php:17
+#: ajax/upload.php:76 templates/index.php:18
+msgid "Upload"
+msgstr "Senda inn"
+
#: ajax/move.php:17
#, php-format
msgid "Could not move %s - File with this name already exists"
@@ -32,46 +37,46 @@ msgstr "Gat ekki fært %s"
msgid "Unable to rename file"
msgstr "Gat ekki endurskýrt skrá"
-#: ajax/upload.php:14
+#: ajax/upload.php:20
msgid "No file was uploaded. Unknown error"
msgstr "Engin skrá var send inn. Óþekkt villa."
-#: ajax/upload.php:21
+#: ajax/upload.php:30
msgid "There is no error, the file uploaded with success"
msgstr "Engin villa, innsending heppnaðist"
-#: ajax/upload.php:22
+#: ajax/upload.php:31
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr "Innsend skrá er stærri en upload_max stillingin í php.ini:"
-#: ajax/upload.php:24
+#: ajax/upload.php:33
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "Innsenda skráin er stærri en MAX_FILE_SIZE sem skilgreint er í HTML sniðinu."
-#: ajax/upload.php:26
+#: ajax/upload.php:35
msgid "The uploaded file was only partially uploaded"
msgstr "Einungis hluti af innsendri skrá skilaði sér"
-#: ajax/upload.php:27
+#: ajax/upload.php:36
msgid "No file was uploaded"
msgstr "Engin skrá skilaði sér"
-#: ajax/upload.php:28
+#: ajax/upload.php:37
msgid "Missing a temporary folder"
msgstr "Vantar bráðabirgðamöppu"
-#: ajax/upload.php:29
+#: ajax/upload.php:38
msgid "Failed to write to disk"
msgstr "Tókst ekki að skrifa á disk"
-#: ajax/upload.php:45
+#: ajax/upload.php:57
msgid "Not enough space available"
msgstr "Ekki nægt pláss tiltækt"
-#: ajax/upload.php:69
+#: ajax/upload.php:91
msgid "Invalid directory."
msgstr "Ógild mappa."
@@ -127,98 +132,100 @@ msgstr "Hætti við deilingu á {files}"
msgid "deleted {files}"
msgstr "eyddi {files}"
-#: js/files.js:31
+#: js/files.js:48
msgid "'.' is an invalid file name."
msgstr "'.' er ekki leyfilegt nafn."
-#: js/files.js:36
+#: js/files.js:53
msgid "File name cannot be empty."
msgstr "Nafn skráar má ekki vera tómt"
-#: js/files.js:45
+#: js/files.js:62
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Ógilt nafn, táknin '\\', '/', '<', '>', ':', '\"', '|', '?' og '*' eru ekki leyfð."
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "bý til ZIP skrá, það gæti tekið smá stund."
+#: js/files.js:204
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
-#: js/files.js:224
+#: js/files.js:242
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Innsending á skrá mistókst, hugsanlega sendir þú möppu eða skráin er 0 bæti."
-#: js/files.js:224
+#: js/files.js:242
msgid "Upload Error"
msgstr "Villa við innsendingu"
-#: js/files.js:241
+#: js/files.js:259
msgid "Close"
msgstr "Loka"
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:278 js/files.js:397 js/files.js:431
msgid "Pending"
msgstr "Bíður"
-#: js/files.js:280
+#: js/files.js:298
msgid "1 file uploading"
msgstr "1 skrá innsend"
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:301 js/files.js:357 js/files.js:372
msgid "{count} files uploading"
msgstr "{count} skrár innsendar"
-#: js/files.js:357 js/files.js:393
+#: js/files.js:376 js/files.js:414
msgid "Upload cancelled."
msgstr "Hætt við innsendingu."
-#: js/files.js:464
+#: js/files.js:486
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Innsending í gangi. Ef þú ferð af þessari síðu mun innsending misheppnast."
-#: js/files.js:537
+#: js/files.js:559
msgid "URL cannot be empty."
msgstr "Vefslóð má ekki vera tóm."
-#: js/files.js:543
+#: js/files.js:565
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Óleyfilegt nafn á möppu. Nafnið 'Shared' er frátekið fyrir Owncloud"
-#: js/files.js:727
+#: js/files.js:775
msgid "{count} files scanned"
msgstr "{count} skrár skimaðar"
-#: js/files.js:735
+#: js/files.js:783
msgid "error while scanning"
msgstr "villa við skimun"
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:857 templates/index.php:64
msgid "Name"
msgstr "Nafn"
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:858 templates/index.php:75
msgid "Size"
msgstr "Stærð"
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:859 templates/index.php:77
msgid "Modified"
msgstr "Breytt"
-#: js/files.js:829
+#: js/files.js:878
msgid "1 folder"
msgstr "1 mappa"
-#: js/files.js:831
+#: js/files.js:880
msgid "{count} folders"
msgstr "{count} möppur"
-#: js/files.js:839
+#: js/files.js:888
msgid "1 file"
msgstr "1 skrá"
-#: js/files.js:841
+#: js/files.js:890
msgid "{count} files"
msgstr "{count} skrár"
@@ -270,10 +277,6 @@ msgstr "Mappa"
msgid "From link"
msgstr "Af tengli"
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Senda inn"
-
#: templates/index.php:41
msgid "Cancel upload"
msgstr "Hætta við innsendingu"
diff --git a/l10n/is/files_encryption.po b/l10n/is/files_encryption.po
index 3dfd91e61ab..b46b5ff3c18 100644
--- a/l10n/is/files_encryption.po
+++ b/l10n/is/files_encryption.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-31 00:04+0100\n"
-"PO-Revision-Date: 2012-12-30 19:56+0000\n"
-"Last-Translator: sveinn <sveinng@gmail.com>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,18 +18,66 @@ msgstr ""
"Language: is\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
msgid "Encryption"
msgstr "Dulkóðun"
-#: templates/settings.php:6
-msgid "Enable Encryption"
-msgstr "Virkja dulkóðun"
+#: templates/settings.php:67
+msgid "Exclude the following file types from encryption"
+msgstr "Undanskilja eftirfarandi skráartegundir frá dulkóðun"
-#: templates/settings.php:7
+#: templates/settings.php:71
msgid "None"
msgstr "Ekkert"
-
-#: templates/settings.php:12
-msgid "Exclude the following file types from encryption"
-msgstr "Undanskilja eftirfarandi skráartegundir frá dulkóðun"
diff --git a/l10n/is/files_versions.po b/l10n/is/files_versions.po
index bc2e72de575..1a0acfa5b88 100644
--- a/l10n/is/files_versions.po
+++ b/l10n/is/files_versions.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-31 00:04+0100\n"
-"PO-Revision-Date: 2012-12-30 17:42+0000\n"
-"Last-Translator: sveinn <sveinng@gmail.com>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,22 +18,10 @@ msgstr ""
"Language: is\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/settings-personal.js:31 templates/settings-personal.php:7
-msgid "Expire all versions"
-msgstr "Úrelda allar útgáfur"
-
#: js/versions.js:16
msgid "History"
msgstr "Saga"
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "Útgáfur"
-
-#: templates/settings-personal.php:10
-msgid "This will delete all existing backup versions of your files"
-msgstr "Þetta mun eyða öllum afritum af skránum þínum"
-
#: templates/settings.php:3
msgid "Files Versioning"
msgstr "Útgáfur af skrám"
diff --git a/l10n/is/lib.po b/l10n/is/lib.po
index 0e7cb461873..e6b54f855f2 100644
--- a/l10n/is/lib.po
+++ b/l10n/is/lib.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-31 00:04+0100\n"
-"PO-Revision-Date: 2012-12-30 15:15+0000\n"
-"Last-Translator: sveinn <sveinng@gmail.com>\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,27 +18,27 @@ msgstr ""
"Language: is\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:287
+#: app.php:301
msgid "Help"
msgstr "Hjálp"
-#: app.php:294
+#: app.php:308
msgid "Personal"
msgstr "Um mig"
-#: app.php:299
+#: app.php:313
msgid "Settings"
msgstr "Stillingar"
-#: app.php:304
+#: app.php:318
msgid "Users"
msgstr "Notendur"
-#: app.php:311
+#: app.php:325
msgid "Apps"
msgstr "Forrit"
-#: app.php:313
+#: app.php:327
msgid "Admin"
msgstr "Stjórnun"
@@ -58,11 +58,15 @@ msgstr "Aftur í skrár"
msgid "Selected files too large to generate zip file."
msgstr "Valdar skrár eru of stórar til að búa til ZIP skrá."
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr ""
+
#: json.php:28
msgid "Application is not enabled"
msgstr "Forrit ekki virkt"
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
msgstr "Villa við auðkenningu"
@@ -82,55 +86,55 @@ msgstr "Texti"
msgid "Images"
msgstr "Myndir"
-#: template.php:103
+#: template.php:113
msgid "seconds ago"
msgstr "sek."
-#: template.php:104
+#: template.php:114
msgid "1 minute ago"
msgstr "Fyrir 1 mínútu"
-#: template.php:105
+#: template.php:115
#, php-format
msgid "%d minutes ago"
msgstr "fyrir %d mínútum"
-#: template.php:106
+#: template.php:116
msgid "1 hour ago"
msgstr "Fyrir 1 klst."
-#: template.php:107
+#: template.php:117
#, php-format
msgid "%d hours ago"
msgstr "fyrir %d klst."
-#: template.php:108
+#: template.php:118
msgid "today"
msgstr "í dag"
-#: template.php:109
+#: template.php:119
msgid "yesterday"
msgstr "í gær"
-#: template.php:110
+#: template.php:120
#, php-format
msgid "%d days ago"
msgstr "fyrir %d dögum"
-#: template.php:111
+#: template.php:121
msgid "last month"
msgstr "síðasta mánuði"
-#: template.php:112
+#: template.php:122
#, php-format
msgid "%d months ago"
msgstr "fyrir %d mánuðum"
-#: template.php:113
+#: template.php:123
msgid "last year"
msgstr "síðasta ári"
-#: template.php:114
+#: template.php:124
msgid "years ago"
msgstr "einhverjum árum"
diff --git a/l10n/is/user_ldap.po b/l10n/is/user_ldap.po
index 828b0b2693a..98dfe70c84e 100644
--- a/l10n/is/user_ldap.po
+++ b/l10n/is/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-31 00:04+0100\n"
-"PO-Revision-Date: 2012-12-30 19:00+0000\n"
-"Last-Translator: sveinn <sveinng@gmail.com>\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 23:20+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -27,8 +27,8 @@ msgstr ""
#: templates/settings.php:11
msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
msgstr ""
#: templates/settings.php:15
@@ -45,6 +45,10 @@ msgid "Base DN"
msgstr ""
#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
@@ -115,10 +119,18 @@ msgstr ""
msgid "Base User Tree"
msgstr ""
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
diff --git a/l10n/is/user_webdavauth.po b/l10n/is/user_webdavauth.po
index 859ebae1986..8bf05572184 100644
--- a/l10n/is/user_webdavauth.po
+++ b/l10n/is/user_webdavauth.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-31 00:04+0100\n"
-"PO-Revision-Date: 2012-12-30 21:13+0000\n"
-"Last-Translator: sveinn <sveinng@gmail.com>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,13 +18,17 @@ msgstr ""
"Language: is\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
#: templates/settings.php:4
msgid "URL: http://"
msgstr "Vefslóð: http://"
#: templates/settings.php:6
msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
-msgstr "ownCloud mun senda auðkenni notenda á þessa vefslóð og túkla svörin http 401 og http 403 sem rangar auðkenniupplýsingar og öll önnur svör sem rétt."
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
+msgstr ""
diff --git a/l10n/it/core.po b/l10n/it/core.po
index 9191a81e2d2..5db447c37b6 100644
--- a/l10n/it/core.po
+++ b/l10n/it/core.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
@@ -212,7 +212,6 @@ msgid "Password protect"
msgstr "Proteggi con password"
#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
msgid "Password"
msgstr "Password"
@@ -569,17 +568,3 @@ msgstr "successivo"
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
msgstr "Aggiornamento di ownCloud alla versione %s in corso, potrebbe richiedere del tempo."
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "Avviso di sicurezza"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "Verifica la tua password.<br/>Per motivi di sicurezza, potresti ricevere una richiesta di digitare nuovamente la password."
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "Verifica"
diff --git a/l10n/it/files.po b/l10n/it/files.po
index 89db9dc1bd9..bf7aa473141 100644
--- a/l10n/it/files.po
+++ b/l10n/it/files.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-11 00:05+0100\n"
-"PO-Revision-Date: 2013-01-10 06:53+0000\n"
+"POT-Creation-Date: 2013-01-21 00:04+0100\n"
+"PO-Revision-Date: 2013-01-19 23:20+0000\n"
"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
@@ -21,6 +21,11 @@ msgstr ""
"Language: it\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/delete.php:28 ajax/getstoragestats.php:11 ajax/upload.php:17
+#: ajax/upload.php:76 templates/index.php:18
+msgid "Upload"
+msgstr "Carica"
+
#: ajax/move.php:17
#, php-format
msgid "Could not move %s - File with this name already exists"
@@ -35,46 +40,46 @@ msgstr "Impossibile spostare %s"
msgid "Unable to rename file"
msgstr "Impossibile rinominare il file"
-#: ajax/upload.php:14
+#: ajax/upload.php:20
msgid "No file was uploaded. Unknown error"
msgstr "Nessun file è stato inviato. Errore sconosciuto"
-#: ajax/upload.php:21
+#: ajax/upload.php:30
msgid "There is no error, the file uploaded with success"
msgstr "Non ci sono errori, file caricato con successo"
-#: ajax/upload.php:22
+#: ajax/upload.php:31
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr "Il file caricato supera la direttiva upload_max_filesize in php.ini:"
-#: ajax/upload.php:24
+#: ajax/upload.php:33
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "Il file caricato supera il valore MAX_FILE_SIZE definito nel form HTML"
-#: ajax/upload.php:26
+#: ajax/upload.php:35
msgid "The uploaded file was only partially uploaded"
msgstr "Il file è stato parzialmente caricato"
-#: ajax/upload.php:27
+#: ajax/upload.php:36
msgid "No file was uploaded"
msgstr "Nessun file è stato caricato"
-#: ajax/upload.php:28
+#: ajax/upload.php:37
msgid "Missing a temporary folder"
msgstr "Cartella temporanea mancante"
-#: ajax/upload.php:29
+#: ajax/upload.php:38
msgid "Failed to write to disk"
msgstr "Scrittura su disco non riuscita"
-#: ajax/upload.php:45
+#: ajax/upload.php:57
msgid "Not enough space available"
msgstr "Spazio disponibile insufficiente"
-#: ajax/upload.php:69
+#: ajax/upload.php:91
msgid "Invalid directory."
msgstr "Cartella non valida."
@@ -130,98 +135,100 @@ msgstr "non condivisi {files}"
msgid "deleted {files}"
msgstr "eliminati {files}"
-#: js/files.js:31
+#: js/files.js:48
msgid "'.' is an invalid file name."
msgstr "'.' non è un nome file valido."
-#: js/files.js:36
+#: js/files.js:53
msgid "File name cannot be empty."
msgstr "Il nome del file non può essere vuoto."
-#: js/files.js:45
+#: js/files.js:62
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Nome non valido, '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' non sono consentiti."
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "creazione file ZIP, potrebbe richiedere del tempo."
+#: js/files.js:204
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr "Il tuo scaricamento è in fase di preparazione. Ciò potrebbe richiedere del tempo se i file sono grandi."
-#: js/files.js:224
+#: js/files.js:242
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Impossibile inviare il file poiché è una cartella o ha dimensione 0 byte"
-#: js/files.js:224
+#: js/files.js:242
msgid "Upload Error"
msgstr "Errore di invio"
-#: js/files.js:241
+#: js/files.js:259
msgid "Close"
msgstr "Chiudi"
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:278 js/files.js:397 js/files.js:431
msgid "Pending"
msgstr "In corso"
-#: js/files.js:280
+#: js/files.js:298
msgid "1 file uploading"
msgstr "1 file in fase di caricamento"
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:301 js/files.js:357 js/files.js:372
msgid "{count} files uploading"
msgstr "{count} file in fase di caricamentoe"
-#: js/files.js:357 js/files.js:393
+#: js/files.js:376 js/files.js:414
msgid "Upload cancelled."
msgstr "Invio annullato"
-#: js/files.js:464
+#: js/files.js:486
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Caricamento del file in corso. La chiusura della pagina annullerà il caricamento."
-#: js/files.js:537
+#: js/files.js:559
msgid "URL cannot be empty."
msgstr "L'URL non può essere vuoto."
-#: js/files.js:543
+#: js/files.js:565
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Nome della cartella non valido. L'uso di 'Shared' è riservato da ownCloud"
-#: js/files.js:727
+#: js/files.js:775
msgid "{count} files scanned"
msgstr "{count} file analizzati"
-#: js/files.js:735
+#: js/files.js:783
msgid "error while scanning"
msgstr "errore durante la scansione"
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:857 templates/index.php:64
msgid "Name"
msgstr "Nome"
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:858 templates/index.php:75
msgid "Size"
msgstr "Dimensione"
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:859 templates/index.php:77
msgid "Modified"
msgstr "Modificato"
-#: js/files.js:829
+#: js/files.js:878
msgid "1 folder"
msgstr "1 cartella"
-#: js/files.js:831
+#: js/files.js:880
msgid "{count} folders"
msgstr "{count} cartelle"
-#: js/files.js:839
+#: js/files.js:888
msgid "1 file"
msgstr "1 file"
-#: js/files.js:841
+#: js/files.js:890
msgid "{count} files"
msgstr "{count} file"
@@ -273,10 +280,6 @@ msgstr "Cartella"
msgid "From link"
msgstr "Da collegamento"
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Carica"
-
#: templates/index.php:41
msgid "Cancel upload"
msgstr "Annulla invio"
diff --git a/l10n/it/files_encryption.po b/l10n/it/files_encryption.po
index 573a32a14a5..06ffe73b73b 100644
--- a/l10n/it/files_encryption.po
+++ b/l10n/it/files_encryption.po
@@ -8,28 +8,76 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-15 02:02+0200\n"
-"PO-Revision-Date: 2012-08-14 11:49+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: it\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
msgid "Encryption"
msgstr "Cifratura"
-#: templates/settings.php:4
+#: templates/settings.php:67
msgid "Exclude the following file types from encryption"
msgstr "Escludi i seguenti tipi di file dalla cifratura"
-#: templates/settings.php:5
+#: templates/settings.php:71
msgid "None"
msgstr "Nessuna"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "Abilita cifratura"
diff --git a/l10n/it/files_versions.po b/l10n/it/files_versions.po
index 273bdef29b0..5bb90cec909 100644
--- a/l10n/it/files_versions.po
+++ b/l10n/it/files_versions.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-23 02:01+0200\n"
-"PO-Revision-Date: 2012-09-22 06:40+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,22 +18,10 @@ msgstr ""
"Language: it\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "Scadenza di tutte le versioni"
-
#: js/versions.js:16
msgid "History"
msgstr "Cronologia"
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "Versioni"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "Ciò eliminerà tutte le versioni esistenti dei tuoi file"
-
#: templates/settings.php:3
msgid "Files Versioning"
msgstr "Controllo di versione dei file"
diff --git a/l10n/it/lib.po b/l10n/it/lib.po
index 093eca463d1..e162e94ad32 100644
--- a/l10n/it/lib.po
+++ b/l10n/it/lib.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Vincenzo Reale <vinx.reale@gmail.com>, 2012.
+# Vincenzo Reale <vinx.reale@gmail.com>, 2012-2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-17 00:01+0100\n"
-"PO-Revision-Date: 2012-11-15 23:21+0000\n"
+"POT-Creation-Date: 2013-01-18 00:03+0100\n"
+"PO-Revision-Date: 2013-01-17 06:44+0000\n"
"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
@@ -18,51 +18,55 @@ msgstr ""
"Language: it\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:285
+#: app.php:301
msgid "Help"
msgstr "Aiuto"
-#: app.php:292
+#: app.php:308
msgid "Personal"
msgstr "Personale"
-#: app.php:297
+#: app.php:313
msgid "Settings"
msgstr "Impostazioni"
-#: app.php:302
+#: app.php:318
msgid "Users"
msgstr "Utenti"
-#: app.php:309
+#: app.php:325
msgid "Apps"
msgstr "Applicazioni"
-#: app.php:311
+#: app.php:327
msgid "Admin"
msgstr "Admin"
-#: files.php:332
+#: files.php:365
msgid "ZIP download is turned off."
msgstr "Lo scaricamento in formato ZIP è stato disabilitato."
-#: files.php:333
+#: files.php:366
msgid "Files need to be downloaded one by one."
msgstr "I file devono essere scaricati uno alla volta."
-#: files.php:333 files.php:358
+#: files.php:366 files.php:391
msgid "Back to Files"
msgstr "Torna ai file"
-#: files.php:357
+#: files.php:390
msgid "Selected files too large to generate zip file."
msgstr "I file selezionati sono troppo grandi per generare un file zip."
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr "non può essere determinato"
+
#: json.php:28
msgid "Application is not enabled"
msgstr "L'applicazione non è abilitata"
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
msgstr "Errore di autenticazione"
@@ -82,55 +86,55 @@ msgstr "Testo"
msgid "Images"
msgstr "Immagini"
-#: template.php:103
+#: template.php:113
msgid "seconds ago"
msgstr "secondi fa"
-#: template.php:104
+#: template.php:114
msgid "1 minute ago"
msgstr "1 minuto fa"
-#: template.php:105
+#: template.php:115
#, php-format
msgid "%d minutes ago"
msgstr "%d minuti fa"
-#: template.php:106
+#: template.php:116
msgid "1 hour ago"
msgstr "1 ora fa"
-#: template.php:107
+#: template.php:117
#, php-format
msgid "%d hours ago"
msgstr "%d ore fa"
-#: template.php:108
+#: template.php:118
msgid "today"
msgstr "oggi"
-#: template.php:109
+#: template.php:119
msgid "yesterday"
msgstr "ieri"
-#: template.php:110
+#: template.php:120
#, php-format
msgid "%d days ago"
msgstr "%d giorni fa"
-#: template.php:111
+#: template.php:121
msgid "last month"
msgstr "il mese scorso"
-#: template.php:112
+#: template.php:122
#, php-format
msgid "%d months ago"
msgstr "%d mesi fa"
-#: template.php:113
+#: template.php:123
msgid "last year"
msgstr "l'anno scorso"
-#: template.php:114
+#: template.php:124
msgid "years ago"
msgstr "anni fa"
diff --git a/l10n/it/settings.po b/l10n/it/settings.po
index 95df71ce194..b8c1b46912e 100644
--- a/l10n/it/settings.po
+++ b/l10n/it/settings.po
@@ -7,16 +7,16 @@
# Francesco Apruzzese <cescoap@gmail.com>, 2011.
# <icewind1991@gmail.com>, 2012.
# Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
-# <marco@carnazzo.it>, 2011, 2012.
+# <marco@carnazzo.it>, 2011-2013.
# <rb.colombo@gmail.com>, 2011.
# Vincenzo Reale <vinx.reale@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-01-18 00:03+0100\n"
+"PO-Revision-Date: 2013-01-17 08:30+0000\n"
+"Last-Translator: ufic <marco@carnazzo.it>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -259,7 +259,7 @@ msgstr "Altro"
#: templates/users.php:85 templates/users.php:117
msgid "Group Admin"
-msgstr "Gruppo di amministrazione"
+msgstr "Gruppi amministrati"
#: templates/users.php:87
msgid "Storage"
diff --git a/l10n/it/user_ldap.po b/l10n/it/user_ldap.po
index 9dc0007050a..5c009d82967 100644
--- a/l10n/it/user_ldap.po
+++ b/l10n/it/user_ldap.po
@@ -4,13 +4,13 @@
#
# Translators:
# Innocenzo Ventre <el.diabl09@gmail.com>, 2012.
-# Vincenzo Reale <vinx.reale@gmail.com>, 2012.
+# Vincenzo Reale <vinx.reale@gmail.com>, 2012-2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-16 00:11+0100\n"
-"PO-Revision-Date: 2012-12-15 10:28+0000\n"
+"POT-Creation-Date: 2013-01-18 00:03+0100\n"
+"PO-Revision-Date: 2013-01-17 08:29+0000\n"
"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
@@ -28,9 +28,9 @@ msgstr "<b>Avviso:</b> le applicazioni user_ldap e user_webdavauth sono incompat
#: templates/settings.php:11
msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
-msgstr "<b>Avviso:</b> il modulo PHP LDAP richiesto non è installato, il motore non funzionerà. Chiedi al tuo amministratore di sistema di installarlo."
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
+msgstr "<b>Avviso:</b> il modulo PHP LDAP non è installato, il motore non funzionerà. Chiedi al tuo amministratore di sistema di installarlo."
#: templates/settings.php:15
msgid "Host"
@@ -46,6 +46,10 @@ msgid "Base DN"
msgstr "DN base"
#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr "Un DN base per riga"
+
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Puoi specificare una DN base per gli utenti ed i gruppi nella scheda Avanzate"
@@ -116,10 +120,18 @@ msgstr "Porta"
msgid "Base User Tree"
msgstr "Struttura base dell'utente"
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr "Un DN base utente per riga"
+
#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "Struttura base del gruppo"
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr "Un DN base gruppo per riga"
+
#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Associazione gruppo-utente "
diff --git a/l10n/it/user_webdavauth.po b/l10n/it/user_webdavauth.po
index 074902ec724..ba6bfbe7d44 100644
--- a/l10n/it/user_webdavauth.po
+++ b/l10n/it/user_webdavauth.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Vincenzo Reale <vinx.reale@gmail.com>, 2012.
+# Vincenzo Reale <vinx.reale@gmail.com>, 2012-2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-22 00:24+0100\n"
-"PO-Revision-Date: 2012-12-21 08:45+0000\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 06:51+0000\n"
"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
@@ -18,13 +18,17 @@ msgstr ""
"Language: it\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr "Autenticazione WebDAV"
+
#: templates/settings.php:4
msgid "URL: http://"
msgstr "URL: http://"
#: templates/settings.php:6
msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
-msgstr "ownCloud invierà le credenziali dell'utente a questo URL. Interpreta i codici http 401 e http 403 come credenziali errate e tutti gli altri codici come credenziali corrette."
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
+msgstr "ownCloud invierà le credenziali dell'utente a questo URL. Questa estensione controlla la risposta e interpreta i codici di stato 401 e 403 come credenziali non valide, e tutte le altre risposte come credenziali valide."
diff --git a/l10n/ja_JP/core.po b/l10n/ja_JP/core.po
index 5915df8dc20..e9ba6cfa4a5 100644
--- a/l10n/ja_JP/core.po
+++ b/l10n/ja_JP/core.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
@@ -210,7 +210,6 @@ msgid "Password protect"
msgstr "パスワード保護"
#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
msgid "Password"
msgstr "パスワード"
@@ -567,17 +566,3 @@ msgstr "次"
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
msgstr "ownCloud をバージョン %s に更新しています、しばらくお待ち下さい。"
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "セキュリティ警告!"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "パスワードの確認<br/>セキュリティ上の理由によりパスワードの再入力をお願いします。"
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "確認"
diff --git a/l10n/ja_JP/files.po b/l10n/ja_JP/files.po
index 74cabcaca6b..d94cd87e309 100644
--- a/l10n/ja_JP/files.po
+++ b/l10n/ja_JP/files.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-11 00:05+0100\n"
-"PO-Revision-Date: 2013-01-10 04:09+0000\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 00:25+0000\n"
"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
@@ -21,6 +21,11 @@ msgstr ""
"Language: ja_JP\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#: ajax/delete.php:28 ajax/getstoragestats.php:11 ajax/upload.php:17
+#: ajax/upload.php:76 templates/index.php:18
+msgid "Upload"
+msgstr "アップロード"
+
#: ajax/move.php:17
#, php-format
msgid "Could not move %s - File with this name already exists"
@@ -35,46 +40,46 @@ msgstr "%s を移動できませんでした"
msgid "Unable to rename file"
msgstr "ファイル名の変更ができません"
-#: ajax/upload.php:14
+#: ajax/upload.php:20
msgid "No file was uploaded. Unknown error"
msgstr "ファイルは何もアップロードされていません。不明なエラー"
-#: ajax/upload.php:21
+#: ajax/upload.php:30
msgid "There is no error, the file uploaded with success"
msgstr "エラーはありません。ファイルのアップロードは成功しました"
-#: ajax/upload.php:22
+#: ajax/upload.php:31
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr "アップロードされたファイルはphp.ini の upload_max_filesize に設定されたサイズを超えています:"
-#: ajax/upload.php:24
+#: ajax/upload.php:33
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "アップロードされたファイルはHTMLのフォームに設定されたMAX_FILE_SIZEに設定されたサイズを超えています"
-#: ajax/upload.php:26
+#: ajax/upload.php:35
msgid "The uploaded file was only partially uploaded"
msgstr "ファイルは一部分しかアップロードされませんでした"
-#: ajax/upload.php:27
+#: ajax/upload.php:36
msgid "No file was uploaded"
msgstr "ファイルはアップロードされませんでした"
-#: ajax/upload.php:28
+#: ajax/upload.php:37
msgid "Missing a temporary folder"
msgstr "テンポラリフォルダが見つかりません"
-#: ajax/upload.php:29
+#: ajax/upload.php:38
msgid "Failed to write to disk"
msgstr "ディスクへの書き込みに失敗しました"
-#: ajax/upload.php:45
+#: ajax/upload.php:57
msgid "Not enough space available"
msgstr "利用可能なスペースが十分にありません"
-#: ajax/upload.php:69
+#: ajax/upload.php:91
msgid "Invalid directory."
msgstr "無効なディレクトリです。"
@@ -130,98 +135,100 @@ msgstr "未共有 {files}"
msgid "deleted {files}"
msgstr "削除 {files}"
-#: js/files.js:31
+#: js/files.js:48
msgid "'.' is an invalid file name."
msgstr "'.' は無効なファイル名です。"
-#: js/files.js:36
+#: js/files.js:53
msgid "File name cannot be empty."
msgstr "ファイル名を空にすることはできません。"
-#: js/files.js:45
+#: js/files.js:62
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "無効な名前、'\\', '/', '<', '>', ':', '\"', '|', '?', '*' は使用できません。"
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "ZIPファイルを生成中です、しばらくお待ちください。"
+#: js/files.js:204
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr "ダウンロードの準備中です。ファイルサイズが大きい場合は少し時間がかかるかもしれません。"
-#: js/files.js:224
+#: js/files.js:242
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "ディレクトリもしくは0バイトのファイルはアップロードできません"
-#: js/files.js:224
+#: js/files.js:242
msgid "Upload Error"
msgstr "アップロードエラー"
-#: js/files.js:241
+#: js/files.js:259
msgid "Close"
msgstr "閉じる"
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:278 js/files.js:397 js/files.js:431
msgid "Pending"
msgstr "保留"
-#: js/files.js:280
+#: js/files.js:298
msgid "1 file uploading"
msgstr "ファイルを1つアップロード中"
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:301 js/files.js:357 js/files.js:372
msgid "{count} files uploading"
msgstr "{count} ファイルをアップロード中"
-#: js/files.js:357 js/files.js:393
+#: js/files.js:376 js/files.js:414
msgid "Upload cancelled."
msgstr "アップロードはキャンセルされました。"
-#: js/files.js:464
+#: js/files.js:486
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "ファイル転送を実行中です。今このページから移動するとアップロードが中止されます。"
-#: js/files.js:537
+#: js/files.js:559
msgid "URL cannot be empty."
msgstr "URLは空にできません。"
-#: js/files.js:543
+#: js/files.js:565
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "無効なフォルダ名です。'Shared' の利用は ownCloud が予約済みです。"
-#: js/files.js:727
+#: js/files.js:775
msgid "{count} files scanned"
msgstr "{count} ファイルをスキャン"
-#: js/files.js:735
+#: js/files.js:783
msgid "error while scanning"
msgstr "スキャン中のエラー"
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:857 templates/index.php:64
msgid "Name"
msgstr "名前"
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:858 templates/index.php:75
msgid "Size"
msgstr "サイズ"
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:859 templates/index.php:77
msgid "Modified"
msgstr "更新日時"
-#: js/files.js:829
+#: js/files.js:878
msgid "1 folder"
msgstr "1 フォルダ"
-#: js/files.js:831
+#: js/files.js:880
msgid "{count} folders"
msgstr "{count} フォルダ"
-#: js/files.js:839
+#: js/files.js:888
msgid "1 file"
msgstr "1 ファイル"
-#: js/files.js:841
+#: js/files.js:890
msgid "{count} files"
msgstr "{count} ファイル"
@@ -273,10 +280,6 @@ msgstr "フォルダ"
msgid "From link"
msgstr "リンク"
-#: templates/index.php:18
-msgid "Upload"
-msgstr "アップロード"
-
#: templates/index.php:41
msgid "Cancel upload"
msgstr "アップロードをキャンセル"
diff --git a/l10n/ja_JP/files_encryption.po b/l10n/ja_JP/files_encryption.po
index c9941a81c9c..99e1f305cb7 100644
--- a/l10n/ja_JP/files_encryption.po
+++ b/l10n/ja_JP/files_encryption.po
@@ -8,28 +8,76 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-15 02:43+0000\n"
-"Last-Translator: Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: ja_JP\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
msgid "Encryption"
msgstr "暗号化"
-#: templates/settings.php:4
+#: templates/settings.php:67
msgid "Exclude the following file types from encryption"
msgstr "暗号化から除外するファイルタイプ"
-#: templates/settings.php:5
+#: templates/settings.php:71
msgid "None"
msgstr "なし"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "暗号化を有効にする"
diff --git a/l10n/ja_JP/files_versions.po b/l10n/ja_JP/files_versions.po
index 9c717bd2fa4..5ebe43b4854 100644
--- a/l10n/ja_JP/files_versions.po
+++ b/l10n/ja_JP/files_versions.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-23 02:01+0200\n"
-"PO-Revision-Date: 2012-09-22 00:30+0000\n"
-"Last-Translator: ttyn <tetuyano+transi@gmail.com>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,22 +19,10 @@ msgstr ""
"Language: ja_JP\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "すべてのバージョンを削除する"
-
#: js/versions.js:16
msgid "History"
msgstr "履歴"
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "バージョン"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "これは、あなたのファイルのすべてのバックアップバージョンを削除します"
-
#: templates/settings.php:3
msgid "Files Versioning"
msgstr "ファイルのバージョン管理"
diff --git a/l10n/ja_JP/lib.po b/l10n/ja_JP/lib.po
index 2f16f657540..8dca4957997 100644
--- a/l10n/ja_JP/lib.po
+++ b/l10n/ja_JP/lib.po
@@ -4,13 +4,14 @@
#
# Translators:
# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
+# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-15 00:37+0000\n"
-"Last-Translator: Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>\n"
+"POT-Creation-Date: 2013-01-19 00:04+0100\n"
+"PO-Revision-Date: 2013-01-18 08:12+0000\n"
+"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,51 +19,55 @@ msgstr ""
"Language: ja_JP\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: app.php:285
+#: app.php:301
msgid "Help"
msgstr "ヘルプ"
-#: app.php:292
+#: app.php:308
msgid "Personal"
msgstr "個人設定"
-#: app.php:297
+#: app.php:313
msgid "Settings"
msgstr "設定"
-#: app.php:302
+#: app.php:318
msgid "Users"
msgstr "ユーザ"
-#: app.php:309
+#: app.php:325
msgid "Apps"
msgstr "アプリ"
-#: app.php:311
+#: app.php:327
msgid "Admin"
msgstr "管理者"
-#: files.php:332
+#: files.php:365
msgid "ZIP download is turned off."
msgstr "ZIPダウンロードは無効です。"
-#: files.php:333
+#: files.php:366
msgid "Files need to be downloaded one by one."
msgstr "ファイルは1つずつダウンロードする必要があります。"
-#: files.php:333 files.php:358
+#: files.php:366 files.php:391
msgid "Back to Files"
msgstr "ファイルに戻る"
-#: files.php:357
+#: files.php:390
msgid "Selected files too large to generate zip file."
msgstr "選択したファイルはZIPファイルの生成には大きすぎます。"
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr "測定できませんでした"
+
#: json.php:28
msgid "Application is not enabled"
msgstr "アプリケーションは無効です"
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
msgstr "認証エラー"
@@ -82,55 +87,55 @@ msgstr "TTY TDD"
msgid "Images"
msgstr "画像"
-#: template.php:103
+#: template.php:113
msgid "seconds ago"
msgstr "秒前"
-#: template.php:104
+#: template.php:114
msgid "1 minute ago"
msgstr "1分前"
-#: template.php:105
+#: template.php:115
#, php-format
msgid "%d minutes ago"
msgstr "%d 分前"
-#: template.php:106
+#: template.php:116
msgid "1 hour ago"
msgstr "1 時間前"
-#: template.php:107
+#: template.php:117
#, php-format
msgid "%d hours ago"
msgstr "%d 時間前"
-#: template.php:108
+#: template.php:118
msgid "today"
msgstr "今日"
-#: template.php:109
+#: template.php:119
msgid "yesterday"
msgstr "昨日"
-#: template.php:110
+#: template.php:120
#, php-format
msgid "%d days ago"
msgstr "%d 日前"
-#: template.php:111
+#: template.php:121
msgid "last month"
msgstr "先月"
-#: template.php:112
+#: template.php:122
#, php-format
msgid "%d months ago"
msgstr "%d 分前"
-#: template.php:113
+#: template.php:123
msgid "last year"
msgstr "昨年"
-#: template.php:114
+#: template.php:124
msgid "years ago"
msgstr "年前"
diff --git a/l10n/ja_JP/user_ldap.po b/l10n/ja_JP/user_ldap.po
index 39aa1002f7e..16a20c7207b 100644
--- a/l10n/ja_JP/user_ldap.po
+++ b/l10n/ja_JP/user_ldap.po
@@ -4,14 +4,14 @@
#
# Translators:
# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
-# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2012.
+# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2012-2013.
# <tetuyano+transi@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-16 00:11+0100\n"
-"PO-Revision-Date: 2012-12-15 06:21+0000\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 05:47+0000\n"
"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
@@ -29,9 +29,9 @@ msgstr "<b>警告:</b> user_ldap と user_webdavauth のアプリには互換性
#: templates/settings.php:11
msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
-msgstr "<b>警告:</b> PHP LDAP モジュールがインストールされていません。バックエンドが正しくどうさしません。システム管理者にインストールするよう問い合わせてください。"
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
+msgstr "<b>警告:</b> PHP LDAP モジュールがインストールされていません。バックエンドが正しく動作しません。システム管理者にインストールするよう問い合わせてください。"
#: templates/settings.php:15
msgid "Host"
@@ -47,6 +47,10 @@ msgid "Base DN"
msgstr "ベースDN"
#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr "1行に1つのベースDN"
+
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "拡張タブでユーザとグループのベースDNを指定することができます。"
@@ -117,10 +121,18 @@ msgstr "ポート"
msgid "Base User Tree"
msgstr "ベースユーザツリー"
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr "1行に1つのユーザベースDN"
+
#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "ベースグループツリー"
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr "1行に1つのグループベースDN"
+
#: templates/settings.php:27
msgid "Group-Member association"
msgstr "グループとメンバーの関連付け"
diff --git a/l10n/ja_JP/user_webdavauth.po b/l10n/ja_JP/user_webdavauth.po
index b6499e4ce5f..966cae84162 100644
--- a/l10n/ja_JP/user_webdavauth.po
+++ b/l10n/ja_JP/user_webdavauth.po
@@ -4,13 +4,13 @@
#
# Translators:
# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
-# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2012.
+# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2012-2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-21 00:10+0100\n"
-"PO-Revision-Date: 2012-12-20 03:51+0000\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 05:50+0000\n"
"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
@@ -19,13 +19,17 @@ msgstr ""
"Language: ja_JP\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr "WebDAV 認証"
+
#: templates/settings.php:4
msgid "URL: http://"
msgstr "URL: http://"
#: templates/settings.php:6
msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
-msgstr "ownCloudのこのURLへのユーザ資格情報の送信は、資格情報が間違っている場合はHTTP401もしくは403を返し、正しい場合は全てのコードを返します。"
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
+msgstr "ownCloudはこのURLにユーザ資格情報を送信します。このプラグインは応答をチェックし、HTTP状態コードが 401 と 403 の場合は無効な資格情報とし、他の応答はすべて有効な資格情報として処理します。"
diff --git a/l10n/ka_GE/core.po b/l10n/ka_GE/core.po
index d1a73ee1366..19c7defb404 100644
--- a/l10n/ka_GE/core.po
+++ b/l10n/ka_GE/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
@@ -208,7 +208,6 @@ msgid "Password protect"
msgstr "პაროლით დაცვა"
#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
msgid "Password"
msgstr "პაროლი"
@@ -565,17 +564,3 @@ msgstr "შემდეგი"
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "უსაფრთხოების გაფრთხილება!"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr ""
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "შემოწმება"
diff --git a/l10n/ka_GE/files.po b/l10n/ka_GE/files.po
index 27c92e92ba5..a789775653e 100644
--- a/l10n/ka_GE/files.po
+++ b/l10n/ka_GE/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:05+0000\n"
+"POT-Creation-Date: 2013-01-20 00:05+0100\n"
+"PO-Revision-Date: 2013-01-19 23:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
@@ -18,6 +18,11 @@ msgstr ""
"Language: ka_GE\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#: ajax/delete.php:28 ajax/getstoragestats.php:11 ajax/upload.php:17
+#: ajax/upload.php:76 templates/index.php:18
+msgid "Upload"
+msgstr "ატვირთვა"
+
#: ajax/move.php:17
#, php-format
msgid "Could not move %s - File with this name already exists"
@@ -32,46 +37,46 @@ msgstr ""
msgid "Unable to rename file"
msgstr ""
-#: ajax/upload.php:14
+#: ajax/upload.php:20
msgid "No file was uploaded. Unknown error"
msgstr ""
-#: ajax/upload.php:21
+#: ajax/upload.php:30
msgid "There is no error, the file uploaded with success"
msgstr "ჭოცდომა არ დაფიქსირდა, ფაილი წარმატებით აიტვირთა"
-#: ajax/upload.php:22
+#: ajax/upload.php:31
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr ""
-#: ajax/upload.php:24
+#: ajax/upload.php:33
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "ატვირთული ფაილი აჭარბებს MAX_FILE_SIZE დირექტივას, რომელიც მითითებულია HTML ფორმაში"
-#: ajax/upload.php:26
+#: ajax/upload.php:35
msgid "The uploaded file was only partially uploaded"
msgstr "ატვირთული ფაილი მხოლოდ ნაწილობრივ აიტვირთა"
-#: ajax/upload.php:27
+#: ajax/upload.php:36
msgid "No file was uploaded"
msgstr "ფაილი არ აიტვირთა"
-#: ajax/upload.php:28
+#: ajax/upload.php:37
msgid "Missing a temporary folder"
msgstr "დროებითი საქაღალდე არ არსებობს"
-#: ajax/upload.php:29
+#: ajax/upload.php:38
msgid "Failed to write to disk"
msgstr "შეცდომა დისკზე ჩაწერისას"
-#: ajax/upload.php:45
+#: ajax/upload.php:57
msgid "Not enough space available"
msgstr ""
-#: ajax/upload.php:69
+#: ajax/upload.php:91
msgid "Invalid directory."
msgstr ""
@@ -127,98 +132,100 @@ msgstr "გაზიარება მოხსნილი {files}"
msgid "deleted {files}"
msgstr "წაშლილი {files}"
-#: js/files.js:31
+#: js/files.js:48
msgid "'.' is an invalid file name."
msgstr ""
-#: js/files.js:36
+#: js/files.js:53
msgid "File name cannot be empty."
msgstr ""
-#: js/files.js:45
+#: js/files.js:62
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "ZIP-ფაილის გენერირება, ამას ჭირდება გარკვეული დრო."
+#: js/files.js:204
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
-#: js/files.js:224
+#: js/files.js:242
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "თქვენი ფაილის ატვირთვა ვერ მოხერხდა. ის არის საქაღალდე და შეიცავს 0 ბაიტს"
-#: js/files.js:224
+#: js/files.js:242
msgid "Upload Error"
msgstr "შეცდომა ატვირთვისას"
-#: js/files.js:241
+#: js/files.js:259
msgid "Close"
msgstr "დახურვა"
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:278 js/files.js:397 js/files.js:431
msgid "Pending"
msgstr "მოცდის რეჟიმში"
-#: js/files.js:280
+#: js/files.js:298
msgid "1 file uploading"
msgstr "1 ფაილის ატვირთვა"
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:301 js/files.js:357 js/files.js:372
msgid "{count} files uploading"
msgstr "{count} ფაილი იტვირთება"
-#: js/files.js:357 js/files.js:393
+#: js/files.js:376 js/files.js:414
msgid "Upload cancelled."
msgstr "ატვირთვა შეჩერებულ იქნა."
-#: js/files.js:464
+#: js/files.js:486
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "მიმდინარეობს ფაილის ატვირთვა. სხვა გვერდზე გადასვლა გამოიწვევს ატვირთვის შეჩერებას"
-#: js/files.js:537
+#: js/files.js:559
msgid "URL cannot be empty."
msgstr ""
-#: js/files.js:543
+#: js/files.js:565
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:727
+#: js/files.js:775
msgid "{count} files scanned"
msgstr "{count} ფაილი სკანირებულია"
-#: js/files.js:735
+#: js/files.js:783
msgid "error while scanning"
msgstr "შეცდომა სკანირებისას"
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:857 templates/index.php:64
msgid "Name"
msgstr "სახელი"
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:858 templates/index.php:75
msgid "Size"
msgstr "ზომა"
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:859 templates/index.php:77
msgid "Modified"
msgstr "შეცვლილია"
-#: js/files.js:829
+#: js/files.js:878
msgid "1 folder"
msgstr "1 საქაღალდე"
-#: js/files.js:831
+#: js/files.js:880
msgid "{count} folders"
msgstr "{count} საქაღალდე"
-#: js/files.js:839
+#: js/files.js:888
msgid "1 file"
msgstr "1 ფაილი"
-#: js/files.js:841
+#: js/files.js:890
msgid "{count} files"
msgstr "{count} ფაილი"
@@ -270,10 +277,6 @@ msgstr "საქაღალდე"
msgid "From link"
msgstr ""
-#: templates/index.php:18
-msgid "Upload"
-msgstr "ატვირთვა"
-
#: templates/index.php:41
msgid "Cancel upload"
msgstr "ატვირთვის გაუქმება"
diff --git a/l10n/ka_GE/files_encryption.po b/l10n/ka_GE/files_encryption.po
index 3cdf3ae4e91..f0cc786850b 100644
--- a/l10n/ka_GE/files_encryption.po
+++ b/l10n/ka_GE/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-22 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,18 +17,66 @@ msgstr ""
"Language: ka_GE\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: templates/settings.php:3
-msgid "Encryption"
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
msgstr ""
-#: templates/settings.php:4
-msgid "Exclude the following file types from encryption"
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
msgstr ""
-#: templates/settings.php:5
-msgid "None"
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
msgstr ""
#: templates/settings.php:10
-msgid "Enable Encryption"
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:67
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:71
+msgid "None"
msgstr ""
diff --git a/l10n/ka_GE/files_versions.po b/l10n/ka_GE/files_versions.po
index 8d38b072b0f..aafddd05a3c 100644
--- a/l10n/ka_GE/files_versions.po
+++ b/l10n/ka_GE/files_versions.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-22 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 22:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,22 +17,10 @@ msgstr ""
"Language: ka_GE\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr ""
-
#: js/versions.js:16
msgid "History"
msgstr ""
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr ""
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr ""
-
#: templates/settings.php:3
msgid "Files Versioning"
msgstr ""
diff --git a/l10n/ka_GE/lib.po b/l10n/ka_GE/lib.po
index 3011c8854f7..f43fa26c139 100644
--- a/l10n/ka_GE/lib.po
+++ b/l10n/ka_GE/lib.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-14 23:13+0000\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
@@ -18,51 +18,55 @@ msgstr ""
"Language: ka_GE\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: app.php:285
+#: app.php:301
msgid "Help"
msgstr "დახმარება"
-#: app.php:292
+#: app.php:308
msgid "Personal"
msgstr "პირადი"
-#: app.php:297
+#: app.php:313
msgid "Settings"
msgstr "პარამეტრები"
-#: app.php:302
+#: app.php:318
msgid "Users"
msgstr "მომხმარებელი"
-#: app.php:309
+#: app.php:325
msgid "Apps"
msgstr "აპლიკაციები"
-#: app.php:311
+#: app.php:327
msgid "Admin"
msgstr "ადმინისტრატორი"
-#: files.php:332
+#: files.php:365
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:333
+#: files.php:366
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:333 files.php:358
+#: files.php:366 files.php:391
msgid "Back to Files"
msgstr ""
-#: files.php:357
+#: files.php:390
msgid "Selected files too large to generate zip file."
msgstr ""
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr ""
+
#: json.php:28
msgid "Application is not enabled"
msgstr ""
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
msgstr "ავთენტიფიკაციის შეცდომა"
@@ -82,55 +86,55 @@ msgstr "ტექსტი"
msgid "Images"
msgstr ""
-#: template.php:103
+#: template.php:113
msgid "seconds ago"
msgstr "წამის წინ"
-#: template.php:104
+#: template.php:114
msgid "1 minute ago"
msgstr "1 წუთის წინ"
-#: template.php:105
+#: template.php:115
#, php-format
msgid "%d minutes ago"
msgstr ""
-#: template.php:106
+#: template.php:116
msgid "1 hour ago"
msgstr ""
-#: template.php:107
+#: template.php:117
#, php-format
msgid "%d hours ago"
msgstr ""
-#: template.php:108
+#: template.php:118
msgid "today"
msgstr "დღეს"
-#: template.php:109
+#: template.php:119
msgid "yesterday"
msgstr "გუშინ"
-#: template.php:110
+#: template.php:120
#, php-format
msgid "%d days ago"
msgstr ""
-#: template.php:111
+#: template.php:121
msgid "last month"
msgstr "გასულ თვეში"
-#: template.php:112
+#: template.php:122
#, php-format
msgid "%d months ago"
msgstr ""
-#: template.php:113
+#: template.php:123
msgid "last year"
msgstr "ბოლო წელს"
-#: template.php:114
+#: template.php:124
msgid "years ago"
msgstr "წლის წინ"
diff --git a/l10n/ka_GE/user_ldap.po b/l10n/ka_GE/user_ldap.po
index 0df8aa5b1a4..14dbca3fc68 100644
--- a/l10n/ka_GE/user_ldap.po
+++ b/l10n/ka_GE/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"POT-Creation-Date: 2013-01-18 00:03+0100\n"
+"PO-Revision-Date: 2013-01-17 21:57+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
@@ -26,8 +26,8 @@ msgstr ""
#: templates/settings.php:11
msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
msgstr ""
#: templates/settings.php:15
@@ -44,6 +44,10 @@ msgid "Base DN"
msgstr ""
#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
@@ -114,10 +118,18 @@ msgstr ""
msgid "Base User Tree"
msgstr ""
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
@@ -180,4 +192,4 @@ msgstr ""
#: templates/settings.php:39
msgid "Help"
-msgstr ""
+msgstr "დახმარება"
diff --git a/l10n/ka_GE/user_webdavauth.po b/l10n/ka_GE/user_webdavauth.po
index 4582092b83e..b7a0b557630 100644
--- a/l10n/ka_GE/user_webdavauth.po
+++ b/l10n/ka_GE/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-20 00:11+0100\n"
-"PO-Revision-Date: 2012-12-19 23:12+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
@@ -17,13 +17,17 @@ msgstr ""
"Language: ka_GE\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
#: templates/settings.php:4
msgid "URL: http://"
msgstr ""
#: templates/settings.php:6
msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
msgstr ""
diff --git a/l10n/ko/core.po b/l10n/ko/core.po
index b64937e17c9..5e2b5617dd6 100644
--- a/l10n/ko/core.po
+++ b/l10n/ko/core.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
@@ -211,7 +211,6 @@ msgid "Password protect"
msgstr "암호 보호"
#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
msgid "Password"
msgstr "암호"
@@ -568,17 +567,3 @@ msgstr "다음"
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
msgstr "ownCloud 를 버젼 %s로 업데이트 하는 중, 시간이 소요됩니다."
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "보안 경고!"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "암호를 확인해 주십시오.<br/>보안상의 이유로 종종 암호를 물어볼 것입니다."
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "확인"
diff --git a/l10n/ko/files.po b/l10n/ko/files.po
index 724bb5fd2d9..5678e11882d 100644
--- a/l10n/ko/files.po
+++ b/l10n/ko/files.po
@@ -12,9 +12,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 13:42+0000\n"
-"Last-Translator: Harim Park <fofwisdom@gmail.com>\n"
+"POT-Creation-Date: 2013-01-20 00:05+0100\n"
+"PO-Revision-Date: 2013-01-19 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -22,6 +22,11 @@ msgstr ""
"Language: ko\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#: ajax/delete.php:28 ajax/getstoragestats.php:11 ajax/upload.php:17
+#: ajax/upload.php:76 templates/index.php:18
+msgid "Upload"
+msgstr "업로드"
+
#: ajax/move.php:17
#, php-format
msgid "Could not move %s - File with this name already exists"
@@ -36,46 +41,46 @@ msgstr "%s 항목을 이딩시키지 못하였음"
msgid "Unable to rename file"
msgstr "파일 이름바꾸기 할 수 없음"
-#: ajax/upload.php:14
+#: ajax/upload.php:20
msgid "No file was uploaded. Unknown error"
msgstr "파일이 업로드되지 않았습니다. 알 수 없는 오류입니다"
-#: ajax/upload.php:21
+#: ajax/upload.php:30
msgid "There is no error, the file uploaded with success"
msgstr "업로드에 성공하였습니다."
-#: ajax/upload.php:22
+#: ajax/upload.php:31
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr "업로드한 파일이 php.ini의 upload_max_filesize보다 큽니다:"
-#: ajax/upload.php:24
+#: ajax/upload.php:33
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "업로드한 파일이 HTML 문서에 지정한 MAX_FILE_SIZE보다 더 큼"
-#: ajax/upload.php:26
+#: ajax/upload.php:35
msgid "The uploaded file was only partially uploaded"
msgstr "파일이 부분적으로 업로드됨"
-#: ajax/upload.php:27
+#: ajax/upload.php:36
msgid "No file was uploaded"
msgstr "업로드된 파일 없음"
-#: ajax/upload.php:28
+#: ajax/upload.php:37
msgid "Missing a temporary folder"
msgstr "임시 폴더가 사라짐"
-#: ajax/upload.php:29
+#: ajax/upload.php:38
msgid "Failed to write to disk"
msgstr "디스크에 쓰지 못했습니다"
-#: ajax/upload.php:45
+#: ajax/upload.php:57
msgid "Not enough space available"
msgstr "여유공간이 부족합니다"
-#: ajax/upload.php:69
+#: ajax/upload.php:91
msgid "Invalid directory."
msgstr "올바르지 않은 디렉토리입니다."
@@ -131,98 +136,100 @@ msgstr "{files} 공유 해제됨"
msgid "deleted {files}"
msgstr "{files} 삭제됨"
-#: js/files.js:31
+#: js/files.js:48
msgid "'.' is an invalid file name."
msgstr "'.' 는 올바르지 않은 파일 이름 입니다."
-#: js/files.js:36
+#: js/files.js:53
msgid "File name cannot be empty."
msgstr "파일이름은 공란이 될 수 없습니다."
-#: js/files.js:45
+#: js/files.js:62
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "폴더 이름이 올바르지 않습니다. 이름에 문자 '\\', '/', '<', '>', ':', '\"', '|', '? ', '*'는 사용할 수 없습니다."
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "ZIP 파일을 생성하고 있습니다. 시간이 걸릴 수도 있습니다."
+#: js/files.js:204
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
-#: js/files.js:224
+#: js/files.js:242
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "이 파일은 디렉터리이거나 비어 있기 때문에 업로드할 수 없습니다"
-#: js/files.js:224
+#: js/files.js:242
msgid "Upload Error"
msgstr "업로드 오류"
-#: js/files.js:241
+#: js/files.js:259
msgid "Close"
msgstr "닫기"
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:278 js/files.js:397 js/files.js:431
msgid "Pending"
msgstr "보류 중"
-#: js/files.js:280
+#: js/files.js:298
msgid "1 file uploading"
msgstr "파일 1개 업로드 중"
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:301 js/files.js:357 js/files.js:372
msgid "{count} files uploading"
msgstr "파일 {count}개 업로드 중"
-#: js/files.js:357 js/files.js:393
+#: js/files.js:376 js/files.js:414
msgid "Upload cancelled."
msgstr "업로드가 취소되었습니다."
-#: js/files.js:464
+#: js/files.js:486
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "파일 업로드가 진행 중입니다. 이 페이지를 벗어나면 업로드가 취소됩니다."
-#: js/files.js:537
+#: js/files.js:559
msgid "URL cannot be empty."
msgstr "URL을 입력해야 합니다."
-#: js/files.js:543
+#: js/files.js:565
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "폴더 이름이 유효하지 않습니다. "
-#: js/files.js:727
+#: js/files.js:775
msgid "{count} files scanned"
msgstr "파일 {count}개 검색됨"
-#: js/files.js:735
+#: js/files.js:783
msgid "error while scanning"
msgstr "검색 중 오류 발생"
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:857 templates/index.php:64
msgid "Name"
msgstr "이름"
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:858 templates/index.php:75
msgid "Size"
msgstr "크기"
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:859 templates/index.php:77
msgid "Modified"
msgstr "수정됨"
-#: js/files.js:829
+#: js/files.js:878
msgid "1 folder"
msgstr "폴더 1개"
-#: js/files.js:831
+#: js/files.js:880
msgid "{count} folders"
msgstr "폴더 {count}개"
-#: js/files.js:839
+#: js/files.js:888
msgid "1 file"
msgstr "파일 1개"
-#: js/files.js:841
+#: js/files.js:890
msgid "{count} files"
msgstr "파일 {count}개"
@@ -274,10 +281,6 @@ msgstr "폴더"
msgid "From link"
msgstr "링크에서"
-#: templates/index.php:18
-msgid "Upload"
-msgstr "업로드"
-
#: templates/index.php:41
msgid "Cancel upload"
msgstr "업로드 취소"
diff --git a/l10n/ko/files_encryption.po b/l10n/ko/files_encryption.po
index 7317bd55f1d..441ba8cec4b 100644
--- a/l10n/ko/files_encryption.po
+++ b/l10n/ko/files_encryption.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-10 00:11+0100\n"
-"PO-Revision-Date: 2012-12-09 06:13+0000\n"
-"Last-Translator: Shinjo Park <kde@peremen.name>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,18 +19,66 @@ msgstr ""
"Language: ko\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
msgid "Encryption"
msgstr "암호화"
-#: templates/settings.php:4
+#: templates/settings.php:67
msgid "Exclude the following file types from encryption"
msgstr "다음 파일 형식은 암호화하지 않음"
-#: templates/settings.php:5
+#: templates/settings.php:71
msgid "None"
msgstr "없음"
-
-#: templates/settings.php:12
-msgid "Enable Encryption"
-msgstr "암호화 사용"
diff --git a/l10n/ko/files_versions.po b/l10n/ko/files_versions.po
index 20d3071b548..0fe524b7701 100644
--- a/l10n/ko/files_versions.po
+++ b/l10n/ko/files_versions.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-10 00:11+0100\n"
-"PO-Revision-Date: 2012-12-09 06:11+0000\n"
-"Last-Translator: Shinjo Park <kde@peremen.name>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,22 +19,10 @@ msgstr ""
"Language: ko\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "모든 버전 삭제"
-
#: js/versions.js:16
msgid "History"
msgstr "역사"
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "버전"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "이 파일의 모든 백업 버전을 삭제합니다"
-
#: templates/settings.php:3
msgid "Files Versioning"
msgstr "파일 버전 관리"
diff --git a/l10n/ko/lib.po b/l10n/ko/lib.po
index 3870ebda87f..c759d43ece3 100644
--- a/l10n/ko/lib.po
+++ b/l10n/ko/lib.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-10 00:11+0100\n"
-"PO-Revision-Date: 2012-12-09 06:06+0000\n"
-"Last-Translator: Shinjo Park <kde@peremen.name>\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,51 +19,55 @@ msgstr ""
"Language: ko\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: app.php:287
+#: app.php:301
msgid "Help"
msgstr "도움말"
-#: app.php:294
+#: app.php:308
msgid "Personal"
msgstr "개인"
-#: app.php:299
+#: app.php:313
msgid "Settings"
msgstr "설정"
-#: app.php:304
+#: app.php:318
msgid "Users"
msgstr "사용자"
-#: app.php:311
+#: app.php:325
msgid "Apps"
msgstr "앱"
-#: app.php:313
+#: app.php:327
msgid "Admin"
msgstr "관리자"
-#: files.php:361
+#: files.php:365
msgid "ZIP download is turned off."
msgstr "ZIP 다운로드가 비활성화되었습니다."
-#: files.php:362
+#: files.php:366
msgid "Files need to be downloaded one by one."
msgstr "파일을 개별적으로 다운로드해야 합니다."
-#: files.php:362 files.php:387
+#: files.php:366 files.php:391
msgid "Back to Files"
msgstr "파일로 돌아가기"
-#: files.php:386
+#: files.php:390
msgid "Selected files too large to generate zip file."
msgstr "선택한 파일들은 ZIP 파일을 생성하기에 너무 큽니다."
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr ""
+
#: json.php:28
msgid "Application is not enabled"
msgstr "앱이 활성화되지 않았습니다"
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
msgstr "인증 오류"
@@ -83,55 +87,55 @@ msgstr "텍스트"
msgid "Images"
msgstr "그림"
-#: template.php:103
+#: template.php:113
msgid "seconds ago"
msgstr "초 전"
-#: template.php:104
+#: template.php:114
msgid "1 minute ago"
msgstr "1분 전"
-#: template.php:105
+#: template.php:115
#, php-format
msgid "%d minutes ago"
msgstr "%d분 전"
-#: template.php:106
+#: template.php:116
msgid "1 hour ago"
msgstr "1시간 전"
-#: template.php:107
+#: template.php:117
#, php-format
msgid "%d hours ago"
msgstr "%d시간 전"
-#: template.php:108
+#: template.php:118
msgid "today"
msgstr "오늘"
-#: template.php:109
+#: template.php:119
msgid "yesterday"
msgstr "어제"
-#: template.php:110
+#: template.php:120
#, php-format
msgid "%d days ago"
msgstr "%d일 전"
-#: template.php:111
+#: template.php:121
msgid "last month"
msgstr "지난 달"
-#: template.php:112
+#: template.php:122
#, php-format
msgid "%d months ago"
msgstr "%d개월 전"
-#: template.php:113
+#: template.php:123
msgid "last year"
msgstr "작년"
-#: template.php:114
+#: template.php:124
msgid "years ago"
msgstr "년 전"
diff --git a/l10n/ko/user_ldap.po b/l10n/ko/user_ldap.po
index f4012dc7305..53b9f3b081f 100644
--- a/l10n/ko/user_ldap.po
+++ b/l10n/ko/user_ldap.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-08 00:30+0100\n"
-"PO-Revision-Date: 2013-01-07 09:58+0000\n"
-"Last-Translator: aoiob4305 <aoiob4305@gmail.com>\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 23:20+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -29,9 +29,9 @@ msgstr "<b>경고</b>user_ldap 앱과 user_webdavauth 앱은 호환되지 않습
#: templates/settings.php:11
msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
-msgstr "<b>경고</b>PHP LDAP 모듈이 설치되지 않았습니다. 백엔드가 동작하지 않을 것 입니다. 시스템관리자에게 요청하여 해당 모듈을 설치하시기 바랍니다."
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
+msgstr ""
#: templates/settings.php:15
msgid "Host"
@@ -47,6 +47,10 @@ msgid "Base DN"
msgstr "기본 DN"
#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "고급 탭에서 사용자 및 그룹에 대한 기본 DN을 지정할 수 있습니다."
@@ -117,10 +121,18 @@ msgstr "포트"
msgid "Base User Tree"
msgstr "기본 사용자 트리"
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "기본 그룹 트리"
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
#: templates/settings.php:27
msgid "Group-Member association"
msgstr "그룹-회원 연결"
diff --git a/l10n/ko/user_webdavauth.po b/l10n/ko/user_webdavauth.po
index 7baa17ed715..bd135598c7f 100644
--- a/l10n/ko/user_webdavauth.po
+++ b/l10n/ko/user_webdavauth.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-08 00:30+0100\n"
-"PO-Revision-Date: 2013-01-07 10:31+0000\n"
-"Last-Translator: aoiob4305 <aoiob4305@gmail.com>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,13 +19,17 @@ msgstr ""
"Language: ko\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
#: templates/settings.php:4
msgid "URL: http://"
msgstr "URL: http://"
#: templates/settings.php:6
msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
-msgstr "ownCloud는 이 URL로 유저 인증을 보내게 되며, http 401 과 http 403은 인증 오류로, 그 외 코드는 인증이 올바른 것으로 해석합니다."
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
+msgstr ""
diff --git a/l10n/ku_IQ/core.po b/l10n/ku_IQ/core.po
index 1362878bd67..66155fca436 100644
--- a/l10n/ku_IQ/core.po
+++ b/l10n/ku_IQ/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
@@ -208,7 +208,6 @@ msgid "Password protect"
msgstr ""
#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
msgid "Password"
msgstr "وشەی تێپەربو"
@@ -565,17 +564,3 @@ msgstr "دواتر"
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr ""
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr ""
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr ""
diff --git a/l10n/ku_IQ/files.po b/l10n/ku_IQ/files.po
index e85f7e13045..abd2fbccd88 100644
--- a/l10n/ku_IQ/files.po
+++ b/l10n/ku_IQ/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"POT-Creation-Date: 2013-01-20 00:05+0100\n"
+"PO-Revision-Date: 2013-01-19 23:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,11 @@ msgstr ""
"Language: ku_IQ\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/delete.php:28 ajax/getstoragestats.php:11 ajax/upload.php:17
+#: ajax/upload.php:76 templates/index.php:18
+msgid "Upload"
+msgstr "بارکردن"
+
#: ajax/move.php:17
#, php-format
msgid "Could not move %s - File with this name already exists"
@@ -31,46 +36,46 @@ msgstr ""
msgid "Unable to rename file"
msgstr ""
-#: ajax/upload.php:14
+#: ajax/upload.php:20
msgid "No file was uploaded. Unknown error"
msgstr ""
-#: ajax/upload.php:21
+#: ajax/upload.php:30
msgid "There is no error, the file uploaded with success"
msgstr ""
-#: ajax/upload.php:22
+#: ajax/upload.php:31
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr ""
-#: ajax/upload.php:24
+#: ajax/upload.php:33
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr ""
-#: ajax/upload.php:26
+#: ajax/upload.php:35
msgid "The uploaded file was only partially uploaded"
msgstr ""
-#: ajax/upload.php:27
+#: ajax/upload.php:36
msgid "No file was uploaded"
msgstr ""
-#: ajax/upload.php:28
+#: ajax/upload.php:37
msgid "Missing a temporary folder"
msgstr ""
-#: ajax/upload.php:29
+#: ajax/upload.php:38
msgid "Failed to write to disk"
msgstr ""
-#: ajax/upload.php:45
+#: ajax/upload.php:57
msgid "Not enough space available"
msgstr ""
-#: ajax/upload.php:69
+#: ajax/upload.php:91
msgid "Invalid directory."
msgstr ""
@@ -126,98 +131,100 @@ msgstr ""
msgid "deleted {files}"
msgstr ""
-#: js/files.js:31
+#: js/files.js:48
msgid "'.' is an invalid file name."
msgstr ""
-#: js/files.js:36
+#: js/files.js:53
msgid "File name cannot be empty."
msgstr ""
-#: js/files.js:45
+#: js/files.js:62
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
+#: js/files.js:204
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
msgstr ""
-#: js/files.js:224
+#: js/files.js:242
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr ""
-#: js/files.js:224
+#: js/files.js:242
msgid "Upload Error"
msgstr ""
-#: js/files.js:241
+#: js/files.js:259
msgid "Close"
msgstr "داخستن"
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:278 js/files.js:397 js/files.js:431
msgid "Pending"
msgstr ""
-#: js/files.js:280
+#: js/files.js:298
msgid "1 file uploading"
msgstr ""
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:301 js/files.js:357 js/files.js:372
msgid "{count} files uploading"
msgstr ""
-#: js/files.js:357 js/files.js:393
+#: js/files.js:376 js/files.js:414
msgid "Upload cancelled."
msgstr ""
-#: js/files.js:464
+#: js/files.js:486
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/files.js:537
+#: js/files.js:559
msgid "URL cannot be empty."
msgstr "ناونیشانی به‌سته‌ر نابێت به‌تاڵ بێت."
-#: js/files.js:543
+#: js/files.js:565
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:727
+#: js/files.js:775
msgid "{count} files scanned"
msgstr ""
-#: js/files.js:735
+#: js/files.js:783
msgid "error while scanning"
msgstr ""
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:857 templates/index.php:64
msgid "Name"
msgstr "ناو"
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:858 templates/index.php:75
msgid "Size"
msgstr ""
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:859 templates/index.php:77
msgid "Modified"
msgstr ""
-#: js/files.js:829
+#: js/files.js:878
msgid "1 folder"
msgstr ""
-#: js/files.js:831
+#: js/files.js:880
msgid "{count} folders"
msgstr ""
-#: js/files.js:839
+#: js/files.js:888
msgid "1 file"
msgstr ""
-#: js/files.js:841
+#: js/files.js:890
msgid "{count} files"
msgstr ""
@@ -269,10 +276,6 @@ msgstr "بوخچه"
msgid "From link"
msgstr ""
-#: templates/index.php:18
-msgid "Upload"
-msgstr "بارکردن"
-
#: templates/index.php:41
msgid "Cancel upload"
msgstr ""
diff --git a/l10n/ku_IQ/files_encryption.po b/l10n/ku_IQ/files_encryption.po
index ebb1c844374..d372d58b033 100644
--- a/l10n/ku_IQ/files_encryption.po
+++ b/l10n/ku_IQ/files_encryption.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-08 02:02+0200\n"
-"PO-Revision-Date: 2012-10-07 00:06+0000\n"
-"Last-Translator: Hozha Koyi <hozhan@gmail.com>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,18 +18,66 @@ msgstr ""
"Language: ku_IQ\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
msgid "Encryption"
msgstr "نهێنیکردن"
-#: templates/settings.php:4
+#: templates/settings.php:67
msgid "Exclude the following file types from encryption"
msgstr "به‌ربه‌ست کردنی ئه‌م جۆره‌ په‌ڕگانه له‌ نهێنیکردن"
-#: templates/settings.php:5
+#: templates/settings.php:71
msgid "None"
msgstr "هیچ"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "چالاکردنی نهێنیکردن"
diff --git a/l10n/ku_IQ/files_versions.po b/l10n/ku_IQ/files_versions.po
index 89832609b9c..b3fa1af6357 100644
--- a/l10n/ku_IQ/files_versions.po
+++ b/l10n/ku_IQ/files_versions.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-07 02:03+0200\n"
-"PO-Revision-Date: 2012-10-07 00:02+0000\n"
-"Last-Translator: Hozha Koyi <hozhan@gmail.com>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,22 +18,10 @@ msgstr ""
"Language: ku_IQ\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "وه‌شانه‌کان گشتیان به‌سه‌رده‌چن"
-
#: js/versions.js:16
msgid "History"
msgstr "مێژوو"
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "وه‌شان"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "ئه‌مه‌ سه‌رجه‌م پاڵپشتی وه‌شانه‌ هه‌بووه‌کانی په‌ڕگه‌کانت ده‌سڕینته‌وه"
-
#: templates/settings.php:3
msgid "Files Versioning"
msgstr "وه‌شانی په‌ڕگه"
diff --git a/l10n/ku_IQ/lib.po b/l10n/ku_IQ/lib.po
index ab5cb3ada24..64ee0185d35 100644
--- a/l10n/ku_IQ/lib.po
+++ b/l10n/ku_IQ/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-14 23:13+0000\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
@@ -17,51 +17,55 @@ msgstr ""
"Language: ku_IQ\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:285
+#: app.php:301
msgid "Help"
msgstr "یارمەتی"
-#: app.php:292
+#: app.php:308
msgid "Personal"
msgstr ""
-#: app.php:297
+#: app.php:313
msgid "Settings"
msgstr "ده‌ستكاری"
-#: app.php:302
+#: app.php:318
msgid "Users"
msgstr "به‌كارهێنه‌ر"
-#: app.php:309
+#: app.php:325
msgid "Apps"
msgstr ""
-#: app.php:311
+#: app.php:327
msgid "Admin"
msgstr ""
-#: files.php:332
+#: files.php:365
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:333
+#: files.php:366
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:333 files.php:358
+#: files.php:366 files.php:391
msgid "Back to Files"
msgstr ""
-#: files.php:357
+#: files.php:390
msgid "Selected files too large to generate zip file."
msgstr ""
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr ""
+
#: json.php:28
msgid "Application is not enabled"
msgstr ""
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
msgstr ""
@@ -81,55 +85,55 @@ msgstr ""
msgid "Images"
msgstr ""
-#: template.php:103
+#: template.php:113
msgid "seconds ago"
msgstr ""
-#: template.php:104
+#: template.php:114
msgid "1 minute ago"
msgstr ""
-#: template.php:105
+#: template.php:115
#, php-format
msgid "%d minutes ago"
msgstr ""
-#: template.php:106
+#: template.php:116
msgid "1 hour ago"
msgstr ""
-#: template.php:107
+#: template.php:117
#, php-format
msgid "%d hours ago"
msgstr ""
-#: template.php:108
+#: template.php:118
msgid "today"
msgstr ""
-#: template.php:109
+#: template.php:119
msgid "yesterday"
msgstr ""
-#: template.php:110
+#: template.php:120
#, php-format
msgid "%d days ago"
msgstr ""
-#: template.php:111
+#: template.php:121
msgid "last month"
msgstr ""
-#: template.php:112
+#: template.php:122
#, php-format
msgid "%d months ago"
msgstr ""
-#: template.php:113
+#: template.php:123
msgid "last year"
msgstr ""
-#: template.php:114
+#: template.php:124
msgid "years ago"
msgstr ""
diff --git a/l10n/ku_IQ/user_ldap.po b/l10n/ku_IQ/user_ldap.po
index f4e484f84f7..a6c60224118 100644
--- a/l10n/ku_IQ/user_ldap.po
+++ b/l10n/ku_IQ/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"POT-Creation-Date: 2013-01-18 00:03+0100\n"
+"PO-Revision-Date: 2013-01-17 21:57+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
@@ -26,8 +26,8 @@ msgstr ""
#: templates/settings.php:11
msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
msgstr ""
#: templates/settings.php:15
@@ -44,6 +44,10 @@ msgid "Base DN"
msgstr ""
#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
@@ -114,10 +118,18 @@ msgstr ""
msgid "Base User Tree"
msgstr ""
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
@@ -180,4 +192,4 @@ msgstr ""
#: templates/settings.php:39
msgid "Help"
-msgstr ""
+msgstr "یارمەتی"
diff --git a/l10n/ku_IQ/user_webdavauth.po b/l10n/ku_IQ/user_webdavauth.po
index 57ded88a09b..313845a14b2 100644
--- a/l10n/ku_IQ/user_webdavauth.po
+++ b/l10n/ku_IQ/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-20 00:11+0100\n"
-"PO-Revision-Date: 2012-12-19 23:12+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
@@ -17,13 +17,17 @@ msgstr ""
"Language: ku_IQ\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
#: templates/settings.php:4
msgid "URL: http://"
msgstr ""
#: templates/settings.php:6
msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
msgstr ""
diff --git a/l10n/lb/core.po b/l10n/lb/core.po
index b8f03766595..d51bf81245a 100644
--- a/l10n/lb/core.po
+++ b/l10n/lb/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
@@ -208,7 +208,6 @@ msgid "Password protect"
msgstr ""
#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
msgid "Password"
msgstr "Passwuert"
@@ -565,17 +564,3 @@ msgstr "weider"
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr ""
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr ""
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr ""
diff --git a/l10n/lb/files.po b/l10n/lb/files.po
index e664d38cc35..61b45edafd4 100644
--- a/l10n/lb/files.po
+++ b/l10n/lb/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"POT-Creation-Date: 2013-01-20 00:05+0100\n"
+"PO-Revision-Date: 2013-01-19 23:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
@@ -18,6 +18,11 @@ msgstr ""
"Language: lb\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/delete.php:28 ajax/getstoragestats.php:11 ajax/upload.php:17
+#: ajax/upload.php:76 templates/index.php:18
+msgid "Upload"
+msgstr "Eroplueden"
+
#: ajax/move.php:17
#, php-format
msgid "Could not move %s - File with this name already exists"
@@ -32,46 +37,46 @@ msgstr ""
msgid "Unable to rename file"
msgstr ""
-#: ajax/upload.php:14
+#: ajax/upload.php:20
msgid "No file was uploaded. Unknown error"
msgstr ""
-#: ajax/upload.php:21
+#: ajax/upload.php:30
msgid "There is no error, the file uploaded with success"
msgstr "Keen Feeler, Datei ass komplett ropgelueden ginn"
-#: ajax/upload.php:22
+#: ajax/upload.php:31
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr ""
-#: ajax/upload.php:24
+#: ajax/upload.php:33
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "Déi ropgelueden Datei ass méi grouss wei d'MAX_FILE_SIZE Eegenschaft déi an der HTML form uginn ass"
-#: ajax/upload.php:26
+#: ajax/upload.php:35
msgid "The uploaded file was only partially uploaded"
msgstr "Déi ropgelueden Datei ass nëmmen hallef ropgelueden ginn"
-#: ajax/upload.php:27
+#: ajax/upload.php:36
msgid "No file was uploaded"
msgstr "Et ass keng Datei ropgelueden ginn"
-#: ajax/upload.php:28
+#: ajax/upload.php:37
msgid "Missing a temporary folder"
msgstr "Et feelt en temporären Dossier"
-#: ajax/upload.php:29
+#: ajax/upload.php:38
msgid "Failed to write to disk"
msgstr "Konnt net op den Disk schreiwen"
-#: ajax/upload.php:45
+#: ajax/upload.php:57
msgid "Not enough space available"
msgstr ""
-#: ajax/upload.php:69
+#: ajax/upload.php:91
msgid "Invalid directory."
msgstr ""
@@ -127,98 +132,100 @@ msgstr ""
msgid "deleted {files}"
msgstr ""
-#: js/files.js:31
+#: js/files.js:48
msgid "'.' is an invalid file name."
msgstr ""
-#: js/files.js:36
+#: js/files.js:53
msgid "File name cannot be empty."
msgstr ""
-#: js/files.js:45
+#: js/files.js:62
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "Et gëtt eng ZIP-File generéiert, dëst ka bëssen daueren."
+#: js/files.js:204
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
-#: js/files.js:224
+#: js/files.js:242
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Kann deng Datei net eroplueden well et en Dossier ass oder 0 byte grouss ass."
-#: js/files.js:224
+#: js/files.js:242
msgid "Upload Error"
msgstr "Fehler beim eroplueden"
-#: js/files.js:241
+#: js/files.js:259
msgid "Close"
msgstr "Zoumaachen"
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:278 js/files.js:397 js/files.js:431
msgid "Pending"
msgstr ""
-#: js/files.js:280
+#: js/files.js:298
msgid "1 file uploading"
msgstr ""
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:301 js/files.js:357 js/files.js:372
msgid "{count} files uploading"
msgstr ""
-#: js/files.js:357 js/files.js:393
+#: js/files.js:376 js/files.js:414
msgid "Upload cancelled."
msgstr "Upload ofgebrach."
-#: js/files.js:464
+#: js/files.js:486
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "File Upload am gaang. Wann's de des Säit verléiss gëtt den Upload ofgebrach."
-#: js/files.js:537
+#: js/files.js:559
msgid "URL cannot be empty."
msgstr ""
-#: js/files.js:543
+#: js/files.js:565
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:727
+#: js/files.js:775
msgid "{count} files scanned"
msgstr ""
-#: js/files.js:735
+#: js/files.js:783
msgid "error while scanning"
msgstr ""
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:857 templates/index.php:64
msgid "Name"
msgstr "Numm"
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:858 templates/index.php:75
msgid "Size"
msgstr "Gréisst"
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:859 templates/index.php:77
msgid "Modified"
msgstr "Geännert"
-#: js/files.js:829
+#: js/files.js:878
msgid "1 folder"
msgstr ""
-#: js/files.js:831
+#: js/files.js:880
msgid "{count} folders"
msgstr ""
-#: js/files.js:839
+#: js/files.js:888
msgid "1 file"
msgstr ""
-#: js/files.js:841
+#: js/files.js:890
msgid "{count} files"
msgstr ""
@@ -270,10 +277,6 @@ msgstr "Dossier"
msgid "From link"
msgstr ""
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Eroplueden"
-
#: templates/index.php:41
msgid "Cancel upload"
msgstr "Upload ofbriechen"
diff --git a/l10n/lb/files_encryption.po b/l10n/lb/files_encryption.po
index 5446d2366b4..f88e884164b 100644
--- a/l10n/lb/files_encryption.po
+++ b/l10n/lb/files_encryption.po
@@ -7,28 +7,76 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: lb\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings.php:3
-msgid "Encryption"
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
msgstr ""
-#: templates/settings.php:4
-msgid "Exclude the following file types from encryption"
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
msgstr ""
-#: templates/settings.php:5
-msgid "None"
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
msgstr ""
#: templates/settings.php:10
-msgid "Enable Encryption"
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:67
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:71
+msgid "None"
msgstr ""
diff --git a/l10n/lb/files_versions.po b/l10n/lb/files_versions.po
index 9f3294d11f6..3c50ece48e4 100644
--- a/l10n/lb/files_versions.po
+++ b/l10n/lb/files_versions.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-22 01:14+0200\n"
-"PO-Revision-Date: 2012-09-21 23:15+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,22 +17,10 @@ msgstr ""
"Language: lb\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr ""
-
#: js/versions.js:16
msgid "History"
msgstr ""
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr ""
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr ""
-
#: templates/settings.php:3
msgid "Files Versioning"
msgstr ""
diff --git a/l10n/lb/lib.po b/l10n/lb/lib.po
index b164e98f222..09aea026773 100644
--- a/l10n/lb/lib.po
+++ b/l10n/lb/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-14 23:13+0000\n"
+"POT-Creation-Date: 2013-01-18 00:03+0100\n"
+"PO-Revision-Date: 2013-01-17 21:57+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
@@ -17,51 +17,55 @@ msgstr ""
"Language: lb\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:285
+#: app.php:301
msgid "Help"
-msgstr ""
+msgstr "Hëllef"
-#: app.php:292
+#: app.php:308
msgid "Personal"
msgstr "Perséinlech"
-#: app.php:297
+#: app.php:313
msgid "Settings"
msgstr "Astellungen"
-#: app.php:302
+#: app.php:318
msgid "Users"
msgstr ""
-#: app.php:309
+#: app.php:325
msgid "Apps"
msgstr ""
-#: app.php:311
+#: app.php:327
msgid "Admin"
msgstr ""
-#: files.php:332
+#: files.php:365
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:333
+#: files.php:366
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:333 files.php:358
+#: files.php:366 files.php:391
msgid "Back to Files"
msgstr ""
-#: files.php:357
+#: files.php:390
msgid "Selected files too large to generate zip file."
msgstr ""
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr ""
+
#: json.php:28
msgid "Application is not enabled"
msgstr ""
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
msgstr "Authentifikatioun's Fehler"
@@ -71,7 +75,7 @@ msgstr ""
#: search/provider/file.php:17 search/provider/file.php:35
msgid "Files"
-msgstr ""
+msgstr "Dateien"
#: search/provider/file.php:26 search/provider/file.php:33
msgid "Text"
@@ -81,55 +85,55 @@ msgstr "SMS"
msgid "Images"
msgstr ""
-#: template.php:103
+#: template.php:113
msgid "seconds ago"
msgstr ""
-#: template.php:104
+#: template.php:114
msgid "1 minute ago"
msgstr ""
-#: template.php:105
+#: template.php:115
#, php-format
msgid "%d minutes ago"
msgstr ""
-#: template.php:106
+#: template.php:116
msgid "1 hour ago"
msgstr ""
-#: template.php:107
+#: template.php:117
#, php-format
msgid "%d hours ago"
msgstr ""
-#: template.php:108
+#: template.php:118
msgid "today"
msgstr ""
-#: template.php:109
+#: template.php:119
msgid "yesterday"
msgstr ""
-#: template.php:110
+#: template.php:120
#, php-format
msgid "%d days ago"
msgstr ""
-#: template.php:111
+#: template.php:121
msgid "last month"
msgstr ""
-#: template.php:112
+#: template.php:122
#, php-format
msgid "%d months ago"
msgstr ""
-#: template.php:113
+#: template.php:123
msgid "last year"
msgstr ""
-#: template.php:114
+#: template.php:124
msgid "years ago"
msgstr ""
diff --git a/l10n/lb/user_ldap.po b/l10n/lb/user_ldap.po
index be1657cb3d3..a12e3f905ee 100644
--- a/l10n/lb/user_ldap.po
+++ b/l10n/lb/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"POT-Creation-Date: 2013-01-18 00:03+0100\n"
+"PO-Revision-Date: 2013-01-17 21:57+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
@@ -26,8 +26,8 @@ msgstr ""
#: templates/settings.php:11
msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
msgstr ""
#: templates/settings.php:15
@@ -44,6 +44,10 @@ msgid "Base DN"
msgstr ""
#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
@@ -114,10 +118,18 @@ msgstr ""
msgid "Base User Tree"
msgstr ""
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
@@ -180,4 +192,4 @@ msgstr ""
#: templates/settings.php:39
msgid "Help"
-msgstr ""
+msgstr "Hëllef"
diff --git a/l10n/lb/user_webdavauth.po b/l10n/lb/user_webdavauth.po
index 626112fb833..fb53f7bcb24 100644
--- a/l10n/lb/user_webdavauth.po
+++ b/l10n/lb/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-20 00:11+0100\n"
-"PO-Revision-Date: 2012-12-19 23:12+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
@@ -17,13 +17,17 @@ msgstr ""
"Language: lb\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
#: templates/settings.php:4
msgid "URL: http://"
msgstr ""
#: templates/settings.php:6
msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
msgstr ""
diff --git a/l10n/lt_LT/core.po b/l10n/lt_LT/core.po
index d920fe7b476..bdc20a2384a 100644
--- a/l10n/lt_LT/core.po
+++ b/l10n/lt_LT/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
@@ -209,7 +209,6 @@ msgid "Password protect"
msgstr "Apsaugotas slaptažodžiu"
#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
msgid "Password"
msgstr "Slaptažodis"
@@ -566,17 +565,3 @@ msgstr "kitas"
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "Saugumo pranešimas!"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "Prašome patvirtinti savo vartotoją.<br/>Dėl saugumo, slaptažodžio patvirtinimas bus reikalaujamas įvesti kas kiek laiko."
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "Patvirtinti"
diff --git a/l10n/lt_LT/files.po b/l10n/lt_LT/files.po
index 0b5d2d78f5b..bae5e238b17 100644
--- a/l10n/lt_LT/files.po
+++ b/l10n/lt_LT/files.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"POT-Creation-Date: 2013-01-20 00:05+0100\n"
+"PO-Revision-Date: 2013-01-19 23:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
@@ -20,6 +20,11 @@ msgstr ""
"Language: lt_LT\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+#: ajax/delete.php:28 ajax/getstoragestats.php:11 ajax/upload.php:17
+#: ajax/upload.php:76 templates/index.php:18
+msgid "Upload"
+msgstr "Įkelti"
+
#: ajax/move.php:17
#, php-format
msgid "Could not move %s - File with this name already exists"
@@ -34,46 +39,46 @@ msgstr ""
msgid "Unable to rename file"
msgstr ""
-#: ajax/upload.php:14
+#: ajax/upload.php:20
msgid "No file was uploaded. Unknown error"
msgstr ""
-#: ajax/upload.php:21
+#: ajax/upload.php:30
msgid "There is no error, the file uploaded with success"
msgstr "Klaidų nėra, failas įkeltas sėkmingai"
-#: ajax/upload.php:22
+#: ajax/upload.php:31
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr ""
-#: ajax/upload.php:24
+#: ajax/upload.php:33
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "Įkeliamo failo dydis viršija MAX_FILE_SIZE parametrą, kuris yra nustatytas HTML formoje"
-#: ajax/upload.php:26
+#: ajax/upload.php:35
msgid "The uploaded file was only partially uploaded"
msgstr "Failas buvo įkeltas tik dalinai"
-#: ajax/upload.php:27
+#: ajax/upload.php:36
msgid "No file was uploaded"
msgstr "Nebuvo įkeltas nė vienas failas"
-#: ajax/upload.php:28
+#: ajax/upload.php:37
msgid "Missing a temporary folder"
msgstr "Nėra laikinojo katalogo"
-#: ajax/upload.php:29
+#: ajax/upload.php:38
msgid "Failed to write to disk"
msgstr "Nepavyko įrašyti į diską"
-#: ajax/upload.php:45
+#: ajax/upload.php:57
msgid "Not enough space available"
msgstr ""
-#: ajax/upload.php:69
+#: ajax/upload.php:91
msgid "Invalid directory."
msgstr ""
@@ -129,98 +134,100 @@ msgstr "nebesidalinti {files}"
msgid "deleted {files}"
msgstr "ištrinti {files}"
-#: js/files.js:31
+#: js/files.js:48
msgid "'.' is an invalid file name."
msgstr ""
-#: js/files.js:36
+#: js/files.js:53
msgid "File name cannot be empty."
msgstr ""
-#: js/files.js:45
+#: js/files.js:62
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "kuriamas ZIP archyvas, tai gali užtrukti šiek tiek laiko."
+#: js/files.js:204
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
-#: js/files.js:224
+#: js/files.js:242
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Neįmanoma įkelti failo - jo dydis gali būti 0 bitų arba tai katalogas"
-#: js/files.js:224
+#: js/files.js:242
msgid "Upload Error"
msgstr "Įkėlimo klaida"
-#: js/files.js:241
+#: js/files.js:259
msgid "Close"
msgstr "Užverti"
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:278 js/files.js:397 js/files.js:431
msgid "Pending"
msgstr "Laukiantis"
-#: js/files.js:280
+#: js/files.js:298
msgid "1 file uploading"
msgstr "įkeliamas 1 failas"
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:301 js/files.js:357 js/files.js:372
msgid "{count} files uploading"
msgstr "{count} įkeliami failai"
-#: js/files.js:357 js/files.js:393
+#: js/files.js:376 js/files.js:414
msgid "Upload cancelled."
msgstr "Įkėlimas atšauktas."
-#: js/files.js:464
+#: js/files.js:486
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Failo įkėlimas pradėtas. Jei paliksite šį puslapį, įkėlimas nutrūks."
-#: js/files.js:537
+#: js/files.js:559
msgid "URL cannot be empty."
msgstr ""
-#: js/files.js:543
+#: js/files.js:565
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:727
+#: js/files.js:775
msgid "{count} files scanned"
msgstr "{count} praskanuoti failai"
-#: js/files.js:735
+#: js/files.js:783
msgid "error while scanning"
msgstr "klaida skanuojant"
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:857 templates/index.php:64
msgid "Name"
msgstr "Pavadinimas"
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:858 templates/index.php:75
msgid "Size"
msgstr "Dydis"
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:859 templates/index.php:77
msgid "Modified"
msgstr "Pakeista"
-#: js/files.js:829
+#: js/files.js:878
msgid "1 folder"
msgstr "1 aplankalas"
-#: js/files.js:831
+#: js/files.js:880
msgid "{count} folders"
msgstr "{count} aplankalai"
-#: js/files.js:839
+#: js/files.js:888
msgid "1 file"
msgstr "1 failas"
-#: js/files.js:841
+#: js/files.js:890
msgid "{count} files"
msgstr "{count} failai"
@@ -272,10 +279,6 @@ msgstr "Katalogas"
msgid "From link"
msgstr ""
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Įkelti"
-
#: templates/index.php:41
msgid "Cancel upload"
msgstr "Atšaukti siuntimą"
diff --git a/l10n/lt_LT/files_encryption.po b/l10n/lt_LT/files_encryption.po
index 41529366d31..152f3677f83 100644
--- a/l10n/lt_LT/files_encryption.po
+++ b/l10n/lt_LT/files_encryption.po
@@ -8,28 +8,76 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-22 12:29+0000\n"
-"Last-Translator: Dr. ROX <to.dr.rox@gmail.com>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: lt_LT\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
msgid "Encryption"
msgstr "Šifravimas"
-#: templates/settings.php:4
+#: templates/settings.php:67
msgid "Exclude the following file types from encryption"
msgstr "Nešifruoti pasirinkto tipo failų"
-#: templates/settings.php:5
+#: templates/settings.php:71
msgid "None"
msgstr "Nieko"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "Įjungti šifravimą"
diff --git a/l10n/lt_LT/files_versions.po b/l10n/lt_LT/files_versions.po
index 2e5b37e12fc..b3cf7ff9e97 100644
--- a/l10n/lt_LT/files_versions.po
+++ b/l10n/lt_LT/files_versions.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-23 02:02+0200\n"
-"PO-Revision-Date: 2012-10-22 16:56+0000\n"
-"Last-Translator: andrejuseu <andrejuszl@gmail.com>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,22 +19,10 @@ msgstr ""
"Language: lt_LT\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "Panaikinti visų versijų galiojimą"
-
#: js/versions.js:16
msgid "History"
msgstr "Istorija"
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "Versijos"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "Tai ištrins visas esamas failo versijas"
-
#: templates/settings.php:3
msgid "Files Versioning"
msgstr "Failų versijos"
diff --git a/l10n/lt_LT/lib.po b/l10n/lt_LT/lib.po
index 8ef5110cd74..1f676fdd4ec 100644
--- a/l10n/lt_LT/lib.po
+++ b/l10n/lt_LT/lib.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-14 23:13+0000\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
@@ -19,51 +19,55 @@ msgstr ""
"Language: lt_LT\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: app.php:285
+#: app.php:301
msgid "Help"
msgstr "Pagalba"
-#: app.php:292
+#: app.php:308
msgid "Personal"
msgstr "Asmeniniai"
-#: app.php:297
+#: app.php:313
msgid "Settings"
msgstr "Nustatymai"
-#: app.php:302
+#: app.php:318
msgid "Users"
msgstr "Vartotojai"
-#: app.php:309
+#: app.php:325
msgid "Apps"
msgstr "Programos"
-#: app.php:311
+#: app.php:327
msgid "Admin"
msgstr "Administravimas"
-#: files.php:332
+#: files.php:365
msgid "ZIP download is turned off."
msgstr "ZIP atsisiuntimo galimybė yra išjungta."
-#: files.php:333
+#: files.php:366
msgid "Files need to be downloaded one by one."
msgstr "Failai turi būti parsiunčiami vienas po kito."
-#: files.php:333 files.php:358
+#: files.php:366 files.php:391
msgid "Back to Files"
msgstr "Atgal į Failus"
-#: files.php:357
+#: files.php:390
msgid "Selected files too large to generate zip file."
msgstr "Pasirinkti failai per dideli archyvavimui į ZIP."
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr ""
+
#: json.php:28
msgid "Application is not enabled"
msgstr "Programa neįjungta"
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
msgstr "Autentikacijos klaida"
@@ -83,55 +87,55 @@ msgstr "Žinučių"
msgid "Images"
msgstr ""
-#: template.php:103
+#: template.php:113
msgid "seconds ago"
msgstr "prieš kelias sekundes"
-#: template.php:104
+#: template.php:114
msgid "1 minute ago"
msgstr "prieš 1 minutę"
-#: template.php:105
+#: template.php:115
#, php-format
msgid "%d minutes ago"
msgstr "prieš %d minučių"
-#: template.php:106
+#: template.php:116
msgid "1 hour ago"
msgstr ""
-#: template.php:107
+#: template.php:117
#, php-format
msgid "%d hours ago"
msgstr ""
-#: template.php:108
+#: template.php:118
msgid "today"
msgstr "šiandien"
-#: template.php:109
+#: template.php:119
msgid "yesterday"
msgstr "vakar"
-#: template.php:110
+#: template.php:120
#, php-format
msgid "%d days ago"
msgstr "prieš %d dienų"
-#: template.php:111
+#: template.php:121
msgid "last month"
msgstr "praėjusį mėnesį"
-#: template.php:112
+#: template.php:122
#, php-format
msgid "%d months ago"
msgstr ""
-#: template.php:113
+#: template.php:123
msgid "last year"
msgstr "pereitais metais"
-#: template.php:114
+#: template.php:124
msgid "years ago"
msgstr "prieš metus"
diff --git a/l10n/lt_LT/user_ldap.po b/l10n/lt_LT/user_ldap.po
index 9891d24f372..0abf2d8c2fd 100644
--- a/l10n/lt_LT/user_ldap.po
+++ b/l10n/lt_LT/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 23:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
@@ -27,8 +27,8 @@ msgstr ""
#: templates/settings.php:11
msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
msgstr ""
#: templates/settings.php:15
@@ -45,6 +45,10 @@ msgid "Base DN"
msgstr ""
#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
@@ -115,10 +119,18 @@ msgstr "Prievadas"
msgid "Base User Tree"
msgstr ""
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
diff --git a/l10n/lt_LT/user_webdavauth.po b/l10n/lt_LT/user_webdavauth.po
index d4919105187..f8bc059ae29 100644
--- a/l10n/lt_LT/user_webdavauth.po
+++ b/l10n/lt_LT/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-20 00:11+0100\n"
-"PO-Revision-Date: 2012-12-19 23:12+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
@@ -17,13 +17,17 @@ msgstr ""
"Language: lt_LT\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
#: templates/settings.php:4
msgid "URL: http://"
msgstr ""
#: templates/settings.php:6
msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
msgstr ""
diff --git a/l10n/lv/core.po b/l10n/lv/core.po
index 6294f8854c9..af275975955 100644
--- a/l10n/lv/core.po
+++ b/l10n/lv/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
@@ -208,7 +208,6 @@ msgid "Password protect"
msgstr ""
#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
msgid "Password"
msgstr "Parole"
@@ -565,17 +564,3 @@ msgstr "nākamā"
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr ""
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr ""
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr ""
diff --git a/l10n/lv/files.po b/l10n/lv/files.po
index 7b978c86d82..0d45b08c187 100644
--- a/l10n/lv/files.po
+++ b/l10n/lv/files.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"POT-Creation-Date: 2013-01-20 00:05+0100\n"
+"PO-Revision-Date: 2013-01-19 23:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
@@ -19,6 +19,11 @@ msgstr ""
"Language: lv\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
+#: ajax/delete.php:28 ajax/getstoragestats.php:11 ajax/upload.php:17
+#: ajax/upload.php:76 templates/index.php:18
+msgid "Upload"
+msgstr "Augšuplādet"
+
#: ajax/move.php:17
#, php-format
msgid "Could not move %s - File with this name already exists"
@@ -33,46 +38,46 @@ msgstr ""
msgid "Unable to rename file"
msgstr ""
-#: ajax/upload.php:14
+#: ajax/upload.php:20
msgid "No file was uploaded. Unknown error"
msgstr ""
-#: ajax/upload.php:21
+#: ajax/upload.php:30
msgid "There is no error, the file uploaded with success"
msgstr "Viss kārtībā, augšupielāde veiksmīga"
-#: ajax/upload.php:22
+#: ajax/upload.php:31
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr ""
-#: ajax/upload.php:24
+#: ajax/upload.php:33
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr ""
-#: ajax/upload.php:26
+#: ajax/upload.php:35
msgid "The uploaded file was only partially uploaded"
msgstr ""
-#: ajax/upload.php:27
+#: ajax/upload.php:36
msgid "No file was uploaded"
msgstr "Neviens fails netika augšuplādēts"
-#: ajax/upload.php:28
+#: ajax/upload.php:37
msgid "Missing a temporary folder"
msgstr "Trūkst pagaidu mapes"
-#: ajax/upload.php:29
+#: ajax/upload.php:38
msgid "Failed to write to disk"
msgstr "Nav iespējams saglabāt"
-#: ajax/upload.php:45
+#: ajax/upload.php:57
msgid "Not enough space available"
msgstr ""
-#: ajax/upload.php:69
+#: ajax/upload.php:91
msgid "Invalid directory."
msgstr ""
@@ -128,98 +133,100 @@ msgstr ""
msgid "deleted {files}"
msgstr ""
-#: js/files.js:31
+#: js/files.js:48
msgid "'.' is an invalid file name."
msgstr ""
-#: js/files.js:36
+#: js/files.js:53
msgid "File name cannot be empty."
msgstr ""
-#: js/files.js:45
+#: js/files.js:62
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "lai uzģenerētu ZIP failu, kāds brīdis ir jāpagaida"
+#: js/files.js:204
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
-#: js/files.js:224
+#: js/files.js:242
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Nav iespējams augšuplādēt jūsu failu, jo tāds jau eksistē vai arī failam nav izmēra (0 baiti)"
-#: js/files.js:224
+#: js/files.js:242
msgid "Upload Error"
msgstr "Augšuplādēšanas laikā radās kļūda"
-#: js/files.js:241
+#: js/files.js:259
msgid "Close"
msgstr ""
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:278 js/files.js:397 js/files.js:431
msgid "Pending"
msgstr "Gaida savu kārtu"
-#: js/files.js:280
+#: js/files.js:298
msgid "1 file uploading"
msgstr ""
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:301 js/files.js:357 js/files.js:372
msgid "{count} files uploading"
msgstr ""
-#: js/files.js:357 js/files.js:393
+#: js/files.js:376 js/files.js:414
msgid "Upload cancelled."
msgstr "Augšuplāde ir atcelta"
-#: js/files.js:464
+#: js/files.js:486
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Notiek augšupielāde. Pametot lapu tagad, tiks atcelta augšupielāde."
-#: js/files.js:537
+#: js/files.js:559
msgid "URL cannot be empty."
msgstr ""
-#: js/files.js:543
+#: js/files.js:565
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:727
+#: js/files.js:775
msgid "{count} files scanned"
msgstr ""
-#: js/files.js:735
+#: js/files.js:783
msgid "error while scanning"
msgstr ""
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:857 templates/index.php:64
msgid "Name"
msgstr "Nosaukums"
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:858 templates/index.php:75
msgid "Size"
msgstr "Izmērs"
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:859 templates/index.php:77
msgid "Modified"
msgstr "Izmainīts"
-#: js/files.js:829
+#: js/files.js:878
msgid "1 folder"
msgstr ""
-#: js/files.js:831
+#: js/files.js:880
msgid "{count} folders"
msgstr ""
-#: js/files.js:839
+#: js/files.js:888
msgid "1 file"
msgstr ""
-#: js/files.js:841
+#: js/files.js:890
msgid "{count} files"
msgstr ""
@@ -271,10 +278,6 @@ msgstr "Mape"
msgid "From link"
msgstr ""
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Augšuplādet"
-
#: templates/index.php:41
msgid "Cancel upload"
msgstr "Atcelt augšuplādi"
diff --git a/l10n/lv/files_encryption.po b/l10n/lv/files_encryption.po
index 6b2dc7673d7..9ceadebe30c 100644
--- a/l10n/lv/files_encryption.po
+++ b/l10n/lv/files_encryption.po
@@ -7,28 +7,76 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: lv\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
-#: templates/settings.php:3
-msgid "Encryption"
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
msgstr ""
-#: templates/settings.php:4
-msgid "Exclude the following file types from encryption"
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
msgstr ""
-#: templates/settings.php:5
-msgid "None"
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
msgstr ""
#: templates/settings.php:10
-msgid "Enable Encryption"
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:67
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:71
+msgid "None"
msgstr ""
diff --git a/l10n/lv/files_versions.po b/l10n/lv/files_versions.po
index 8f4cc2911f8..399b82e06fc 100644
--- a/l10n/lv/files_versions.po
+++ b/l10n/lv/files_versions.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-22 01:14+0200\n"
-"PO-Revision-Date: 2012-09-21 23:15+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,22 +17,10 @@ msgstr ""
"Language: lv\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr ""
-
#: js/versions.js:16
msgid "History"
msgstr ""
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr ""
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr ""
-
#: templates/settings.php:3
msgid "Files Versioning"
msgstr ""
diff --git a/l10n/lv/lib.po b/l10n/lv/lib.po
index 8ef8b7d5060..03dc8d418c3 100644
--- a/l10n/lv/lib.po
+++ b/l10n/lv/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-14 23:13+0000\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
@@ -17,51 +17,55 @@ msgstr ""
"Language: lv\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
-#: app.php:285
+#: app.php:301
msgid "Help"
msgstr "Palīdzība"
-#: app.php:292
+#: app.php:308
msgid "Personal"
msgstr "Personīgi"
-#: app.php:297
+#: app.php:313
msgid "Settings"
msgstr "Iestatījumi"
-#: app.php:302
+#: app.php:318
msgid "Users"
msgstr "Lietotāji"
-#: app.php:309
+#: app.php:325
msgid "Apps"
msgstr ""
-#: app.php:311
+#: app.php:327
msgid "Admin"
msgstr ""
-#: files.php:332
+#: files.php:365
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:333
+#: files.php:366
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:333 files.php:358
+#: files.php:366 files.php:391
msgid "Back to Files"
msgstr ""
-#: files.php:357
+#: files.php:390
msgid "Selected files too large to generate zip file."
msgstr ""
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr ""
+
#: json.php:28
msgid "Application is not enabled"
msgstr ""
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
msgstr "Ielogošanās kļūme"
@@ -81,55 +85,55 @@ msgstr ""
msgid "Images"
msgstr ""
-#: template.php:103
+#: template.php:113
msgid "seconds ago"
msgstr ""
-#: template.php:104
+#: template.php:114
msgid "1 minute ago"
msgstr ""
-#: template.php:105
+#: template.php:115
#, php-format
msgid "%d minutes ago"
msgstr ""
-#: template.php:106
+#: template.php:116
msgid "1 hour ago"
msgstr ""
-#: template.php:107
+#: template.php:117
#, php-format
msgid "%d hours ago"
msgstr ""
-#: template.php:108
+#: template.php:118
msgid "today"
msgstr ""
-#: template.php:109
+#: template.php:119
msgid "yesterday"
msgstr ""
-#: template.php:110
+#: template.php:120
#, php-format
msgid "%d days ago"
msgstr ""
-#: template.php:111
+#: template.php:121
msgid "last month"
msgstr ""
-#: template.php:112
+#: template.php:122
#, php-format
msgid "%d months ago"
msgstr ""
-#: template.php:113
+#: template.php:123
msgid "last year"
msgstr ""
-#: template.php:114
+#: template.php:124
msgid "years ago"
msgstr ""
diff --git a/l10n/lv/user_ldap.po b/l10n/lv/user_ldap.po
index b0d8f36bed3..737869b743e 100644
--- a/l10n/lv/user_ldap.po
+++ b/l10n/lv/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"POT-Creation-Date: 2013-01-18 00:03+0100\n"
+"PO-Revision-Date: 2013-01-17 21:57+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
@@ -26,8 +26,8 @@ msgstr ""
#: templates/settings.php:11
msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
msgstr ""
#: templates/settings.php:15
@@ -44,6 +44,10 @@ msgid "Base DN"
msgstr ""
#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
@@ -114,10 +118,18 @@ msgstr ""
msgid "Base User Tree"
msgstr ""
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
@@ -180,4 +192,4 @@ msgstr ""
#: templates/settings.php:39
msgid "Help"
-msgstr ""
+msgstr "Palīdzība"
diff --git a/l10n/lv/user_webdavauth.po b/l10n/lv/user_webdavauth.po
index c2af7da931a..6d3874a0c53 100644
--- a/l10n/lv/user_webdavauth.po
+++ b/l10n/lv/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-20 00:11+0100\n"
-"PO-Revision-Date: 2012-12-19 23:12+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
@@ -17,13 +17,17 @@ msgstr ""
"Language: lv\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
#: templates/settings.php:4
msgid "URL: http://"
msgstr ""
#: templates/settings.php:6
msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
msgstr ""
diff --git a/l10n/mk/core.po b/l10n/mk/core.po
index dc83a622e0c..2442222918c 100644
--- a/l10n/mk/core.po
+++ b/l10n/mk/core.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
@@ -210,7 +210,6 @@ msgid "Password protect"
msgstr "Заштити со лозинка"
#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
msgid "Password"
msgstr "Лозинка"
@@ -567,17 +566,3 @@ msgstr "следно"
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "Безбедносно предупредување."
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "Ве молам потврдете ја вашата лозинка. <br />Од безбедносни причини од време на време може да биде побарано да ја внесете вашата лозинка повторно."
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "Потврди"
diff --git a/l10n/mk/files.po b/l10n/mk/files.po
index 5c3bf733238..4bd4be8d532 100644
--- a/l10n/mk/files.po
+++ b/l10n/mk/files.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"POT-Creation-Date: 2013-01-20 00:05+0100\n"
+"PO-Revision-Date: 2013-01-19 23:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
@@ -20,6 +20,11 @@ msgstr ""
"Language: mk\n"
"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
+#: ajax/delete.php:28 ajax/getstoragestats.php:11 ajax/upload.php:17
+#: ajax/upload.php:76 templates/index.php:18
+msgid "Upload"
+msgstr "Подигни"
+
#: ajax/move.php:17
#, php-format
msgid "Could not move %s - File with this name already exists"
@@ -34,46 +39,46 @@ msgstr ""
msgid "Unable to rename file"
msgstr ""
-#: ajax/upload.php:14
+#: ajax/upload.php:20
msgid "No file was uploaded. Unknown error"
msgstr "Ниту еден фајл не се вчита. Непозната грешка"
-#: ajax/upload.php:21
+#: ajax/upload.php:30
msgid "There is no error, the file uploaded with success"
msgstr "Нема грешка, датотеката беше подигната успешно"
-#: ajax/upload.php:22
+#: ajax/upload.php:31
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr "Подигнатата датотека ја надминува upload_max_filesize директивата во php.ini:"
-#: ajax/upload.php:24
+#: ajax/upload.php:33
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "Подигнатата датотеката ја надминува MAX_FILE_SIZE директивата која беше поставена во HTML формата"
-#: ajax/upload.php:26
+#: ajax/upload.php:35
msgid "The uploaded file was only partially uploaded"
msgstr "Датотеката беше само делумно подигната."
-#: ajax/upload.php:27
+#: ajax/upload.php:36
msgid "No file was uploaded"
msgstr "Не беше подигната датотека"
-#: ajax/upload.php:28
+#: ajax/upload.php:37
msgid "Missing a temporary folder"
msgstr "Не постои привремена папка"
-#: ajax/upload.php:29
+#: ajax/upload.php:38
msgid "Failed to write to disk"
msgstr "Неуспеав да запишам на диск"
-#: ajax/upload.php:45
+#: ajax/upload.php:57
msgid "Not enough space available"
msgstr ""
-#: ajax/upload.php:69
+#: ajax/upload.php:91
msgid "Invalid directory."
msgstr ""
@@ -129,98 +134,100 @@ msgstr "без споделување {files}"
msgid "deleted {files}"
msgstr "избришани {files}"
-#: js/files.js:31
+#: js/files.js:48
msgid "'.' is an invalid file name."
msgstr ""
-#: js/files.js:36
+#: js/files.js:53
msgid "File name cannot be empty."
msgstr ""
-#: js/files.js:45
+#: js/files.js:62
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Неправилно име. , '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' не се дозволени."
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "Се генерира ZIP фајлот, ќе треба извесно време."
+#: js/files.js:204
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
-#: js/files.js:224
+#: js/files.js:242
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Не може да се преземе вашата датотека бидејќи фолдерот во кој се наоѓа фајлот има големина од 0 бајти"
-#: js/files.js:224
+#: js/files.js:242
msgid "Upload Error"
msgstr "Грешка при преземање"
-#: js/files.js:241
+#: js/files.js:259
msgid "Close"
msgstr "Затвои"
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:278 js/files.js:397 js/files.js:431
msgid "Pending"
msgstr "Чека"
-#: js/files.js:280
+#: js/files.js:298
msgid "1 file uploading"
msgstr "1 датотека се подига"
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:301 js/files.js:357 js/files.js:372
msgid "{count} files uploading"
msgstr "{count} датотеки се подигаат"
-#: js/files.js:357 js/files.js:393
+#: js/files.js:376 js/files.js:414
msgid "Upload cancelled."
msgstr "Преземањето е прекинато."
-#: js/files.js:464
+#: js/files.js:486
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Подигање на датотека е во тек. Напуштење на страницата ќе го прекине."
-#: js/files.js:537
+#: js/files.js:559
msgid "URL cannot be empty."
msgstr "Адресата неможе да биде празна."
-#: js/files.js:543
+#: js/files.js:565
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:727
+#: js/files.js:775
msgid "{count} files scanned"
msgstr "{count} датотеки скенирани"
-#: js/files.js:735
+#: js/files.js:783
msgid "error while scanning"
msgstr "грешка при скенирање"
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:857 templates/index.php:64
msgid "Name"
msgstr "Име"
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:858 templates/index.php:75
msgid "Size"
msgstr "Големина"
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:859 templates/index.php:77
msgid "Modified"
msgstr "Променето"
-#: js/files.js:829
+#: js/files.js:878
msgid "1 folder"
msgstr "1 папка"
-#: js/files.js:831
+#: js/files.js:880
msgid "{count} folders"
msgstr "{count} папки"
-#: js/files.js:839
+#: js/files.js:888
msgid "1 file"
msgstr "1 датотека"
-#: js/files.js:841
+#: js/files.js:890
msgid "{count} files"
msgstr "{count} датотеки"
@@ -272,10 +279,6 @@ msgstr "Папка"
msgid "From link"
msgstr "Од врска"
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Подигни"
-
#: templates/index.php:41
msgid "Cancel upload"
msgstr "Откажи прикачување"
diff --git a/l10n/mk/files_encryption.po b/l10n/mk/files_encryption.po
index 2b4f5dfb57a..b34192fc864 100644
--- a/l10n/mk/files_encryption.po
+++ b/l10n/mk/files_encryption.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-18 00:13+0100\n"
-"PO-Revision-Date: 2012-12-17 13:14+0000\n"
-"Last-Translator: Georgi Stanojevski <glisha@gmail.com>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,18 +18,66 @@ msgstr ""
"Language: mk\n"
"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
msgid "Encryption"
msgstr "Енкрипција"
-#: templates/settings.php:4
+#: templates/settings.php:67
msgid "Exclude the following file types from encryption"
msgstr "Исклучи ги следните типови на датотеки од енкрипција"
-#: templates/settings.php:5
+#: templates/settings.php:71
msgid "None"
msgstr "Ништо"
-
-#: templates/settings.php:12
-msgid "Enable Encryption"
-msgstr "Овозможи енкрипција"
diff --git a/l10n/mk/files_versions.po b/l10n/mk/files_versions.po
index bbe751713aa..3f4e68131e3 100644
--- a/l10n/mk/files_versions.po
+++ b/l10n/mk/files_versions.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-18 00:13+0100\n"
-"PO-Revision-Date: 2012-12-17 13:19+0000\n"
-"Last-Translator: Georgi Stanojevski <glisha@gmail.com>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,22 +18,10 @@ msgstr ""
"Language: mk\n"
"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "Истечи ги сите верзии"
-
#: js/versions.js:16
msgid "History"
msgstr "Историја"
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "Версии"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "Ова ќе ги избрише сите постоечки резервни копии од вашите датотеки"
-
#: templates/settings.php:3
msgid "Files Versioning"
msgstr "Верзии на датотеки"
diff --git a/l10n/mk/lib.po b/l10n/mk/lib.po
index a315a725a96..ada37660729 100644
--- a/l10n/mk/lib.po
+++ b/l10n/mk/lib.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-18 00:13+0100\n"
-"PO-Revision-Date: 2012-12-17 13:04+0000\n"
-"Last-Translator: Georgi Stanojevski <glisha@gmail.com>\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,51 +18,55 @@ msgstr ""
"Language: mk\n"
"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
-#: app.php:287
+#: app.php:301
msgid "Help"
msgstr "Помош"
-#: app.php:294
+#: app.php:308
msgid "Personal"
msgstr "Лично"
-#: app.php:299
+#: app.php:313
msgid "Settings"
msgstr "Параметри"
-#: app.php:304
+#: app.php:318
msgid "Users"
msgstr "Корисници"
-#: app.php:311
+#: app.php:325
msgid "Apps"
msgstr "Аппликации"
-#: app.php:313
+#: app.php:327
msgid "Admin"
msgstr "Админ"
-#: files.php:366
+#: files.php:365
msgid "ZIP download is turned off."
msgstr "Преземање во ZIP е исклучено"
-#: files.php:367
+#: files.php:366
msgid "Files need to be downloaded one by one."
msgstr "Датотеките треба да се симнат една по една."
-#: files.php:367 files.php:392
+#: files.php:366 files.php:391
msgid "Back to Files"
msgstr "Назад кон датотеки"
-#: files.php:391
+#: files.php:390
msgid "Selected files too large to generate zip file."
msgstr "Избраните датотеки се преголеми за да се генерира zip."
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr ""
+
#: json.php:28
msgid "Application is not enabled"
msgstr "Апликацијата не е овозможена"
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
msgstr "Грешка во автентикација"
@@ -82,55 +86,55 @@ msgstr "Текст"
msgid "Images"
msgstr "Слики"
-#: template.php:103
+#: template.php:113
msgid "seconds ago"
msgstr "пред секунди"
-#: template.php:104
+#: template.php:114
msgid "1 minute ago"
msgstr "пред 1 минута"
-#: template.php:105
+#: template.php:115
#, php-format
msgid "%d minutes ago"
msgstr "пред %d минути"
-#: template.php:106
+#: template.php:116
msgid "1 hour ago"
msgstr "пред 1 час"
-#: template.php:107
+#: template.php:117
#, php-format
msgid "%d hours ago"
msgstr "пред %d часови"
-#: template.php:108
+#: template.php:118
msgid "today"
msgstr "денеска"
-#: template.php:109
+#: template.php:119
msgid "yesterday"
msgstr "вчера"
-#: template.php:110
+#: template.php:120
#, php-format
msgid "%d days ago"
msgstr "пред %d денови"
-#: template.php:111
+#: template.php:121
msgid "last month"
msgstr "минатиот месец"
-#: template.php:112
+#: template.php:122
#, php-format
msgid "%d months ago"
msgstr "пред %d месеци"
-#: template.php:113
+#: template.php:123
msgid "last year"
msgstr "минатата година"
-#: template.php:114
+#: template.php:124
msgid "years ago"
msgstr "пред години"
diff --git a/l10n/mk/user_ldap.po b/l10n/mk/user_ldap.po
index 3b3498bce1c..c80a334455b 100644
--- a/l10n/mk/user_ldap.po
+++ b/l10n/mk/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-29 00:07+0100\n"
-"PO-Revision-Date: 2012-12-28 09:25+0000\n"
-"Last-Translator: Georgi Stanojevski <glisha@gmail.com>\n"
+"POT-Creation-Date: 2013-01-18 00:03+0100\n"
+"PO-Revision-Date: 2013-01-17 21:57+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -27,8 +27,8 @@ msgstr ""
#: templates/settings.php:11
msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
msgstr ""
#: templates/settings.php:15
@@ -45,6 +45,10 @@ msgid "Base DN"
msgstr ""
#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
@@ -115,10 +119,18 @@ msgstr ""
msgid "Base User Tree"
msgstr ""
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
@@ -181,4 +193,4 @@ msgstr ""
#: templates/settings.php:39
msgid "Help"
-msgstr ""
+msgstr "Помош"
diff --git a/l10n/mk/user_webdavauth.po b/l10n/mk/user_webdavauth.po
index 20fbb4d7b33..19b5d3df58e 100644
--- a/l10n/mk/user_webdavauth.po
+++ b/l10n/mk/user_webdavauth.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-29 00:07+0100\n"
-"PO-Revision-Date: 2012-12-28 09:21+0000\n"
-"Last-Translator: Georgi Stanojevski <glisha@gmail.com>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,13 +18,17 @@ msgstr ""
"Language: mk\n"
"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
#: templates/settings.php:4
msgid "URL: http://"
msgstr "URL: http://"
#: templates/settings.php:6
msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
msgstr ""
diff --git a/l10n/ms_MY/core.po b/l10n/ms_MY/core.po
index fcd9385d072..d3e6303e112 100644
--- a/l10n/ms_MY/core.po
+++ b/l10n/ms_MY/core.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
@@ -210,7 +210,6 @@ msgid "Password protect"
msgstr ""
#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
msgid "Password"
msgstr "Kata laluan"
@@ -567,17 +566,3 @@ msgstr "seterus"
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr ""
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr ""
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr ""
diff --git a/l10n/ms_MY/files.po b/l10n/ms_MY/files.po
index 5ae3ad9c1a6..aa3c0c9f0c5 100644
--- a/l10n/ms_MY/files.po
+++ b/l10n/ms_MY/files.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"POT-Creation-Date: 2013-01-20 00:05+0100\n"
+"PO-Revision-Date: 2013-01-19 23:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
@@ -21,6 +21,11 @@ msgstr ""
"Language: ms_MY\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#: ajax/delete.php:28 ajax/getstoragestats.php:11 ajax/upload.php:17
+#: ajax/upload.php:76 templates/index.php:18
+msgid "Upload"
+msgstr "Muat naik"
+
#: ajax/move.php:17
#, php-format
msgid "Could not move %s - File with this name already exists"
@@ -35,46 +40,46 @@ msgstr ""
msgid "Unable to rename file"
msgstr ""
-#: ajax/upload.php:14
+#: ajax/upload.php:20
msgid "No file was uploaded. Unknown error"
msgstr "Tiada fail dimuatnaik. Ralat tidak diketahui."
-#: ajax/upload.php:21
+#: ajax/upload.php:30
msgid "There is no error, the file uploaded with success"
msgstr "Tiada ralat, fail berjaya dimuat naik."
-#: ajax/upload.php:22
+#: ajax/upload.php:31
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr ""
-#: ajax/upload.php:24
+#: ajax/upload.php:33
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "Fail yang dimuat naik melebihi MAX_FILE_SIZE yang dinyatakan dalam form HTML "
-#: ajax/upload.php:26
+#: ajax/upload.php:35
msgid "The uploaded file was only partially uploaded"
msgstr "Sebahagian daripada fail telah dimuat naik. "
-#: ajax/upload.php:27
+#: ajax/upload.php:36
msgid "No file was uploaded"
msgstr "Tiada fail yang dimuat naik"
-#: ajax/upload.php:28
+#: ajax/upload.php:37
msgid "Missing a temporary folder"
msgstr "Folder sementara hilang"
-#: ajax/upload.php:29
+#: ajax/upload.php:38
msgid "Failed to write to disk"
msgstr "Gagal untuk disimpan"
-#: ajax/upload.php:45
+#: ajax/upload.php:57
msgid "Not enough space available"
msgstr ""
-#: ajax/upload.php:69
+#: ajax/upload.php:91
msgid "Invalid directory."
msgstr ""
@@ -130,98 +135,100 @@ msgstr ""
msgid "deleted {files}"
msgstr ""
-#: js/files.js:31
+#: js/files.js:48
msgid "'.' is an invalid file name."
msgstr ""
-#: js/files.js:36
+#: js/files.js:53
msgid "File name cannot be empty."
msgstr ""
-#: js/files.js:45
+#: js/files.js:62
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "sedang menghasilkan fail ZIP, mungkin mengambil sedikit masa."
+#: js/files.js:204
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
-#: js/files.js:224
+#: js/files.js:242
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Tidak boleh memuatnaik fail anda kerana mungkin ianya direktori atau saiz fail 0 bytes"
-#: js/files.js:224
+#: js/files.js:242
msgid "Upload Error"
msgstr "Muat naik ralat"
-#: js/files.js:241
+#: js/files.js:259
msgid "Close"
msgstr "Tutup"
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:278 js/files.js:397 js/files.js:431
msgid "Pending"
msgstr "Dalam proses"
-#: js/files.js:280
+#: js/files.js:298
msgid "1 file uploading"
msgstr ""
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:301 js/files.js:357 js/files.js:372
msgid "{count} files uploading"
msgstr ""
-#: js/files.js:357 js/files.js:393
+#: js/files.js:376 js/files.js:414
msgid "Upload cancelled."
msgstr "Muatnaik dibatalkan."
-#: js/files.js:464
+#: js/files.js:486
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/files.js:537
+#: js/files.js:559
msgid "URL cannot be empty."
msgstr ""
-#: js/files.js:543
+#: js/files.js:565
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:727
+#: js/files.js:775
msgid "{count} files scanned"
msgstr ""
-#: js/files.js:735
+#: js/files.js:783
msgid "error while scanning"
msgstr ""
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:857 templates/index.php:64
msgid "Name"
msgstr "Nama "
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:858 templates/index.php:75
msgid "Size"
msgstr "Saiz"
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:859 templates/index.php:77
msgid "Modified"
msgstr "Dimodifikasi"
-#: js/files.js:829
+#: js/files.js:878
msgid "1 folder"
msgstr ""
-#: js/files.js:831
+#: js/files.js:880
msgid "{count} folders"
msgstr ""
-#: js/files.js:839
+#: js/files.js:888
msgid "1 file"
msgstr ""
-#: js/files.js:841
+#: js/files.js:890
msgid "{count} files"
msgstr ""
@@ -273,10 +280,6 @@ msgstr "Folder"
msgid "From link"
msgstr ""
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Muat naik"
-
#: templates/index.php:41
msgid "Cancel upload"
msgstr "Batal muat naik"
diff --git a/l10n/ms_MY/files_encryption.po b/l10n/ms_MY/files_encryption.po
index 33de1d365d7..65777823e5b 100644
--- a/l10n/ms_MY/files_encryption.po
+++ b/l10n/ms_MY/files_encryption.po
@@ -7,28 +7,76 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: ms_MY\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
-#: templates/settings.php:3
-msgid "Encryption"
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
msgstr ""
-#: templates/settings.php:4
-msgid "Exclude the following file types from encryption"
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
msgstr ""
-#: templates/settings.php:5
-msgid "None"
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
msgstr ""
#: templates/settings.php:10
-msgid "Enable Encryption"
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:67
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:71
+msgid "None"
msgstr ""
diff --git a/l10n/ms_MY/files_versions.po b/l10n/ms_MY/files_versions.po
index 46f3f7ed90f..389afec231e 100644
--- a/l10n/ms_MY/files_versions.po
+++ b/l10n/ms_MY/files_versions.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-22 01:14+0200\n"
-"PO-Revision-Date: 2012-09-21 23:15+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,22 +17,10 @@ msgstr ""
"Language: ms_MY\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr ""
-
#: js/versions.js:16
msgid "History"
msgstr ""
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr ""
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr ""
-
#: templates/settings.php:3
msgid "Files Versioning"
msgstr ""
diff --git a/l10n/ms_MY/lib.po b/l10n/ms_MY/lib.po
index 57990c29b6b..5365e602ba1 100644
--- a/l10n/ms_MY/lib.po
+++ b/l10n/ms_MY/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-14 23:13+0000\n"
+"POT-Creation-Date: 2013-01-18 00:03+0100\n"
+"PO-Revision-Date: 2013-01-17 21:57+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
@@ -17,51 +17,55 @@ msgstr ""
"Language: ms_MY\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: app.php:285
+#: app.php:301
msgid "Help"
-msgstr ""
+msgstr "Bantuan"
-#: app.php:292
+#: app.php:308
msgid "Personal"
msgstr "Peribadi"
-#: app.php:297
+#: app.php:313
msgid "Settings"
msgstr "Tetapan"
-#: app.php:302
+#: app.php:318
msgid "Users"
msgstr "Pengguna"
-#: app.php:309
+#: app.php:325
msgid "Apps"
msgstr ""
-#: app.php:311
+#: app.php:327
msgid "Admin"
msgstr ""
-#: files.php:332
+#: files.php:365
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:333
+#: files.php:366
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:333 files.php:358
+#: files.php:366 files.php:391
msgid "Back to Files"
msgstr ""
-#: files.php:357
+#: files.php:390
msgid "Selected files too large to generate zip file."
msgstr ""
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr ""
+
#: json.php:28
msgid "Application is not enabled"
msgstr ""
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
msgstr "Ralat pengesahan"
@@ -81,55 +85,55 @@ msgstr "Teks"
msgid "Images"
msgstr ""
-#: template.php:103
+#: template.php:113
msgid "seconds ago"
msgstr ""
-#: template.php:104
+#: template.php:114
msgid "1 minute ago"
msgstr ""
-#: template.php:105
+#: template.php:115
#, php-format
msgid "%d minutes ago"
msgstr ""
-#: template.php:106
+#: template.php:116
msgid "1 hour ago"
msgstr ""
-#: template.php:107
+#: template.php:117
#, php-format
msgid "%d hours ago"
msgstr ""
-#: template.php:108
+#: template.php:118
msgid "today"
msgstr ""
-#: template.php:109
+#: template.php:119
msgid "yesterday"
msgstr ""
-#: template.php:110
+#: template.php:120
#, php-format
msgid "%d days ago"
msgstr ""
-#: template.php:111
+#: template.php:121
msgid "last month"
msgstr ""
-#: template.php:112
+#: template.php:122
#, php-format
msgid "%d months ago"
msgstr ""
-#: template.php:113
+#: template.php:123
msgid "last year"
msgstr ""
-#: template.php:114
+#: template.php:124
msgid "years ago"
msgstr ""
diff --git a/l10n/ms_MY/user_ldap.po b/l10n/ms_MY/user_ldap.po
index 4509f10da64..3c7e352259a 100644
--- a/l10n/ms_MY/user_ldap.po
+++ b/l10n/ms_MY/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"POT-Creation-Date: 2013-01-18 00:03+0100\n"
+"PO-Revision-Date: 2013-01-17 21:57+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
@@ -26,8 +26,8 @@ msgstr ""
#: templates/settings.php:11
msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
msgstr ""
#: templates/settings.php:15
@@ -44,6 +44,10 @@ msgid "Base DN"
msgstr ""
#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
@@ -114,10 +118,18 @@ msgstr ""
msgid "Base User Tree"
msgstr ""
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
@@ -180,4 +192,4 @@ msgstr ""
#: templates/settings.php:39
msgid "Help"
-msgstr ""
+msgstr "Bantuan"
diff --git a/l10n/ms_MY/user_webdavauth.po b/l10n/ms_MY/user_webdavauth.po
index 2974263352c..8e8f74d0a70 100644
--- a/l10n/ms_MY/user_webdavauth.po
+++ b/l10n/ms_MY/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-20 00:11+0100\n"
-"PO-Revision-Date: 2012-12-19 23:12+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
@@ -17,13 +17,17 @@ msgstr ""
"Language: ms_MY\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
#: templates/settings.php:4
msgid "URL: http://"
msgstr ""
#: templates/settings.php:6
msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
msgstr ""
diff --git a/l10n/nb_NO/core.po b/l10n/nb_NO/core.po
index ae9bd903ac4..6a652e8cea5 100644
--- a/l10n/nb_NO/core.po
+++ b/l10n/nb_NO/core.po
@@ -14,8 +14,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
@@ -214,7 +214,6 @@ msgid "Password protect"
msgstr "Passordbeskyttet"
#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
msgid "Password"
msgstr "Passord"
@@ -571,17 +570,3 @@ msgstr "neste"
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "Sikkerhetsadvarsel!"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr ""
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "Verifiser"
diff --git a/l10n/nb_NO/files.po b/l10n/nb_NO/files.po
index d6d18d6614c..4ca3bc26a60 100644
--- a/l10n/nb_NO/files.po
+++ b/l10n/nb_NO/files.po
@@ -16,8 +16,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"POT-Creation-Date: 2013-01-20 00:05+0100\n"
+"PO-Revision-Date: 2013-01-19 23:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
@@ -26,6 +26,11 @@ msgstr ""
"Language: nb_NO\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/delete.php:28 ajax/getstoragestats.php:11 ajax/upload.php:17
+#: ajax/upload.php:76 templates/index.php:18
+msgid "Upload"
+msgstr "Last opp"
+
#: ajax/move.php:17
#, php-format
msgid "Could not move %s - File with this name already exists"
@@ -40,46 +45,46 @@ msgstr ""
msgid "Unable to rename file"
msgstr ""
-#: ajax/upload.php:14
+#: ajax/upload.php:20
msgid "No file was uploaded. Unknown error"
msgstr "Ingen filer ble lastet opp. Ukjent feil."
-#: ajax/upload.php:21
+#: ajax/upload.php:30
msgid "There is no error, the file uploaded with success"
msgstr "Det er ingen feil. Filen ble lastet opp."
-#: ajax/upload.php:22
+#: ajax/upload.php:31
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr ""
-#: ajax/upload.php:24
+#: ajax/upload.php:33
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "Filstørrelsen overskrider maksgrensen på MAX_FILE_SIZE som ble oppgitt i HTML-skjemaet"
-#: ajax/upload.php:26
+#: ajax/upload.php:35
msgid "The uploaded file was only partially uploaded"
msgstr "Filopplastningen ble bare delvis gjennomført"
-#: ajax/upload.php:27
+#: ajax/upload.php:36
msgid "No file was uploaded"
msgstr "Ingen fil ble lastet opp"
-#: ajax/upload.php:28
+#: ajax/upload.php:37
msgid "Missing a temporary folder"
msgstr "Mangler en midlertidig mappe"
-#: ajax/upload.php:29
+#: ajax/upload.php:38
msgid "Failed to write to disk"
msgstr "Klarte ikke å skrive til disk"
-#: ajax/upload.php:45
+#: ajax/upload.php:57
msgid "Not enough space available"
msgstr ""
-#: ajax/upload.php:69
+#: ajax/upload.php:91
msgid "Invalid directory."
msgstr ""
@@ -135,98 +140,100 @@ msgstr ""
msgid "deleted {files}"
msgstr "slettet {files}"
-#: js/files.js:31
+#: js/files.js:48
msgid "'.' is an invalid file name."
msgstr ""
-#: js/files.js:36
+#: js/files.js:53
msgid "File name cannot be empty."
msgstr ""
-#: js/files.js:45
+#: js/files.js:62
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Ugyldig navn, '\\', '/', '<', '>', ':', '\"', '|', '?' og '*' er ikke tillatt."
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "opprettet ZIP-fil, dette kan ta litt tid"
+#: js/files.js:204
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
-#: js/files.js:224
+#: js/files.js:242
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Kan ikke laste opp filen din siden det er en mappe eller den har 0 bytes"
-#: js/files.js:224
+#: js/files.js:242
msgid "Upload Error"
msgstr "Opplasting feilet"
-#: js/files.js:241
+#: js/files.js:259
msgid "Close"
msgstr "Lukk"
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:278 js/files.js:397 js/files.js:431
msgid "Pending"
msgstr "Ventende"
-#: js/files.js:280
+#: js/files.js:298
msgid "1 file uploading"
msgstr "1 fil lastes opp"
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:301 js/files.js:357 js/files.js:372
msgid "{count} files uploading"
msgstr "{count} filer laster opp"
-#: js/files.js:357 js/files.js:393
+#: js/files.js:376 js/files.js:414
msgid "Upload cancelled."
msgstr "Opplasting avbrutt."
-#: js/files.js:464
+#: js/files.js:486
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Filopplasting pågår. Forlater du siden nå avbrytes opplastingen."
-#: js/files.js:537
+#: js/files.js:559
msgid "URL cannot be empty."
msgstr "URL-en kan ikke være tom."
-#: js/files.js:543
+#: js/files.js:565
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:727
+#: js/files.js:775
msgid "{count} files scanned"
msgstr "{count} filer lest inn"
-#: js/files.js:735
+#: js/files.js:783
msgid "error while scanning"
msgstr "feil under skanning"
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:857 templates/index.php:64
msgid "Name"
msgstr "Navn"
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:858 templates/index.php:75
msgid "Size"
msgstr "Størrelse"
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:859 templates/index.php:77
msgid "Modified"
msgstr "Endret"
-#: js/files.js:829
+#: js/files.js:878
msgid "1 folder"
msgstr "1 mappe"
-#: js/files.js:831
+#: js/files.js:880
msgid "{count} folders"
msgstr "{count} mapper"
-#: js/files.js:839
+#: js/files.js:888
msgid "1 file"
msgstr "1 fil"
-#: js/files.js:841
+#: js/files.js:890
msgid "{count} files"
msgstr "{count} filer"
@@ -278,10 +285,6 @@ msgstr "Mappe"
msgid "From link"
msgstr "Fra link"
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Last opp"
-
#: templates/index.php:41
msgid "Cancel upload"
msgstr "Avbryt opplasting"
diff --git a/l10n/nb_NO/files_encryption.po b/l10n/nb_NO/files_encryption.po
index a74d1bacc7e..5e2f1a4cf99 100644
--- a/l10n/nb_NO/files_encryption.po
+++ b/l10n/nb_NO/files_encryption.po
@@ -8,28 +8,76 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-24 02:02+0200\n"
-"PO-Revision-Date: 2012-08-23 17:13+0000\n"
-"Last-Translator: Arvid Nornes <arvid.nornes@gmail.com>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: nb_NO\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
msgid "Encryption"
msgstr "Kryptering"
-#: templates/settings.php:4
+#: templates/settings.php:67
msgid "Exclude the following file types from encryption"
msgstr "Ekskluder følgende filer fra kryptering"
-#: templates/settings.php:5
+#: templates/settings.php:71
msgid "None"
msgstr "Ingen"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "Slå på kryptering"
diff --git a/l10n/nb_NO/files_versions.po b/l10n/nb_NO/files_versions.po
index bd8d0fed59e..38f8fbe36fe 100644
--- a/l10n/nb_NO/files_versions.po
+++ b/l10n/nb_NO/files_versions.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-31 00:01+0100\n"
-"PO-Revision-Date: 2012-10-30 12:48+0000\n"
-"Last-Translator: hdalgrav <hdalgrav@gmail.com>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,22 +19,10 @@ msgstr ""
"Language: nb_NO\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr ""
-
#: js/versions.js:16
msgid "History"
msgstr "Historie"
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "Versjoner"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "Dette vil slette alle tidligere versjoner av alle filene dine"
-
#: templates/settings.php:3
msgid "Files Versioning"
msgstr "Fil versjonering"
diff --git a/l10n/nb_NO/lib.po b/l10n/nb_NO/lib.po
index abaf9fc0847..4de87004856 100644
--- a/l10n/nb_NO/lib.po
+++ b/l10n/nb_NO/lib.po
@@ -12,9 +12,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-30 00:04+0100\n"
-"PO-Revision-Date: 2012-12-29 17:26+0000\n"
-"Last-Translator: espenbye <espenbye@me.com>\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -22,27 +22,27 @@ msgstr ""
"Language: nb_NO\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:287
+#: app.php:301
msgid "Help"
msgstr "Hjelp"
-#: app.php:294
+#: app.php:308
msgid "Personal"
msgstr "Personlig"
-#: app.php:299
+#: app.php:313
msgid "Settings"
msgstr "Innstillinger"
-#: app.php:304
+#: app.php:318
msgid "Users"
msgstr "Brukere"
-#: app.php:311
+#: app.php:325
msgid "Apps"
msgstr "Apper"
-#: app.php:313
+#: app.php:327
msgid "Admin"
msgstr "Admin"
@@ -62,11 +62,15 @@ msgstr "Tilbake til filer"
msgid "Selected files too large to generate zip file."
msgstr "De valgte filene er for store til å kunne generere ZIP-fil"
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr ""
+
#: json.php:28
msgid "Application is not enabled"
msgstr "Applikasjon er ikke påslått"
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
msgstr "Autentiseringsfeil"
@@ -86,55 +90,55 @@ msgstr "Tekst"
msgid "Images"
msgstr "Bilder"
-#: template.php:103
+#: template.php:113
msgid "seconds ago"
msgstr "sekunder siden"
-#: template.php:104
+#: template.php:114
msgid "1 minute ago"
msgstr "1 minutt siden"
-#: template.php:105
+#: template.php:115
#, php-format
msgid "%d minutes ago"
msgstr "%d minutter siden"
-#: template.php:106
+#: template.php:116
msgid "1 hour ago"
msgstr "1 time siden"
-#: template.php:107
+#: template.php:117
#, php-format
msgid "%d hours ago"
msgstr "%d timer siden"
-#: template.php:108
+#: template.php:118
msgid "today"
msgstr "i dag"
-#: template.php:109
+#: template.php:119
msgid "yesterday"
msgstr "i går"
-#: template.php:110
+#: template.php:120
#, php-format
msgid "%d days ago"
msgstr "%d dager siden"
-#: template.php:111
+#: template.php:121
msgid "last month"
msgstr "forrige måned"
-#: template.php:112
+#: template.php:122
#, php-format
msgid "%d months ago"
msgstr "%d måneder siden"
-#: template.php:113
+#: template.php:123
msgid "last year"
msgstr "i fjor"
-#: template.php:114
+#: template.php:124
msgid "years ago"
msgstr "år siden"
diff --git a/l10n/nb_NO/user_ldap.po b/l10n/nb_NO/user_ldap.po
index b415afa31aa..b7660396ac4 100644
--- a/l10n/nb_NO/user_ldap.po
+++ b/l10n/nb_NO/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 23:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
@@ -27,8 +27,8 @@ msgstr ""
#: templates/settings.php:11
msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
msgstr ""
#: templates/settings.php:15
@@ -45,6 +45,10 @@ msgid "Base DN"
msgstr ""
#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
@@ -115,10 +119,18 @@ msgstr "Port"
msgid "Base User Tree"
msgstr ""
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
diff --git a/l10n/nb_NO/user_webdavauth.po b/l10n/nb_NO/user_webdavauth.po
index 9d7d3571927..915d27dae8f 100644
--- a/l10n/nb_NO/user_webdavauth.po
+++ b/l10n/nb_NO/user_webdavauth.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-30 00:04+0100\n"
-"PO-Revision-Date: 2012-12-29 16:42+0000\n"
-"Last-Translator: espenbye <espenbye@me.com>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,13 +18,17 @@ msgstr ""
"Language: nb_NO\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
#: templates/settings.php:4
msgid "URL: http://"
msgstr "URL: http://"
#: templates/settings.php:6
msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
msgstr ""
diff --git a/l10n/nl/core.po b/l10n/nl/core.po
index e22773d2369..bc83b48cd57 100644
--- a/l10n/nl/core.po
+++ b/l10n/nl/core.po
@@ -21,8 +21,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
@@ -221,7 +221,6 @@ msgid "Password protect"
msgstr "Wachtwoord beveiliging"
#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
msgid "Password"
msgstr "Wachtwoord"
@@ -578,17 +577,3 @@ msgstr "volgende"
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
msgstr "Updaten ownCloud naar versie %s, dit kan even duren."
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "Beveiligingswaarschuwing!"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "Verifieer uw wachtwoord!<br/>Om veiligheidsredenen wordt u regelmatig gevraagd uw wachtwoord in te geven."
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "Verifieer"
diff --git a/l10n/nl/files.po b/l10n/nl/files.po
index 9471312dac3..5482d64d4e4 100644
--- a/l10n/nl/files.po
+++ b/l10n/nl/files.po
@@ -14,13 +14,14 @@
# <lenny@weijl.org>, 2012.
# <pietje8501@gmail.com>, 2012.
# Richard Bos <radoeka@gmail.com>, 2012.
+# Wilfred Dijksman <info@wdijksman.nl>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-01-21 00:04+0100\n"
+"PO-Revision-Date: 2013-01-20 17:55+0000\n"
+"Last-Translator: Wilfred Dijksman <info@wdijksman.nl>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -28,60 +29,65 @@ msgstr ""
"Language: nl\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/delete.php:28 ajax/getstoragestats.php:11 ajax/upload.php:17
+#: ajax/upload.php:76 templates/index.php:18
+msgid "Upload"
+msgstr "Upload"
+
#: ajax/move.php:17
#, php-format
msgid "Could not move %s - File with this name already exists"
-msgstr ""
+msgstr "Kon %s niet verplaatsen - Er bestaat al een bestand met deze naam"
#: ajax/move.php:24
#, php-format
msgid "Could not move %s"
-msgstr ""
+msgstr "Kon %s niet verplaatsen"
#: ajax/rename.php:19
msgid "Unable to rename file"
-msgstr ""
+msgstr "Kan bestand niet hernoemen"
-#: ajax/upload.php:14
+#: ajax/upload.php:20
msgid "No file was uploaded. Unknown error"
msgstr "Er was geen bestand geladen. Onbekende fout"
-#: ajax/upload.php:21
+#: ajax/upload.php:30
msgid "There is no error, the file uploaded with success"
msgstr "Geen fout opgetreden, bestand successvol geupload."
-#: ajax/upload.php:22
+#: ajax/upload.php:31
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr "Het geüploade bestand overscheidt de upload_max_filesize optie in php.ini:"
-#: ajax/upload.php:24
+#: ajax/upload.php:33
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "Het geüploade bestand is groter dan de MAX_FILE_SIZE richtlijn die is opgegeven in de HTML-formulier"
-#: ajax/upload.php:26
+#: ajax/upload.php:35
msgid "The uploaded file was only partially uploaded"
msgstr "Het bestand is slechts gedeeltelijk geupload"
-#: ajax/upload.php:27
+#: ajax/upload.php:36
msgid "No file was uploaded"
msgstr "Geen bestand geüpload"
-#: ajax/upload.php:28
+#: ajax/upload.php:37
msgid "Missing a temporary folder"
msgstr "Een tijdelijke map mist"
-#: ajax/upload.php:29
+#: ajax/upload.php:38
msgid "Failed to write to disk"
msgstr "Schrijven naar schijf mislukt"
-#: ajax/upload.php:45
+#: ajax/upload.php:57
msgid "Not enough space available"
msgstr "Niet genoeg ruimte beschikbaar"
-#: ajax/upload.php:69
+#: ajax/upload.php:91
msgid "Invalid directory."
msgstr "Ongeldige directory."
@@ -137,98 +143,100 @@ msgstr "delen gestopt {files}"
msgid "deleted {files}"
msgstr "verwijderde {files}"
-#: js/files.js:31
+#: js/files.js:48
msgid "'.' is an invalid file name."
msgstr "'.' is een ongeldige bestandsnaam."
-#: js/files.js:36
+#: js/files.js:53
msgid "File name cannot be empty."
msgstr "Bestandsnaam kan niet leeg zijn."
-#: js/files.js:45
+#: js/files.js:62
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Onjuiste naam; '\\', '/', '<', '>', ':', '\"', '|', '?' en '*' zijn niet toegestaan."
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "aanmaken ZIP-file, dit kan enige tijd duren."
+#: js/files.js:204
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr "Uw download wordt voorbereid. Dit kan enige tijd duren bij grote bestanden."
-#: js/files.js:224
+#: js/files.js:242
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "uploaden van de file mislukt, het is of een directory of de bestandsgrootte is 0 bytes"
-#: js/files.js:224
+#: js/files.js:242
msgid "Upload Error"
msgstr "Upload Fout"
-#: js/files.js:241
+#: js/files.js:259
msgid "Close"
msgstr "Sluit"
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:278 js/files.js:397 js/files.js:431
msgid "Pending"
msgstr "Wachten"
-#: js/files.js:280
+#: js/files.js:298
msgid "1 file uploading"
msgstr "1 bestand wordt ge-upload"
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:301 js/files.js:357 js/files.js:372
msgid "{count} files uploading"
msgstr "{count} bestanden aan het uploaden"
-#: js/files.js:357 js/files.js:393
+#: js/files.js:376 js/files.js:414
msgid "Upload cancelled."
msgstr "Uploaden geannuleerd."
-#: js/files.js:464
+#: js/files.js:486
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Bestandsupload is bezig. Wanneer de pagina nu verlaten wordt, stopt de upload."
-#: js/files.js:537
+#: js/files.js:559
msgid "URL cannot be empty."
msgstr "URL kan niet leeg zijn."
-#: js/files.js:543
+#: js/files.js:565
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
+msgstr "Ongeldige mapnaam. Gebruik van'Gedeeld' is voorbehouden aan Owncloud"
-#: js/files.js:727
+#: js/files.js:775
msgid "{count} files scanned"
msgstr "{count} bestanden gescanned"
-#: js/files.js:735
+#: js/files.js:783
msgid "error while scanning"
msgstr "Fout tijdens het scannen"
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:857 templates/index.php:64
msgid "Name"
msgstr "Naam"
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:858 templates/index.php:75
msgid "Size"
msgstr "Bestandsgrootte"
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:859 templates/index.php:77
msgid "Modified"
msgstr "Laatst aangepast"
-#: js/files.js:829
+#: js/files.js:878
msgid "1 folder"
msgstr "1 map"
-#: js/files.js:831
+#: js/files.js:880
msgid "{count} folders"
msgstr "{count} mappen"
-#: js/files.js:839
+#: js/files.js:888
msgid "1 file"
msgstr "1 bestand"
-#: js/files.js:841
+#: js/files.js:890
msgid "{count} files"
msgstr "{count} bestanden"
@@ -280,10 +288,6 @@ msgstr "Map"
msgid "From link"
msgstr "Vanaf link"
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Upload"
-
#: templates/index.php:41
msgid "Cancel upload"
msgstr "Upload afbreken"
diff --git a/l10n/nl/files_encryption.po b/l10n/nl/files_encryption.po
index bd80bdcae78..b1ef07dc13e 100644
--- a/l10n/nl/files_encryption.po
+++ b/l10n/nl/files_encryption.po
@@ -8,28 +8,76 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-25 02:04+0200\n"
-"PO-Revision-Date: 2012-08-24 19:11+0000\n"
-"Last-Translator: Richard Bos <radoeka@gmail.com>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: nl\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
msgid "Encryption"
msgstr "Versleuteling"
-#: templates/settings.php:4
+#: templates/settings.php:67
msgid "Exclude the following file types from encryption"
msgstr "Versleutel de volgende bestand types niet"
-#: templates/settings.php:5
+#: templates/settings.php:71
msgid "None"
msgstr "Geen"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "Zet versleuteling aan"
diff --git a/l10n/nl/files_versions.po b/l10n/nl/files_versions.po
index 0328e198c57..95169bacce0 100644
--- a/l10n/nl/files_versions.po
+++ b/l10n/nl/files_versions.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-28 00:01+0200\n"
-"PO-Revision-Date: 2012-10-27 08:43+0000\n"
-"Last-Translator: Richard Bos <radoeka@gmail.com>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,22 +18,10 @@ msgstr ""
"Language: nl\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "Alle versies laten verlopen"
-
#: js/versions.js:16
msgid "History"
msgstr "Geschiedenis"
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "Versies"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "Dit zal alle bestaande backup versies van uw bestanden verwijderen"
-
#: templates/settings.php:3
msgid "Files Versioning"
msgstr "Bestand versies"
diff --git a/l10n/nl/lib.po b/l10n/nl/lib.po
index f8ebea3c492..2ae038b9e40 100644
--- a/l10n/nl/lib.po
+++ b/l10n/nl/lib.po
@@ -3,6 +3,7 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# André Koot <meneer@tken.net>, 2013.
# <lenny@weijl.org>, 2012.
# Richard Bos <radoeka@gmail.com>, 2012.
# <transifex@thisnet.nl>, 2012.
@@ -10,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-17 00:01+0100\n"
-"PO-Revision-Date: 2012-11-16 05:45+0000\n"
-"Last-Translator: Len <lenny@weijl.org>\n"
+"POT-Creation-Date: 2013-01-19 00:04+0100\n"
+"PO-Revision-Date: 2013-01-18 09:03+0000\n"
+"Last-Translator: André Koot <meneer@tken.net>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,51 +21,55 @@ msgstr ""
"Language: nl\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:285
+#: app.php:301
msgid "Help"
msgstr "Help"
-#: app.php:292
+#: app.php:308
msgid "Personal"
msgstr "Persoonlijk"
-#: app.php:297
+#: app.php:313
msgid "Settings"
msgstr "Instellingen"
-#: app.php:302
+#: app.php:318
msgid "Users"
msgstr "Gebruikers"
-#: app.php:309
+#: app.php:325
msgid "Apps"
msgstr "Apps"
-#: app.php:311
+#: app.php:327
msgid "Admin"
msgstr "Beheerder"
-#: files.php:332
+#: files.php:365
msgid "ZIP download is turned off."
msgstr "ZIP download is uitgeschakeld."
-#: files.php:333
+#: files.php:366
msgid "Files need to be downloaded one by one."
msgstr "Bestanden moeten één voor één worden gedownload."
-#: files.php:333 files.php:358
+#: files.php:366 files.php:391
msgid "Back to Files"
msgstr "Terug naar bestanden"
-#: files.php:357
+#: files.php:390
msgid "Selected files too large to generate zip file."
msgstr "De geselecteerde bestanden zijn te groot om een zip bestand te maken."
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr "kon niet worden vastgesteld"
+
#: json.php:28
msgid "Application is not enabled"
msgstr "De applicatie is niet actief"
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
msgstr "Authenticatie fout"
@@ -84,55 +89,55 @@ msgstr "Tekst"
msgid "Images"
msgstr "Afbeeldingen"
-#: template.php:103
+#: template.php:113
msgid "seconds ago"
msgstr "seconden geleden"
-#: template.php:104
+#: template.php:114
msgid "1 minute ago"
msgstr "1 minuut geleden"
-#: template.php:105
+#: template.php:115
#, php-format
msgid "%d minutes ago"
msgstr "%d minuten geleden"
-#: template.php:106
+#: template.php:116
msgid "1 hour ago"
msgstr "1 uur geleden"
-#: template.php:107
+#: template.php:117
#, php-format
msgid "%d hours ago"
msgstr "%d uren geleden"
-#: template.php:108
+#: template.php:118
msgid "today"
msgstr "vandaag"
-#: template.php:109
+#: template.php:119
msgid "yesterday"
msgstr "gisteren"
-#: template.php:110
+#: template.php:120
#, php-format
msgid "%d days ago"
msgstr "%d dagen geleden"
-#: template.php:111
+#: template.php:121
msgid "last month"
msgstr "vorige maand"
-#: template.php:112
+#: template.php:122
#, php-format
msgid "%d months ago"
msgstr "%d maanden geleden"
-#: template.php:113
+#: template.php:123
msgid "last year"
msgstr "vorig jaar"
-#: template.php:114
+#: template.php:124
msgid "years ago"
msgstr "jaar geleden"
diff --git a/l10n/nl/user_ldap.po b/l10n/nl/user_ldap.po
index 840adfacc66..41b46e70ec4 100644
--- a/l10n/nl/user_ldap.po
+++ b/l10n/nl/user_ldap.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# André Koot <meneer@tken.net>, 2012.
+# André Koot <meneer@tken.net>, 2012-2013.
+# <bart.formosus@gmail.com>, 2013.
# <lenny@weijl.org>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-21 00:10+0100\n"
-"PO-Revision-Date: 2012-12-20 17:25+0000\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 15:38+0000\n"
"Last-Translator: André Koot <meneer@tken.net>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
@@ -28,9 +29,9 @@ msgstr "<b>Waarschuwing:</b> De Apps user_ldap en user_webdavauth zijn incompati
#: templates/settings.php:11
msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
-msgstr "<b>Waarschuwing:</b> De PHP LDAP module is niet geïnstalleerd, de backend zal dus niet werken. Vraag uw beheerder de module te installeren."
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
+msgstr "<b>Waarschuwing:</b> De PHP LDAP module is niet geïnstalleerd, het backend zal niet werken. Vraag uw systeembeheerder om de module te installeren."
#: templates/settings.php:15
msgid "Host"
@@ -43,15 +44,19 @@ msgstr "Je kunt het protocol weglaten, tenzij je SSL vereist. Start in dat geval
#: templates/settings.php:16
msgid "Base DN"
-msgstr "Basis DN"
+msgstr "Base DN"
+
+#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr "Een Base DN per regel"
#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
-msgstr "Je kunt het standaard DN voor gebruikers en groepen specificeren in het tab Geavanceerd."
+msgstr "Je kunt het Base DN voor gebruikers en groepen specificeren in het tab Geavanceerd."
#: templates/settings.php:17
msgid "User DN"
-msgstr "Gebruikers DN"
+msgstr "User DN"
#: templates/settings.php:17
msgid ""
@@ -116,10 +121,18 @@ msgstr "Poort"
msgid "Base User Tree"
msgstr "Basis Gebruikers Structuur"
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr "Een User Base DN per regel"
+
#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "Basis Groupen Structuur"
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr "Een Group Base DN per regel"
+
#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Groepslid associatie"
diff --git a/l10n/nl/user_webdavauth.po b/l10n/nl/user_webdavauth.po
index 81dd911eef5..8606d6f3164 100644
--- a/l10n/nl/user_webdavauth.po
+++ b/l10n/nl/user_webdavauth.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# André Koot <meneer@tken.net>, 2012.
+# André Koot <meneer@tken.net>, 2012-2013.
# Richard Bos <radoeka@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-21 00:10+0100\n"
-"PO-Revision-Date: 2012-12-20 17:23+0000\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 09:56+0000\n"
"Last-Translator: André Koot <meneer@tken.net>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
@@ -19,13 +19,17 @@ msgstr ""
"Language: nl\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr "WebDAV authenticatie"
+
#: templates/settings.php:4
msgid "URL: http://"
msgstr "URL: http://"
#: templates/settings.php:6
msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
-msgstr "ownCloud zal de inloggegevens naar deze URL als geïnterpreteerde http 401 en http 403 als de inloggegevens onjuist zijn. Andere codes als de inloggegevens correct zijn."
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
+msgstr "ownCloud stuurt de inloggegevens naar deze URL. Deze plugin controleert het antwoord en interpreteert de HTTP statuscodes 401 als 403 als ongeldige inloggegevens, maar alle andere antwoorden als geldige inloggegevens."
diff --git a/l10n/nn_NO/core.po b/l10n/nn_NO/core.po
index 1856fc19f75..2bec4e1cdc3 100644
--- a/l10n/nn_NO/core.po
+++ b/l10n/nn_NO/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
@@ -209,7 +209,6 @@ msgid "Password protect"
msgstr ""
#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
msgid "Password"
msgstr "Passord"
@@ -566,17 +565,3 @@ msgstr "neste"
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr ""
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr ""
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr ""
diff --git a/l10n/nn_NO/files.po b/l10n/nn_NO/files.po
index 28e98a9cd57..20c27a56323 100644
--- a/l10n/nn_NO/files.po
+++ b/l10n/nn_NO/files.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"POT-Creation-Date: 2013-01-20 00:05+0100\n"
+"PO-Revision-Date: 2013-01-19 23:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
@@ -19,6 +19,11 @@ msgstr ""
"Language: nn_NO\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/delete.php:28 ajax/getstoragestats.php:11 ajax/upload.php:17
+#: ajax/upload.php:76 templates/index.php:18
+msgid "Upload"
+msgstr "Last opp"
+
#: ajax/move.php:17
#, php-format
msgid "Could not move %s - File with this name already exists"
@@ -33,46 +38,46 @@ msgstr ""
msgid "Unable to rename file"
msgstr ""
-#: ajax/upload.php:14
+#: ajax/upload.php:20
msgid "No file was uploaded. Unknown error"
msgstr ""
-#: ajax/upload.php:21
+#: ajax/upload.php:30
msgid "There is no error, the file uploaded with success"
msgstr "Ingen feil, fila vart lasta opp"
-#: ajax/upload.php:22
+#: ajax/upload.php:31
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr ""
-#: ajax/upload.php:24
+#: ajax/upload.php:33
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "Den opplasta fila er større enn variabelen MAX_FILE_SIZE i HTML-skjemaet"
-#: ajax/upload.php:26
+#: ajax/upload.php:35
msgid "The uploaded file was only partially uploaded"
msgstr "Fila vart berre delvis lasta opp"
-#: ajax/upload.php:27
+#: ajax/upload.php:36
msgid "No file was uploaded"
msgstr "Ingen filer vart lasta opp"
-#: ajax/upload.php:28
+#: ajax/upload.php:37
msgid "Missing a temporary folder"
msgstr "Manglar ei mellombels mappe"
-#: ajax/upload.php:29
+#: ajax/upload.php:38
msgid "Failed to write to disk"
msgstr ""
-#: ajax/upload.php:45
+#: ajax/upload.php:57
msgid "Not enough space available"
msgstr ""
-#: ajax/upload.php:69
+#: ajax/upload.php:91
msgid "Invalid directory."
msgstr ""
@@ -128,98 +133,100 @@ msgstr ""
msgid "deleted {files}"
msgstr ""
-#: js/files.js:31
+#: js/files.js:48
msgid "'.' is an invalid file name."
msgstr ""
-#: js/files.js:36
+#: js/files.js:53
msgid "File name cannot be empty."
msgstr ""
-#: js/files.js:45
+#: js/files.js:62
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
+#: js/files.js:204
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
msgstr ""
-#: js/files.js:224
+#: js/files.js:242
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr ""
-#: js/files.js:224
+#: js/files.js:242
msgid "Upload Error"
msgstr ""
-#: js/files.js:241
+#: js/files.js:259
msgid "Close"
msgstr "Lukk"
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:278 js/files.js:397 js/files.js:431
msgid "Pending"
msgstr ""
-#: js/files.js:280
+#: js/files.js:298
msgid "1 file uploading"
msgstr ""
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:301 js/files.js:357 js/files.js:372
msgid "{count} files uploading"
msgstr ""
-#: js/files.js:357 js/files.js:393
+#: js/files.js:376 js/files.js:414
msgid "Upload cancelled."
msgstr ""
-#: js/files.js:464
+#: js/files.js:486
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/files.js:537
+#: js/files.js:559
msgid "URL cannot be empty."
msgstr ""
-#: js/files.js:543
+#: js/files.js:565
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:727
+#: js/files.js:775
msgid "{count} files scanned"
msgstr ""
-#: js/files.js:735
+#: js/files.js:783
msgid "error while scanning"
msgstr ""
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:857 templates/index.php:64
msgid "Name"
msgstr "Namn"
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:858 templates/index.php:75
msgid "Size"
msgstr "Storleik"
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:859 templates/index.php:77
msgid "Modified"
msgstr "Endra"
-#: js/files.js:829
+#: js/files.js:878
msgid "1 folder"
msgstr ""
-#: js/files.js:831
+#: js/files.js:880
msgid "{count} folders"
msgstr ""
-#: js/files.js:839
+#: js/files.js:888
msgid "1 file"
msgstr ""
-#: js/files.js:841
+#: js/files.js:890
msgid "{count} files"
msgstr ""
@@ -271,10 +278,6 @@ msgstr "Mappe"
msgid "From link"
msgstr ""
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Last opp"
-
#: templates/index.php:41
msgid "Cancel upload"
msgstr ""
diff --git a/l10n/nn_NO/files_encryption.po b/l10n/nn_NO/files_encryption.po
index 8ad39e5cbfb..f821638fbcd 100644
--- a/l10n/nn_NO/files_encryption.po
+++ b/l10n/nn_NO/files_encryption.po
@@ -7,28 +7,76 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: nn_NO\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings.php:3
-msgid "Encryption"
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
msgstr ""
-#: templates/settings.php:4
-msgid "Exclude the following file types from encryption"
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
msgstr ""
-#: templates/settings.php:5
-msgid "None"
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
msgstr ""
#: templates/settings.php:10
-msgid "Enable Encryption"
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:67
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:71
+msgid "None"
msgstr ""
diff --git a/l10n/nn_NO/files_versions.po b/l10n/nn_NO/files_versions.po
index 4e0539875ac..3d20ded946a 100644
--- a/l10n/nn_NO/files_versions.po
+++ b/l10n/nn_NO/files_versions.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-22 01:14+0200\n"
-"PO-Revision-Date: 2012-09-21 23:15+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,22 +17,10 @@ msgstr ""
"Language: nn_NO\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr ""
-
#: js/versions.js:16
msgid "History"
msgstr ""
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr ""
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr ""
-
#: templates/settings.php:3
msgid "Files Versioning"
msgstr ""
diff --git a/l10n/nn_NO/lib.po b/l10n/nn_NO/lib.po
index ee2fd61fe02..5d33fc1e808 100644
--- a/l10n/nn_NO/lib.po
+++ b/l10n/nn_NO/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-14 23:13+0000\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
@@ -17,51 +17,55 @@ msgstr ""
"Language: nn_NO\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:285
+#: app.php:301
msgid "Help"
msgstr "Hjelp"
-#: app.php:292
+#: app.php:308
msgid "Personal"
msgstr "Personleg"
-#: app.php:297
+#: app.php:313
msgid "Settings"
msgstr "Innstillingar"
-#: app.php:302
+#: app.php:318
msgid "Users"
msgstr "Brukarar"
-#: app.php:309
+#: app.php:325
msgid "Apps"
msgstr ""
-#: app.php:311
+#: app.php:327
msgid "Admin"
msgstr ""
-#: files.php:332
+#: files.php:365
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:333
+#: files.php:366
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:333 files.php:358
+#: files.php:366 files.php:391
msgid "Back to Files"
msgstr ""
-#: files.php:357
+#: files.php:390
msgid "Selected files too large to generate zip file."
msgstr ""
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr ""
+
#: json.php:28
msgid "Application is not enabled"
msgstr ""
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
msgstr "Feil i autentisering"
@@ -81,55 +85,55 @@ msgstr "Tekst"
msgid "Images"
msgstr ""
-#: template.php:103
+#: template.php:113
msgid "seconds ago"
msgstr ""
-#: template.php:104
+#: template.php:114
msgid "1 minute ago"
msgstr ""
-#: template.php:105
+#: template.php:115
#, php-format
msgid "%d minutes ago"
msgstr ""
-#: template.php:106
+#: template.php:116
msgid "1 hour ago"
msgstr ""
-#: template.php:107
+#: template.php:117
#, php-format
msgid "%d hours ago"
msgstr ""
-#: template.php:108
+#: template.php:118
msgid "today"
msgstr ""
-#: template.php:109
+#: template.php:119
msgid "yesterday"
msgstr ""
-#: template.php:110
+#: template.php:120
#, php-format
msgid "%d days ago"
msgstr ""
-#: template.php:111
+#: template.php:121
msgid "last month"
msgstr ""
-#: template.php:112
+#: template.php:122
#, php-format
msgid "%d months ago"
msgstr ""
-#: template.php:113
+#: template.php:123
msgid "last year"
msgstr ""
-#: template.php:114
+#: template.php:124
msgid "years ago"
msgstr ""
diff --git a/l10n/nn_NO/user_ldap.po b/l10n/nn_NO/user_ldap.po
index 7f064cb1e25..0046c6c622c 100644
--- a/l10n/nn_NO/user_ldap.po
+++ b/l10n/nn_NO/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"POT-Creation-Date: 2013-01-18 00:03+0100\n"
+"PO-Revision-Date: 2013-01-17 21:57+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
@@ -26,8 +26,8 @@ msgstr ""
#: templates/settings.php:11
msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
msgstr ""
#: templates/settings.php:15
@@ -44,6 +44,10 @@ msgid "Base DN"
msgstr ""
#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
@@ -114,10 +118,18 @@ msgstr ""
msgid "Base User Tree"
msgstr ""
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
@@ -180,4 +192,4 @@ msgstr ""
#: templates/settings.php:39
msgid "Help"
-msgstr ""
+msgstr "Hjelp"
diff --git a/l10n/nn_NO/user_webdavauth.po b/l10n/nn_NO/user_webdavauth.po
index 0c942635476..42c4c7ed976 100644
--- a/l10n/nn_NO/user_webdavauth.po
+++ b/l10n/nn_NO/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-20 00:11+0100\n"
-"PO-Revision-Date: 2012-12-19 23:12+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
@@ -17,13 +17,17 @@ msgstr ""
"Language: nn_NO\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
#: templates/settings.php:4
msgid "URL: http://"
msgstr ""
#: templates/settings.php:6
msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
msgstr ""
diff --git a/l10n/oc/core.po b/l10n/oc/core.po
index c2aede203e5..17e293699e2 100644
--- a/l10n/oc/core.po
+++ b/l10n/oc/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
@@ -208,7 +208,6 @@ msgid "Password protect"
msgstr "Parat per senhal"
#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
msgid "Password"
msgstr "Senhal"
@@ -565,17 +564,3 @@ msgstr "venent"
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr ""
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr ""
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr ""
diff --git a/l10n/oc/files.po b/l10n/oc/files.po
index 63681ee8348..98f3014e02e 100644
--- a/l10n/oc/files.po
+++ b/l10n/oc/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"POT-Creation-Date: 2013-01-20 00:05+0100\n"
+"PO-Revision-Date: 2013-01-19 23:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
@@ -18,6 +18,11 @@ msgstr ""
"Language: oc\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+#: ajax/delete.php:28 ajax/getstoragestats.php:11 ajax/upload.php:17
+#: ajax/upload.php:76 templates/index.php:18
+msgid "Upload"
+msgstr "Amontcarga"
+
#: ajax/move.php:17
#, php-format
msgid "Could not move %s - File with this name already exists"
@@ -32,46 +37,46 @@ msgstr ""
msgid "Unable to rename file"
msgstr ""
-#: ajax/upload.php:14
+#: ajax/upload.php:20
msgid "No file was uploaded. Unknown error"
msgstr ""
-#: ajax/upload.php:21
+#: ajax/upload.php:30
msgid "There is no error, the file uploaded with success"
msgstr "Amontcargament capitat, pas d'errors"
-#: ajax/upload.php:22
+#: ajax/upload.php:31
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr ""
-#: ajax/upload.php:24
+#: ajax/upload.php:33
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "Lo fichièr amontcargat es mai gròs que la directiva «MAX_FILE_SIZE» especifiada dins lo formulari HTML"
-#: ajax/upload.php:26
+#: ajax/upload.php:35
msgid "The uploaded file was only partially uploaded"
msgstr "Lo fichièr foguèt pas completament amontcargat"
-#: ajax/upload.php:27
+#: ajax/upload.php:36
msgid "No file was uploaded"
msgstr "Cap de fichièrs son estats amontcargats"
-#: ajax/upload.php:28
+#: ajax/upload.php:37
msgid "Missing a temporary folder"
msgstr "Un dorsièr temporari manca"
-#: ajax/upload.php:29
+#: ajax/upload.php:38
msgid "Failed to write to disk"
msgstr "L'escriptura sul disc a fracassat"
-#: ajax/upload.php:45
+#: ajax/upload.php:57
msgid "Not enough space available"
msgstr ""
-#: ajax/upload.php:69
+#: ajax/upload.php:91
msgid "Invalid directory."
msgstr ""
@@ -127,98 +132,100 @@ msgstr ""
msgid "deleted {files}"
msgstr ""
-#: js/files.js:31
+#: js/files.js:48
msgid "'.' is an invalid file name."
msgstr ""
-#: js/files.js:36
+#: js/files.js:53
msgid "File name cannot be empty."
msgstr ""
-#: js/files.js:45
+#: js/files.js:62
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "Fichièr ZIP a se far, aquò pòt trigar un briu."
+#: js/files.js:204
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
-#: js/files.js:224
+#: js/files.js:242
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Impossible d'amontcargar lo teu fichièr qu'es un repertòri o que ten pas que 0 octet."
-#: js/files.js:224
+#: js/files.js:242
msgid "Upload Error"
msgstr "Error d'amontcargar"
-#: js/files.js:241
+#: js/files.js:259
msgid "Close"
msgstr ""
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:278 js/files.js:397 js/files.js:431
msgid "Pending"
msgstr "Al esperar"
-#: js/files.js:280
+#: js/files.js:298
msgid "1 file uploading"
msgstr "1 fichièr al amontcargar"
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:301 js/files.js:357 js/files.js:372
msgid "{count} files uploading"
msgstr ""
-#: js/files.js:357 js/files.js:393
+#: js/files.js:376 js/files.js:414
msgid "Upload cancelled."
msgstr "Amontcargar anullat."
-#: js/files.js:464
+#: js/files.js:486
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Un amontcargar es a se far. Daissar aquesta pagina ara tamparà lo cargament. "
-#: js/files.js:537
+#: js/files.js:559
msgid "URL cannot be empty."
msgstr ""
-#: js/files.js:543
+#: js/files.js:565
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:727
+#: js/files.js:775
msgid "{count} files scanned"
msgstr ""
-#: js/files.js:735
+#: js/files.js:783
msgid "error while scanning"
msgstr "error pendant l'exploracion"
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:857 templates/index.php:64
msgid "Name"
msgstr "Nom"
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:858 templates/index.php:75
msgid "Size"
msgstr "Talha"
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:859 templates/index.php:77
msgid "Modified"
msgstr "Modificat"
-#: js/files.js:829
+#: js/files.js:878
msgid "1 folder"
msgstr ""
-#: js/files.js:831
+#: js/files.js:880
msgid "{count} folders"
msgstr ""
-#: js/files.js:839
+#: js/files.js:888
msgid "1 file"
msgstr ""
-#: js/files.js:841
+#: js/files.js:890
msgid "{count} files"
msgstr ""
@@ -270,10 +277,6 @@ msgstr "Dorsièr"
msgid "From link"
msgstr ""
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Amontcarga"
-
#: templates/index.php:41
msgid "Cancel upload"
msgstr " Anulla l'amontcargar"
diff --git a/l10n/oc/files_encryption.po b/l10n/oc/files_encryption.po
index d6e0c7a83be..91f6f906aae 100644
--- a/l10n/oc/files_encryption.po
+++ b/l10n/oc/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-08 02:01+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,18 +17,66 @@ msgstr ""
"Language: oc\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: templates/settings.php:3
-msgid "Encryption"
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
msgstr ""
-#: templates/settings.php:4
-msgid "Exclude the following file types from encryption"
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
msgstr ""
-#: templates/settings.php:5
-msgid "None"
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
msgstr ""
#: templates/settings.php:10
-msgid "Enable Encryption"
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:67
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:71
+msgid "None"
msgstr ""
diff --git a/l10n/oc/files_versions.po b/l10n/oc/files_versions.po
index 8ea27eb3243..e8848887184 100644
--- a/l10n/oc/files_versions.po
+++ b/l10n/oc/files_versions.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-22 01:14+0200\n"
-"PO-Revision-Date: 2012-09-21 23:15+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,22 +17,10 @@ msgstr ""
"Language: oc\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr ""
-
#: js/versions.js:16
msgid "History"
msgstr ""
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr ""
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr ""
-
#: templates/settings.php:3
msgid "Files Versioning"
msgstr ""
diff --git a/l10n/oc/lib.po b/l10n/oc/lib.po
index 150704cd235..7a056315f6d 100644
--- a/l10n/oc/lib.po
+++ b/l10n/oc/lib.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-14 23:13+0000\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
@@ -18,51 +18,55 @@ msgstr ""
"Language: oc\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: app.php:285
+#: app.php:301
msgid "Help"
msgstr "Ajuda"
-#: app.php:292
+#: app.php:308
msgid "Personal"
msgstr "Personal"
-#: app.php:297
+#: app.php:313
msgid "Settings"
msgstr "Configuracion"
-#: app.php:302
+#: app.php:318
msgid "Users"
msgstr "Usancièrs"
-#: app.php:309
+#: app.php:325
msgid "Apps"
msgstr "Apps"
-#: app.php:311
+#: app.php:327
msgid "Admin"
msgstr "Admin"
-#: files.php:332
+#: files.php:365
msgid "ZIP download is turned off."
msgstr "Avalcargar los ZIP es inactiu."
-#: files.php:333
+#: files.php:366
msgid "Files need to be downloaded one by one."
msgstr "Los fichièrs devan èsser avalcargats un per un."
-#: files.php:333 files.php:358
+#: files.php:366 files.php:391
msgid "Back to Files"
msgstr "Torna cap als fichièrs"
-#: files.php:357
+#: files.php:390
msgid "Selected files too large to generate zip file."
msgstr ""
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr ""
+
#: json.php:28
msgid "Application is not enabled"
msgstr ""
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
msgstr "Error d'autentificacion"
@@ -82,55 +86,55 @@ msgstr ""
msgid "Images"
msgstr ""
-#: template.php:103
+#: template.php:113
msgid "seconds ago"
msgstr "segonda a"
-#: template.php:104
+#: template.php:114
msgid "1 minute ago"
msgstr "1 minuta a"
-#: template.php:105
+#: template.php:115
#, php-format
msgid "%d minutes ago"
msgstr "%d minutas a"
-#: template.php:106
+#: template.php:116
msgid "1 hour ago"
msgstr ""
-#: template.php:107
+#: template.php:117
#, php-format
msgid "%d hours ago"
msgstr ""
-#: template.php:108
+#: template.php:118
msgid "today"
msgstr "uèi"
-#: template.php:109
+#: template.php:119
msgid "yesterday"
msgstr "ièr"
-#: template.php:110
+#: template.php:120
#, php-format
msgid "%d days ago"
msgstr "%d jorns a"
-#: template.php:111
+#: template.php:121
msgid "last month"
msgstr "mes passat"
-#: template.php:112
+#: template.php:122
#, php-format
msgid "%d months ago"
msgstr ""
-#: template.php:113
+#: template.php:123
msgid "last year"
msgstr "an passat"
-#: template.php:114
+#: template.php:124
msgid "years ago"
msgstr "ans a"
diff --git a/l10n/oc/user_ldap.po b/l10n/oc/user_ldap.po
index 29bd7864d7e..f3e7f309794 100644
--- a/l10n/oc/user_ldap.po
+++ b/l10n/oc/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"POT-Creation-Date: 2013-01-18 00:03+0100\n"
+"PO-Revision-Date: 2013-01-17 21:57+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
@@ -26,8 +26,8 @@ msgstr ""
#: templates/settings.php:11
msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
msgstr ""
#: templates/settings.php:15
@@ -44,6 +44,10 @@ msgid "Base DN"
msgstr ""
#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
@@ -114,10 +118,18 @@ msgstr ""
msgid "Base User Tree"
msgstr ""
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
@@ -180,4 +192,4 @@ msgstr ""
#: templates/settings.php:39
msgid "Help"
-msgstr ""
+msgstr "Ajuda"
diff --git a/l10n/oc/user_webdavauth.po b/l10n/oc/user_webdavauth.po
index 5d411e9dab1..03cdef79eb0 100644
--- a/l10n/oc/user_webdavauth.po
+++ b/l10n/oc/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-20 00:11+0100\n"
-"PO-Revision-Date: 2012-12-19 23:12+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
@@ -17,13 +17,17 @@ msgstr ""
"Language: oc\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
#: templates/settings.php:4
msgid "URL: http://"
msgstr ""
#: templates/settings.php:6
msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
msgstr ""
diff --git a/l10n/pl/core.po b/l10n/pl/core.po
index 4bcaa717c39..4e0e383e612 100644
--- a/l10n/pl/core.po
+++ b/l10n/pl/core.po
@@ -17,8 +17,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
@@ -217,7 +217,6 @@ msgid "Password protect"
msgstr "Zabezpieczone hasłem"
#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
msgid "Password"
msgstr "Hasło"
@@ -574,17 +573,3 @@ msgstr "naprzód"
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
msgstr "Aktualizowanie ownCloud do wersji %s, może to potrwać chwilę."
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "Ostrzeżenie o zabezpieczeniach!"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "Sprawdź swoje hasło.<br/>Ze względów bezpieczeństwa możesz zostać czasami poproszony o wprowadzenie hasła ponownie."
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "Zweryfikowane"
diff --git a/l10n/pl/files.po b/l10n/pl/files.po
index 64357ad8259..14c09603236 100644
--- a/l10n/pl/files.po
+++ b/l10n/pl/files.po
@@ -3,6 +3,7 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <bbartlomiej@gmail.com>, 2013.
# Cyryl Sochacki <>, 2012.
# Cyryl Sochacki <cyrylsochacki@gmail.com>, 2012-2013.
# Marcin Małecki <gerber@tkdami.net>, 2011-2012.
@@ -14,8 +15,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"POT-Creation-Date: 2013-01-20 00:05+0100\n"
+"PO-Revision-Date: 2013-01-19 23:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
@@ -24,60 +25,65 @@ msgstr ""
"Language: pl\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+#: ajax/delete.php:28 ajax/getstoragestats.php:11 ajax/upload.php:17
+#: ajax/upload.php:76 templates/index.php:18
+msgid "Upload"
+msgstr "Prześlij"
+
#: ajax/move.php:17
#, php-format
msgid "Could not move %s - File with this name already exists"
-msgstr ""
+msgstr "Nie można było przenieść %s - Plik o takiej nazwie już istnieje"
#: ajax/move.php:24
#, php-format
msgid "Could not move %s"
-msgstr ""
+msgstr "Nie można było przenieść %s"
#: ajax/rename.php:19
msgid "Unable to rename file"
-msgstr ""
+msgstr "Nie można zmienić nazwy pliku"
-#: ajax/upload.php:14
+#: ajax/upload.php:20
msgid "No file was uploaded. Unknown error"
msgstr "Plik nie został załadowany. Nieznany błąd"
-#: ajax/upload.php:21
+#: ajax/upload.php:30
msgid "There is no error, the file uploaded with success"
msgstr "Przesłano plik"
-#: ajax/upload.php:22
+#: ajax/upload.php:31
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr "Wgrany plik przekracza wartość upload_max_filesize zdefiniowaną w php.ini: "
-#: ajax/upload.php:24
+#: ajax/upload.php:33
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "Rozmiar przesłanego pliku przekracza maksymalną wartość dyrektywy upload_max_filesize, zawartą formularzu HTML"
-#: ajax/upload.php:26
+#: ajax/upload.php:35
msgid "The uploaded file was only partially uploaded"
msgstr "Plik przesłano tylko częściowo"
-#: ajax/upload.php:27
+#: ajax/upload.php:36
msgid "No file was uploaded"
msgstr "Nie przesłano żadnego pliku"
-#: ajax/upload.php:28
+#: ajax/upload.php:37
msgid "Missing a temporary folder"
msgstr "Brak katalogu tymczasowego"
-#: ajax/upload.php:29
+#: ajax/upload.php:38
msgid "Failed to write to disk"
msgstr "Błąd zapisu na dysk"
-#: ajax/upload.php:45
+#: ajax/upload.php:57
msgid "Not enough space available"
msgstr "Za mało miejsca"
-#: ajax/upload.php:69
+#: ajax/upload.php:91
msgid "Invalid directory."
msgstr "Zła ścieżka."
@@ -133,98 +139,100 @@ msgstr "Udostępniane wstrzymane {files}"
msgid "deleted {files}"
msgstr "usunięto {files}"
-#: js/files.js:31
+#: js/files.js:48
msgid "'.' is an invalid file name."
msgstr "'.' jest nieprawidłową nazwą pliku."
-#: js/files.js:36
+#: js/files.js:53
msgid "File name cannot be empty."
msgstr "Nazwa pliku nie może być pusta."
-#: js/files.js:45
+#: js/files.js:62
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Niepoprawna nazwa, Znaki '\\', '/', '<', '>', ':', '\"', '|', '?' oraz '*'są niedozwolone."
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "Generowanie pliku ZIP, może potrwać pewien czas."
+#: js/files.js:204
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
-#: js/files.js:224
+#: js/files.js:242
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Nie można wczytać pliku jeśli jest katalogiem lub ma 0 bajtów"
-#: js/files.js:224
+#: js/files.js:242
msgid "Upload Error"
msgstr "Błąd wczytywania"
-#: js/files.js:241
+#: js/files.js:259
msgid "Close"
msgstr "Zamknij"
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:278 js/files.js:397 js/files.js:431
msgid "Pending"
msgstr "Oczekujące"
-#: js/files.js:280
+#: js/files.js:298
msgid "1 file uploading"
msgstr "1 plik wczytany"
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:301 js/files.js:357 js/files.js:372
msgid "{count} files uploading"
msgstr "{count} przesyłanie plików"
-#: js/files.js:357 js/files.js:393
+#: js/files.js:376 js/files.js:414
msgid "Upload cancelled."
msgstr "Wczytywanie anulowane."
-#: js/files.js:464
+#: js/files.js:486
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Wysyłanie pliku jest w toku. Teraz opuszczając stronę wysyłanie zostanie anulowane."
-#: js/files.js:537
+#: js/files.js:559
msgid "URL cannot be empty."
msgstr "URL nie może być pusty."
-#: js/files.js:543
+#: js/files.js:565
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Nazwa folderu nieprawidłowa. Wykorzystanie \"Shared\" jest zarezerwowane przez Owncloud"
-#: js/files.js:727
+#: js/files.js:775
msgid "{count} files scanned"
msgstr "{count} pliki skanowane"
-#: js/files.js:735
+#: js/files.js:783
msgid "error while scanning"
msgstr "Wystąpił błąd podczas skanowania"
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:857 templates/index.php:64
msgid "Name"
msgstr "Nazwa"
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:858 templates/index.php:75
msgid "Size"
msgstr "Rozmiar"
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:859 templates/index.php:77
msgid "Modified"
msgstr "Czas modyfikacji"
-#: js/files.js:829
+#: js/files.js:878
msgid "1 folder"
msgstr "1 folder"
-#: js/files.js:831
+#: js/files.js:880
msgid "{count} folders"
msgstr "{count} foldery"
-#: js/files.js:839
+#: js/files.js:888
msgid "1 file"
msgstr "1 plik"
-#: js/files.js:841
+#: js/files.js:890
msgid "{count} files"
msgstr "{count} pliki"
@@ -276,10 +284,6 @@ msgstr "Katalog"
msgid "From link"
msgstr "Z linku"
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Prześlij"
-
#: templates/index.php:41
msgid "Cancel upload"
msgstr "Przestań wysyłać"
diff --git a/l10n/pl/files_encryption.po b/l10n/pl/files_encryption.po
index fbb12dbe1fb..21fa364ff19 100644
--- a/l10n/pl/files_encryption.po
+++ b/l10n/pl/files_encryption.po
@@ -8,28 +8,76 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-13 12:15+0000\n"
-"Last-Translator: Cyryl Sochacki <>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: pl\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
msgid "Encryption"
msgstr "Szyfrowanie"
-#: templates/settings.php:4
+#: templates/settings.php:67
msgid "Exclude the following file types from encryption"
msgstr "Wyłącz następujące typy plików z szyfrowania"
-#: templates/settings.php:5
+#: templates/settings.php:71
msgid "None"
msgstr "Brak"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "Włącz szyfrowanie"
diff --git a/l10n/pl/files_versions.po b/l10n/pl/files_versions.po
index adfdc97439a..a2020d78f2d 100644
--- a/l10n/pl/files_versions.po
+++ b/l10n/pl/files_versions.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-26 13:19+0200\n"
-"PO-Revision-Date: 2012-09-26 10:42+0000\n"
-"Last-Translator: emc <mplichta@gmail.com>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,22 +19,10 @@ msgstr ""
"Language: pl\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "Wygasają wszystkie wersje"
-
#: js/versions.js:16
msgid "History"
msgstr "Historia"
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "Wersje"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "Spowoduje to usunięcie wszystkich istniejących wersji kopii zapasowych plików"
-
#: templates/settings.php:3
msgid "Files Versioning"
msgstr "Wersjonowanie plików"
diff --git a/l10n/pl/lib.po b/l10n/pl/lib.po
index 0cebd731831..5d59857b1b6 100644
--- a/l10n/pl/lib.po
+++ b/l10n/pl/lib.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-28 00:10+0100\n"
-"PO-Revision-Date: 2012-11-27 08:54+0000\n"
-"Last-Translator: Cyryl Sochacki <cyrylsochacki@gmail.com>\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,51 +20,55 @@ msgstr ""
"Language: pl\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: app.php:285
+#: app.php:301
msgid "Help"
msgstr "Pomoc"
-#: app.php:292
+#: app.php:308
msgid "Personal"
msgstr "Osobiste"
-#: app.php:297
+#: app.php:313
msgid "Settings"
msgstr "Ustawienia"
-#: app.php:302
+#: app.php:318
msgid "Users"
msgstr "Użytkownicy"
-#: app.php:309
+#: app.php:325
msgid "Apps"
msgstr "Aplikacje"
-#: app.php:311
+#: app.php:327
msgid "Admin"
msgstr "Administrator"
-#: files.php:361
+#: files.php:365
msgid "ZIP download is turned off."
msgstr "Pobieranie ZIP jest wyłączone."
-#: files.php:362
+#: files.php:366
msgid "Files need to be downloaded one by one."
msgstr "Pliki muszą zostać pobrane pojedynczo."
-#: files.php:362 files.php:387
+#: files.php:366 files.php:391
msgid "Back to Files"
msgstr "Wróć do plików"
-#: files.php:386
+#: files.php:390
msgid "Selected files too large to generate zip file."
msgstr "Wybrane pliki są zbyt duże, aby wygenerować plik zip."
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr ""
+
#: json.php:28
msgid "Application is not enabled"
msgstr "Aplikacja nie jest włączona"
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
msgstr "Błąd uwierzytelniania"
@@ -84,55 +88,55 @@ msgstr "Połączenie tekstowe"
msgid "Images"
msgstr "Obrazy"
-#: template.php:103
+#: template.php:113
msgid "seconds ago"
msgstr "sekund temu"
-#: template.php:104
+#: template.php:114
msgid "1 minute ago"
msgstr "1 minutę temu"
-#: template.php:105
+#: template.php:115
#, php-format
msgid "%d minutes ago"
msgstr "%d minut temu"
-#: template.php:106
+#: template.php:116
msgid "1 hour ago"
msgstr "1 godzine temu"
-#: template.php:107
+#: template.php:117
#, php-format
msgid "%d hours ago"
msgstr "%d godzin temu"
-#: template.php:108
+#: template.php:118
msgid "today"
msgstr "dzisiaj"
-#: template.php:109
+#: template.php:119
msgid "yesterday"
msgstr "wczoraj"
-#: template.php:110
+#: template.php:120
#, php-format
msgid "%d days ago"
msgstr "%d dni temu"
-#: template.php:111
+#: template.php:121
msgid "last month"
msgstr "ostatni miesiąc"
-#: template.php:112
+#: template.php:122
#, php-format
msgid "%d months ago"
msgstr "%d miesiecy temu"
-#: template.php:113
+#: template.php:123
msgid "last year"
msgstr "ostatni rok"
-#: template.php:114
+#: template.php:124
msgid "years ago"
msgstr "lat temu"
diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po
index 8482ae800e6..e54af3f5f75 100644
--- a/l10n/pl/settings.po
+++ b/l10n/pl/settings.po
@@ -3,6 +3,7 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <b13n1u@gmail.com>, 2013.
# Cyryl Sochacki <>, 2012.
# Cyryl Sochacki <cyrylsochacki@gmail.com>, 2012-2013.
# <icewind1991@gmail.com>, 2012.
@@ -17,9 +18,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-01-21 00:04+0100\n"
+"PO-Revision-Date: 2013-01-20 19:42+0000\n"
+"Last-Translator: b13n1u <b13n1u@gmail.com>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -234,7 +235,7 @@ msgid ""
"licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" "
"target=\"_blank\"><abbr title=\"Affero General Public "
"License\">AGPL</abbr></a>."
-msgstr "Stwirzone przez <a href=\"http://ownCloud.org/contact\" target=\"_blank\"> społeczność ownCloud</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">kod źródłowy</a> na licencji <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
+msgstr "Stworzone przez <a href=\"http://ownCloud.org/contact\" target=\"_blank\"> społeczność ownCloud</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">kod źródłowy</a> na licencji <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
#: templates/users.php:21 templates/users.php:81
msgid "Name"
diff --git a/l10n/pl/user_ldap.po b/l10n/pl/user_ldap.po
index 25b35d770df..cd8904acc25 100644
--- a/l10n/pl/user_ldap.po
+++ b/l10n/pl/user_ldap.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-19 00:03+0100\n"
-"PO-Revision-Date: 2012-12-18 18:12+0000\n"
-"Last-Translator: Marcin Małecki <gerber@tkdami.net>\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 23:20+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -29,9 +29,9 @@ msgstr "<b>Ostrzeżenie:</b> Aplikacje user_ldap i user_webdavauth nie są komp
#: templates/settings.php:11
msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
-msgstr "<b>Ostrzeżenie:</b> Moduł PHP LDAP nie jest zainstalowany i nie będzie działał. Poproś administratora o włączenie go."
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
+msgstr ""
#: templates/settings.php:15
msgid "Host"
@@ -47,6 +47,10 @@ msgid "Base DN"
msgstr "Baza DN"
#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Bazę DN można określić dla użytkowników i grup w karcie Zaawansowane"
@@ -117,10 +121,18 @@ msgstr "Port"
msgid "Base User Tree"
msgstr "Drzewo bazy użytkowników"
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "Drzewo bazy grup"
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Członek grupy stowarzyszenia"
diff --git a/l10n/pl/user_webdavauth.po b/l10n/pl/user_webdavauth.po
index f745f1f1320..44e963a5a43 100644
--- a/l10n/pl/user_webdavauth.po
+++ b/l10n/pl/user_webdavauth.po
@@ -3,15 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <bbartlomiej@gmail.com>, 2013.
# Cyryl Sochacki <cyrylsochacki@gmail.com>, 2012.
# Marcin Małecki <gerber@tkdami.net>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-21 00:10+0100\n"
-"PO-Revision-Date: 2012-12-20 11:39+0000\n"
-"Last-Translator: Marcin Małecki <gerber@tkdami.net>\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 08:54+0000\n"
+"Last-Translator: bbartlomiej <bbartlomiej@gmail.com>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,13 +20,17 @@ msgstr ""
"Language: pl\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr "Uwierzytelnienie WebDAV"
+
#: templates/settings.php:4
msgid "URL: http://"
msgstr "URL: http://"
#: templates/settings.php:6
msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
-msgstr ""
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
+msgstr "ownCloud wyśle dane uwierzytelniające do tego URL. Ten plugin sprawdza odpowiedź i zinterpretuje kody HTTP 401 oraz 403 jako nieprawidłowe dane uwierzytelniające, a każdy inny kod odpowiedzi jako poprawne dane."
diff --git a/l10n/pl_PL/core.po b/l10n/pl_PL/core.po
index 76a51798833..d5e325117d9 100644
--- a/l10n/pl_PL/core.po
+++ b/l10n/pl_PL/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
"MIME-Version: 1.0\n"
@@ -207,7 +207,6 @@ msgid "Password protect"
msgstr ""
#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
msgid "Password"
msgstr ""
@@ -564,17 +563,3 @@ msgstr ""
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr ""
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr ""
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr ""
diff --git a/l10n/pl_PL/files.po b/l10n/pl_PL/files.po
index 4c12f2aa8c2..d76af487676 100644
--- a/l10n/pl_PL/files.po
+++ b/l10n/pl_PL/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"POT-Creation-Date: 2013-01-20 00:05+0100\n"
+"PO-Revision-Date: 2013-01-19 23:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,11 @@ msgstr ""
"Language: pl_PL\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+#: ajax/delete.php:28 ajax/getstoragestats.php:11 ajax/upload.php:17
+#: ajax/upload.php:76 templates/index.php:18
+msgid "Upload"
+msgstr ""
+
#: ajax/move.php:17
#, php-format
msgid "Could not move %s - File with this name already exists"
@@ -31,46 +36,46 @@ msgstr ""
msgid "Unable to rename file"
msgstr ""
-#: ajax/upload.php:14
+#: ajax/upload.php:20
msgid "No file was uploaded. Unknown error"
msgstr ""
-#: ajax/upload.php:21
+#: ajax/upload.php:30
msgid "There is no error, the file uploaded with success"
msgstr ""
-#: ajax/upload.php:22
+#: ajax/upload.php:31
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr ""
-#: ajax/upload.php:24
+#: ajax/upload.php:33
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr ""
-#: ajax/upload.php:26
+#: ajax/upload.php:35
msgid "The uploaded file was only partially uploaded"
msgstr ""
-#: ajax/upload.php:27
+#: ajax/upload.php:36
msgid "No file was uploaded"
msgstr ""
-#: ajax/upload.php:28
+#: ajax/upload.php:37
msgid "Missing a temporary folder"
msgstr ""
-#: ajax/upload.php:29
+#: ajax/upload.php:38
msgid "Failed to write to disk"
msgstr ""
-#: ajax/upload.php:45
+#: ajax/upload.php:57
msgid "Not enough space available"
msgstr ""
-#: ajax/upload.php:69
+#: ajax/upload.php:91
msgid "Invalid directory."
msgstr ""
@@ -126,98 +131,100 @@ msgstr ""
msgid "deleted {files}"
msgstr ""
-#: js/files.js:31
+#: js/files.js:48
msgid "'.' is an invalid file name."
msgstr ""
-#: js/files.js:36
+#: js/files.js:53
msgid "File name cannot be empty."
msgstr ""
-#: js/files.js:45
+#: js/files.js:62
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
+#: js/files.js:204
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
msgstr ""
-#: js/files.js:224
+#: js/files.js:242
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr ""
-#: js/files.js:224
+#: js/files.js:242
msgid "Upload Error"
msgstr ""
-#: js/files.js:241
+#: js/files.js:259
msgid "Close"
msgstr ""
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:278 js/files.js:397 js/files.js:431
msgid "Pending"
msgstr ""
-#: js/files.js:280
+#: js/files.js:298
msgid "1 file uploading"
msgstr ""
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:301 js/files.js:357 js/files.js:372
msgid "{count} files uploading"
msgstr ""
-#: js/files.js:357 js/files.js:393
+#: js/files.js:376 js/files.js:414
msgid "Upload cancelled."
msgstr ""
-#: js/files.js:464
+#: js/files.js:486
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/files.js:537
+#: js/files.js:559
msgid "URL cannot be empty."
msgstr ""
-#: js/files.js:543
+#: js/files.js:565
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:727
+#: js/files.js:775
msgid "{count} files scanned"
msgstr ""
-#: js/files.js:735
+#: js/files.js:783
msgid "error while scanning"
msgstr ""
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:857 templates/index.php:64
msgid "Name"
msgstr ""
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:858 templates/index.php:75
msgid "Size"
msgstr ""
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:859 templates/index.php:77
msgid "Modified"
msgstr ""
-#: js/files.js:829
+#: js/files.js:878
msgid "1 folder"
msgstr ""
-#: js/files.js:831
+#: js/files.js:880
msgid "{count} folders"
msgstr ""
-#: js/files.js:839
+#: js/files.js:888
msgid "1 file"
msgstr ""
-#: js/files.js:841
+#: js/files.js:890
msgid "{count} files"
msgstr ""
@@ -269,10 +276,6 @@ msgstr ""
msgid "From link"
msgstr ""
-#: templates/index.php:18
-msgid "Upload"
-msgstr ""
-
#: templates/index.php:41
msgid "Cancel upload"
msgstr ""
diff --git a/l10n/pl_PL/files_encryption.po b/l10n/pl_PL/files_encryption.po
index 6512705ecbc..ce8f0779cae 100644
--- a/l10n/pl_PL/files_encryption.po
+++ b/l10n/pl_PL/files_encryption.po
@@ -7,28 +7,76 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: pl_PL\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: templates/settings.php:3
-msgid "Encryption"
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
msgstr ""
-#: templates/settings.php:4
-msgid "Exclude the following file types from encryption"
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
msgstr ""
-#: templates/settings.php:5
-msgid "None"
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
msgstr ""
#: templates/settings.php:10
-msgid "Enable Encryption"
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:67
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:71
+msgid "None"
msgstr ""
diff --git a/l10n/pl_PL/files_versions.po b/l10n/pl_PL/files_versions.po
index 40053b76ef7..38bf131e3e4 100644
--- a/l10n/pl_PL/files_versions.po
+++ b/l10n/pl_PL/files_versions.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-22 01:14+0200\n"
-"PO-Revision-Date: 2012-09-21 23:15+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,22 +17,10 @@ msgstr ""
"Language: pl_PL\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr ""
-
#: js/versions.js:16
msgid "History"
msgstr ""
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr ""
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr ""
-
#: templates/settings.php:3
msgid "Files Versioning"
msgstr ""
diff --git a/l10n/pl_PL/lib.po b/l10n/pl_PL/lib.po
index 3ce2989bb99..af7e0260b91 100644
--- a/l10n/pl_PL/lib.po
+++ b/l10n/pl_PL/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-14 23:13+0000\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
"MIME-Version: 1.0\n"
@@ -17,51 +17,55 @@ msgstr ""
"Language: pl_PL\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: app.php:285
+#: app.php:301
msgid "Help"
msgstr ""
-#: app.php:292
+#: app.php:308
msgid "Personal"
msgstr ""
-#: app.php:297
+#: app.php:313
msgid "Settings"
msgstr "Ustawienia"
-#: app.php:302
+#: app.php:318
msgid "Users"
msgstr ""
-#: app.php:309
+#: app.php:325
msgid "Apps"
msgstr ""
-#: app.php:311
+#: app.php:327
msgid "Admin"
msgstr ""
-#: files.php:332
+#: files.php:365
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:333
+#: files.php:366
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:333 files.php:358
+#: files.php:366 files.php:391
msgid "Back to Files"
msgstr ""
-#: files.php:357
+#: files.php:390
msgid "Selected files too large to generate zip file."
msgstr ""
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr ""
+
#: json.php:28
msgid "Application is not enabled"
msgstr ""
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
msgstr ""
@@ -81,55 +85,55 @@ msgstr ""
msgid "Images"
msgstr ""
-#: template.php:103
+#: template.php:113
msgid "seconds ago"
msgstr ""
-#: template.php:104
+#: template.php:114
msgid "1 minute ago"
msgstr ""
-#: template.php:105
+#: template.php:115
#, php-format
msgid "%d minutes ago"
msgstr ""
-#: template.php:106
+#: template.php:116
msgid "1 hour ago"
msgstr ""
-#: template.php:107
+#: template.php:117
#, php-format
msgid "%d hours ago"
msgstr ""
-#: template.php:108
+#: template.php:118
msgid "today"
msgstr ""
-#: template.php:109
+#: template.php:119
msgid "yesterday"
msgstr ""
-#: template.php:110
+#: template.php:120
#, php-format
msgid "%d days ago"
msgstr ""
-#: template.php:111
+#: template.php:121
msgid "last month"
msgstr ""
-#: template.php:112
+#: template.php:122
#, php-format
msgid "%d months ago"
msgstr ""
-#: template.php:113
+#: template.php:123
msgid "last year"
msgstr ""
-#: template.php:114
+#: template.php:124
msgid "years ago"
msgstr ""
diff --git a/l10n/pl_PL/user_ldap.po b/l10n/pl_PL/user_ldap.po
index de4bd2f3523..36eb526f464 100644
--- a/l10n/pl_PL/user_ldap.po
+++ b/l10n/pl_PL/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 23:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
"MIME-Version: 1.0\n"
@@ -26,8 +26,8 @@ msgstr ""
#: templates/settings.php:11
msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
msgstr ""
#: templates/settings.php:15
@@ -44,6 +44,10 @@ msgid "Base DN"
msgstr ""
#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
@@ -114,10 +118,18 @@ msgstr ""
msgid "Base User Tree"
msgstr ""
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
diff --git a/l10n/pl_PL/user_webdavauth.po b/l10n/pl_PL/user_webdavauth.po
index 77261b85639..2ffe7523c4d 100644
--- a/l10n/pl_PL/user_webdavauth.po
+++ b/l10n/pl_PL/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-20 00:11+0100\n"
-"PO-Revision-Date: 2012-12-19 23:12+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
"MIME-Version: 1.0\n"
@@ -17,13 +17,17 @@ msgstr ""
"Language: pl_PL\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
#: templates/settings.php:4
msgid "URL: http://"
msgstr ""
#: templates/settings.php:6
msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
msgstr ""
diff --git a/l10n/pt_BR/core.po b/l10n/pt_BR/core.po
index ea81e6307e9..da3de9ac4c4 100644
--- a/l10n/pt_BR/core.po
+++ b/l10n/pt_BR/core.po
@@ -17,8 +17,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
@@ -217,7 +217,6 @@ msgid "Password protect"
msgstr "Proteger com senha"
#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
msgid "Password"
msgstr "Senha"
@@ -574,17 +573,3 @@ msgstr "próximo"
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "Aviso de Segurança!"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "Por favor, verifique a sua senha.<br />Por motivos de segurança, você deverá ser solicitado a muda-la ocasionalmente."
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "Verificar"
diff --git a/l10n/pt_BR/files.po b/l10n/pt_BR/files.po
index 105d7c96385..e56d1ca354f 100644
--- a/l10n/pt_BR/files.po
+++ b/l10n/pt_BR/files.po
@@ -15,8 +15,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"POT-Creation-Date: 2013-01-20 00:05+0100\n"
+"PO-Revision-Date: 2013-01-19 23:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
@@ -25,6 +25,11 @@ msgstr ""
"Language: pt_BR\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+#: ajax/delete.php:28 ajax/getstoragestats.php:11 ajax/upload.php:17
+#: ajax/upload.php:76 templates/index.php:18
+msgid "Upload"
+msgstr "Carregar"
+
#: ajax/move.php:17
#, php-format
msgid "Could not move %s - File with this name already exists"
@@ -39,46 +44,46 @@ msgstr ""
msgid "Unable to rename file"
msgstr ""
-#: ajax/upload.php:14
+#: ajax/upload.php:20
msgid "No file was uploaded. Unknown error"
msgstr "Nenhum arquivo foi transferido. Erro desconhecido"
-#: ajax/upload.php:21
+#: ajax/upload.php:30
msgid "There is no error, the file uploaded with success"
msgstr "Não houve nenhum erro, o arquivo foi transferido com sucesso"
-#: ajax/upload.php:22
+#: ajax/upload.php:31
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr "O arquivo enviado excede a diretiva upload_max_filesize no php.ini: "
-#: ajax/upload.php:24
+#: ajax/upload.php:33
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "O arquivo carregado excede o MAX_FILE_SIZE que foi especificado no formulário HTML"
-#: ajax/upload.php:26
+#: ajax/upload.php:35
msgid "The uploaded file was only partially uploaded"
msgstr "O arquivo foi transferido parcialmente"
-#: ajax/upload.php:27
+#: ajax/upload.php:36
msgid "No file was uploaded"
msgstr "Nenhum arquivo foi transferido"
-#: ajax/upload.php:28
+#: ajax/upload.php:37
msgid "Missing a temporary folder"
msgstr "Pasta temporária não encontrada"
-#: ajax/upload.php:29
+#: ajax/upload.php:38
msgid "Failed to write to disk"
msgstr "Falha ao escrever no disco"
-#: ajax/upload.php:45
+#: ajax/upload.php:57
msgid "Not enough space available"
msgstr ""
-#: ajax/upload.php:69
+#: ajax/upload.php:91
msgid "Invalid directory."
msgstr ""
@@ -134,98 +139,100 @@ msgstr "{files} não compartilhados"
msgid "deleted {files}"
msgstr "{files} apagados"
-#: js/files.js:31
+#: js/files.js:48
msgid "'.' is an invalid file name."
msgstr ""
-#: js/files.js:36
+#: js/files.js:53
msgid "File name cannot be empty."
msgstr ""
-#: js/files.js:45
+#: js/files.js:62
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Nome inválido, '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' não são permitidos."
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "gerando arquivo ZIP, isso pode levar um tempo."
+#: js/files.js:204
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
-#: js/files.js:224
+#: js/files.js:242
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Impossível enviar seus arquivo como diretório ou ele tem 0 bytes."
-#: js/files.js:224
+#: js/files.js:242
msgid "Upload Error"
msgstr "Erro de envio"
-#: js/files.js:241
+#: js/files.js:259
msgid "Close"
msgstr "Fechar"
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:278 js/files.js:397 js/files.js:431
msgid "Pending"
msgstr "Pendente"
-#: js/files.js:280
+#: js/files.js:298
msgid "1 file uploading"
msgstr "enviando 1 arquivo"
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:301 js/files.js:357 js/files.js:372
msgid "{count} files uploading"
msgstr "Enviando {count} arquivos"
-#: js/files.js:357 js/files.js:393
+#: js/files.js:376 js/files.js:414
msgid "Upload cancelled."
msgstr "Envio cancelado."
-#: js/files.js:464
+#: js/files.js:486
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Upload em andamento. Sair da página agora resultará no cancelamento do envio."
-#: js/files.js:537
+#: js/files.js:559
msgid "URL cannot be empty."
msgstr "URL não pode ficar em branco"
-#: js/files.js:543
+#: js/files.js:565
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:727
+#: js/files.js:775
msgid "{count} files scanned"
msgstr "{count} arquivos scaneados"
-#: js/files.js:735
+#: js/files.js:783
msgid "error while scanning"
msgstr "erro durante verificação"
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:857 templates/index.php:64
msgid "Name"
msgstr "Nome"
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:858 templates/index.php:75
msgid "Size"
msgstr "Tamanho"
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:859 templates/index.php:77
msgid "Modified"
msgstr "Modificado"
-#: js/files.js:829
+#: js/files.js:878
msgid "1 folder"
msgstr "1 pasta"
-#: js/files.js:831
+#: js/files.js:880
msgid "{count} folders"
msgstr "{count} pastas"
-#: js/files.js:839
+#: js/files.js:888
msgid "1 file"
msgstr "1 arquivo"
-#: js/files.js:841
+#: js/files.js:890
msgid "{count} files"
msgstr "{count} arquivos"
@@ -277,10 +284,6 @@ msgstr "Pasta"
msgid "From link"
msgstr "Do link"
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Carregar"
-
#: templates/index.php:41
msgid "Cancel upload"
msgstr "Cancelar upload"
diff --git a/l10n/pt_BR/files_encryption.po b/l10n/pt_BR/files_encryption.po
index 250fed658f3..ee24c51910d 100644
--- a/l10n/pt_BR/files_encryption.po
+++ b/l10n/pt_BR/files_encryption.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-24 02:01+0200\n"
-"PO-Revision-Date: 2012-09-23 16:57+0000\n"
-"Last-Translator: sedir <philippi.sedir@gmail.com>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,18 +18,66 @@ msgstr ""
"Language: pt_BR\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
msgid "Encryption"
msgstr "Criptografia"
-#: templates/settings.php:4
+#: templates/settings.php:67
msgid "Exclude the following file types from encryption"
msgstr "Excluir os seguintes tipos de arquivo da criptografia"
-#: templates/settings.php:5
+#: templates/settings.php:71
msgid "None"
msgstr "Nenhuma"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "Habilitar Criptografia"
diff --git a/l10n/pt_BR/files_versions.po b/l10n/pt_BR/files_versions.po
index f310a86a675..63442db0efe 100644
--- a/l10n/pt_BR/files_versions.po
+++ b/l10n/pt_BR/files_versions.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-24 02:01+0200\n"
-"PO-Revision-Date: 2012-09-23 15:33+0000\n"
-"Last-Translator: sedir <philippi.sedir@gmail.com>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,22 +19,10 @@ msgstr ""
"Language: pt_BR\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "Expirar todas as versões"
-
#: js/versions.js:16
msgid "History"
msgstr "Histórico"
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "Versões"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "Isso removerá todas as versões de backup existentes dos seus arquivos"
-
#: templates/settings.php:3
msgid "Files Versioning"
msgstr "Versionamento de Arquivos"
diff --git a/l10n/pt_BR/lib.po b/l10n/pt_BR/lib.po
index a42adb315bc..f1a550574ba 100644
--- a/l10n/pt_BR/lib.po
+++ b/l10n/pt_BR/lib.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-02 00:02+0100\n"
-"PO-Revision-Date: 2012-12-01 18:47+0000\n"
-"Last-Translator: Schopfer <glauber.guimaraes@poli.ufrj.br>\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,51 +20,55 @@ msgstr ""
"Language: pt_BR\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: app.php:285
+#: app.php:301
msgid "Help"
msgstr "Ajuda"
-#: app.php:292
+#: app.php:308
msgid "Personal"
msgstr "Pessoal"
-#: app.php:297
+#: app.php:313
msgid "Settings"
msgstr "Ajustes"
-#: app.php:302
+#: app.php:318
msgid "Users"
msgstr "Usuários"
-#: app.php:309
+#: app.php:325
msgid "Apps"
msgstr "Aplicações"
-#: app.php:311
+#: app.php:327
msgid "Admin"
msgstr "Admin"
-#: files.php:361
+#: files.php:365
msgid "ZIP download is turned off."
msgstr "Download ZIP está desligado."
-#: files.php:362
+#: files.php:366
msgid "Files need to be downloaded one by one."
msgstr "Arquivos precisam ser baixados um de cada vez."
-#: files.php:362 files.php:387
+#: files.php:366 files.php:391
msgid "Back to Files"
msgstr "Voltar para Arquivos"
-#: files.php:386
+#: files.php:390
msgid "Selected files too large to generate zip file."
msgstr "Arquivos selecionados são muito grandes para gerar arquivo zip."
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr ""
+
#: json.php:28
msgid "Application is not enabled"
msgstr "Aplicação não está habilitada"
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
msgstr "Erro de autenticação"
@@ -84,55 +88,55 @@ msgstr "Texto"
msgid "Images"
msgstr "Imagens"
-#: template.php:103
+#: template.php:113
msgid "seconds ago"
msgstr "segundos atrás"
-#: template.php:104
+#: template.php:114
msgid "1 minute ago"
msgstr "1 minuto atrás"
-#: template.php:105
+#: template.php:115
#, php-format
msgid "%d minutes ago"
msgstr "%d minutos atrás"
-#: template.php:106
+#: template.php:116
msgid "1 hour ago"
msgstr "1 hora atrás"
-#: template.php:107
+#: template.php:117
#, php-format
msgid "%d hours ago"
msgstr "%d horas atrás"
-#: template.php:108
+#: template.php:118
msgid "today"
msgstr "hoje"
-#: template.php:109
+#: template.php:119
msgid "yesterday"
msgstr "ontem"
-#: template.php:110
+#: template.php:120
#, php-format
msgid "%d days ago"
msgstr "%d dias atrás"
-#: template.php:111
+#: template.php:121
msgid "last month"
msgstr "último mês"
-#: template.php:112
+#: template.php:122
#, php-format
msgid "%d months ago"
msgstr "%d meses atrás"
-#: template.php:113
+#: template.php:123
msgid "last year"
msgstr "último ano"
-#: template.php:114
+#: template.php:124
msgid "years ago"
msgstr "anos atrás"
diff --git a/l10n/pt_BR/settings.po b/l10n/pt_BR/settings.po
index 9d7a2512d56..30c7088ec92 100644
--- a/l10n/pt_BR/settings.po
+++ b/l10n/pt_BR/settings.po
@@ -7,6 +7,7 @@
# <fred.maranhao@gmail.com>, 2012.
# Guilherme Maluf Balzana <guimalufb@gmail.com>, 2012.
# <philippi.sedir@gmail.com>, 2012.
+# Rodrigo Tavares <rodrigo.st23@hotmail.com>, 2013.
# Sandro Venezuela <sandrovenezuela@gmail.com>, 2012.
# <targinosilveira@gmail.com>, 2012.
# Thiago Vicente <thiagovice@gmail.com>, 2012.
@@ -16,9 +17,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-01-21 00:04+0100\n"
+"PO-Revision-Date: 2013-01-20 20:18+0000\n"
+"Last-Translator: rodrigost23 <rodrigo.st23@hotmail.com>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -98,7 +99,7 @@ msgstr "Gravando..."
#: personal.php:42 personal.php:43
msgid "__language_name__"
-msgstr "Português"
+msgstr "Português do Brasil"
#: templates/apps.php:10
msgid "Add your App"
diff --git a/l10n/pt_BR/user_ldap.po b/l10n/pt_BR/user_ldap.po
index fdd9c02d90a..7596db8ad37 100644
--- a/l10n/pt_BR/user_ldap.po
+++ b/l10n/pt_BR/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 23:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
@@ -27,8 +27,8 @@ msgstr ""
#: templates/settings.php:11
msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
msgstr ""
#: templates/settings.php:15
@@ -45,6 +45,10 @@ msgid "Base DN"
msgstr "DN Base"
#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Você pode especificar DN Base para usuários e grupos na guia Avançada"
@@ -115,10 +119,18 @@ msgstr "Porta"
msgid "Base User Tree"
msgstr "Árvore de Usuário Base"
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "Árvore de Grupo Base"
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Associação Grupo-Membro"
diff --git a/l10n/pt_BR/user_webdavauth.po b/l10n/pt_BR/user_webdavauth.po
index febd61f9ee5..db7d62a36b8 100644
--- a/l10n/pt_BR/user_webdavauth.po
+++ b/l10n/pt_BR/user_webdavauth.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-20 00:11+0100\n"
-"PO-Revision-Date: 2012-12-19 23:12+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
@@ -18,13 +18,17 @@ msgstr ""
"Language: pt_BR\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
#: templates/settings.php:4
msgid "URL: http://"
msgstr ""
#: templates/settings.php:6
msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
msgstr ""
diff --git a/l10n/pt_PT/core.po b/l10n/pt_PT/core.po
index ba200a60054..8cf1dad2efb 100644
--- a/l10n/pt_PT/core.po
+++ b/l10n/pt_PT/core.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
@@ -213,7 +213,6 @@ msgid "Password protect"
msgstr "Proteger com palavra-passe"
#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
msgid "Password"
msgstr "Palavra chave"
@@ -570,17 +569,3 @@ msgstr "seguinte"
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
msgstr "A Actualizar o ownCloud para a versão %s, esta operação pode demorar."
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "Aviso de Segurança!"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "Por favor verifique a sua palavra-passe. <br/>Por razões de segurança, pode ser-lhe perguntada, ocasionalmente, a sua palavra-passe de novo."
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "Verificar"
diff --git a/l10n/pt_PT/files.po b/l10n/pt_PT/files.po
index 74b9f45b855..1ba8520b85c 100644
--- a/l10n/pt_PT/files.po
+++ b/l10n/pt_PT/files.po
@@ -4,6 +4,7 @@
#
# Translators:
# <daniel@mouxy.net>, 2012-2013.
+# Daniel Pinto <daniel@mouxy.net>, 2013.
# Duarte Velez Grilo <duartegrilo@gmail.com>, 2012.
# <geral@ricardolameiro.pt>, 2012.
# Helder Meneses <helder.meneses@gmail.com>, 2012.
@@ -12,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-11 00:05+0100\n"
-"PO-Revision-Date: 2013-01-09 23:21+0000\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-21 12:23+0000\n"
"Last-Translator: Mouxy <daniel@mouxy.net>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
@@ -22,6 +23,11 @@ msgstr ""
"Language: pt_PT\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/delete.php:28 ajax/getstoragestats.php:11 ajax/upload.php:17
+#: ajax/upload.php:76 templates/index.php:18
+msgid "Upload"
+msgstr "Enviar"
+
#: ajax/move.php:17
#, php-format
msgid "Could not move %s - File with this name already exists"
@@ -36,46 +42,46 @@ msgstr "Não foi possível move o ficheiro %s"
msgid "Unable to rename file"
msgstr "Não foi possível renomear o ficheiro"
-#: ajax/upload.php:14
+#: ajax/upload.php:20
msgid "No file was uploaded. Unknown error"
msgstr "Nenhum ficheiro foi carregado. Erro desconhecido"
-#: ajax/upload.php:21
+#: ajax/upload.php:30
msgid "There is no error, the file uploaded with success"
msgstr "Sem erro, ficheiro enviado com sucesso"
-#: ajax/upload.php:22
+#: ajax/upload.php:31
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr "O ficheiro enviado excede o limite permitido na directiva do php.ini upload_max_filesize"
-#: ajax/upload.php:24
+#: ajax/upload.php:33
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "O ficheiro enviado excede o diretivo MAX_FILE_SIZE especificado no formulário HTML"
-#: ajax/upload.php:26
+#: ajax/upload.php:35
msgid "The uploaded file was only partially uploaded"
msgstr "O ficheiro enviado só foi enviado parcialmente"
-#: ajax/upload.php:27
+#: ajax/upload.php:36
msgid "No file was uploaded"
msgstr "Não foi enviado nenhum ficheiro"
-#: ajax/upload.php:28
+#: ajax/upload.php:37
msgid "Missing a temporary folder"
msgstr "Falta uma pasta temporária"
-#: ajax/upload.php:29
+#: ajax/upload.php:38
msgid "Failed to write to disk"
msgstr "Falhou a escrita no disco"
-#: ajax/upload.php:45
+#: ajax/upload.php:57
msgid "Not enough space available"
msgstr "Espaço em disco insuficiente!"
-#: ajax/upload.php:69
+#: ajax/upload.php:91
msgid "Invalid directory."
msgstr "Directório Inválido"
@@ -131,98 +137,100 @@ msgstr "{files} não partilhado(s)"
msgid "deleted {files}"
msgstr "{files} eliminado(s)"
-#: js/files.js:31
+#: js/files.js:48
msgid "'.' is an invalid file name."
msgstr "'.' não é um nome de ficheiro válido!"
-#: js/files.js:36
+#: js/files.js:53
msgid "File name cannot be empty."
msgstr "O nome do ficheiro não pode estar vazio."
-#: js/files.js:45
+#: js/files.js:62
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Nome Inválido, os caracteres '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' não são permitidos."
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "a gerar o ficheiro ZIP, poderá demorar algum tempo."
+#: js/files.js:204
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr "O seu download está a ser preparado. Este processo pode demorar algum tempo se os ficheiros forem grandes."
-#: js/files.js:224
+#: js/files.js:242
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Não é possível fazer o envio do ficheiro devido a ser uma pasta ou ter 0 bytes"
-#: js/files.js:224
+#: js/files.js:242
msgid "Upload Error"
msgstr "Erro no envio"
-#: js/files.js:241
+#: js/files.js:259
msgid "Close"
msgstr "Fechar"
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:278 js/files.js:397 js/files.js:431
msgid "Pending"
msgstr "Pendente"
-#: js/files.js:280
+#: js/files.js:298
msgid "1 file uploading"
msgstr "A enviar 1 ficheiro"
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:301 js/files.js:357 js/files.js:372
msgid "{count} files uploading"
msgstr "A carregar {count} ficheiros"
-#: js/files.js:357 js/files.js:393
+#: js/files.js:376 js/files.js:414
msgid "Upload cancelled."
msgstr "O envio foi cancelado."
-#: js/files.js:464
+#: js/files.js:486
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Envio de ficheiro em progresso. Irá cancelar o envio se sair da página agora."
-#: js/files.js:537
+#: js/files.js:559
msgid "URL cannot be empty."
msgstr "O URL não pode estar vazio."
-#: js/files.js:543
+#: js/files.js:565
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Nome de pasta inválido. O Uso de 'shared' é reservado para o ownCloud"
-#: js/files.js:727
+#: js/files.js:775
msgid "{count} files scanned"
msgstr "{count} ficheiros analisados"
-#: js/files.js:735
+#: js/files.js:783
msgid "error while scanning"
msgstr "erro ao analisar"
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:857 templates/index.php:64
msgid "Name"
msgstr "Nome"
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:858 templates/index.php:75
msgid "Size"
msgstr "Tamanho"
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:859 templates/index.php:77
msgid "Modified"
msgstr "Modificado"
-#: js/files.js:829
+#: js/files.js:878
msgid "1 folder"
msgstr "1 pasta"
-#: js/files.js:831
+#: js/files.js:880
msgid "{count} folders"
msgstr "{count} pastas"
-#: js/files.js:839
+#: js/files.js:888
msgid "1 file"
msgstr "1 ficheiro"
-#: js/files.js:841
+#: js/files.js:890
msgid "{count} files"
msgstr "{count} ficheiros"
@@ -274,10 +282,6 @@ msgstr "Pasta"
msgid "From link"
msgstr "Da ligação"
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Enviar"
-
#: templates/index.php:41
msgid "Cancel upload"
msgstr "Cancelar envio"
diff --git a/l10n/pt_PT/files_encryption.po b/l10n/pt_PT/files_encryption.po
index 803037caf42..08eeb3d7e75 100644
--- a/l10n/pt_PT/files_encryption.po
+++ b/l10n/pt_PT/files_encryption.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-27 02:01+0200\n"
-"PO-Revision-Date: 2012-09-26 13:24+0000\n"
-"Last-Translator: Duarte Velez Grilo <duartegrilo@gmail.com>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,18 +18,66 @@ msgstr ""
"Language: pt_PT\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
msgid "Encryption"
msgstr "Encriptação"
-#: templates/settings.php:4
+#: templates/settings.php:67
msgid "Exclude the following file types from encryption"
msgstr "Excluir da encriptação os seguintes tipo de ficheiros"
-#: templates/settings.php:5
+#: templates/settings.php:71
msgid "None"
msgstr "Nenhum"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "Activar Encriptação"
diff --git a/l10n/pt_PT/files_versions.po b/l10n/pt_PT/files_versions.po
index 0a78dc0df95..596deab4396 100644
--- a/l10n/pt_PT/files_versions.po
+++ b/l10n/pt_PT/files_versions.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-01 02:04+0200\n"
-"PO-Revision-Date: 2012-09-30 22:21+0000\n"
-"Last-Translator: Duarte Velez Grilo <duartegrilo@gmail.com>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,22 +18,10 @@ msgstr ""
"Language: pt_PT\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "Expirar todas as versões"
-
#: js/versions.js:16
msgid "History"
msgstr "Histórico"
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "Versões"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "Isto irá apagar todas as versões de backup do seus ficheiros"
-
#: templates/settings.php:3
msgid "Files Versioning"
msgstr "Versionamento de Ficheiros"
diff --git a/l10n/pt_PT/lib.po b/l10n/pt_PT/lib.po
index fe66807cc3a..b9d558cbb40 100644
--- a/l10n/pt_PT/lib.po
+++ b/l10n/pt_PT/lib.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# <daniel@mouxy.net>, 2012.
+# <daniel@mouxy.net>, 2012-2013.
# Duarte Velez Grilo <duartegrilo@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-17 00:01+0100\n"
-"PO-Revision-Date: 2012-11-16 00:33+0000\n"
+"POT-Creation-Date: 2013-01-18 00:03+0100\n"
+"PO-Revision-Date: 2013-01-17 00:47+0000\n"
"Last-Translator: Mouxy <daniel@mouxy.net>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
@@ -19,51 +19,55 @@ msgstr ""
"Language: pt_PT\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:285
+#: app.php:301
msgid "Help"
msgstr "Ajuda"
-#: app.php:292
+#: app.php:308
msgid "Personal"
msgstr "Pessoal"
-#: app.php:297
+#: app.php:313
msgid "Settings"
msgstr "Configurações"
-#: app.php:302
+#: app.php:318
msgid "Users"
msgstr "Utilizadores"
-#: app.php:309
+#: app.php:325
msgid "Apps"
msgstr "Aplicações"
-#: app.php:311
+#: app.php:327
msgid "Admin"
msgstr "Admin"
-#: files.php:332
+#: files.php:365
msgid "ZIP download is turned off."
msgstr "Descarregamento em ZIP está desligado."
-#: files.php:333
+#: files.php:366
msgid "Files need to be downloaded one by one."
msgstr "Os ficheiros precisam de ser descarregados um por um."
-#: files.php:333 files.php:358
+#: files.php:366 files.php:391
msgid "Back to Files"
msgstr "Voltar a Ficheiros"
-#: files.php:357
+#: files.php:390
msgid "Selected files too large to generate zip file."
msgstr "Os ficheiros seleccionados são grandes demais para gerar um ficheiro zip."
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr "Não foi possível determinar"
+
#: json.php:28
msgid "Application is not enabled"
msgstr "A aplicação não está activada"
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
msgstr "Erro na autenticação"
@@ -83,55 +87,55 @@ msgstr "Texto"
msgid "Images"
msgstr "Imagens"
-#: template.php:103
+#: template.php:113
msgid "seconds ago"
msgstr "há alguns segundos"
-#: template.php:104
+#: template.php:114
msgid "1 minute ago"
msgstr "há 1 minuto"
-#: template.php:105
+#: template.php:115
#, php-format
msgid "%d minutes ago"
msgstr "há %d minutos"
-#: template.php:106
+#: template.php:116
msgid "1 hour ago"
msgstr "Há 1 horas"
-#: template.php:107
+#: template.php:117
#, php-format
msgid "%d hours ago"
msgstr "Há %d horas"
-#: template.php:108
+#: template.php:118
msgid "today"
msgstr "hoje"
-#: template.php:109
+#: template.php:119
msgid "yesterday"
msgstr "ontem"
-#: template.php:110
+#: template.php:120
#, php-format
msgid "%d days ago"
msgstr "há %d dias"
-#: template.php:111
+#: template.php:121
msgid "last month"
msgstr "mês passado"
-#: template.php:112
+#: template.php:122
#, php-format
msgid "%d months ago"
msgstr "Há %d meses atrás"
-#: template.php:113
+#: template.php:123
msgid "last year"
msgstr "ano passado"
-#: template.php:114
+#: template.php:124
msgid "years ago"
msgstr "há anos"
diff --git a/l10n/pt_PT/user_ldap.po b/l10n/pt_PT/user_ldap.po
index 2ecb6bd3751..734a694ccec 100644
--- a/l10n/pt_PT/user_ldap.po
+++ b/l10n/pt_PT/user_ldap.po
@@ -3,7 +3,7 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# <daniel@mouxy.net>, 2012.
+# <daniel@mouxy.net>, 2012-2013.
# Duarte Velez Grilo <duartegrilo@gmail.com>, 2012.
# Helder Meneses <helder.meneses@gmail.com>, 2012.
# Nelson Rosado <nelsontrosado@gmail.com>, 2012.
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-18 00:13+0100\n"
-"PO-Revision-Date: 2012-12-17 01:25+0000\n"
+"POT-Creation-Date: 2013-01-18 00:03+0100\n"
+"PO-Revision-Date: 2013-01-17 00:52+0000\n"
"Last-Translator: Mouxy <daniel@mouxy.net>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
@@ -30,9 +30,9 @@ msgstr "<b>Aviso:</b> A aplicação user_ldap e user_webdavauth são incompative
#: templates/settings.php:11
msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
-msgstr "<b>Aviso:</b> O módulo PHP LDAP necessário não está instalado, o backend não irá funcionar. Peça ao seu administrador para o instalar."
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
+msgstr "<b>Aviso:</b> O módulo PHP LDAP não está instalado, logo não irá funcionar. Por favor peça ao administrador para o instalar."
#: templates/settings.php:15
msgid "Host"
@@ -48,6 +48,10 @@ msgid "Base DN"
msgstr "DN base"
#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr "Uma base DN por linho"
+
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Pode especificar o ND Base para utilizadores e grupos no separador Avançado"
@@ -118,10 +122,18 @@ msgstr "Porto"
msgid "Base User Tree"
msgstr "Base da árvore de utilizadores."
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr "Uma base de utilizador DN por linha"
+
#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "Base da árvore de grupos."
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr "Uma base de grupo DN por linha"
+
#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Associar utilizador ao grupo."
diff --git a/l10n/pt_PT/user_webdavauth.po b/l10n/pt_PT/user_webdavauth.po
index f34c1b223df..6f6d78b3df7 100644
--- a/l10n/pt_PT/user_webdavauth.po
+++ b/l10n/pt_PT/user_webdavauth.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# <daniel@mouxy.net>, 2012.
+# <daniel@mouxy.net>, 2012-2013.
# Helder Meneses <helder.meneses@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-22 00:24+0100\n"
-"PO-Revision-Date: 2012-12-20 23:46+0000\n"
+"POT-Creation-Date: 2013-01-18 00:03+0100\n"
+"PO-Revision-Date: 2013-01-17 00:54+0000\n"
"Last-Translator: Mouxy <daniel@mouxy.net>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
@@ -19,13 +19,17 @@ msgstr ""
"Language: pt_PT\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr "Autenticação WebDAV"
+
#: templates/settings.php:4
msgid "URL: http://"
msgstr "URL: http://"
#: templates/settings.php:6
msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
-msgstr "O ownCloud vai enviar as credenciais para este URL. Todos os códigos http 401 e 403 serão interpretados como credenciais inválidas, todos os restantes códigos http serão interpretados como credenciais correctas."
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
+msgstr "O ownCloud vai enviar as credenciais do utilizador através deste URL. Este plugin verifica a resposta e vai interpretar os códigos de estado HTTP 401 e 403 como credenciais inválidas, e todas as outras como válidas."
diff --git a/l10n/ro/core.po b/l10n/ro/core.po
index 509e2c92f27..b4fb56151ad 100644
--- a/l10n/ro/core.po
+++ b/l10n/ro/core.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
@@ -212,7 +212,6 @@ msgid "Password protect"
msgstr "Protejare cu parolă"
#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
msgid "Password"
msgstr "Parola"
@@ -569,17 +568,3 @@ msgstr "următorul"
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "Advertisment de Securitate"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "Te rog verifica parola. <br/>Pentru securitate va poate fi cerut ocazional introducerea parolei din nou"
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "Verifica"
diff --git a/l10n/ro/files.po b/l10n/ro/files.po
index 4c4093cbf4d..113c4ac8b1f 100644
--- a/l10n/ro/files.po
+++ b/l10n/ro/files.po
@@ -3,7 +3,7 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Claudiu <claudiu@tanaselia.ro>, 2011, 2012.
+# Claudiu <claudiu@tanaselia.ro>, 2011-2013.
# Dimon Pockemon <>, 2012.
# Eugen Mihalache <eugemjj@gmail.com>, 2012.
# <g.ciprian@osn.ro>, 2012-2013.
@@ -12,9 +12,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 13:23+0000\n"
-"Last-Translator: g.ciprian <g.ciprian@osn.ro>\n"
+"POT-Creation-Date: 2013-01-20 00:05+0100\n"
+"PO-Revision-Date: 2013-01-19 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -22,6 +22,11 @@ msgstr ""
"Language: ro\n"
"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+#: ajax/delete.php:28 ajax/getstoragestats.php:11 ajax/upload.php:17
+#: ajax/upload.php:76 templates/index.php:18
+msgid "Upload"
+msgstr "Încarcă"
+
#: ajax/move.php:17
#, php-format
msgid "Could not move %s - File with this name already exists"
@@ -36,46 +41,46 @@ msgstr "Nu s-a putut muta %s"
msgid "Unable to rename file"
msgstr "Nu s-a putut redenumi fișierul"
-#: ajax/upload.php:14
+#: ajax/upload.php:20
msgid "No file was uploaded. Unknown error"
msgstr "Nici un fișier nu a fost încărcat. Eroare necunoscută"
-#: ajax/upload.php:21
+#: ajax/upload.php:30
msgid "There is no error, the file uploaded with success"
msgstr "Nicio eroare, fișierul a fost încărcat cu succes"
-#: ajax/upload.php:22
+#: ajax/upload.php:31
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr "Fisierul incarcat depaseste upload_max_filesize permisi in php.ini: "
-#: ajax/upload.php:24
+#: ajax/upload.php:33
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "Fișierul are o dimensiune mai mare decât variabile MAX_FILE_SIZE specificată în formularul HTML"
-#: ajax/upload.php:26
+#: ajax/upload.php:35
msgid "The uploaded file was only partially uploaded"
msgstr "Fișierul a fost încărcat doar parțial"
-#: ajax/upload.php:27
+#: ajax/upload.php:36
msgid "No file was uploaded"
msgstr "Niciun fișier încărcat"
-#: ajax/upload.php:28
+#: ajax/upload.php:37
msgid "Missing a temporary folder"
msgstr "Lipsește un dosar temporar"
-#: ajax/upload.php:29
+#: ajax/upload.php:38
msgid "Failed to write to disk"
msgstr "Eroare la scriere pe disc"
-#: ajax/upload.php:45
+#: ajax/upload.php:57
msgid "Not enough space available"
msgstr "Nu este suficient spațiu disponibil"
-#: ajax/upload.php:69
+#: ajax/upload.php:91
msgid "Invalid directory."
msgstr "Director invalid."
@@ -131,98 +136,100 @@ msgstr "nedistribuit {files}"
msgid "deleted {files}"
msgstr "Sterse {files}"
-#: js/files.js:31
+#: js/files.js:48
msgid "'.' is an invalid file name."
msgstr "'.' este un nume invalid de fișier."
-#: js/files.js:36
+#: js/files.js:53
msgid "File name cannot be empty."
msgstr "Numele fișierului nu poate rămâne gol."
-#: js/files.js:45
+#: js/files.js:62
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Nume invalid, '\\', '/', '<', '>', ':', '\"', '|', '?' si '*' nu sunt permise."
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "se generază fișierul ZIP, va dura ceva timp."
+#: js/files.js:204
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
-#: js/files.js:224
+#: js/files.js:242
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Nu s-a putut încărca fișierul tău deoarece pare să fie un director sau are 0 bytes."
-#: js/files.js:224
+#: js/files.js:242
msgid "Upload Error"
msgstr "Eroare la încărcare"
-#: js/files.js:241
+#: js/files.js:259
msgid "Close"
msgstr "Închide"
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:278 js/files.js:397 js/files.js:431
msgid "Pending"
msgstr "În așteptare"
-#: js/files.js:280
+#: js/files.js:298
msgid "1 file uploading"
msgstr "un fișier se încarcă"
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:301 js/files.js:357 js/files.js:372
msgid "{count} files uploading"
msgstr "{count} fisiere incarcate"
-#: js/files.js:357 js/files.js:393
+#: js/files.js:376 js/files.js:414
msgid "Upload cancelled."
msgstr "Încărcare anulată."
-#: js/files.js:464
+#: js/files.js:486
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Fișierul este în curs de încărcare. Părăsirea paginii va întrerupe încărcarea."
-#: js/files.js:537
+#: js/files.js:559
msgid "URL cannot be empty."
msgstr "Adresa URL nu poate fi goală."
-#: js/files.js:543
+#: js/files.js:565
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
+msgstr "Invalid folder name. Usage of 'Shared' is reserved by Ownclou"
-#: js/files.js:727
+#: js/files.js:775
msgid "{count} files scanned"
msgstr "{count} fisiere scanate"
-#: js/files.js:735
+#: js/files.js:783
msgid "error while scanning"
msgstr "eroare la scanarea"
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:857 templates/index.php:64
msgid "Name"
msgstr "Nume"
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:858 templates/index.php:75
msgid "Size"
msgstr "Dimensiune"
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:859 templates/index.php:77
msgid "Modified"
msgstr "Modificat"
-#: js/files.js:829
+#: js/files.js:878
msgid "1 folder"
msgstr "1 folder"
-#: js/files.js:831
+#: js/files.js:880
msgid "{count} folders"
msgstr "{count} foldare"
-#: js/files.js:839
+#: js/files.js:888
msgid "1 file"
msgstr "1 fisier"
-#: js/files.js:841
+#: js/files.js:890
msgid "{count} files"
msgstr "{count} fisiere"
@@ -274,10 +281,6 @@ msgstr "Dosar"
msgid "From link"
msgstr "de la adresa"
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Încarcă"
-
#: templates/index.php:41
msgid "Cancel upload"
msgstr "Anulează încărcarea"
diff --git a/l10n/ro/files_encryption.po b/l10n/ro/files_encryption.po
index 2c3a3ed30b0..701aea30fb9 100644
--- a/l10n/ro/files_encryption.po
+++ b/l10n/ro/files_encryption.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-19 02:02+0200\n"
-"PO-Revision-Date: 2012-09-18 11:31+0000\n"
-"Last-Translator: g.ciprian <g.ciprian@osn.ro>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,18 +18,66 @@ msgstr ""
"Language: ro\n"
"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
msgid "Encryption"
msgstr "Încriptare"
-#: templates/settings.php:4
+#: templates/settings.php:67
msgid "Exclude the following file types from encryption"
msgstr "Exclude următoarele tipuri de fișiere de la încriptare"
-#: templates/settings.php:5
+#: templates/settings.php:71
msgid "None"
msgstr "Niciuna"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "Activare încriptare"
diff --git a/l10n/ro/files_versions.po b/l10n/ro/files_versions.po
index d3058eb6ed2..28514d6ddd3 100644
--- a/l10n/ro/files_versions.po
+++ b/l10n/ro/files_versions.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-27 02:01+0200\n"
-"PO-Revision-Date: 2012-09-26 13:05+0000\n"
-"Last-Translator: g.ciprian <g.ciprian@osn.ro>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,22 +18,10 @@ msgstr ""
"Language: ro\n"
"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "Expiră toate versiunile"
-
#: js/versions.js:16
msgid "History"
msgstr "Istoric"
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "Versiuni"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "Această acțiune va șterge toate versiunile salvate ale fișierelor tale"
-
#: templates/settings.php:3
msgid "Files Versioning"
msgstr "Versionare fișiere"
diff --git a/l10n/ro/lib.po b/l10n/ro/lib.po
index 3cfb1c4c4a0..cbfb8c3bfd4 100644
--- a/l10n/ro/lib.po
+++ b/l10n/ro/lib.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-27 00:04+0100\n"
-"PO-Revision-Date: 2012-12-26 05:14+0000\n"
-"Last-Translator: laurentiucristescu <laur.cristescu@gmail.com>\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,27 +19,27 @@ msgstr ""
"Language: ro\n"
"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
-#: app.php:287
+#: app.php:301
msgid "Help"
msgstr "Ajutor"
-#: app.php:294
+#: app.php:308
msgid "Personal"
msgstr "Personal"
-#: app.php:299
+#: app.php:313
msgid "Settings"
msgstr "Setări"
-#: app.php:304
+#: app.php:318
msgid "Users"
msgstr "Utilizatori"
-#: app.php:311
+#: app.php:325
msgid "Apps"
msgstr "Aplicații"
-#: app.php:313
+#: app.php:327
msgid "Admin"
msgstr "Admin"
@@ -59,11 +59,15 @@ msgstr "Înapoi la fișiere"
msgid "Selected files too large to generate zip file."
msgstr "Fișierele selectate sunt prea mari pentru a genera un fișier zip."
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr ""
+
#: json.php:28
msgid "Application is not enabled"
msgstr "Aplicația nu este activată"
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
msgstr "Eroare la autentificare"
@@ -83,55 +87,55 @@ msgstr "Text"
msgid "Images"
msgstr "Imagini"
-#: template.php:103
+#: template.php:113
msgid "seconds ago"
msgstr "secunde în urmă"
-#: template.php:104
+#: template.php:114
msgid "1 minute ago"
msgstr "1 minut în urmă"
-#: template.php:105
+#: template.php:115
#, php-format
msgid "%d minutes ago"
msgstr "%d minute în urmă"
-#: template.php:106
+#: template.php:116
msgid "1 hour ago"
msgstr "Acum o ora"
-#: template.php:107
+#: template.php:117
#, php-format
msgid "%d hours ago"
msgstr "%d ore in urma"
-#: template.php:108
+#: template.php:118
msgid "today"
msgstr "astăzi"
-#: template.php:109
+#: template.php:119
msgid "yesterday"
msgstr "ieri"
-#: template.php:110
+#: template.php:120
#, php-format
msgid "%d days ago"
msgstr "%d zile în urmă"
-#: template.php:111
+#: template.php:121
msgid "last month"
msgstr "ultima lună"
-#: template.php:112
+#: template.php:122
#, php-format
msgid "%d months ago"
msgstr "%d luni in urma"
-#: template.php:113
+#: template.php:123
msgid "last year"
msgstr "ultimul an"
-#: template.php:114
+#: template.php:124
msgid "years ago"
msgstr "ani în urmă"
diff --git a/l10n/ro/user_ldap.po b/l10n/ro/user_ldap.po
index 171e91b27d4..41e4eebb9f3 100644
--- a/l10n/ro/user_ldap.po
+++ b/l10n/ro/user_ldap.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-27 00:04+0100\n"
-"PO-Revision-Date: 2012-12-26 05:09+0000\n"
-"Last-Translator: laurentiucristescu <laur.cristescu@gmail.com>\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 23:19+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -29,9 +29,9 @@ msgstr "<b>Atentie:</b> Apps user_ldap si user_webdavauth sunt incompatibile. Es
#: templates/settings.php:11
msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
-msgstr "<b>Atentie:</b Modulul PHP LDAP care este necesar nu este instalat. Va rugam intrebati administratorul de sistem instalarea acestuia"
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
+msgstr ""
#: templates/settings.php:15
msgid "Host"
@@ -47,6 +47,10 @@ msgid "Base DN"
msgstr "DN de bază"
#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Puteți să specificați DN de bază pentru utilizatori și grupuri în fila Avansat"
@@ -117,10 +121,18 @@ msgstr "Portul"
msgid "Base User Tree"
msgstr "Arborele de bază al Utilizatorilor"
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "Arborele de bază al Grupurilor"
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Asocierea Grup-Membru"
diff --git a/l10n/ro/user_webdavauth.po b/l10n/ro/user_webdavauth.po
index 7c83e127d1c..fdbba4b6f80 100644
--- a/l10n/ro/user_webdavauth.po
+++ b/l10n/ro/user_webdavauth.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-27 00:04+0100\n"
-"PO-Revision-Date: 2012-12-26 05:17+0000\n"
-"Last-Translator: laurentiucristescu <laur.cristescu@gmail.com>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,13 +18,17 @@ msgstr ""
"Language: ro\n"
"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
#: templates/settings.php:4
msgid "URL: http://"
msgstr "URL: http://"
#: templates/settings.php:6
msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
-msgstr "owncloud va trimite acreditatile de utilizator pentru a interpreta aceasta pagina. Http 401 si Http 403 are acreditarile si orice alt cod gresite ca acreditarile corecte"
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
+msgstr ""
diff --git a/l10n/ru/core.po b/l10n/ru/core.po
index 00951912304..2bbb44f36f8 100644
--- a/l10n/ru/core.po
+++ b/l10n/ru/core.po
@@ -17,9 +17,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-13 00:08+0100\n"
-"PO-Revision-Date: 2013-01-12 11:49+0000\n"
-"Last-Translator: adol <sharov3@gmail.com>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -217,7 +217,6 @@ msgid "Password protect"
msgstr "Защитить паролем"
#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
msgid "Password"
msgstr "Пароль"
@@ -574,17 +573,3 @@ msgstr "след"
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
msgstr "Производится обновление ownCloud до версии %s. Это может занять некоторое время."
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "Предупреждение безопасности!"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "Пожалуйста, проверьте свой ​​пароль. <br/>По соображениям безопасности, Вам иногда придется вводить свой пароль снова."
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "Подтвердить"
diff --git a/l10n/ru/files.po b/l10n/ru/files.po
index aaa96b72d90..7e8d79834dc 100644
--- a/l10n/ru/files.po
+++ b/l10n/ru/files.po
@@ -18,9 +18,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-13 00:08+0100\n"
-"PO-Revision-Date: 2013-01-12 11:53+0000\n"
-"Last-Translator: adol <sharov3@gmail.com>\n"
+"POT-Creation-Date: 2013-01-20 00:05+0100\n"
+"PO-Revision-Date: 2013-01-19 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -28,6 +28,11 @@ msgstr ""
"Language: ru\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+#: ajax/delete.php:28 ajax/getstoragestats.php:11 ajax/upload.php:17
+#: ajax/upload.php:76 templates/index.php:18
+msgid "Upload"
+msgstr "Загрузить"
+
#: ajax/move.php:17
#, php-format
msgid "Could not move %s - File with this name already exists"
@@ -42,46 +47,46 @@ msgstr "Невозможно переместить %s"
msgid "Unable to rename file"
msgstr "Невозможно переименовать файл"
-#: ajax/upload.php:14
+#: ajax/upload.php:20
msgid "No file was uploaded. Unknown error"
msgstr "Файл не был загружен. Неизвестная ошибка"
-#: ajax/upload.php:21
+#: ajax/upload.php:30
msgid "There is no error, the file uploaded with success"
msgstr "Файл успешно загружен"
-#: ajax/upload.php:22
+#: ajax/upload.php:31
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr "Файл превышает размер установленный upload_max_filesize в php.ini:"
-#: ajax/upload.php:24
+#: ajax/upload.php:33
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "Файл превышает размер MAX_FILE_SIZE, указаный в HTML-форме"
-#: ajax/upload.php:26
+#: ajax/upload.php:35
msgid "The uploaded file was only partially uploaded"
msgstr "Файл был загружен не полностью"
-#: ajax/upload.php:27
+#: ajax/upload.php:36
msgid "No file was uploaded"
msgstr "Файл не был загружен"
-#: ajax/upload.php:28
+#: ajax/upload.php:37
msgid "Missing a temporary folder"
msgstr "Невозможно найти временную папку"
-#: ajax/upload.php:29
+#: ajax/upload.php:38
msgid "Failed to write to disk"
msgstr "Ошибка записи на диск"
-#: ajax/upload.php:45
+#: ajax/upload.php:57
msgid "Not enough space available"
msgstr "Недостаточно свободного места"
-#: ajax/upload.php:69
+#: ajax/upload.php:91
msgid "Invalid directory."
msgstr "Неправильный каталог."
@@ -137,98 +142,100 @@ msgstr "не опубликованные {files}"
msgid "deleted {files}"
msgstr "удаленные {files}"
-#: js/files.js:31
+#: js/files.js:48
msgid "'.' is an invalid file name."
msgstr "'.' - неправильное имя файла."
-#: js/files.js:36
+#: js/files.js:53
msgid "File name cannot be empty."
msgstr "Имя файла не может быть пустым."
-#: js/files.js:45
+#: js/files.js:62
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Неправильное имя, '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' недопустимы."
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "создание ZIP-файла, это может занять некоторое время."
+#: js/files.js:204
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
-#: js/files.js:224
+#: js/files.js:242
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Не удается загрузить файл размером 0 байт в каталог"
-#: js/files.js:224
+#: js/files.js:242
msgid "Upload Error"
msgstr "Ошибка загрузки"
-#: js/files.js:241
+#: js/files.js:259
msgid "Close"
msgstr "Закрыть"
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:278 js/files.js:397 js/files.js:431
msgid "Pending"
msgstr "Ожидание"
-#: js/files.js:280
+#: js/files.js:298
msgid "1 file uploading"
msgstr "загружается 1 файл"
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:301 js/files.js:357 js/files.js:372
msgid "{count} files uploading"
msgstr "{count} файлов загружается"
-#: js/files.js:357 js/files.js:393
+#: js/files.js:376 js/files.js:414
msgid "Upload cancelled."
msgstr "Загрузка отменена."
-#: js/files.js:464
+#: js/files.js:486
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Файл в процессе загрузки. Покинув страницу вы прервёте загрузку."
-#: js/files.js:537
+#: js/files.js:559
msgid "URL cannot be empty."
msgstr "Ссылка не может быть пустой."
-#: js/files.js:543
+#: js/files.js:565
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Неправильное имя каталога. Имя 'Shared' зарезервировано."
-#: js/files.js:727
+#: js/files.js:775
msgid "{count} files scanned"
msgstr "{count} файлов просканировано"
-#: js/files.js:735
+#: js/files.js:783
msgid "error while scanning"
msgstr "ошибка во время санирования"
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:857 templates/index.php:64
msgid "Name"
msgstr "Название"
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:858 templates/index.php:75
msgid "Size"
msgstr "Размер"
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:859 templates/index.php:77
msgid "Modified"
msgstr "Изменён"
-#: js/files.js:829
+#: js/files.js:878
msgid "1 folder"
msgstr "1 папка"
-#: js/files.js:831
+#: js/files.js:880
msgid "{count} folders"
msgstr "{count} папок"
-#: js/files.js:839
+#: js/files.js:888
msgid "1 file"
msgstr "1 файл"
-#: js/files.js:841
+#: js/files.js:890
msgid "{count} files"
msgstr "{count} файлов"
@@ -280,10 +287,6 @@ msgstr "Папка"
msgid "From link"
msgstr "Из ссылки"
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Загрузить"
-
#: templates/index.php:41
msgid "Cancel upload"
msgstr "Отмена загрузки"
diff --git a/l10n/ru/files_encryption.po b/l10n/ru/files_encryption.po
index 5ae5f485223..9a2315aa144 100644
--- a/l10n/ru/files_encryption.po
+++ b/l10n/ru/files_encryption.po
@@ -8,28 +8,76 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-25 02:04+0200\n"
-"PO-Revision-Date: 2012-08-24 07:47+0000\n"
-"Last-Translator: Denis <reg.transifex.net@demitel.ru>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: ru\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
msgid "Encryption"
msgstr "Шифрование"
-#: templates/settings.php:4
+#: templates/settings.php:67
msgid "Exclude the following file types from encryption"
msgstr "Исключить шифрование следующих типов файлов"
-#: templates/settings.php:5
+#: templates/settings.php:71
msgid "None"
msgstr "Ничего"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "Включить шифрование"
diff --git a/l10n/ru/files_versions.po b/l10n/ru/files_versions.po
index bb622c0e095..e25aa41375a 100644
--- a/l10n/ru/files_versions.po
+++ b/l10n/ru/files_versions.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-20 02:02+0200\n"
-"PO-Revision-Date: 2012-10-19 13:09+0000\n"
-"Last-Translator: skoptev <skoptev@ukr.net>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,22 +20,10 @@ msgstr ""
"Language: ru\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "Просрочить все версии"
-
#: js/versions.js:16
msgid "History"
msgstr "История"
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "Версии"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "Очистить список версий ваших файлов"
-
#: templates/settings.php:3
msgid "Files Versioning"
msgstr "Версии файлов"
diff --git a/l10n/ru/lib.po b/l10n/ru/lib.po
index a031a62f802..3426bc61722 100644
--- a/l10n/ru/lib.po
+++ b/l10n/ru/lib.po
@@ -12,9 +12,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-22 00:01+0100\n"
-"PO-Revision-Date: 2012-11-21 12:19+0000\n"
-"Last-Translator: Mihail Vasiliev <mickvav@gmail.com>\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -22,51 +22,55 @@ msgstr ""
"Language: ru\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: app.php:285
+#: app.php:301
msgid "Help"
msgstr "Помощь"
-#: app.php:292
+#: app.php:308
msgid "Personal"
msgstr "Личное"
-#: app.php:297
+#: app.php:313
msgid "Settings"
msgstr "Настройки"
-#: app.php:302
+#: app.php:318
msgid "Users"
msgstr "Пользователи"
-#: app.php:309
+#: app.php:325
msgid "Apps"
msgstr "Приложения"
-#: app.php:311
+#: app.php:327
msgid "Admin"
msgstr "Admin"
-#: files.php:361
+#: files.php:365
msgid "ZIP download is turned off."
msgstr "ZIP-скачивание отключено."
-#: files.php:362
+#: files.php:366
msgid "Files need to be downloaded one by one."
msgstr "Файлы должны быть загружены по одному."
-#: files.php:362 files.php:387
+#: files.php:366 files.php:391
msgid "Back to Files"
msgstr "Назад к файлам"
-#: files.php:386
+#: files.php:390
msgid "Selected files too large to generate zip file."
msgstr "Выбранные файлы слишком велики, чтобы создать zip файл."
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr ""
+
#: json.php:28
msgid "Application is not enabled"
msgstr "Приложение не разрешено"
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
msgstr "Ошибка аутентификации"
@@ -86,55 +90,55 @@ msgstr "Текст"
msgid "Images"
msgstr "Изображения"
-#: template.php:103
+#: template.php:113
msgid "seconds ago"
msgstr "менее минуты"
-#: template.php:104
+#: template.php:114
msgid "1 minute ago"
msgstr "1 минуту назад"
-#: template.php:105
+#: template.php:115
#, php-format
msgid "%d minutes ago"
msgstr "%d минут назад"
-#: template.php:106
+#: template.php:116
msgid "1 hour ago"
msgstr "час назад"
-#: template.php:107
+#: template.php:117
#, php-format
msgid "%d hours ago"
msgstr "%d часов назад"
-#: template.php:108
+#: template.php:118
msgid "today"
msgstr "сегодня"
-#: template.php:109
+#: template.php:119
msgid "yesterday"
msgstr "вчера"
-#: template.php:110
+#: template.php:120
#, php-format
msgid "%d days ago"
msgstr "%d дней назад"
-#: template.php:111
+#: template.php:121
msgid "last month"
msgstr "в прошлом месяце"
-#: template.php:112
+#: template.php:122
#, php-format
msgid "%d months ago"
msgstr "%d месяцев назад"
-#: template.php:113
+#: template.php:123
msgid "last year"
msgstr "в прошлом году"
-#: template.php:114
+#: template.php:124
msgid "years ago"
msgstr "годы назад"
diff --git a/l10n/ru/user_ldap.po b/l10n/ru/user_ldap.po
index 5ab21a67d52..383f6bb2909 100644
--- a/l10n/ru/user_ldap.po
+++ b/l10n/ru/user_ldap.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-16 00:11+0100\n"
-"PO-Revision-Date: 2012-12-15 01:57+0000\n"
-"Last-Translator: sam002 <semen@sam002.net>\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 23:19+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -29,9 +29,9 @@ msgstr "<b>Внимание:</b>Приложения user_ldap и user_webdavaut
#: templates/settings.php:11
msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
-msgstr "<b>Внимание:</b> Необходимый PHP LDAP модуль не установлен, внутренний интерфейс не будет работать. Пожалуйста, обратитесь к системному администратору, чтобы установить его."
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
+msgstr ""
#: templates/settings.php:15
msgid "Host"
@@ -47,6 +47,10 @@ msgid "Base DN"
msgstr "Базовый DN"
#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Вы можете задать Base DN для пользователей и групп на вкладке \"Расширенное\""
@@ -117,10 +121,18 @@ msgstr "Порт"
msgid "Base User Tree"
msgstr "База пользовательского дерева"
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "База группового дерева"
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Ассоциация Группа-Участник"
diff --git a/l10n/ru/user_webdavauth.po b/l10n/ru/user_webdavauth.po
index 12e0350b328..709cb4a65dc 100644
--- a/l10n/ru/user_webdavauth.po
+++ b/l10n/ru/user_webdavauth.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-27 00:04+0100\n"
-"PO-Revision-Date: 2012-12-26 06:19+0000\n"
-"Last-Translator: adol <sharov3@gmail.com>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,13 +19,17 @@ msgstr ""
"Language: ru\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
#: templates/settings.php:4
msgid "URL: http://"
msgstr "URL: http://"
#: templates/settings.php:6
msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
msgstr ""
diff --git a/l10n/ru_RU/core.po b/l10n/ru_RU/core.po
index a785898d1c2..7ecd789d863 100644
--- a/l10n/ru_RU/core.po
+++ b/l10n/ru_RU/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
"MIME-Version: 1.0\n"
@@ -208,7 +208,6 @@ msgid "Password protect"
msgstr "Защитить паролем"
#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
msgid "Password"
msgstr "Пароль"
@@ -565,17 +564,3 @@ msgstr "следующий"
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "Предупреждение системы безопасности!"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "Пожалуйста, проверьте свой ​​пароль. <br/>По соображениям безопасности Вам может быть иногда предложено ввести пароль еще раз."
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "Проверить"
diff --git a/l10n/ru_RU/files.po b/l10n/ru_RU/files.po
index 5c40bd57bd1..04fe3223ae2 100644
--- a/l10n/ru_RU/files.po
+++ b/l10n/ru_RU/files.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"POT-Creation-Date: 2013-01-20 00:05+0100\n"
+"PO-Revision-Date: 2013-01-19 23:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
"MIME-Version: 1.0\n"
@@ -19,6 +19,11 @@ msgstr ""
"Language: ru_RU\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+#: ajax/delete.php:28 ajax/getstoragestats.php:11 ajax/upload.php:17
+#: ajax/upload.php:76 templates/index.php:18
+msgid "Upload"
+msgstr "Загрузить "
+
#: ajax/move.php:17
#, php-format
msgid "Could not move %s - File with this name already exists"
@@ -33,46 +38,46 @@ msgstr ""
msgid "Unable to rename file"
msgstr ""
-#: ajax/upload.php:14
+#: ajax/upload.php:20
msgid "No file was uploaded. Unknown error"
msgstr "Файл не был загружен. Неизвестная ошибка"
-#: ajax/upload.php:21
+#: ajax/upload.php:30
msgid "There is no error, the file uploaded with success"
msgstr "Ошибка отсутствует, файл загружен успешно."
-#: ajax/upload.php:22
+#: ajax/upload.php:31
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr "Размер загружаемого файла превышает upload_max_filesize директиву в php.ini:"
-#: ajax/upload.php:24
+#: ajax/upload.php:33
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "Размер загруженного"
-#: ajax/upload.php:26
+#: ajax/upload.php:35
msgid "The uploaded file was only partially uploaded"
msgstr "Загружаемый файл был загружен частично"
-#: ajax/upload.php:27
+#: ajax/upload.php:36
msgid "No file was uploaded"
msgstr "Файл не был загружен"
-#: ajax/upload.php:28
+#: ajax/upload.php:37
msgid "Missing a temporary folder"
msgstr "Отсутствует временная папка"
-#: ajax/upload.php:29
+#: ajax/upload.php:38
msgid "Failed to write to disk"
msgstr "Не удалось записать на диск"
-#: ajax/upload.php:45
+#: ajax/upload.php:57
msgid "Not enough space available"
msgstr ""
-#: ajax/upload.php:69
+#: ajax/upload.php:91
msgid "Invalid directory."
msgstr ""
@@ -128,98 +133,100 @@ msgstr "Cовместное использование прекращено {ф
msgid "deleted {files}"
msgstr "удалено {файлы}"
-#: js/files.js:31
+#: js/files.js:48
msgid "'.' is an invalid file name."
msgstr ""
-#: js/files.js:36
+#: js/files.js:53
msgid "File name cannot be empty."
msgstr ""
-#: js/files.js:45
+#: js/files.js:62
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Некорректное имя, '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' не допустимы."
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "Создание ZIP-файла, это может занять некоторое время."
+#: js/files.js:204
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
-#: js/files.js:224
+#: js/files.js:242
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Невозможно загрузить файл,\n так как он имеет нулевой размер или является директорией"
-#: js/files.js:224
+#: js/files.js:242
msgid "Upload Error"
msgstr "Ошибка загрузки"
-#: js/files.js:241
+#: js/files.js:259
msgid "Close"
msgstr "Закрыть"
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:278 js/files.js:397 js/files.js:431
msgid "Pending"
msgstr "Ожидающий решения"
-#: js/files.js:280
+#: js/files.js:298
msgid "1 file uploading"
msgstr "загрузка 1 файла"
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:301 js/files.js:357 js/files.js:372
msgid "{count} files uploading"
msgstr "{количество} загружено файлов"
-#: js/files.js:357 js/files.js:393
+#: js/files.js:376 js/files.js:414
msgid "Upload cancelled."
msgstr "Загрузка отменена"
-#: js/files.js:464
+#: js/files.js:486
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Процесс загрузки файла. Если покинуть страницу сейчас, загрузка будет отменена."
-#: js/files.js:537
+#: js/files.js:559
msgid "URL cannot be empty."
msgstr "URL не должен быть пустым."
-#: js/files.js:543
+#: js/files.js:565
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:727
+#: js/files.js:775
msgid "{count} files scanned"
msgstr "{количество} файлов отсканировано"
-#: js/files.js:735
+#: js/files.js:783
msgid "error while scanning"
msgstr "ошибка при сканировании"
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:857 templates/index.php:64
msgid "Name"
msgstr "Имя"
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:858 templates/index.php:75
msgid "Size"
msgstr "Размер"
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:859 templates/index.php:77
msgid "Modified"
msgstr "Изменен"
-#: js/files.js:829
+#: js/files.js:878
msgid "1 folder"
msgstr "1 папка"
-#: js/files.js:831
+#: js/files.js:880
msgid "{count} folders"
msgstr "{количество} папок"
-#: js/files.js:839
+#: js/files.js:888
msgid "1 file"
msgstr "1 файл"
-#: js/files.js:841
+#: js/files.js:890
msgid "{count} files"
msgstr "{количество} файлов"
@@ -271,10 +278,6 @@ msgstr "Папка"
msgid "From link"
msgstr "По ссылке"
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Загрузить "
-
#: templates/index.php:41
msgid "Cancel upload"
msgstr "Отмена загрузки"
diff --git a/l10n/ru_RU/files_encryption.po b/l10n/ru_RU/files_encryption.po
index 11a61701141..b27f0a2def2 100644
--- a/l10n/ru_RU/files_encryption.po
+++ b/l10n/ru_RU/files_encryption.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-20 02:05+0200\n"
-"PO-Revision-Date: 2012-09-19 12:14+0000\n"
-"Last-Translator: AnnaSch <cdewqazxsqwe@gmail.com>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,18 +18,66 @@ msgstr ""
"Language: ru_RU\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
msgid "Encryption"
msgstr "Шифрование"
-#: templates/settings.php:4
+#: templates/settings.php:67
msgid "Exclude the following file types from encryption"
msgstr "Исключите следующие типы файлов из шифрования"
-#: templates/settings.php:5
+#: templates/settings.php:71
msgid "None"
msgstr "Ни один"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "Включить шифрование"
diff --git a/l10n/ru_RU/files_versions.po b/l10n/ru_RU/files_versions.po
index 241dfcc0e91..440d5bbecb0 100644
--- a/l10n/ru_RU/files_versions.po
+++ b/l10n/ru_RU/files_versions.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-17 00:01+0100\n"
-"PO-Revision-Date: 2012-11-16 07:25+0000\n"
-"Last-Translator: AnnaSch <cdewqazxsqwe@gmail.com>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,22 +18,10 @@ msgstr ""
"Language: ru_RU\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "Срок действия всех версий истекает"
-
#: js/versions.js:16
msgid "History"
msgstr "История"
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "Версии"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "Это приведет к удалению всех существующих версий резервной копии Ваших файлов"
-
#: templates/settings.php:3
msgid "Files Versioning"
msgstr "Файлы управления версиями"
diff --git a/l10n/ru_RU/lib.po b/l10n/ru_RU/lib.po
index 5ca45d27ad2..be65ac1f023 100644
--- a/l10n/ru_RU/lib.po
+++ b/l10n/ru_RU/lib.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-15 09:27+0000\n"
-"Last-Translator: AnnaSch <cdewqazxsqwe@gmail.com>\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,51 +18,55 @@ msgstr ""
"Language: ru_RU\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: app.php:285
+#: app.php:301
msgid "Help"
msgstr "Помощь"
-#: app.php:292
+#: app.php:308
msgid "Personal"
msgstr "Персональный"
-#: app.php:297
+#: app.php:313
msgid "Settings"
msgstr "Настройки"
-#: app.php:302
+#: app.php:318
msgid "Users"
msgstr "Пользователи"
-#: app.php:309
+#: app.php:325
msgid "Apps"
msgstr "Приложения"
-#: app.php:311
+#: app.php:327
msgid "Admin"
msgstr "Админ"
-#: files.php:332
+#: files.php:365
msgid "ZIP download is turned off."
msgstr "Загрузка ZIP выключена."
-#: files.php:333
+#: files.php:366
msgid "Files need to be downloaded one by one."
msgstr "Файлы должны быть загружены один за другим."
-#: files.php:333 files.php:358
+#: files.php:366 files.php:391
msgid "Back to Files"
msgstr "Обратно к файлам"
-#: files.php:357
+#: files.php:390
msgid "Selected files too large to generate zip file."
msgstr "Выбранные файлы слишком велики для генерации zip-архива."
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr ""
+
#: json.php:28
msgid "Application is not enabled"
msgstr "Приложение не запущено"
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
msgstr "Ошибка аутентификации"
@@ -82,55 +86,55 @@ msgstr "Текст"
msgid "Images"
msgstr "Изображения"
-#: template.php:103
+#: template.php:113
msgid "seconds ago"
msgstr "секунд назад"
-#: template.php:104
+#: template.php:114
msgid "1 minute ago"
msgstr "1 минуту назад"
-#: template.php:105
+#: template.php:115
#, php-format
msgid "%d minutes ago"
msgstr "%d минут назад"
-#: template.php:106
+#: template.php:116
msgid "1 hour ago"
msgstr "1 час назад"
-#: template.php:107
+#: template.php:117
#, php-format
msgid "%d hours ago"
msgstr "%d часов назад"
-#: template.php:108
+#: template.php:118
msgid "today"
msgstr "сегодня"
-#: template.php:109
+#: template.php:119
msgid "yesterday"
msgstr "вчера"
-#: template.php:110
+#: template.php:120
#, php-format
msgid "%d days ago"
msgstr "%d дней назад"
-#: template.php:111
+#: template.php:121
msgid "last month"
msgstr "в прошлом месяце"
-#: template.php:112
+#: template.php:122
#, php-format
msgid "%d months ago"
msgstr "%d месяцев назад"
-#: template.php:113
+#: template.php:123
msgid "last year"
msgstr "в прошлом году"
-#: template.php:114
+#: template.php:124
msgid "years ago"
msgstr "год назад"
diff --git a/l10n/ru_RU/user_ldap.po b/l10n/ru_RU/user_ldap.po
index 4a514279ab3..ef2d84ebcb1 100644
--- a/l10n/ru_RU/user_ldap.po
+++ b/l10n/ru_RU/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-19 00:03+0100\n"
-"PO-Revision-Date: 2012-12-18 08:59+0000\n"
-"Last-Translator: AnnaSch <cdewqazxsqwe@gmail.com>\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 23:20+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -27,9 +27,9 @@ msgstr "<b>Предупреждение:</b> Приложения user_ldap и u
#: templates/settings.php:11
msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
-msgstr "<b>Предупреждение:</b> Необходимый PHP LDAP-модуль не установлен, backend не будет работать. Пожалуйста, обратитесь к системному администратору, чтобы установить его."
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
+msgstr ""
#: templates/settings.php:15
msgid "Host"
@@ -45,6 +45,10 @@ msgid "Base DN"
msgstr "База DN"
#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Вы можете задать Base DN для пользователей и групп во вкладке «Дополнительно»"
@@ -115,10 +119,18 @@ msgstr "Порт"
msgid "Base User Tree"
msgstr "Базовое дерево пользователей"
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "Базовое дерево групп"
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Связь член-группа"
diff --git a/l10n/ru_RU/user_webdavauth.po b/l10n/ru_RU/user_webdavauth.po
index 5308dbe4c2d..a14bb9d28ed 100644
--- a/l10n/ru_RU/user_webdavauth.po
+++ b/l10n/ru_RU/user_webdavauth.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-21 00:10+0100\n"
-"PO-Revision-Date: 2012-12-20 06:57+0000\n"
-"Last-Translator: AnnaSch <cdewqazxsqwe@gmail.com>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,13 +19,17 @@ msgstr ""
"Language: ru_RU\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
#: templates/settings.php:4
msgid "URL: http://"
msgstr "URL: http://"
#: templates/settings.php:6
msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
msgstr ""
diff --git a/l10n/si_LK/core.po b/l10n/si_LK/core.po
index 349d4486cc4..e0b4be93b4d 100644
--- a/l10n/si_LK/core.po
+++ b/l10n/si_LK/core.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
@@ -210,7 +210,6 @@ msgid "Password protect"
msgstr "මුර පදයකින් ආරක්ශාකරන්න"
#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
msgid "Password"
msgstr "මුර පදය "
@@ -567,17 +566,3 @@ msgstr "ඊළඟ"
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr ""
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr ""
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr ""
diff --git a/l10n/si_LK/files.po b/l10n/si_LK/files.po
index b905772406b..570832cb837 100644
--- a/l10n/si_LK/files.po
+++ b/l10n/si_LK/files.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"POT-Creation-Date: 2013-01-20 00:05+0100\n"
+"PO-Revision-Date: 2013-01-19 23:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
@@ -19,6 +19,11 @@ msgstr ""
"Language: si_LK\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/delete.php:28 ajax/getstoragestats.php:11 ajax/upload.php:17
+#: ajax/upload.php:76 templates/index.php:18
+msgid "Upload"
+msgstr "උඩුගත කිරීම"
+
#: ajax/move.php:17
#, php-format
msgid "Could not move %s - File with this name already exists"
@@ -33,46 +38,46 @@ msgstr ""
msgid "Unable to rename file"
msgstr ""
-#: ajax/upload.php:14
+#: ajax/upload.php:20
msgid "No file was uploaded. Unknown error"
msgstr "ගොනුවක් උඩුගත නොවුනි. නොහැඳිනු දෝෂයක්"
-#: ajax/upload.php:21
+#: ajax/upload.php:30
msgid "There is no error, the file uploaded with success"
msgstr "නිවැරදි ව ගොනුව උඩුගත කෙරිනි"
-#: ajax/upload.php:22
+#: ajax/upload.php:31
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr ""
-#: ajax/upload.php:24
+#: ajax/upload.php:33
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "උඩුගත කළ ගොනුවේ විශාලත්වය HTML පෝරමයේ නියම කළ ඇති MAX_FILE_SIZE විශාලත්වයට වඩා වැඩිය"
-#: ajax/upload.php:26
+#: ajax/upload.php:35
msgid "The uploaded file was only partially uploaded"
msgstr "උඩුගත කළ ගොනුවේ කොටසක් පමණක් උඩුගත විය"
-#: ajax/upload.php:27
+#: ajax/upload.php:36
msgid "No file was uploaded"
msgstr "කිසිදු ගොනවක් උඩුගත නොවිනි"
-#: ajax/upload.php:28
+#: ajax/upload.php:37
msgid "Missing a temporary folder"
msgstr "තාවකාලික ෆොල්ඩරයක් සොයාගත නොහැක"
-#: ajax/upload.php:29
+#: ajax/upload.php:38
msgid "Failed to write to disk"
msgstr "තැටිගත කිරීම අසාර්ථකයි"
-#: ajax/upload.php:45
+#: ajax/upload.php:57
msgid "Not enough space available"
msgstr ""
-#: ajax/upload.php:69
+#: ajax/upload.php:91
msgid "Invalid directory."
msgstr ""
@@ -128,98 +133,100 @@ msgstr ""
msgid "deleted {files}"
msgstr ""
-#: js/files.js:31
+#: js/files.js:48
msgid "'.' is an invalid file name."
msgstr ""
-#: js/files.js:36
+#: js/files.js:53
msgid "File name cannot be empty."
msgstr ""
-#: js/files.js:45
+#: js/files.js:62
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "ගොනුවක් සෑදෙමින් පවතී. කෙටි වේලාවක් ගත විය හැක"
+#: js/files.js:204
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
-#: js/files.js:224
+#: js/files.js:242
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr ""
-#: js/files.js:224
+#: js/files.js:242
msgid "Upload Error"
msgstr "උඩුගත කිරීමේ දෝශයක්"
-#: js/files.js:241
+#: js/files.js:259
msgid "Close"
msgstr "වසන්න"
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:278 js/files.js:397 js/files.js:431
msgid "Pending"
msgstr ""
-#: js/files.js:280
+#: js/files.js:298
msgid "1 file uploading"
msgstr "1 ගොනුවක් උඩගත කෙරේ"
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:301 js/files.js:357 js/files.js:372
msgid "{count} files uploading"
msgstr ""
-#: js/files.js:357 js/files.js:393
+#: js/files.js:376 js/files.js:414
msgid "Upload cancelled."
msgstr "උඩුගත කිරීම අත් හරින්න ලදී"
-#: js/files.js:464
+#: js/files.js:486
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "උඩුගතකිරීමක් සිදුවේ. පිටුව හැර යාමෙන් එය නැවතෙනු ඇත"
-#: js/files.js:537
+#: js/files.js:559
msgid "URL cannot be empty."
msgstr "යොමුව හිස් විය නොහැක"
-#: js/files.js:543
+#: js/files.js:565
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:727
+#: js/files.js:775
msgid "{count} files scanned"
msgstr ""
-#: js/files.js:735
+#: js/files.js:783
msgid "error while scanning"
msgstr "පරීක්ෂා කිරීමේදී දෝෂයක්"
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:857 templates/index.php:64
msgid "Name"
msgstr "නම"
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:858 templates/index.php:75
msgid "Size"
msgstr "ප්‍රමාණය"
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:859 templates/index.php:77
msgid "Modified"
msgstr "වෙනස් කළ"
-#: js/files.js:829
+#: js/files.js:878
msgid "1 folder"
msgstr "1 ෆොල්ඩරයක්"
-#: js/files.js:831
+#: js/files.js:880
msgid "{count} folders"
msgstr ""
-#: js/files.js:839
+#: js/files.js:888
msgid "1 file"
msgstr "1 ගොනුවක්"
-#: js/files.js:841
+#: js/files.js:890
msgid "{count} files"
msgstr ""
@@ -271,10 +278,6 @@ msgstr "ෆෝල්ඩරය"
msgid "From link"
msgstr "යොමුවෙන්"
-#: templates/index.php:18
-msgid "Upload"
-msgstr "උඩුගත කිරීම"
-
#: templates/index.php:41
msgid "Cancel upload"
msgstr "උඩුගත කිරීම අත් හරින්න"
diff --git a/l10n/si_LK/files_encryption.po b/l10n/si_LK/files_encryption.po
index 7e40f2c3ea7..8f8475ed596 100644
--- a/l10n/si_LK/files_encryption.po
+++ b/l10n/si_LK/files_encryption.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-20 02:02+0200\n"
-"PO-Revision-Date: 2012-10-19 11:00+0000\n"
-"Last-Translator: Anushke Guneratne <anushke@gmail.com>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,18 +18,66 @@ msgstr ""
"Language: si_LK\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
msgid "Encryption"
msgstr "ගුප්ත කේතනය"
-#: templates/settings.php:4
+#: templates/settings.php:67
msgid "Exclude the following file types from encryption"
msgstr "මෙම ගොනු වර්ග ගුප්ත කේතනය කිරීමෙන් බැහැරව තබන්න"
-#: templates/settings.php:5
+#: templates/settings.php:71
msgid "None"
msgstr "කිසිවක් නැත"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "ගුප්ත කේතනය සක්‍රිය කරන්න"
diff --git a/l10n/si_LK/files_versions.po b/l10n/si_LK/files_versions.po
index 1d5285a2554..65443ed184b 100644
--- a/l10n/si_LK/files_versions.po
+++ b/l10n/si_LK/files_versions.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-20 02:02+0200\n"
-"PO-Revision-Date: 2012-10-19 10:27+0000\n"
-"Last-Translator: Anushke Guneratne <anushke@gmail.com>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,22 +18,10 @@ msgstr ""
"Language: si_LK\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "සියලු අනුවාද අවලංගු කරන්න"
-
#: js/versions.js:16
msgid "History"
msgstr "ඉතිහාසය"
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "අනුවාද"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "මෙයින් ඔබගේ ගොනුවේ රක්ශිත කරනු ලැබු අනුවාද සියල්ල මකා දමනු ලැබේ"
-
#: templates/settings.php:3
msgid "Files Versioning"
msgstr "ගොනු අනුවාදයන්"
diff --git a/l10n/si_LK/lib.po b/l10n/si_LK/lib.po
index f798fa5f24e..9fcdc0a05a4 100644
--- a/l10n/si_LK/lib.po
+++ b/l10n/si_LK/lib.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-14 23:13+0000\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
@@ -19,51 +19,55 @@ msgstr ""
"Language: si_LK\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:285
+#: app.php:301
msgid "Help"
msgstr "උදව්"
-#: app.php:292
+#: app.php:308
msgid "Personal"
msgstr "පෞද්ගලික"
-#: app.php:297
+#: app.php:313
msgid "Settings"
msgstr "සිටුවම්"
-#: app.php:302
+#: app.php:318
msgid "Users"
msgstr "පරිශීලකයන්"
-#: app.php:309
+#: app.php:325
msgid "Apps"
msgstr "යෙදුම්"
-#: app.php:311
+#: app.php:327
msgid "Admin"
msgstr "පරිපාලක"
-#: files.php:332
+#: files.php:365
msgid "ZIP download is turned off."
msgstr "ZIP භාගත කිරීම් අක්‍රියයි"
-#: files.php:333
+#: files.php:366
msgid "Files need to be downloaded one by one."
msgstr "ගොනු එකින් එක භාගත යුතුයි"
-#: files.php:333 files.php:358
+#: files.php:366 files.php:391
msgid "Back to Files"
msgstr "ගොනු වෙතට නැවත යන්න"
-#: files.php:357
+#: files.php:390
msgid "Selected files too large to generate zip file."
msgstr "තෝරාගත් ගොනු ZIP ගොනුවක් තැනීමට විශාල වැඩිය."
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr ""
+
#: json.php:28
msgid "Application is not enabled"
msgstr "යෙදුම සක්‍රිය කර නොමැත"
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
msgstr "සත්‍යාපනය කිරීමේ දෝශයක්"
@@ -83,55 +87,55 @@ msgstr "පෙළ"
msgid "Images"
msgstr "අනු රූ"
-#: template.php:103
+#: template.php:113
msgid "seconds ago"
msgstr "තත්පරයන්ට පෙර"
-#: template.php:104
+#: template.php:114
msgid "1 minute ago"
msgstr "1 මිනිත්තුවකට පෙර"
-#: template.php:105
+#: template.php:115
#, php-format
msgid "%d minutes ago"
msgstr "%d මිනිත්තුවන්ට පෙර"
-#: template.php:106
+#: template.php:116
msgid "1 hour ago"
msgstr ""
-#: template.php:107
+#: template.php:117
#, php-format
msgid "%d hours ago"
msgstr ""
-#: template.php:108
+#: template.php:118
msgid "today"
msgstr "අද"
-#: template.php:109
+#: template.php:119
msgid "yesterday"
msgstr "ඊයේ"
-#: template.php:110
+#: template.php:120
#, php-format
msgid "%d days ago"
msgstr "%d දිනකට පෙර"
-#: template.php:111
+#: template.php:121
msgid "last month"
msgstr "පෙර මාසයේ"
-#: template.php:112
+#: template.php:122
#, php-format
msgid "%d months ago"
msgstr ""
-#: template.php:113
+#: template.php:123
msgid "last year"
msgstr "පෙර අවුරුද්දේ"
-#: template.php:114
+#: template.php:124
msgid "years ago"
msgstr "අවුරුදු කීපයකට පෙර"
diff --git a/l10n/si_LK/user_ldap.po b/l10n/si_LK/user_ldap.po
index f44ac30b3ea..536c0438d76 100644
--- a/l10n/si_LK/user_ldap.po
+++ b/l10n/si_LK/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 23:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
@@ -27,8 +27,8 @@ msgstr ""
#: templates/settings.php:11
msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
msgstr ""
#: templates/settings.php:15
@@ -45,6 +45,10 @@ msgid "Base DN"
msgstr ""
#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
@@ -115,10 +119,18 @@ msgstr "තොට"
msgid "Base User Tree"
msgstr ""
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
diff --git a/l10n/si_LK/user_webdavauth.po b/l10n/si_LK/user_webdavauth.po
index b97c5beb1cc..a6141d359c9 100644
--- a/l10n/si_LK/user_webdavauth.po
+++ b/l10n/si_LK/user_webdavauth.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-20 00:11+0100\n"
-"PO-Revision-Date: 2012-12-19 23:12+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
@@ -18,13 +18,17 @@ msgstr ""
"Language: si_LK\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
#: templates/settings.php:4
msgid "URL: http://"
msgstr ""
#: templates/settings.php:6
msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
msgstr ""
diff --git a/l10n/sk_SK/core.po b/l10n/sk_SK/core.po
index 7e64b445c71..e11a2eda0fe 100644
--- a/l10n/sk_SK/core.po
+++ b/l10n/sk_SK/core.po
@@ -5,15 +5,16 @@
# Translators:
# <intense.feel@gmail.com>, 2011, 2012.
# <martin.babik@gmail.com>, 2012.
+# <mehturt@gmail.com>, 2013.
# Roman Priesol <roman@priesol.net>, 2012.
# <zatroch.martin@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 15:24+0000\n"
+"Last-Translator: mehturt <mehturt@gmail.com>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -24,26 +25,26 @@ msgstr ""
#: ajax/share.php:84
#, php-format
msgid "User %s shared a file with you"
-msgstr ""
+msgstr "Používateľ %s zdieľa s Vami súbor"
#: ajax/share.php:86
#, php-format
msgid "User %s shared a folder with you"
-msgstr ""
+msgstr "Používateľ %s zdieľa s Vami adresár"
#: ajax/share.php:88
#, php-format
msgid ""
"User %s shared the file \"%s\" with you. It is available for download here: "
"%s"
-msgstr ""
+msgstr "Používateľ %s zdieľa s Vami súbor \"%s\". Môžete si ho stiahnuť tu: %s"
#: ajax/share.php:90
#, php-format
msgid ""
"User %s shared the folder \"%s\" with you. It is available for download "
"here: %s"
-msgstr ""
+msgstr "Používateľ %s zdieľa s Vami adresár \"%s\". Môžete si ho stiahnuť tu: %s"
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
@@ -211,17 +212,16 @@ msgid "Password protect"
msgstr "Chrániť heslom"
#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
msgid "Password"
msgstr "Heslo"
#: js/share.js:172
msgid "Email link to person"
-msgstr ""
+msgstr "Odoslať odkaz osobe e-mailom"
#: js/share.js:173
msgid "Send"
-msgstr ""
+msgstr "Odoslať"
#: js/share.js:177
msgid "Set expiration date"
@@ -289,11 +289,11 @@ msgstr "Chyba pri nastavení dátumu vypršania platnosti"
#: js/share.js:581
msgid "Sending ..."
-msgstr ""
+msgstr "Odosielam ..."
#: js/share.js:592
msgid "Email sent"
-msgstr ""
+msgstr "Email odoslaný"
#: lostpassword/controller.php:47
msgid "ownCloud password reset"
@@ -567,18 +567,4 @@ msgstr "ďalej"
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
-msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "Bezpečnostné varovanie!"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "Prosím, overte svoje heslo. <br />Z bezpečnostných dôvodov môžete byť občas požiadaný o jeho opätovné zadanie."
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "Overenie"
+msgstr "Aktualizujem ownCloud na verziu %s, môže to chvíľu trvať."
diff --git a/l10n/sk_SK/files.po b/l10n/sk_SK/files.po
index 1d4d69bb59e..30706c6eff9 100644
--- a/l10n/sk_SK/files.po
+++ b/l10n/sk_SK/files.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"POT-Creation-Date: 2013-01-20 00:05+0100\n"
+"PO-Revision-Date: 2013-01-19 23:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
@@ -21,6 +21,11 @@ msgstr ""
"Language: sk_SK\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+#: ajax/delete.php:28 ajax/getstoragestats.php:11 ajax/upload.php:17
+#: ajax/upload.php:76 templates/index.php:18
+msgid "Upload"
+msgstr "Odoslať"
+
#: ajax/move.php:17
#, php-format
msgid "Could not move %s - File with this name already exists"
@@ -35,46 +40,46 @@ msgstr ""
msgid "Unable to rename file"
msgstr ""
-#: ajax/upload.php:14
+#: ajax/upload.php:20
msgid "No file was uploaded. Unknown error"
msgstr "Žiaden súbor nebol odoslaný. Neznáma chyba"
-#: ajax/upload.php:21
+#: ajax/upload.php:30
msgid "There is no error, the file uploaded with success"
msgstr "Nenastala žiadna chyba, súbor bol úspešne nahraný"
-#: ajax/upload.php:22
+#: ajax/upload.php:31
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr "Nahraný súbor predčil konfiguračnú direktívu upload_max_filesize v súbore php.ini:"
-#: ajax/upload.php:24
+#: ajax/upload.php:33
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "Nahrávaný súbor presiahol MAX_FILE_SIZE direktívu, ktorá bola špecifikovaná v HTML formulári"
-#: ajax/upload.php:26
+#: ajax/upload.php:35
msgid "The uploaded file was only partially uploaded"
msgstr "Nahrávaný súbor bol iba čiastočne nahraný"
-#: ajax/upload.php:27
+#: ajax/upload.php:36
msgid "No file was uploaded"
msgstr "Žiaden súbor nebol nahraný"
-#: ajax/upload.php:28
+#: ajax/upload.php:37
msgid "Missing a temporary folder"
msgstr "Chýbajúci dočasný priečinok"
-#: ajax/upload.php:29
+#: ajax/upload.php:38
msgid "Failed to write to disk"
msgstr "Zápis na disk sa nepodaril"
-#: ajax/upload.php:45
+#: ajax/upload.php:57
msgid "Not enough space available"
msgstr ""
-#: ajax/upload.php:69
+#: ajax/upload.php:91
msgid "Invalid directory."
msgstr ""
@@ -130,98 +135,100 @@ msgstr "zdieľanie zrušené pre {files}"
msgid "deleted {files}"
msgstr "zmazané {files}"
-#: js/files.js:31
+#: js/files.js:48
msgid "'.' is an invalid file name."
msgstr ""
-#: js/files.js:36
+#: js/files.js:53
msgid "File name cannot be empty."
msgstr ""
-#: js/files.js:45
+#: js/files.js:62
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Nesprávne meno, '\\', '/', '<', '>', ':', '\"', '|', '?' a '*' nie sú povolené hodnoty."
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "generujem ZIP-súbor, môže to chvíľu trvať."
+#: js/files.js:204
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
-#: js/files.js:224
+#: js/files.js:242
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Nemôžem nahrať súbor lebo je to priečinok alebo má 0 bajtov."
-#: js/files.js:224
+#: js/files.js:242
msgid "Upload Error"
msgstr "Chyba odosielania"
-#: js/files.js:241
+#: js/files.js:259
msgid "Close"
msgstr "Zavrieť"
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:278 js/files.js:397 js/files.js:431
msgid "Pending"
msgstr "Čaká sa"
-#: js/files.js:280
+#: js/files.js:298
msgid "1 file uploading"
msgstr "1 súbor sa posiela "
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:301 js/files.js:357 js/files.js:372
msgid "{count} files uploading"
msgstr "{count} súborov odosielaných"
-#: js/files.js:357 js/files.js:393
+#: js/files.js:376 js/files.js:414
msgid "Upload cancelled."
msgstr "Odosielanie zrušené"
-#: js/files.js:464
+#: js/files.js:486
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Opustenie stránky zruší práve prebiehajúce odosielanie súboru."
-#: js/files.js:537
+#: js/files.js:559
msgid "URL cannot be empty."
msgstr "URL nemôže byť prázdne"
-#: js/files.js:543
+#: js/files.js:565
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:727
+#: js/files.js:775
msgid "{count} files scanned"
msgstr "{count} súborov prehľadaných"
-#: js/files.js:735
+#: js/files.js:783
msgid "error while scanning"
msgstr "chyba počas kontroly"
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:857 templates/index.php:64
msgid "Name"
msgstr "Meno"
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:858 templates/index.php:75
msgid "Size"
msgstr "Veľkosť"
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:859 templates/index.php:77
msgid "Modified"
msgstr "Upravené"
-#: js/files.js:829
+#: js/files.js:878
msgid "1 folder"
msgstr "1 priečinok"
-#: js/files.js:831
+#: js/files.js:880
msgid "{count} folders"
msgstr "{count} priečinkov"
-#: js/files.js:839
+#: js/files.js:888
msgid "1 file"
msgstr "1 súbor"
-#: js/files.js:841
+#: js/files.js:890
msgid "{count} files"
msgstr "{count} súborov"
@@ -273,10 +280,6 @@ msgstr "Priečinok"
msgid "From link"
msgstr "Z odkazu"
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Odoslať"
-
#: templates/index.php:41
msgid "Cancel upload"
msgstr "Zrušiť odosielanie"
diff --git a/l10n/sk_SK/files_encryption.po b/l10n/sk_SK/files_encryption.po
index a698624cb5d..813c05deb37 100644
--- a/l10n/sk_SK/files_encryption.po
+++ b/l10n/sk_SK/files_encryption.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-05 17:32+0000\n"
-"Last-Translator: intense <intense.feel@gmail.com>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,18 +18,66 @@ msgstr ""
"Language: sk_SK\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
msgid "Encryption"
msgstr "Šifrovanie"
-#: templates/settings.php:4
+#: templates/settings.php:67
msgid "Exclude the following file types from encryption"
msgstr "Vynechať nasledujúce súbory pri šifrovaní"
-#: templates/settings.php:5
+#: templates/settings.php:71
msgid "None"
msgstr "Žiadne"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "Zapnúť šifrovanie"
diff --git a/l10n/sk_SK/files_versions.po b/l10n/sk_SK/files_versions.po
index 89f540dae66..32d3549ff90 100644
--- a/l10n/sk_SK/files_versions.po
+++ b/l10n/sk_SK/files_versions.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-24 02:01+0200\n"
-"PO-Revision-Date: 2012-09-23 18:45+0000\n"
-"Last-Translator: martinb <martin.babik@gmail.com>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,22 +18,10 @@ msgstr ""
"Language: sk_SK\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "Expirovať všetky verzie"
-
#: js/versions.js:16
msgid "History"
msgstr "História"
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "Verzie"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "Budú zmazané všetky zálohované verzie vašich súborov"
-
#: templates/settings.php:3
msgid "Files Versioning"
msgstr "Vytváranie verzií súborov"
diff --git a/l10n/sk_SK/lib.po b/l10n/sk_SK/lib.po
index ba1e859d9c9..07b4a925917 100644
--- a/l10n/sk_SK/lib.po
+++ b/l10n/sk_SK/lib.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-02 00:02+0100\n"
-"PO-Revision-Date: 2012-12-01 16:27+0000\n"
-"Last-Translator: martin <zatroch.martin@gmail.com>\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,51 +20,55 @@ msgstr ""
"Language: sk_SK\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: app.php:285
+#: app.php:301
msgid "Help"
msgstr "Pomoc"
-#: app.php:292
+#: app.php:308
msgid "Personal"
msgstr "Osobné"
-#: app.php:297
+#: app.php:313
msgid "Settings"
msgstr "Nastavenia"
-#: app.php:302
+#: app.php:318
msgid "Users"
msgstr "Užívatelia"
-#: app.php:309
+#: app.php:325
msgid "Apps"
msgstr "Aplikácie"
-#: app.php:311
+#: app.php:327
msgid "Admin"
msgstr "Správca"
-#: files.php:361
+#: files.php:365
msgid "ZIP download is turned off."
msgstr "Sťahovanie súborov ZIP je vypnuté."
-#: files.php:362
+#: files.php:366
msgid "Files need to be downloaded one by one."
msgstr "Súbory musia byť nahrávané jeden za druhým."
-#: files.php:362 files.php:387
+#: files.php:366 files.php:391
msgid "Back to Files"
msgstr "Späť na súbory"
-#: files.php:386
+#: files.php:390
msgid "Selected files too large to generate zip file."
msgstr "Zvolené súbory sú príliž veľké na vygenerovanie zip súboru."
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr ""
+
#: json.php:28
msgid "Application is not enabled"
msgstr "Aplikácia nie je zapnutá"
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
msgstr "Chyba autentifikácie"
@@ -84,55 +88,55 @@ msgstr "Text"
msgid "Images"
msgstr "Obrázky"
-#: template.php:103
+#: template.php:113
msgid "seconds ago"
msgstr "pred sekundami"
-#: template.php:104
+#: template.php:114
msgid "1 minute ago"
msgstr "pred 1 minútou"
-#: template.php:105
+#: template.php:115
#, php-format
msgid "%d minutes ago"
msgstr "pred %d minútami"
-#: template.php:106
+#: template.php:116
msgid "1 hour ago"
msgstr "Pred 1 hodinou"
-#: template.php:107
+#: template.php:117
#, php-format
msgid "%d hours ago"
msgstr "Pred %d hodinami."
-#: template.php:108
+#: template.php:118
msgid "today"
msgstr "dnes"
-#: template.php:109
+#: template.php:119
msgid "yesterday"
msgstr "včera"
-#: template.php:110
+#: template.php:120
#, php-format
msgid "%d days ago"
msgstr "pred %d dňami"
-#: template.php:111
+#: template.php:121
msgid "last month"
msgstr "minulý mesiac"
-#: template.php:112
+#: template.php:122
#, php-format
msgid "%d months ago"
msgstr "Pred %d mesiacmi."
-#: template.php:113
+#: template.php:123
msgid "last year"
msgstr "minulý rok"
-#: template.php:114
+#: template.php:124
msgid "years ago"
msgstr "pred rokmi"
diff --git a/l10n/sk_SK/user_ldap.po b/l10n/sk_SK/user_ldap.po
index fde4a583528..497fea635a1 100644
--- a/l10n/sk_SK/user_ldap.po
+++ b/l10n/sk_SK/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 23:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
@@ -27,8 +27,8 @@ msgstr ""
#: templates/settings.php:11
msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
msgstr ""
#: templates/settings.php:15
@@ -45,6 +45,10 @@ msgid "Base DN"
msgstr "Základné DN"
#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "V rozšírenom nastavení môžete zadať základné DN pre používateľov a skupiny"
@@ -115,10 +119,18 @@ msgstr "Port"
msgid "Base User Tree"
msgstr "Základný používateľský strom"
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "Základný skupinový strom"
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Asociácia člena skupiny"
diff --git a/l10n/sk_SK/user_webdavauth.po b/l10n/sk_SK/user_webdavauth.po
index fe313b19276..26b96954a94 100644
--- a/l10n/sk_SK/user_webdavauth.po
+++ b/l10n/sk_SK/user_webdavauth.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-20 00:11+0100\n"
-"PO-Revision-Date: 2012-12-19 23:12+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
@@ -18,13 +18,17 @@ msgstr ""
"Language: sk_SK\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
#: templates/settings.php:4
msgid "URL: http://"
msgstr ""
#: templates/settings.php:6
msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
msgstr ""
diff --git a/l10n/sl/core.po b/l10n/sl/core.po
index 60b6da31073..2b4637d8013 100644
--- a/l10n/sl/core.po
+++ b/l10n/sl/core.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
@@ -211,7 +211,6 @@ msgid "Password protect"
msgstr "Zaščiti z geslom"
#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
msgid "Password"
msgstr "Geslo"
@@ -568,17 +567,3 @@ msgstr "naprej"
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "Varnostno opozorilo!"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "Prosimo, če preverite vaše geslo. Iz varnostnih razlogov vas lahko občasno prosimo, da ga ponovno vnesete."
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "Preveri"
diff --git a/l10n/sl/files.po b/l10n/sl/files.po
index 5ed732142e8..db5b65339a7 100644
--- a/l10n/sl/files.po
+++ b/l10n/sl/files.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"POT-Creation-Date: 2013-01-20 00:05+0100\n"
+"PO-Revision-Date: 2013-01-19 23:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
@@ -21,6 +21,11 @@ msgstr ""
"Language: sl\n"
"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
+#: ajax/delete.php:28 ajax/getstoragestats.php:11 ajax/upload.php:17
+#: ajax/upload.php:76 templates/index.php:18
+msgid "Upload"
+msgstr "Pošlji"
+
#: ajax/move.php:17
#, php-format
msgid "Could not move %s - File with this name already exists"
@@ -35,46 +40,46 @@ msgstr ""
msgid "Unable to rename file"
msgstr ""
-#: ajax/upload.php:14
+#: ajax/upload.php:20
msgid "No file was uploaded. Unknown error"
msgstr "Nobena datoteka ni naložena. Neznana napaka."
-#: ajax/upload.php:21
+#: ajax/upload.php:30
msgid "There is no error, the file uploaded with success"
msgstr "Datoteka je uspešno naložena brez napak."
-#: ajax/upload.php:22
+#: ajax/upload.php:31
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr "Naložena datoteka presega dovoljeno velikost. Le-ta je določena z vrstico upload_max_filesize v datoteki php.ini:"
-#: ajax/upload.php:24
+#: ajax/upload.php:33
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "Naložena datoteka presega velikost, ki jo določa parameter MAX_FILE_SIZE v HTML obrazcu"
-#: ajax/upload.php:26
+#: ajax/upload.php:35
msgid "The uploaded file was only partially uploaded"
msgstr "Datoteka je le delno naložena"
-#: ajax/upload.php:27
+#: ajax/upload.php:36
msgid "No file was uploaded"
msgstr "Nobena datoteka ni bila naložena"
-#: ajax/upload.php:28
+#: ajax/upload.php:37
msgid "Missing a temporary folder"
msgstr "Manjka začasna mapa"
-#: ajax/upload.php:29
+#: ajax/upload.php:38
msgid "Failed to write to disk"
msgstr "Pisanje na disk je spodletelo"
-#: ajax/upload.php:45
+#: ajax/upload.php:57
msgid "Not enough space available"
msgstr ""
-#: ajax/upload.php:69
+#: ajax/upload.php:91
msgid "Invalid directory."
msgstr ""
@@ -130,98 +135,100 @@ msgstr "odstranjeno iz souporabe {files}"
msgid "deleted {files}"
msgstr "izbrisano {files}"
-#: js/files.js:31
+#: js/files.js:48
msgid "'.' is an invalid file name."
msgstr ""
-#: js/files.js:36
+#: js/files.js:53
msgid "File name cannot be empty."
msgstr ""
-#: js/files.js:45
+#: js/files.js:62
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Neveljavno ime, znaki '\\', '/', '<', '>', ':', '\"', '|', '?' in '*' niso dovoljeni."
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "Ustvarjanje datoteke ZIP. To lahko traja nekaj časa."
+#: js/files.js:204
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
-#: js/files.js:224
+#: js/files.js:242
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Pošiljanje ni mogoče, saj gre za mapo, ali pa je datoteka velikosti 0 bajtov."
-#: js/files.js:224
+#: js/files.js:242
msgid "Upload Error"
msgstr "Napaka med nalaganjem"
-#: js/files.js:241
+#: js/files.js:259
msgid "Close"
msgstr "Zapri"
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:278 js/files.js:397 js/files.js:431
msgid "Pending"
msgstr "V čakanju ..."
-#: js/files.js:280
+#: js/files.js:298
msgid "1 file uploading"
msgstr "Pošiljanje 1 datoteke"
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:301 js/files.js:357 js/files.js:372
msgid "{count} files uploading"
msgstr "nalagam {count} datotek"
-#: js/files.js:357 js/files.js:393
+#: js/files.js:376 js/files.js:414
msgid "Upload cancelled."
msgstr "Pošiljanje je preklicano."
-#: js/files.js:464
+#: js/files.js:486
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "V teku je pošiljanje datoteke. Če zapustite to stran zdaj, bo pošiljanje preklicano."
-#: js/files.js:537
+#: js/files.js:559
msgid "URL cannot be empty."
msgstr "Naslov URL ne sme biti prazen."
-#: js/files.js:543
+#: js/files.js:565
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:727
+#: js/files.js:775
msgid "{count} files scanned"
msgstr "{count} files scanned"
-#: js/files.js:735
+#: js/files.js:783
msgid "error while scanning"
msgstr "napaka med pregledovanjem datotek"
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:857 templates/index.php:64
msgid "Name"
msgstr "Ime"
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:858 templates/index.php:75
msgid "Size"
msgstr "Velikost"
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:859 templates/index.php:77
msgid "Modified"
msgstr "Spremenjeno"
-#: js/files.js:829
+#: js/files.js:878
msgid "1 folder"
msgstr "1 mapa"
-#: js/files.js:831
+#: js/files.js:880
msgid "{count} folders"
msgstr "{count} map"
-#: js/files.js:839
+#: js/files.js:888
msgid "1 file"
msgstr "1 datoteka"
-#: js/files.js:841
+#: js/files.js:890
msgid "{count} files"
msgstr "{count} datotek"
@@ -273,10 +280,6 @@ msgstr "Mapa"
msgid "From link"
msgstr "Iz povezave"
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Pošlji"
-
#: templates/index.php:41
msgid "Cancel upload"
msgstr "Prekliči pošiljanje"
diff --git a/l10n/sl/files_encryption.po b/l10n/sl/files_encryption.po
index ee5f5c6ec05..934903b3bc5 100644
--- a/l10n/sl/files_encryption.po
+++ b/l10n/sl/files_encryption.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-23 02:02+0200\n"
-"PO-Revision-Date: 2012-10-22 16:57+0000\n"
-"Last-Translator: mateju <>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,18 +19,66 @@ msgstr ""
"Language: sl\n"
"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
msgid "Encryption"
msgstr "Šifriranje"
-#: templates/settings.php:4
+#: templates/settings.php:67
msgid "Exclude the following file types from encryption"
msgstr "Navedene vrste datotek naj ne bodo šifrirane"
-#: templates/settings.php:5
+#: templates/settings.php:71
msgid "None"
msgstr "Brez"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "Omogoči šifriranje"
diff --git a/l10n/sl/files_versions.po b/l10n/sl/files_versions.po
index 2bde547fb1f..1a4d2854d91 100644
--- a/l10n/sl/files_versions.po
+++ b/l10n/sl/files_versions.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-23 02:02+0200\n"
-"PO-Revision-Date: 2012-10-22 17:00+0000\n"
-"Last-Translator: mateju <>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,22 +19,10 @@ msgstr ""
"Language: sl\n"
"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "Zastaraj vse različice"
-
#: js/versions.js:16
msgid "History"
msgstr "Zgodovina"
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "Različice"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "S tem bodo izbrisane vse obstoječe različice varnostnih kopij vaših datotek"
-
#: templates/settings.php:3
msgid "Files Versioning"
msgstr "Sledenje različicam"
diff --git a/l10n/sl/lib.po b/l10n/sl/lib.po
index 606aa03de9d..4af090e968d 100644
--- a/l10n/sl/lib.po
+++ b/l10n/sl/lib.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-20 00:01+0100\n"
-"PO-Revision-Date: 2012-11-19 19:49+0000\n"
-"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,51 +19,55 @@ msgstr ""
"Language: sl\n"
"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
-#: app.php:285
+#: app.php:301
msgid "Help"
msgstr "Pomoč"
-#: app.php:292
+#: app.php:308
msgid "Personal"
msgstr "Osebno"
-#: app.php:297
+#: app.php:313
msgid "Settings"
msgstr "Nastavitve"
-#: app.php:302
+#: app.php:318
msgid "Users"
msgstr "Uporabniki"
-#: app.php:309
+#: app.php:325
msgid "Apps"
msgstr "Programi"
-#: app.php:311
+#: app.php:327
msgid "Admin"
msgstr "Skrbništvo"
-#: files.php:361
+#: files.php:365
msgid "ZIP download is turned off."
msgstr "Prejem datotek ZIP je onemogočen."
-#: files.php:362
+#: files.php:366
msgid "Files need to be downloaded one by one."
msgstr "Datoteke je mogoče prejeti le posamič."
-#: files.php:362 files.php:387
+#: files.php:366 files.php:391
msgid "Back to Files"
msgstr "Nazaj na datoteke"
-#: files.php:386
+#: files.php:390
msgid "Selected files too large to generate zip file."
msgstr "Izbrane datoteke so prevelike za ustvarjanje datoteke arhiva zip."
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr ""
+
#: json.php:28
msgid "Application is not enabled"
msgstr "Program ni omogočen"
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
msgstr "Napaka overitve"
@@ -83,55 +87,55 @@ msgstr "Besedilo"
msgid "Images"
msgstr "Slike"
-#: template.php:103
+#: template.php:113
msgid "seconds ago"
msgstr "pred nekaj sekundami"
-#: template.php:104
+#: template.php:114
msgid "1 minute ago"
msgstr "pred minuto"
-#: template.php:105
+#: template.php:115
#, php-format
msgid "%d minutes ago"
msgstr "pred %d minutami"
-#: template.php:106
+#: template.php:116
msgid "1 hour ago"
msgstr "Pred 1 uro"
-#: template.php:107
+#: template.php:117
#, php-format
msgid "%d hours ago"
msgstr "Pred %d urami"
-#: template.php:108
+#: template.php:118
msgid "today"
msgstr "danes"
-#: template.php:109
+#: template.php:119
msgid "yesterday"
msgstr "včeraj"
-#: template.php:110
+#: template.php:120
#, php-format
msgid "%d days ago"
msgstr "pred %d dnevi"
-#: template.php:111
+#: template.php:121
msgid "last month"
msgstr "prejšnji mesec"
-#: template.php:112
+#: template.php:122
#, php-format
msgid "%d months ago"
msgstr "Pred %d meseci"
-#: template.php:113
+#: template.php:123
msgid "last year"
msgstr "lani"
-#: template.php:114
+#: template.php:124
msgid "years ago"
msgstr "pred nekaj leti"
diff --git a/l10n/sl/user_ldap.po b/l10n/sl/user_ldap.po
index d34b56f8c01..9671d69486e 100644
--- a/l10n/sl/user_ldap.po
+++ b/l10n/sl/user_ldap.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-16 00:11+0100\n"
-"PO-Revision-Date: 2012-12-15 16:46+0000\n"
-"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 23:20+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -28,9 +28,9 @@ msgstr "<b>Opozorilo:</b> Aplikaciji user_ldap in user_webdavauth nista združlj
#: templates/settings.php:11
msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
-msgstr "<b>Opozorilo:</b> PHP LDAP modul mora biti nameščen, sicer ta vmesnik ne bo deloval. Prosimo, prosite vašega skrbnika, če ga namesti."
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
+msgstr ""
#: templates/settings.php:15
msgid "Host"
@@ -46,6 +46,10 @@ msgid "Base DN"
msgstr "Osnovni DN"
#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Osnovni DN za uporabnike in skupine lahko določite v zavihku Napredno"
@@ -116,10 +120,18 @@ msgstr "Vrata"
msgid "Base User Tree"
msgstr "Osnovno uporabniško drevo"
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "Osnovno drevo skupine"
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Povezava člana skupine"
diff --git a/l10n/sl/user_webdavauth.po b/l10n/sl/user_webdavauth.po
index c6891589fd4..05172dc5b95 100644
--- a/l10n/sl/user_webdavauth.po
+++ b/l10n/sl/user_webdavauth.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-02 00:04+0100\n"
-"PO-Revision-Date: 2013-01-01 14:17+0000\n"
-"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,13 +18,17 @@ msgstr ""
"Language: sl\n"
"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
#: templates/settings.php:4
msgid "URL: http://"
msgstr "URL: http://"
#: templates/settings.php:6
msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
-msgstr "ownCloud bo poslal uporabniška poverila temu URL naslovu. Pri tem bo interpretiral http 401 in http 403 odgovor kot spodletelo avtentikacijo ter vse ostale http odgovore kot uspešne."
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
+msgstr ""
diff --git a/l10n/sq/core.po b/l10n/sq/core.po
index 0646f7fd17c..4c77ff63f84 100644
--- a/l10n/sq/core.po
+++ b/l10n/sq/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
@@ -207,7 +207,6 @@ msgid "Password protect"
msgstr ""
#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
msgid "Password"
msgstr ""
@@ -564,17 +563,3 @@ msgstr ""
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr ""
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr ""
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr ""
diff --git a/l10n/sq/files.po b/l10n/sq/files.po
index 57c754a69e0..ea89733fef6 100644
--- a/l10n/sq/files.po
+++ b/l10n/sq/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"POT-Creation-Date: 2013-01-20 00:05+0100\n"
+"PO-Revision-Date: 2013-01-19 23:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,11 @@ msgstr ""
"Language: sq\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/delete.php:28 ajax/getstoragestats.php:11 ajax/upload.php:17
+#: ajax/upload.php:76 templates/index.php:18
+msgid "Upload"
+msgstr ""
+
#: ajax/move.php:17
#, php-format
msgid "Could not move %s - File with this name already exists"
@@ -31,46 +36,46 @@ msgstr ""
msgid "Unable to rename file"
msgstr ""
-#: ajax/upload.php:14
+#: ajax/upload.php:20
msgid "No file was uploaded. Unknown error"
msgstr ""
-#: ajax/upload.php:21
+#: ajax/upload.php:30
msgid "There is no error, the file uploaded with success"
msgstr ""
-#: ajax/upload.php:22
+#: ajax/upload.php:31
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr ""
-#: ajax/upload.php:24
+#: ajax/upload.php:33
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr ""
-#: ajax/upload.php:26
+#: ajax/upload.php:35
msgid "The uploaded file was only partially uploaded"
msgstr ""
-#: ajax/upload.php:27
+#: ajax/upload.php:36
msgid "No file was uploaded"
msgstr ""
-#: ajax/upload.php:28
+#: ajax/upload.php:37
msgid "Missing a temporary folder"
msgstr ""
-#: ajax/upload.php:29
+#: ajax/upload.php:38
msgid "Failed to write to disk"
msgstr ""
-#: ajax/upload.php:45
+#: ajax/upload.php:57
msgid "Not enough space available"
msgstr ""
-#: ajax/upload.php:69
+#: ajax/upload.php:91
msgid "Invalid directory."
msgstr ""
@@ -126,98 +131,100 @@ msgstr ""
msgid "deleted {files}"
msgstr ""
-#: js/files.js:31
+#: js/files.js:48
msgid "'.' is an invalid file name."
msgstr ""
-#: js/files.js:36
+#: js/files.js:53
msgid "File name cannot be empty."
msgstr ""
-#: js/files.js:45
+#: js/files.js:62
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
+#: js/files.js:204
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
msgstr ""
-#: js/files.js:224
+#: js/files.js:242
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr ""
-#: js/files.js:224
+#: js/files.js:242
msgid "Upload Error"
msgstr ""
-#: js/files.js:241
+#: js/files.js:259
msgid "Close"
msgstr ""
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:278 js/files.js:397 js/files.js:431
msgid "Pending"
msgstr ""
-#: js/files.js:280
+#: js/files.js:298
msgid "1 file uploading"
msgstr ""
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:301 js/files.js:357 js/files.js:372
msgid "{count} files uploading"
msgstr ""
-#: js/files.js:357 js/files.js:393
+#: js/files.js:376 js/files.js:414
msgid "Upload cancelled."
msgstr ""
-#: js/files.js:464
+#: js/files.js:486
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/files.js:537
+#: js/files.js:559
msgid "URL cannot be empty."
msgstr ""
-#: js/files.js:543
+#: js/files.js:565
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:727
+#: js/files.js:775
msgid "{count} files scanned"
msgstr ""
-#: js/files.js:735
+#: js/files.js:783
msgid "error while scanning"
msgstr ""
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:857 templates/index.php:64
msgid "Name"
msgstr ""
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:858 templates/index.php:75
msgid "Size"
msgstr ""
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:859 templates/index.php:77
msgid "Modified"
msgstr ""
-#: js/files.js:829
+#: js/files.js:878
msgid "1 folder"
msgstr ""
-#: js/files.js:831
+#: js/files.js:880
msgid "{count} folders"
msgstr ""
-#: js/files.js:839
+#: js/files.js:888
msgid "1 file"
msgstr ""
-#: js/files.js:841
+#: js/files.js:890
msgid "{count} files"
msgstr ""
@@ -269,10 +276,6 @@ msgstr ""
msgid "From link"
msgstr ""
-#: templates/index.php:18
-msgid "Upload"
-msgstr ""
-
#: templates/index.php:41
msgid "Cancel upload"
msgstr ""
diff --git a/l10n/sq/files_versions.po b/l10n/sq/files_versions.po
index 97616a40636..5128bf7cf1b 100644
--- a/l10n/sq/files_versions.po
+++ b/l10n/sq/files_versions.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-27 00:10+0100\n"
-"PO-Revision-Date: 2012-08-12 22:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,22 +17,10 @@ msgstr ""
"Language: sq\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr ""
-
#: js/versions.js:16
msgid "History"
msgstr ""
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr ""
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr ""
-
#: templates/settings.php:3
msgid "Files Versioning"
msgstr ""
diff --git a/l10n/sq/lib.po b/l10n/sq/lib.po
index 431a0e3c621..ce2ab5c3311 100644
--- a/l10n/sq/lib.po
+++ b/l10n/sq/lib.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-27 00:10+0100\n"
-"PO-Revision-Date: 2012-07-27 22:23+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,51 +17,55 @@ msgstr ""
"Language: sq\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:285
+#: app.php:301
msgid "Help"
msgstr ""
-#: app.php:292
+#: app.php:308
msgid "Personal"
msgstr ""
-#: app.php:297
+#: app.php:313
msgid "Settings"
msgstr ""
-#: app.php:302
+#: app.php:318
msgid "Users"
msgstr ""
-#: app.php:309
+#: app.php:325
msgid "Apps"
msgstr ""
-#: app.php:311
+#: app.php:327
msgid "Admin"
msgstr ""
-#: files.php:361
+#: files.php:365
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:362
+#: files.php:366
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:362 files.php:387
+#: files.php:366 files.php:391
msgid "Back to Files"
msgstr ""
-#: files.php:386
+#: files.php:390
msgid "Selected files too large to generate zip file."
msgstr ""
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr ""
+
#: json.php:28
msgid "Application is not enabled"
msgstr ""
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
msgstr ""
@@ -81,55 +85,55 @@ msgstr ""
msgid "Images"
msgstr ""
-#: template.php:103
+#: template.php:113
msgid "seconds ago"
msgstr ""
-#: template.php:104
+#: template.php:114
msgid "1 minute ago"
msgstr ""
-#: template.php:105
+#: template.php:115
#, php-format
msgid "%d minutes ago"
msgstr ""
-#: template.php:106
+#: template.php:116
msgid "1 hour ago"
msgstr ""
-#: template.php:107
+#: template.php:117
#, php-format
msgid "%d hours ago"
msgstr ""
-#: template.php:108
+#: template.php:118
msgid "today"
msgstr ""
-#: template.php:109
+#: template.php:119
msgid "yesterday"
msgstr ""
-#: template.php:110
+#: template.php:120
#, php-format
msgid "%d days ago"
msgstr ""
-#: template.php:111
+#: template.php:121
msgid "last month"
msgstr ""
-#: template.php:112
+#: template.php:122
#, php-format
msgid "%d months ago"
msgstr ""
-#: template.php:113
+#: template.php:123
msgid "last year"
msgstr ""
-#: template.php:114
+#: template.php:124
msgid "years ago"
msgstr ""
diff --git a/l10n/sq/user_ldap.po b/l10n/sq/user_ldap.po
index 3c0afbd378a..4c54b0c5724 100644
--- a/l10n/sq/user_ldap.po
+++ b/l10n/sq/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 23:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
@@ -26,8 +26,8 @@ msgstr ""
#: templates/settings.php:11
msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
msgstr ""
#: templates/settings.php:15
@@ -44,6 +44,10 @@ msgid "Base DN"
msgstr ""
#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
@@ -114,10 +118,18 @@ msgstr ""
msgid "Base User Tree"
msgstr ""
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
diff --git a/l10n/sq/user_webdavauth.po b/l10n/sq/user_webdavauth.po
index 132bf6829ad..1a2d007461b 100644
--- a/l10n/sq/user_webdavauth.po
+++ b/l10n/sq/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-20 00:11+0100\n"
-"PO-Revision-Date: 2012-12-19 23:12+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
@@ -17,13 +17,17 @@ msgstr ""
"Language: sq\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
#: templates/settings.php:4
msgid "URL: http://"
msgstr ""
#: templates/settings.php:6
msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
msgstr ""
diff --git a/l10n/sr/core.po b/l10n/sr/core.po
index f715cccd51c..b40e7317a48 100644
--- a/l10n/sr/core.po
+++ b/l10n/sr/core.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
@@ -210,7 +210,6 @@ msgid "Password protect"
msgstr "Заштићено лозинком"
#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
msgid "Password"
msgstr "Лозинка"
@@ -567,17 +566,3 @@ msgstr "следеће"
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "Сигурносно упозорење!"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "Потврдите лозинку. <br />Из сигурносних разлога затрежићемо вам да два пута унесете лозинку."
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "Потврди"
diff --git a/l10n/sr/files.po b/l10n/sr/files.po
index 74593611902..66e365482d7 100644
--- a/l10n/sr/files.po
+++ b/l10n/sr/files.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"POT-Creation-Date: 2013-01-20 00:05+0100\n"
+"PO-Revision-Date: 2013-01-19 23:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
@@ -20,6 +20,11 @@ msgstr ""
"Language: sr\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+#: ajax/delete.php:28 ajax/getstoragestats.php:11 ajax/upload.php:17
+#: ajax/upload.php:76 templates/index.php:18
+msgid "Upload"
+msgstr "Отпреми"
+
#: ajax/move.php:17
#, php-format
msgid "Could not move %s - File with this name already exists"
@@ -34,46 +39,46 @@ msgstr ""
msgid "Unable to rename file"
msgstr ""
-#: ajax/upload.php:14
+#: ajax/upload.php:20
msgid "No file was uploaded. Unknown error"
msgstr ""
-#: ajax/upload.php:21
+#: ajax/upload.php:30
msgid "There is no error, the file uploaded with success"
msgstr "Није дошло до грешке. Датотека је успешно отпремљена."
-#: ajax/upload.php:22
+#: ajax/upload.php:31
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr "Отпремљена датотека прелази смерницу upload_max_filesize у датотеци php.ini:"
-#: ajax/upload.php:24
+#: ajax/upload.php:33
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "Отпремљена датотека прелази смерницу MAX_FILE_SIZE која је наведена у HTML обрасцу"
-#: ajax/upload.php:26
+#: ajax/upload.php:35
msgid "The uploaded file was only partially uploaded"
msgstr "Датотека је делимично отпремљена"
-#: ajax/upload.php:27
+#: ajax/upload.php:36
msgid "No file was uploaded"
msgstr "Датотека није отпремљена"
-#: ajax/upload.php:28
+#: ajax/upload.php:37
msgid "Missing a temporary folder"
msgstr "Недостаје привремена фасцикла"
-#: ajax/upload.php:29
+#: ajax/upload.php:38
msgid "Failed to write to disk"
msgstr "Не могу да пишем на диск"
-#: ajax/upload.php:45
+#: ajax/upload.php:57
msgid "Not enough space available"
msgstr ""
-#: ajax/upload.php:69
+#: ajax/upload.php:91
msgid "Invalid directory."
msgstr ""
@@ -129,98 +134,100 @@ msgstr "укинуто дељење {files}"
msgid "deleted {files}"
msgstr "обрисано {files}"
-#: js/files.js:31
+#: js/files.js:48
msgid "'.' is an invalid file name."
msgstr ""
-#: js/files.js:36
+#: js/files.js:53
msgid "File name cannot be empty."
msgstr ""
-#: js/files.js:45
+#: js/files.js:62
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Неисправан назив. Следећи знакови нису дозвољени: \\, /, <, >, :, \", |, ? и *."
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "правим ZIP датотеку…"
+#: js/files.js:204
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
-#: js/files.js:224
+#: js/files.js:242
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Не могу да отпремим датотеку као фасциклу или она има 0 бајтова"
-#: js/files.js:224
+#: js/files.js:242
msgid "Upload Error"
msgstr "Грешка при отпремању"
-#: js/files.js:241
+#: js/files.js:259
msgid "Close"
msgstr "Затвори"
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:278 js/files.js:397 js/files.js:431
msgid "Pending"
msgstr "На чекању"
-#: js/files.js:280
+#: js/files.js:298
msgid "1 file uploading"
msgstr "Отпремам 1 датотеку"
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:301 js/files.js:357 js/files.js:372
msgid "{count} files uploading"
msgstr "Отпремам {count} датотеке/а"
-#: js/files.js:357 js/files.js:393
+#: js/files.js:376 js/files.js:414
msgid "Upload cancelled."
msgstr "Отпремање је прекинуто."
-#: js/files.js:464
+#: js/files.js:486
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Отпремање датотеке је у току. Ако сада напустите страницу, прекинућете отпремање."
-#: js/files.js:537
+#: js/files.js:559
msgid "URL cannot be empty."
msgstr ""
-#: js/files.js:543
+#: js/files.js:565
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:727
+#: js/files.js:775
msgid "{count} files scanned"
msgstr "Скенирано датотека: {count}"
-#: js/files.js:735
+#: js/files.js:783
msgid "error while scanning"
msgstr "грешка при скенирању"
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:857 templates/index.php:64
msgid "Name"
msgstr "Назив"
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:858 templates/index.php:75
msgid "Size"
msgstr "Величина"
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:859 templates/index.php:77
msgid "Modified"
msgstr "Измењено"
-#: js/files.js:829
+#: js/files.js:878
msgid "1 folder"
msgstr "1 фасцикла"
-#: js/files.js:831
+#: js/files.js:880
msgid "{count} folders"
msgstr "{count} фасцикле/и"
-#: js/files.js:839
+#: js/files.js:888
msgid "1 file"
msgstr "1 датотека"
-#: js/files.js:841
+#: js/files.js:890
msgid "{count} files"
msgstr "{count} датотеке/а"
@@ -272,10 +279,6 @@ msgstr "фасцикла"
msgid "From link"
msgstr "Са везе"
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Отпреми"
-
#: templates/index.php:41
msgid "Cancel upload"
msgstr "Прекини отпремање"
diff --git a/l10n/sr/files_encryption.po b/l10n/sr/files_encryption.po
index a0a21dd2c84..7765fc06e6c 100644
--- a/l10n/sr/files_encryption.po
+++ b/l10n/sr/files_encryption.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-05 00:04+0100\n"
-"PO-Revision-Date: 2012-12-04 15:06+0000\n"
-"Last-Translator: Kostic <marko@evizo.com>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,18 +19,66 @@ msgstr ""
"Language: sr\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
msgid "Encryption"
msgstr "Шифровање"
-#: templates/settings.php:4
+#: templates/settings.php:67
msgid "Exclude the following file types from encryption"
msgstr "Не шифруј следеће типове датотека"
-#: templates/settings.php:5
+#: templates/settings.php:71
msgid "None"
msgstr "Ништа"
-
-#: templates/settings.php:12
-msgid "Enable Encryption"
-msgstr "Омогући шифровање"
diff --git a/l10n/sr/files_versions.po b/l10n/sr/files_versions.po
index 592163313fc..7c031b84aa7 100644
--- a/l10n/sr/files_versions.po
+++ b/l10n/sr/files_versions.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-22 01:14+0200\n"
-"PO-Revision-Date: 2012-09-21 23:15+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,22 +17,10 @@ msgstr ""
"Language: sr\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr ""
-
#: js/versions.js:16
msgid "History"
msgstr ""
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr ""
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr ""
-
#: templates/settings.php:3
msgid "Files Versioning"
msgstr ""
diff --git a/l10n/sr/lib.po b/l10n/sr/lib.po
index 0ffcb3e09d3..d6456f9db16 100644
--- a/l10n/sr/lib.po
+++ b/l10n/sr/lib.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-02 00:02+0100\n"
-"PO-Revision-Date: 2012-12-01 19:18+0000\n"
-"Last-Translator: Rancher <theranchcowboy@gmail.com>\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,51 +19,55 @@ msgstr ""
"Language: sr\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: app.php:285
+#: app.php:301
msgid "Help"
msgstr "Помоћ"
-#: app.php:292
+#: app.php:308
msgid "Personal"
msgstr "Лично"
-#: app.php:297
+#: app.php:313
msgid "Settings"
msgstr "Подешавања"
-#: app.php:302
+#: app.php:318
msgid "Users"
msgstr "Корисници"
-#: app.php:309
+#: app.php:325
msgid "Apps"
msgstr "Апликације"
-#: app.php:311
+#: app.php:327
msgid "Admin"
msgstr "Администрација"
-#: files.php:361
+#: files.php:365
msgid "ZIP download is turned off."
msgstr "Преузимање ZIP-а је искључено."
-#: files.php:362
+#: files.php:366
msgid "Files need to be downloaded one by one."
msgstr "Датотеке морате преузимати једну по једну."
-#: files.php:362 files.php:387
+#: files.php:366 files.php:391
msgid "Back to Files"
msgstr "Назад на датотеке"
-#: files.php:386
+#: files.php:390
msgid "Selected files too large to generate zip file."
msgstr "Изабране датотеке су превелике да бисте направили ZIP датотеку."
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr ""
+
#: json.php:28
msgid "Application is not enabled"
msgstr "Апликација није омогућена"
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
msgstr "Грешка при провери идентитета"
@@ -83,55 +87,55 @@ msgstr "Текст"
msgid "Images"
msgstr "Слике"
-#: template.php:103
+#: template.php:113
msgid "seconds ago"
msgstr "пре неколико секунди"
-#: template.php:104
+#: template.php:114
msgid "1 minute ago"
msgstr "пре 1 минут"
-#: template.php:105
+#: template.php:115
#, php-format
msgid "%d minutes ago"
msgstr "пре %d минута"
-#: template.php:106
+#: template.php:116
msgid "1 hour ago"
msgstr "пре 1 сат"
-#: template.php:107
+#: template.php:117
#, php-format
msgid "%d hours ago"
msgstr "пре %d сата/и"
-#: template.php:108
+#: template.php:118
msgid "today"
msgstr "данас"
-#: template.php:109
+#: template.php:119
msgid "yesterday"
msgstr "јуче"
-#: template.php:110
+#: template.php:120
#, php-format
msgid "%d days ago"
msgstr "пре %d дана"
-#: template.php:111
+#: template.php:121
msgid "last month"
msgstr "прошлог месеца"
-#: template.php:112
+#: template.php:122
#, php-format
msgid "%d months ago"
msgstr "пре %d месеца/и"
-#: template.php:113
+#: template.php:123
msgid "last year"
msgstr "прошле године"
-#: template.php:114
+#: template.php:124
msgid "years ago"
msgstr "година раније"
diff --git a/l10n/sr/user_ldap.po b/l10n/sr/user_ldap.po
index 2af4aa92fab..00ff848a20a 100644
--- a/l10n/sr/user_ldap.po
+++ b/l10n/sr/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"POT-Creation-Date: 2013-01-18 00:03+0100\n"
+"PO-Revision-Date: 2013-01-17 21:57+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
@@ -26,8 +26,8 @@ msgstr ""
#: templates/settings.php:11
msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
msgstr ""
#: templates/settings.php:15
@@ -44,6 +44,10 @@ msgid "Base DN"
msgstr ""
#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
@@ -114,10 +118,18 @@ msgstr ""
msgid "Base User Tree"
msgstr ""
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
@@ -180,4 +192,4 @@ msgstr ""
#: templates/settings.php:39
msgid "Help"
-msgstr ""
+msgstr "Помоћ"
diff --git a/l10n/sr/user_webdavauth.po b/l10n/sr/user_webdavauth.po
index 914fb17354e..8e72a9d363a 100644
--- a/l10n/sr/user_webdavauth.po
+++ b/l10n/sr/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-20 00:11+0100\n"
-"PO-Revision-Date: 2012-12-19 23:12+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
@@ -17,13 +17,17 @@ msgstr ""
"Language: sr\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
#: templates/settings.php:4
msgid "URL: http://"
msgstr ""
#: templates/settings.php:6
msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
msgstr ""
diff --git a/l10n/sr@latin/core.po b/l10n/sr@latin/core.po
index 62f3de31a2f..2cd55d70441 100644
--- a/l10n/sr@latin/core.po
+++ b/l10n/sr@latin/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
@@ -208,7 +208,6 @@ msgid "Password protect"
msgstr ""
#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
msgid "Password"
msgstr "Lozinka"
@@ -565,17 +564,3 @@ msgstr "sledeće"
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr ""
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr ""
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr ""
diff --git a/l10n/sr@latin/files.po b/l10n/sr@latin/files.po
index 81511f85a80..d9fd6727232 100644
--- a/l10n/sr@latin/files.po
+++ b/l10n/sr@latin/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"POT-Creation-Date: 2013-01-20 00:05+0100\n"
+"PO-Revision-Date: 2013-01-19 23:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
@@ -18,6 +18,11 @@ msgstr ""
"Language: sr@latin\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+#: ajax/delete.php:28 ajax/getstoragestats.php:11 ajax/upload.php:17
+#: ajax/upload.php:76 templates/index.php:18
+msgid "Upload"
+msgstr "Pošalji"
+
#: ajax/move.php:17
#, php-format
msgid "Could not move %s - File with this name already exists"
@@ -32,46 +37,46 @@ msgstr ""
msgid "Unable to rename file"
msgstr ""
-#: ajax/upload.php:14
+#: ajax/upload.php:20
msgid "No file was uploaded. Unknown error"
msgstr ""
-#: ajax/upload.php:21
+#: ajax/upload.php:30
msgid "There is no error, the file uploaded with success"
msgstr "Nema greške, fajl je uspešno poslat"
-#: ajax/upload.php:22
+#: ajax/upload.php:31
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr ""
-#: ajax/upload.php:24
+#: ajax/upload.php:33
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "Poslati fajl prevazilazi direktivu MAX_FILE_SIZE koja je navedena u HTML formi"
-#: ajax/upload.php:26
+#: ajax/upload.php:35
msgid "The uploaded file was only partially uploaded"
msgstr "Poslati fajl je samo delimično otpremljen!"
-#: ajax/upload.php:27
+#: ajax/upload.php:36
msgid "No file was uploaded"
msgstr "Nijedan fajl nije poslat"
-#: ajax/upload.php:28
+#: ajax/upload.php:37
msgid "Missing a temporary folder"
msgstr "Nedostaje privremena fascikla"
-#: ajax/upload.php:29
+#: ajax/upload.php:38
msgid "Failed to write to disk"
msgstr ""
-#: ajax/upload.php:45
+#: ajax/upload.php:57
msgid "Not enough space available"
msgstr ""
-#: ajax/upload.php:69
+#: ajax/upload.php:91
msgid "Invalid directory."
msgstr ""
@@ -127,98 +132,100 @@ msgstr ""
msgid "deleted {files}"
msgstr ""
-#: js/files.js:31
+#: js/files.js:48
msgid "'.' is an invalid file name."
msgstr ""
-#: js/files.js:36
+#: js/files.js:53
msgid "File name cannot be empty."
msgstr ""
-#: js/files.js:45
+#: js/files.js:62
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
+#: js/files.js:204
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
msgstr ""
-#: js/files.js:224
+#: js/files.js:242
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr ""
-#: js/files.js:224
+#: js/files.js:242
msgid "Upload Error"
msgstr ""
-#: js/files.js:241
+#: js/files.js:259
msgid "Close"
msgstr "Zatvori"
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:278 js/files.js:397 js/files.js:431
msgid "Pending"
msgstr ""
-#: js/files.js:280
+#: js/files.js:298
msgid "1 file uploading"
msgstr ""
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:301 js/files.js:357 js/files.js:372
msgid "{count} files uploading"
msgstr ""
-#: js/files.js:357 js/files.js:393
+#: js/files.js:376 js/files.js:414
msgid "Upload cancelled."
msgstr ""
-#: js/files.js:464
+#: js/files.js:486
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/files.js:537
+#: js/files.js:559
msgid "URL cannot be empty."
msgstr ""
-#: js/files.js:543
+#: js/files.js:565
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:727
+#: js/files.js:775
msgid "{count} files scanned"
msgstr ""
-#: js/files.js:735
+#: js/files.js:783
msgid "error while scanning"
msgstr ""
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:857 templates/index.php:64
msgid "Name"
msgstr "Ime"
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:858 templates/index.php:75
msgid "Size"
msgstr "Veličina"
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:859 templates/index.php:77
msgid "Modified"
msgstr "Zadnja izmena"
-#: js/files.js:829
+#: js/files.js:878
msgid "1 folder"
msgstr ""
-#: js/files.js:831
+#: js/files.js:880
msgid "{count} folders"
msgstr ""
-#: js/files.js:839
+#: js/files.js:888
msgid "1 file"
msgstr ""
-#: js/files.js:841
+#: js/files.js:890
msgid "{count} files"
msgstr ""
@@ -270,10 +277,6 @@ msgstr ""
msgid "From link"
msgstr ""
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Pošalji"
-
#: templates/index.php:41
msgid "Cancel upload"
msgstr ""
diff --git a/l10n/sr@latin/files_encryption.po b/l10n/sr@latin/files_encryption.po
index c6f3f5b636c..39f12cfb59b 100644
--- a/l10n/sr@latin/files_encryption.po
+++ b/l10n/sr@latin/files_encryption.po
@@ -7,28 +7,76 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: sr@latin\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: templates/settings.php:3
-msgid "Encryption"
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
msgstr ""
-#: templates/settings.php:4
-msgid "Exclude the following file types from encryption"
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
msgstr ""
-#: templates/settings.php:5
-msgid "None"
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
msgstr ""
#: templates/settings.php:10
-msgid "Enable Encryption"
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:67
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:71
+msgid "None"
msgstr ""
diff --git a/l10n/sr@latin/files_versions.po b/l10n/sr@latin/files_versions.po
index 1f2db94b8ad..a35cd43237b 100644
--- a/l10n/sr@latin/files_versions.po
+++ b/l10n/sr@latin/files_versions.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-22 01:14+0200\n"
-"PO-Revision-Date: 2012-09-21 23:15+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,22 +17,10 @@ msgstr ""
"Language: sr@latin\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr ""
-
#: js/versions.js:16
msgid "History"
msgstr ""
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr ""
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr ""
-
#: templates/settings.php:3
msgid "Files Versioning"
msgstr ""
diff --git a/l10n/sr@latin/lib.po b/l10n/sr@latin/lib.po
index edcbb0203e2..264724c0911 100644
--- a/l10n/sr@latin/lib.po
+++ b/l10n/sr@latin/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-14 23:13+0000\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
@@ -17,51 +17,55 @@ msgstr ""
"Language: sr@latin\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: app.php:285
+#: app.php:301
msgid "Help"
msgstr "Pomoć"
-#: app.php:292
+#: app.php:308
msgid "Personal"
msgstr "Lično"
-#: app.php:297
+#: app.php:313
msgid "Settings"
msgstr "Podešavanja"
-#: app.php:302
+#: app.php:318
msgid "Users"
msgstr "Korisnici"
-#: app.php:309
+#: app.php:325
msgid "Apps"
msgstr ""
-#: app.php:311
+#: app.php:327
msgid "Admin"
msgstr ""
-#: files.php:332
+#: files.php:365
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:333
+#: files.php:366
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:333 files.php:358
+#: files.php:366 files.php:391
msgid "Back to Files"
msgstr ""
-#: files.php:357
+#: files.php:390
msgid "Selected files too large to generate zip file."
msgstr ""
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr ""
+
#: json.php:28
msgid "Application is not enabled"
msgstr ""
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
msgstr "Greška pri autentifikaciji"
@@ -81,55 +85,55 @@ msgstr "Tekst"
msgid "Images"
msgstr ""
-#: template.php:103
+#: template.php:113
msgid "seconds ago"
msgstr ""
-#: template.php:104
+#: template.php:114
msgid "1 minute ago"
msgstr ""
-#: template.php:105
+#: template.php:115
#, php-format
msgid "%d minutes ago"
msgstr ""
-#: template.php:106
+#: template.php:116
msgid "1 hour ago"
msgstr ""
-#: template.php:107
+#: template.php:117
#, php-format
msgid "%d hours ago"
msgstr ""
-#: template.php:108
+#: template.php:118
msgid "today"
msgstr ""
-#: template.php:109
+#: template.php:119
msgid "yesterday"
msgstr ""
-#: template.php:110
+#: template.php:120
#, php-format
msgid "%d days ago"
msgstr ""
-#: template.php:111
+#: template.php:121
msgid "last month"
msgstr ""
-#: template.php:112
+#: template.php:122
#, php-format
msgid "%d months ago"
msgstr ""
-#: template.php:113
+#: template.php:123
msgid "last year"
msgstr ""
-#: template.php:114
+#: template.php:124
msgid "years ago"
msgstr ""
diff --git a/l10n/sr@latin/user_ldap.po b/l10n/sr@latin/user_ldap.po
index 47549f334d5..c78635ad495 100644
--- a/l10n/sr@latin/user_ldap.po
+++ b/l10n/sr@latin/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"POT-Creation-Date: 2013-01-18 00:03+0100\n"
+"PO-Revision-Date: 2013-01-17 21:57+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
@@ -26,8 +26,8 @@ msgstr ""
#: templates/settings.php:11
msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
msgstr ""
#: templates/settings.php:15
@@ -44,6 +44,10 @@ msgid "Base DN"
msgstr ""
#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
@@ -114,10 +118,18 @@ msgstr ""
msgid "Base User Tree"
msgstr ""
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
@@ -180,4 +192,4 @@ msgstr ""
#: templates/settings.php:39
msgid "Help"
-msgstr ""
+msgstr "Pomoć"
diff --git a/l10n/sr@latin/user_webdavauth.po b/l10n/sr@latin/user_webdavauth.po
index 9fe7b885a10..246116723c6 100644
--- a/l10n/sr@latin/user_webdavauth.po
+++ b/l10n/sr@latin/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-20 00:11+0100\n"
-"PO-Revision-Date: 2012-12-19 23:12+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
@@ -17,13 +17,17 @@ msgstr ""
"Language: sr@latin\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
#: templates/settings.php:4
msgid "URL: http://"
msgstr ""
#: templates/settings.php:6
msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
msgstr ""
diff --git a/l10n/sv/core.po b/l10n/sv/core.po
index 36584ca3131..799ca43b10b 100644
--- a/l10n/sv/core.po
+++ b/l10n/sv/core.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
@@ -213,7 +213,6 @@ msgid "Password protect"
msgstr "Lösenordsskydda"
#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
msgid "Password"
msgstr "Lösenord"
@@ -570,17 +569,3 @@ msgstr "nästa"
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
msgstr "Uppdaterar ownCloud till version %s, detta kan ta en stund."
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "Säkerhetsvarning!"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "Bekräfta ditt lösenord. <br/>Av säkerhetsskäl kan du ibland bli ombedd att ange ditt lösenord igen."
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "Verifiera"
diff --git a/l10n/sv/files.po b/l10n/sv/files.po
index 16e2e102563..4dc201683ef 100644
--- a/l10n/sv/files.po
+++ b/l10n/sv/files.po
@@ -13,9 +13,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-21 14:36+0000\n"
+"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -23,60 +23,65 @@ msgstr ""
"Language: sv\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/delete.php:28 ajax/getstoragestats.php:11 ajax/upload.php:17
+#: ajax/upload.php:76 templates/index.php:18
+msgid "Upload"
+msgstr "Ladda upp"
+
#: ajax/move.php:17
#, php-format
msgid "Could not move %s - File with this name already exists"
-msgstr ""
+msgstr "Kunde inte flytta %s - Det finns redan en fil med detta namn"
#: ajax/move.php:24
#, php-format
msgid "Could not move %s"
-msgstr ""
+msgstr "Kan inte flytta %s"
#: ajax/rename.php:19
msgid "Unable to rename file"
-msgstr ""
+msgstr "Kan inte byta namn på filen"
-#: ajax/upload.php:14
+#: ajax/upload.php:20
msgid "No file was uploaded. Unknown error"
msgstr "Ingen fil uppladdad. Okänt fel"
-#: ajax/upload.php:21
+#: ajax/upload.php:30
msgid "There is no error, the file uploaded with success"
msgstr "Inga fel uppstod. Filen laddades upp utan problem"
-#: ajax/upload.php:22
+#: ajax/upload.php:31
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr "Den uppladdade filen överskrider upload_max_filesize direktivet php.ini:"
-#: ajax/upload.php:24
+#: ajax/upload.php:33
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "Den uppladdade filen överstiger MAX_FILE_SIZE direktivet som anges i HTML-formulär"
-#: ajax/upload.php:26
+#: ajax/upload.php:35
msgid "The uploaded file was only partially uploaded"
msgstr "Den uppladdade filen var endast delvis uppladdad"
-#: ajax/upload.php:27
+#: ajax/upload.php:36
msgid "No file was uploaded"
msgstr "Ingen fil blev uppladdad"
-#: ajax/upload.php:28
+#: ajax/upload.php:37
msgid "Missing a temporary folder"
msgstr "Saknar en tillfällig mapp"
-#: ajax/upload.php:29
+#: ajax/upload.php:38
msgid "Failed to write to disk"
msgstr "Misslyckades spara till disk"
-#: ajax/upload.php:45
+#: ajax/upload.php:57
msgid "Not enough space available"
msgstr "Inte tillräckligt med utrymme tillgängligt"
-#: ajax/upload.php:69
+#: ajax/upload.php:91
msgid "Invalid directory."
msgstr "Felaktig mapp."
@@ -132,98 +137,100 @@ msgstr "stoppad delning {files}"
msgid "deleted {files}"
msgstr "raderade {files}"
-#: js/files.js:31
+#: js/files.js:48
msgid "'.' is an invalid file name."
msgstr "'.' är ett ogiltigt filnamn."
-#: js/files.js:36
+#: js/files.js:53
msgid "File name cannot be empty."
msgstr "Filnamn kan inte vara tomt."
-#: js/files.js:45
+#: js/files.js:62
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Ogiltigt namn, '\\', '/', '<', '>', ':', '\"', '|', '?' och '*' är inte tillåtet."
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "genererar ZIP-fil, det kan ta lite tid."
+#: js/files.js:204
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr "Din nedladdning förbereds. Det kan ta tid om det är stora filer."
-#: js/files.js:224
+#: js/files.js:242
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Kunde inte ladda upp dina filer eftersom det antingen är en mapp eller har 0 bytes."
-#: js/files.js:224
+#: js/files.js:242
msgid "Upload Error"
msgstr "Uppladdningsfel"
-#: js/files.js:241
+#: js/files.js:259
msgid "Close"
msgstr "Stäng"
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:278 js/files.js:397 js/files.js:431
msgid "Pending"
msgstr "Väntar"
-#: js/files.js:280
+#: js/files.js:298
msgid "1 file uploading"
msgstr "1 filuppladdning"
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:301 js/files.js:357 js/files.js:372
msgid "{count} files uploading"
msgstr "{count} filer laddas upp"
-#: js/files.js:357 js/files.js:393
+#: js/files.js:376 js/files.js:414
msgid "Upload cancelled."
msgstr "Uppladdning avbruten."
-#: js/files.js:464
+#: js/files.js:486
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Filuppladdning pågår. Lämnar du sidan så avbryts uppladdningen."
-#: js/files.js:537
+#: js/files.js:559
msgid "URL cannot be empty."
msgstr "URL kan inte vara tom."
-#: js/files.js:543
+#: js/files.js:565
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Ogiltigt mappnamn. Användande av 'Shared' är reserverat av ownCloud"
-#: js/files.js:727
+#: js/files.js:775
msgid "{count} files scanned"
msgstr "{count} filer skannade"
-#: js/files.js:735
+#: js/files.js:783
msgid "error while scanning"
msgstr "fel vid skanning"
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:857 templates/index.php:64
msgid "Name"
msgstr "Namn"
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:858 templates/index.php:75
msgid "Size"
msgstr "Storlek"
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:859 templates/index.php:77
msgid "Modified"
msgstr "Ändrad"
-#: js/files.js:829
+#: js/files.js:878
msgid "1 folder"
msgstr "1 mapp"
-#: js/files.js:831
+#: js/files.js:880
msgid "{count} folders"
msgstr "{count} mappar"
-#: js/files.js:839
+#: js/files.js:888
msgid "1 file"
msgstr "1 fil"
-#: js/files.js:841
+#: js/files.js:890
msgid "{count} files"
msgstr "{count} filer"
@@ -275,10 +282,6 @@ msgstr "Mapp"
msgid "From link"
msgstr "Från länk"
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Ladda upp"
-
#: templates/index.php:41
msgid "Cancel upload"
msgstr "Avbryt uppladdning"
diff --git a/l10n/sv/files_encryption.po b/l10n/sv/files_encryption.po
index 42165069483..946f272acca 100644
--- a/l10n/sv/files_encryption.po
+++ b/l10n/sv/files_encryption.po
@@ -8,28 +8,76 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-13 10:20+0000\n"
-"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: sv\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
msgid "Encryption"
msgstr "Kryptering"
-#: templates/settings.php:4
+#: templates/settings.php:67
msgid "Exclude the following file types from encryption"
msgstr "Exkludera följande filtyper från kryptering"
-#: templates/settings.php:5
+#: templates/settings.php:71
msgid "None"
msgstr "Ingen"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "Aktivera kryptering"
diff --git a/l10n/sv/files_versions.po b/l10n/sv/files_versions.po
index a926036b892..5f3d273b389 100644
--- a/l10n/sv/files_versions.po
+++ b/l10n/sv/files_versions.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-24 02:01+0200\n"
-"PO-Revision-Date: 2012-09-23 11:20+0000\n"
-"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,22 +18,10 @@ msgstr ""
"Language: sv\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "Upphör alla versioner"
-
#: js/versions.js:16
msgid "History"
msgstr "Historik"
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "Versioner"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "Detta kommer att radera alla befintliga säkerhetskopior av dina filer"
-
#: templates/settings.php:3
msgid "Files Versioning"
msgstr "Versionshantering av filer"
diff --git a/l10n/sv/lib.po b/l10n/sv/lib.po
index 548f7a84d4c..3fea987f13f 100644
--- a/l10n/sv/lib.po
+++ b/l10n/sv/lib.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Magnus Höglund <magnus@linux.com>, 2012.
+# Magnus Höglund <magnus@linux.com>, 2012-2013.
# <magnus@linux.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-15 07:21+0000\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-21 14:32+0000\n"
"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
@@ -19,51 +19,55 @@ msgstr ""
"Language: sv\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:285
+#: app.php:301
msgid "Help"
msgstr "Hjälp"
-#: app.php:292
+#: app.php:308
msgid "Personal"
msgstr "Personligt"
-#: app.php:297
+#: app.php:313
msgid "Settings"
msgstr "Inställningar"
-#: app.php:302
+#: app.php:318
msgid "Users"
msgstr "Användare"
-#: app.php:309
+#: app.php:325
msgid "Apps"
msgstr "Program"
-#: app.php:311
+#: app.php:327
msgid "Admin"
msgstr "Admin"
-#: files.php:332
+#: files.php:365
msgid "ZIP download is turned off."
msgstr "Nerladdning av ZIP är avstängd."
-#: files.php:333
+#: files.php:366
msgid "Files need to be downloaded one by one."
msgstr "Filer laddas ner en åt gången."
-#: files.php:333 files.php:358
+#: files.php:366 files.php:391
msgid "Back to Files"
msgstr "Tillbaka till Filer"
-#: files.php:357
+#: files.php:390
msgid "Selected files too large to generate zip file."
msgstr "Valda filer är för stora för att skapa zip-fil."
+#: helper.php:229
+msgid "couldn't be determined"
+msgstr "kunde inte bestämmas"
+
#: json.php:28
msgid "Application is not enabled"
msgstr "Applikationen är inte aktiverad"
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
msgstr "Fel vid autentisering"
@@ -83,55 +87,55 @@ msgstr "Text"
msgid "Images"
msgstr "Bilder"
-#: template.php:103
+#: template.php:113
msgid "seconds ago"
msgstr "sekunder sedan"
-#: template.php:104
+#: template.php:114
msgid "1 minute ago"
msgstr "1 minut sedan"
-#: template.php:105
+#: template.php:115
#, php-format
msgid "%d minutes ago"
msgstr "%d minuter sedan"
-#: template.php:106
+#: template.php:116
msgid "1 hour ago"
msgstr "1 timme sedan"
-#: template.php:107
+#: template.php:117
#, php-format
msgid "%d hours ago"
msgstr "%d timmar sedan"
-#: template.php:108
+#: template.php:118
msgid "today"
msgstr "idag"
-#: template.php:109
+#: template.php:119
msgid "yesterday"
msgstr "igår"
-#: template.php:110
+#: template.php:120
#, php-format
msgid "%d days ago"
msgstr "%d dagar sedan"
-#: template.php:111
+#: template.php:121
msgid "last month"
msgstr "förra månaden"
-#: template.php:112
+#: template.php:122
#, php-format
msgid "%d months ago"
msgstr "%d månader sedan"
-#: template.php:113
+#: template.php:123
msgid "last year"
msgstr "förra året"
-#: template.php:114
+#: template.php:124
msgid "years ago"
msgstr "år sedan"
diff --git a/l10n/sv/user_ldap.po b/l10n/sv/user_ldap.po
index 76ca9c76224..4455df0fb2f 100644
--- a/l10n/sv/user_ldap.po
+++ b/l10n/sv/user_ldap.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Magnus Höglund <magnus@linux.com>, 2012.
+# Magnus Höglund <magnus@linux.com>, 2012-2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-18 00:13+0100\n"
-"PO-Revision-Date: 2012-12-17 19:54+0000\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-21 15:10+0000\n"
"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
@@ -27,9 +27,9 @@ msgstr "<b>Varning:</b> Apps user_ldap och user_webdavauth är inkompatibla. Ov
#: templates/settings.php:11
msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
-msgstr "<b>Varning:</b> PHP LDAP-modulen måste vara installerad, serversidan kommer inte att fungera. Be din systemadministratör att installera den."
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
+msgstr "<b>Varning:</b> PHP LDAP - modulen är inte installerad, serversidan kommer inte att fungera. Kontakta din systemadministratör för installation."
#: templates/settings.php:15
msgid "Host"
@@ -45,6 +45,10 @@ msgid "Base DN"
msgstr "Start DN"
#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr "Ett Start DN per rad"
+
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Du kan ange start DN för användare och grupper under fliken Avancerat"
@@ -115,10 +119,18 @@ msgstr "Port"
msgid "Base User Tree"
msgstr "Bas för användare i katalogtjänst"
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr "En Användare start DN per rad"
+
#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "Bas för grupper i katalogtjänst"
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr "En Grupp start DN per rad"
+
#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Attribut för gruppmedlemmar"
diff --git a/l10n/sv/user_webdavauth.po b/l10n/sv/user_webdavauth.po
index b2063cd23bc..98475a8bd97 100644
--- a/l10n/sv/user_webdavauth.po
+++ b/l10n/sv/user_webdavauth.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Magnus Höglund <magnus@linux.com>, 2012.
+# Magnus Höglund <magnus@linux.com>, 2012-2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-26 00:10+0100\n"
-"PO-Revision-Date: 2012-12-25 08:03+0000\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-21 15:25+0000\n"
"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
@@ -18,13 +18,17 @@ msgstr ""
"Language: sv\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr "WebDAV Autentisering"
+
#: templates/settings.php:4
msgid "URL: http://"
msgstr "URL: http://"
#: templates/settings.php:6
msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
-msgstr "ownCloud kommer att skicka inloggningsuppgifterna till denna URL och tolkar http 401 och http 403 som fel och alla andra koder som korrekt."
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
+msgstr "ownCloud kommer skicka användaruppgifterna till denna URL. Denna plugin kontrollerar svaret och tolkar HTTP-statuskoderna 401 och 403 som felaktiga uppgifter, och alla andra svar som giltiga uppgifter."
diff --git a/l10n/ta_LK/core.po b/l10n/ta_LK/core.po
index f35d465eb3b..83a4981f2ef 100644
--- a/l10n/ta_LK/core.po
+++ b/l10n/ta_LK/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
@@ -208,7 +208,6 @@ msgid "Password protect"
msgstr "கடவுச்சொல்லை பாதுகாத்தல்"
#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
msgid "Password"
msgstr "கடவுச்சொல்"
@@ -565,17 +564,3 @@ msgstr "அடுத்து"
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "பாதுகாப்பு எச்சரிக்கை!"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "உங்களுடைய கடவுச்சொல்லை உறுதிப்படுத்துக. <br/> பாதுகாப்பு காரணங்களுக்காக நீங்கள் எப்போதாவது உங்களுடைய கடவுச்சொல்லை மீண்டும் நுழைக்க கேட்கப்படுவீர்கள்."
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "உறுதிப்படுத்தல்"
diff --git a/l10n/ta_LK/files.po b/l10n/ta_LK/files.po
index 5c90380e9ab..25ae576772c 100644
--- a/l10n/ta_LK/files.po
+++ b/l10n/ta_LK/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"POT-Creation-Date: 2013-01-20 00:05+0100\n"
+"PO-Revision-Date: 2013-01-19 23:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
@@ -18,6 +18,11 @@ msgstr ""
"Language: ta_LK\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/delete.php:28 ajax/getstoragestats.php:11 ajax/upload.php:17
+#: ajax/upload.php:76 templates/index.php:18
+msgid "Upload"
+msgstr "பதிவேற்றுக"
+
#: ajax/move.php:17
#, php-format
msgid "Could not move %s - File with this name already exists"
@@ -32,46 +37,46 @@ msgstr ""
msgid "Unable to rename file"
msgstr ""
-#: ajax/upload.php:14
+#: ajax/upload.php:20
msgid "No file was uploaded. Unknown error"
msgstr "ஒரு கோப்பும் பதிவேற்றப்படவில்லை. அறியப்படாத வழு"
-#: ajax/upload.php:21
+#: ajax/upload.php:30
msgid "There is no error, the file uploaded with success"
msgstr "இங்கு வழு இல்லை, கோப்பு வெற்றிகரமாக பதிவேற்றப்பட்டது"
-#: ajax/upload.php:22
+#: ajax/upload.php:31
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr ""
-#: ajax/upload.php:24
+#: ajax/upload.php:33
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "பதிவேற்றப்பட்ட கோப்பானது HTML படிவத்தில் குறிப்பிடப்பட்டுள்ள MAX_FILE_SIZE directive ஐ விட கூடியது"
-#: ajax/upload.php:26
+#: ajax/upload.php:35
msgid "The uploaded file was only partially uploaded"
msgstr "பதிவேற்றப்பட்ட கோப்பானது பகுதியாக மட்டுமே பதிவேற்றப்பட்டுள்ளது"
-#: ajax/upload.php:27
+#: ajax/upload.php:36
msgid "No file was uploaded"
msgstr "எந்த கோப்பும் பதிவேற்றப்படவில்லை"
-#: ajax/upload.php:28
+#: ajax/upload.php:37
msgid "Missing a temporary folder"
msgstr "ஒரு தற்காலிகமான கோப்புறையை காணவில்லை"
-#: ajax/upload.php:29
+#: ajax/upload.php:38
msgid "Failed to write to disk"
msgstr "வட்டில் எழுத முடியவில்லை"
-#: ajax/upload.php:45
+#: ajax/upload.php:57
msgid "Not enough space available"
msgstr ""
-#: ajax/upload.php:69
+#: ajax/upload.php:91
msgid "Invalid directory."
msgstr ""
@@ -127,98 +132,100 @@ msgstr "பகிரப்படாதது {கோப்புகள்}"
msgid "deleted {files}"
msgstr "நீக்கப்பட்டது {கோப்புகள்}"
-#: js/files.js:31
+#: js/files.js:48
msgid "'.' is an invalid file name."
msgstr ""
-#: js/files.js:36
+#: js/files.js:53
msgid "File name cannot be empty."
msgstr ""
-#: js/files.js:45
+#: js/files.js:62
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "செல்லுபடியற்ற பெயர்,'\\', '/', '<', '>', ':', '\"', '|', '?' மற்றும் '*' ஆகியன அனுமதிக்கப்படமாட்டாது."
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr " ZIP கோப்பு உருவாக்கப்படுகின்றது, இது சில நேரம் ஆகலாம்."
+#: js/files.js:204
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
-#: js/files.js:224
+#: js/files.js:242
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "அடைவு அல்லது 0 bytes ஐ கொண்டுள்ளதால் உங்களுடைய கோப்பை பதிவேற்ற முடியவில்லை"
-#: js/files.js:224
+#: js/files.js:242
msgid "Upload Error"
msgstr "பதிவேற்றல் வழு"
-#: js/files.js:241
+#: js/files.js:259
msgid "Close"
msgstr "மூடுக"
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:278 js/files.js:397 js/files.js:431
msgid "Pending"
msgstr "நிலுவையிலுள்ள"
-#: js/files.js:280
+#: js/files.js:298
msgid "1 file uploading"
msgstr "1 கோப்பு பதிவேற்றப்படுகிறது"
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:301 js/files.js:357 js/files.js:372
msgid "{count} files uploading"
msgstr "{எண்ணிக்கை} கோப்புகள் பதிவேற்றப்படுகின்றது"
-#: js/files.js:357 js/files.js:393
+#: js/files.js:376 js/files.js:414
msgid "Upload cancelled."
msgstr "பதிவேற்றல் இரத்து செய்யப்பட்டுள்ளது"
-#: js/files.js:464
+#: js/files.js:486
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "கோப்பு பதிவேற்றம் செயல்பாட்டில் உள்ளது. இந்தப் பக்கத்திலிருந்து வெறியேறுவதானது பதிவேற்றலை இரத்து செய்யும்."
-#: js/files.js:537
+#: js/files.js:559
msgid "URL cannot be empty."
msgstr "URL வெறுமையாக இருக்கமுடியாது."
-#: js/files.js:543
+#: js/files.js:565
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:727
+#: js/files.js:775
msgid "{count} files scanned"
msgstr "{எண்ணிக்கை} கோப்புகள் வருடப்பட்டது"
-#: js/files.js:735
+#: js/files.js:783
msgid "error while scanning"
msgstr "வருடும் போதான வழு"
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:857 templates/index.php:64
msgid "Name"
msgstr "பெயர்"
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:858 templates/index.php:75
msgid "Size"
msgstr "அளவு"
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:859 templates/index.php:77
msgid "Modified"
msgstr "மாற்றப்பட்டது"
-#: js/files.js:829
+#: js/files.js:878
msgid "1 folder"
msgstr "1 கோப்புறை"
-#: js/files.js:831
+#: js/files.js:880
msgid "{count} folders"
msgstr "{எண்ணிக்கை} கோப்புறைகள்"
-#: js/files.js:839
+#: js/files.js:888
msgid "1 file"
msgstr "1 கோப்பு"
-#: js/files.js:841
+#: js/files.js:890
msgid "{count} files"
msgstr "{எண்ணிக்கை} கோப்புகள்"
@@ -270,10 +277,6 @@ msgstr "கோப்புறை"
msgid "From link"
msgstr "இணைப்பிலிருந்து"
-#: templates/index.php:18
-msgid "Upload"
-msgstr "பதிவேற்றுக"
-
#: templates/index.php:41
msgid "Cancel upload"
msgstr "பதிவேற்றலை இரத்து செய்க"
diff --git a/l10n/ta_LK/files_encryption.po b/l10n/ta_LK/files_encryption.po
index 2eee3be9df2..82cfd11914c 100644
--- a/l10n/ta_LK/files_encryption.po
+++ b/l10n/ta_LK/files_encryption.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-18 00:01+0100\n"
-"PO-Revision-Date: 2012-11-17 05:33+0000\n"
-"Last-Translator: suganthi <suganthi@nic.lk>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,18 +18,66 @@ msgstr ""
"Language: ta_LK\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
msgid "Encryption"
msgstr "மறைக்குறியீடு"
-#: templates/settings.php:4
+#: templates/settings.php:67
msgid "Exclude the following file types from encryption"
msgstr "மறைக்குறியாக்கலில் பின்வரும் கோப்பு வகைகளை நீக்கவும்"
-#: templates/settings.php:5
+#: templates/settings.php:71
msgid "None"
msgstr "ஒன்றுமில்லை"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "மறைக்குறியாக்கலை இயலுமைப்படுத்துக"
diff --git a/l10n/ta_LK/files_versions.po b/l10n/ta_LK/files_versions.po
index d1c44e0d9d0..ed417e58282 100644
--- a/l10n/ta_LK/files_versions.po
+++ b/l10n/ta_LK/files_versions.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-20 00:01+0100\n"
-"PO-Revision-Date: 2012-11-19 08:42+0000\n"
-"Last-Translator: suganthi <suganthi@nic.lk>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,22 +18,10 @@ msgstr ""
"Language: ta_LK\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "எல்லா பதிப்புகளும் காலாவதியாகிவிட்டது"
-
#: js/versions.js:16
msgid "History"
msgstr "வரலாறு"
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "பதிப்புகள்"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "உங்களுடைய கோப்புக்களில் ஏற்கனவே உள்ள ஆதாரநகல்களின் பதிப்புக்களை இவை அழித்துவிடும்"
-
#: templates/settings.php:3
msgid "Files Versioning"
msgstr "கோப்பு பதிப்புகள்"
diff --git a/l10n/ta_LK/lib.po b/l10n/ta_LK/lib.po
index 804cdf565e5..febb5ad3281 100644
--- a/l10n/ta_LK/lib.po
+++ b/l10n/ta_LK/lib.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-15 14:16+0000\n"
-"Last-Translator: suganthi <suganthi@nic.lk>\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,51 +18,55 @@ msgstr ""
"Language: ta_LK\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:285
+#: app.php:301
msgid "Help"
msgstr "உதவி"
-#: app.php:292
+#: app.php:308
msgid "Personal"
msgstr "தனிப்பட்ட"
-#: app.php:297
+#: app.php:313
msgid "Settings"
msgstr "அமைப்புகள்"
-#: app.php:302
+#: app.php:318
msgid "Users"
msgstr "பயனாளர்கள்"
-#: app.php:309
+#: app.php:325
msgid "Apps"
msgstr "செயலிகள்"
-#: app.php:311
+#: app.php:327
msgid "Admin"
msgstr "நிர்வாகம்"
-#: files.php:332
+#: files.php:365
msgid "ZIP download is turned off."
msgstr "வீசொலிப் பூட்டு பதிவிறக்கம் நிறுத்தப்பட்டுள்ளது."
-#: files.php:333
+#: files.php:366
msgid "Files need to be downloaded one by one."
msgstr "கோப்புகள்ஒன்றன் பின் ஒன்றாக பதிவிறக்கப்படவேண்டும்."
-#: files.php:333 files.php:358
+#: files.php:366 files.php:391
msgid "Back to Files"
msgstr "கோப்புகளுக்கு செல்க"
-#: files.php:357
+#: files.php:390
msgid "Selected files too large to generate zip file."
msgstr "வீ சொலிக் கோப்புகளை உருவாக்குவதற்கு தெரிவுசெய்யப்பட்ட கோப்புகள் மிகப்பெரியவை"
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr ""
+
#: json.php:28
msgid "Application is not enabled"
msgstr "செயலி இயலுமைப்படுத்தப்படவில்லை"
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
msgstr "அத்தாட்சிப்படுத்தலில் வழு"
@@ -82,55 +86,55 @@ msgstr "உரை"
msgid "Images"
msgstr "படங்கள்"
-#: template.php:103
+#: template.php:113
msgid "seconds ago"
msgstr "செக்கன்களுக்கு முன்"
-#: template.php:104
+#: template.php:114
msgid "1 minute ago"
msgstr "1 நிமிடத்திற்கு முன் "
-#: template.php:105
+#: template.php:115
#, php-format
msgid "%d minutes ago"
msgstr "%d நிமிடங்களுக்கு முன்"
-#: template.php:106
+#: template.php:116
msgid "1 hour ago"
msgstr "1 மணித்தியாலத்திற்கு முன்"
-#: template.php:107
+#: template.php:117
#, php-format
msgid "%d hours ago"
msgstr "%d மணித்தியாலத்திற்கு முன்"
-#: template.php:108
+#: template.php:118
msgid "today"
msgstr "இன்று"
-#: template.php:109
+#: template.php:119
msgid "yesterday"
msgstr "நேற்று"
-#: template.php:110
+#: template.php:120
#, php-format
msgid "%d days ago"
msgstr "%d நாட்களுக்கு முன்"
-#: template.php:111
+#: template.php:121
msgid "last month"
msgstr "கடந்த மாதம்"
-#: template.php:112
+#: template.php:122
#, php-format
msgid "%d months ago"
msgstr "%d மாதத்திற்கு முன்"
-#: template.php:113
+#: template.php:123
msgid "last year"
msgstr "கடந்த வருடம்"
-#: template.php:114
+#: template.php:124
msgid "years ago"
msgstr "வருடங்களுக்கு முன்"
diff --git a/l10n/ta_LK/user_ldap.po b/l10n/ta_LK/user_ldap.po
index e98a09afa8c..401d69aec01 100644
--- a/l10n/ta_LK/user_ldap.po
+++ b/l10n/ta_LK/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 23:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
@@ -27,8 +27,8 @@ msgstr ""
#: templates/settings.php:11
msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
msgstr ""
#: templates/settings.php:15
@@ -45,6 +45,10 @@ msgid "Base DN"
msgstr "தள DN"
#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "நீங்கள் பயனாளர்களுக்கும் மேன்மை தத்தலில் உள்ள குழுவிற்கும் தள DN ஐ குறிப்பிடலாம் "
@@ -115,10 +119,18 @@ msgstr "துறை "
msgid "Base User Tree"
msgstr "தள பயனாளர் மரம்"
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "தள குழு மரம்"
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
#: templates/settings.php:27
msgid "Group-Member association"
msgstr "குழு உறுப்பினர் சங்கம்"
diff --git a/l10n/ta_LK/user_webdavauth.po b/l10n/ta_LK/user_webdavauth.po
index b74d36a8e43..59edf0b378a 100644
--- a/l10n/ta_LK/user_webdavauth.po
+++ b/l10n/ta_LK/user_webdavauth.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-20 00:11+0100\n"
-"PO-Revision-Date: 2012-12-19 23:12+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
@@ -18,13 +18,17 @@ msgstr ""
"Language: ta_LK\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
#: templates/settings.php:4
msgid "URL: http://"
msgstr ""
#: templates/settings.php:6
msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
msgstr ""
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 727f5550191..753402f2141 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-14 00:17+0100\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -83,55 +83,55 @@ msgstr ""
msgid "Settings"
msgstr ""
-#: js/js.js:711
+#: js/js.js:706
msgid "seconds ago"
msgstr ""
-#: js/js.js:712
+#: js/js.js:707
msgid "1 minute ago"
msgstr ""
-#: js/js.js:713
+#: js/js.js:708
msgid "{minutes} minutes ago"
msgstr ""
-#: js/js.js:714
+#: js/js.js:709
msgid "1 hour ago"
msgstr ""
-#: js/js.js:715
+#: js/js.js:710
msgid "{hours} hours ago"
msgstr ""
-#: js/js.js:716
+#: js/js.js:711
msgid "today"
msgstr ""
-#: js/js.js:717
+#: js/js.js:712
msgid "yesterday"
msgstr ""
-#: js/js.js:718
+#: js/js.js:713
msgid "{days} days ago"
msgstr ""
-#: js/js.js:719
+#: js/js.js:714
msgid "last month"
msgstr ""
-#: js/js.js:720
+#: js/js.js:715
msgid "{months} months ago"
msgstr ""
-#: js/js.js:721
+#: js/js.js:716
msgid "months ago"
msgstr ""
-#: js/js.js:722
+#: js/js.js:717
msgid "last year"
msgstr ""
-#: js/js.js:723
+#: js/js.js:718
msgid "years ago"
msgstr ""
@@ -207,7 +207,6 @@ msgid "Password protect"
msgstr ""
#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
msgid "Password"
msgstr ""
@@ -442,83 +441,83 @@ msgstr ""
msgid "Finish setup"
msgstr ""
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:15 templates/layout.user.php:17
msgid "Sunday"
msgstr ""
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:15 templates/layout.user.php:17
msgid "Monday"
msgstr ""
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:15 templates/layout.user.php:17
msgid "Tuesday"
msgstr ""
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:15 templates/layout.user.php:17
msgid "Wednesday"
msgstr ""
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:15 templates/layout.user.php:17
msgid "Thursday"
msgstr ""
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:15 templates/layout.user.php:17
msgid "Friday"
msgstr ""
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:15 templates/layout.user.php:17
msgid "Saturday"
msgstr ""
-#: templates/layout.guest.php:17 templates/layout.user.php:18
+#: templates/layout.guest.php:16 templates/layout.user.php:18
msgid "January"
msgstr ""
-#: templates/layout.guest.php:17 templates/layout.user.php:18
+#: templates/layout.guest.php:16 templates/layout.user.php:18
msgid "February"
msgstr ""
-#: templates/layout.guest.php:17 templates/layout.user.php:18
+#: templates/layout.guest.php:16 templates/layout.user.php:18
msgid "March"
msgstr ""
-#: templates/layout.guest.php:17 templates/layout.user.php:18
+#: templates/layout.guest.php:16 templates/layout.user.php:18
msgid "April"
msgstr ""
-#: templates/layout.guest.php:17 templates/layout.user.php:18
+#: templates/layout.guest.php:16 templates/layout.user.php:18
msgid "May"
msgstr ""
-#: templates/layout.guest.php:17 templates/layout.user.php:18
+#: templates/layout.guest.php:16 templates/layout.user.php:18
msgid "June"
msgstr ""
-#: templates/layout.guest.php:17 templates/layout.user.php:18
+#: templates/layout.guest.php:16 templates/layout.user.php:18
msgid "July"
msgstr ""
-#: templates/layout.guest.php:17 templates/layout.user.php:18
+#: templates/layout.guest.php:16 templates/layout.user.php:18
msgid "August"
msgstr ""
-#: templates/layout.guest.php:17 templates/layout.user.php:18
+#: templates/layout.guest.php:16 templates/layout.user.php:18
msgid "September"
msgstr ""
-#: templates/layout.guest.php:17 templates/layout.user.php:18
+#: templates/layout.guest.php:16 templates/layout.user.php:18
msgid "October"
msgstr ""
-#: templates/layout.guest.php:17 templates/layout.user.php:18
+#: templates/layout.guest.php:16 templates/layout.user.php:18
msgid "November"
msgstr ""
-#: templates/layout.guest.php:17 templates/layout.user.php:18
+#: templates/layout.guest.php:16 templates/layout.user.php:18
msgid "December"
msgstr ""
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:41
msgid "web services under your control"
msgstr ""
@@ -564,17 +563,3 @@ msgstr ""
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr ""
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr ""
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr ""
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index eda9e58013d..535c86fc44b 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-14 00:17+0100\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,6 +17,11 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
+#: ajax/delete.php:28 ajax/getstoragestats.php:11 ajax/upload.php:17
+#: ajax/upload.php:76 templates/index.php:18
+msgid "Upload"
+msgstr ""
+
#: ajax/move.php:17
#, php-format
msgid "Could not move %s - File with this name already exists"
@@ -31,46 +36,46 @@ msgstr ""
msgid "Unable to rename file"
msgstr ""
-#: ajax/upload.php:14
+#: ajax/upload.php:20
msgid "No file was uploaded. Unknown error"
msgstr ""
-#: ajax/upload.php:21
+#: ajax/upload.php:30
msgid "There is no error, the file uploaded with success"
msgstr ""
-#: ajax/upload.php:22
+#: ajax/upload.php:31
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr ""
-#: ajax/upload.php:24
+#: ajax/upload.php:33
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr ""
-#: ajax/upload.php:26
+#: ajax/upload.php:35
msgid "The uploaded file was only partially uploaded"
msgstr ""
-#: ajax/upload.php:27
+#: ajax/upload.php:36
msgid "No file was uploaded"
msgstr ""
-#: ajax/upload.php:28
+#: ajax/upload.php:37
msgid "Missing a temporary folder"
msgstr ""
-#: ajax/upload.php:29
+#: ajax/upload.php:38
msgid "Failed to write to disk"
msgstr ""
-#: ajax/upload.php:45
+#: ajax/upload.php:57
msgid "Not enough space available"
msgstr ""
-#: ajax/upload.php:69
+#: ajax/upload.php:91
msgid "Invalid directory."
msgstr ""
@@ -126,98 +131,100 @@ msgstr ""
msgid "deleted {files}"
msgstr ""
-#: js/files.js:31
+#: js/files.js:48
msgid "'.' is an invalid file name."
msgstr ""
-#: js/files.js:36
+#: js/files.js:53
msgid "File name cannot be empty."
msgstr ""
-#: js/files.js:45
+#: js/files.js:62
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
+#: js/files.js:204
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
msgstr ""
-#: js/files.js:224
+#: js/files.js:242
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr ""
-#: js/files.js:224
+#: js/files.js:242
msgid "Upload Error"
msgstr ""
-#: js/files.js:241
+#: js/files.js:259
msgid "Close"
msgstr ""
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:278 js/files.js:397 js/files.js:431
msgid "Pending"
msgstr ""
-#: js/files.js:280
+#: js/files.js:298
msgid "1 file uploading"
msgstr ""
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:301 js/files.js:357 js/files.js:372
msgid "{count} files uploading"
msgstr ""
-#: js/files.js:357 js/files.js:393
+#: js/files.js:376 js/files.js:414
msgid "Upload cancelled."
msgstr ""
-#: js/files.js:464
+#: js/files.js:486
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/files.js:537
+#: js/files.js:559
msgid "URL cannot be empty."
msgstr ""
-#: js/files.js:543
+#: js/files.js:565
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:727
+#: js/files.js:775
msgid "{count} files scanned"
msgstr ""
-#: js/files.js:735
+#: js/files.js:783
msgid "error while scanning"
msgstr ""
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:857 templates/index.php:64
msgid "Name"
msgstr ""
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:858 templates/index.php:75
msgid "Size"
msgstr ""
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:859 templates/index.php:77
msgid "Modified"
msgstr ""
-#: js/files.js:829
+#: js/files.js:878
msgid "1 folder"
msgstr ""
-#: js/files.js:831
+#: js/files.js:880
msgid "{count} folders"
msgstr ""
-#: js/files.js:839
+#: js/files.js:888
msgid "1 file"
msgstr ""
-#: js/files.js:841
+#: js/files.js:890
msgid "{count} files"
msgstr ""
@@ -269,10 +276,6 @@ msgstr ""
msgid "From link"
msgstr ""
-#: templates/index.php:18
-msgid "Upload"
-msgstr ""
-
#: templates/index.php:41
msgid "Cancel upload"
msgstr ""
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index ac850a6cf5a..b0174b4df0d 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-14 00:17+0100\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,18 +17,66 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: templates/settings.php:3
-msgid "Encryption"
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to "
+"complete the conversion."
msgstr ""
-#: templates/settings.php:6
-msgid "Enable Encryption"
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
msgstr ""
-#: templates/settings.php:7
-msgid "None"
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it "
+"back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
+msgid "Encryption"
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:67
msgid "Exclude the following file types from encryption"
msgstr ""
+
+#: templates/settings.php:71
+msgid "None"
+msgstr ""
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index 44a86d09259..0b141e370d5 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-14 00:17+0100\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index 9fb6d948529..5291a185d3d 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-14 00:17+0100\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index 9cbe1ef9f6e..0fd775d5518 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-14 00:17+0100\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,22 +17,10 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: js/settings-personal.js:31 templates/settings-personal.php:7
-msgid "Expire all versions"
-msgstr ""
-
#: js/versions.js:16
msgid "History"
msgstr ""
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr ""
-
-#: templates/settings-personal.php:10
-msgid "This will delete all existing backup versions of your files"
-msgstr ""
-
#: templates/settings.php:3
msgid "Files Versioning"
msgstr ""
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 729094921d8..d9c2c443876 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-14 00:17+0100\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -57,11 +57,15 @@ msgstr ""
msgid "Selected files too large to generate zip file."
msgstr ""
+#: helper.php:229
+msgid "couldn't be determined"
+msgstr ""
+
#: json.php:28
msgid "Application is not enabled"
msgstr ""
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
msgstr ""
@@ -81,55 +85,55 @@ msgstr ""
msgid "Images"
msgstr ""
-#: template.php:103
+#: template.php:113
msgid "seconds ago"
msgstr ""
-#: template.php:104
+#: template.php:114
msgid "1 minute ago"
msgstr ""
-#: template.php:105
+#: template.php:115
#, php-format
msgid "%d minutes ago"
msgstr ""
-#: template.php:106
+#: template.php:116
msgid "1 hour ago"
msgstr ""
-#: template.php:107
+#: template.php:117
#, php-format
msgid "%d hours ago"
msgstr ""
-#: template.php:108
+#: template.php:118
msgid "today"
msgstr ""
-#: template.php:109
+#: template.php:119
msgid "yesterday"
msgstr ""
-#: template.php:110
+#: template.php:120
#, php-format
msgid "%d days ago"
msgstr ""
-#: template.php:111
+#: template.php:121
msgid "last month"
msgstr ""
-#: template.php:112
+#: template.php:122
#, php-format
msgid "%d months ago"
msgstr ""
-#: template.php:113
+#: template.php:123
msgid "last year"
msgstr ""
-#: template.php:114
+#: template.php:124
msgid "years ago"
msgstr ""
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 138b8fdffd9..89ce02d3933 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-14 00:17+0100\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index 73eaae18c4c..03c8c9e73c1 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-14 00:17+0100\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -26,8 +26,8 @@ msgstr ""
#: templates/settings.php:11
msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will "
-"not work. Please ask your system administrator to install it."
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
msgstr ""
#: templates/settings.php:15
@@ -44,6 +44,10 @@ msgid "Base DN"
msgstr ""
#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
@@ -113,10 +117,18 @@ msgstr ""
msgid "Base User Tree"
msgstr ""
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index 24c56c17a42..63897bf14b5 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-14 00:17+0100\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,12 +17,17 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
#: templates/settings.php:4
msgid "URL: http://"
msgstr ""
#: templates/settings.php:6
msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials correct."
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
msgstr ""
diff --git a/l10n/th_TH/core.po b/l10n/th_TH/core.po
index e36ae6f3983..e9fe1ca9c9e 100644
--- a/l10n/th_TH/core.po
+++ b/l10n/th_TH/core.po
@@ -3,15 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012.
+# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012-2013.
# AriesAnywhere Anywhere <ariesanywherer@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 01:02+0000\n"
+"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -22,26 +22,26 @@ msgstr ""
#: ajax/share.php:84
#, php-format
msgid "User %s shared a file with you"
-msgstr ""
+msgstr "ผู้ใช้งาน %s ได้แชร์ไฟล์ให้กับคุณ"
#: ajax/share.php:86
#, php-format
msgid "User %s shared a folder with you"
-msgstr ""
+msgstr "ผู้ใช้งาน %s ได้แชร์โฟลเดอร์ให้กับคุณ"
#: ajax/share.php:88
#, php-format
msgid ""
"User %s shared the file \"%s\" with you. It is available for download here: "
"%s"
-msgstr ""
+msgstr "ผู้ใช้งาน %s ได้แชร์ไฟล์ \"%s\" ให้กับคุณ และคุณสามารถสามารถดาวน์โหลดไฟล์ดังกล่าวได้จากที่นี่: %s"
#: ajax/share.php:90
#, php-format
msgid ""
"User %s shared the folder \"%s\" with you. It is available for download "
"here: %s"
-msgstr ""
+msgstr "ผู้ใช้งาน %s ได้แชร์โฟลเดอร์ \"%s\" ให้กับคุณ และคุณสามารถดาวน์โหลดโฟลเดอร์ดังกล่าวได้จากที่นี่: %s"
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
@@ -85,55 +85,55 @@ msgstr "เกิดข้อผิดพลาดในการลบ %s อ
msgid "Settings"
msgstr "ตั้งค่า"
-#: js/js.js:711
+#: js/js.js:706
msgid "seconds ago"
msgstr "วินาที ก่อนหน้านี้"
-#: js/js.js:712
+#: js/js.js:707
msgid "1 minute ago"
msgstr "1 นาทีก่อนหน้านี้"
-#: js/js.js:713
+#: js/js.js:708
msgid "{minutes} minutes ago"
msgstr "{minutes} นาทีก่อนหน้านี้"
-#: js/js.js:714
+#: js/js.js:709
msgid "1 hour ago"
msgstr "1 ชั่วโมงก่อนหน้านี้"
-#: js/js.js:715
+#: js/js.js:710
msgid "{hours} hours ago"
msgstr "{hours} ชั่วโมงก่อนหน้านี้"
-#: js/js.js:716
+#: js/js.js:711
msgid "today"
msgstr "วันนี้"
-#: js/js.js:717
+#: js/js.js:712
msgid "yesterday"
msgstr "เมื่อวานนี้"
-#: js/js.js:718
+#: js/js.js:713
msgid "{days} days ago"
msgstr "{day} วันก่อนหน้านี้"
-#: js/js.js:719
+#: js/js.js:714
msgid "last month"
msgstr "เดือนที่แล้ว"
-#: js/js.js:720
+#: js/js.js:715
msgid "{months} months ago"
msgstr "{months} เดือนก่อนหน้านี้"
-#: js/js.js:721
+#: js/js.js:716
msgid "months ago"
msgstr "เดือน ที่ผ่านมา"
-#: js/js.js:722
+#: js/js.js:717
msgid "last year"
msgstr "ปีที่แล้ว"
-#: js/js.js:723
+#: js/js.js:718
msgid "years ago"
msgstr "ปี ที่ผ่านมา"
@@ -209,17 +209,16 @@ msgid "Password protect"
msgstr "ใส่รหัสผ่านไว้"
#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
msgid "Password"
msgstr "รหัสผ่าน"
#: js/share.js:172
msgid "Email link to person"
-msgstr ""
+msgstr "ส่งลิงก์ให้ทางอีเมล"
#: js/share.js:173
msgid "Send"
-msgstr ""
+msgstr "ส่ง"
#: js/share.js:177
msgid "Set expiration date"
@@ -287,11 +286,11 @@ msgstr "เกิดข้อผิดพลาดในการตั้งค
#: js/share.js:581
msgid "Sending ..."
-msgstr ""
+msgstr "กำลังส่ง..."
#: js/share.js:592
msgid "Email sent"
-msgstr ""
+msgstr "ส่งอีเมล์แล้ว"
#: lostpassword/controller.php:47
msgid "ownCloud password reset"
@@ -444,83 +443,83 @@ msgstr "Database host"
msgid "Finish setup"
msgstr "ติดตั้งเรียบร้อยแล้ว"
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:15 templates/layout.user.php:17
msgid "Sunday"
msgstr "วันอาทิตย์"
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:15 templates/layout.user.php:17
msgid "Monday"
msgstr "วันจันทร์"
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:15 templates/layout.user.php:17
msgid "Tuesday"
msgstr "วันอังคาร"
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:15 templates/layout.user.php:17
msgid "Wednesday"
msgstr "วันพุธ"
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:15 templates/layout.user.php:17
msgid "Thursday"
msgstr "วันพฤหัสบดี"
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:15 templates/layout.user.php:17
msgid "Friday"
msgstr "วันศุกร์"
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:15 templates/layout.user.php:17
msgid "Saturday"
msgstr "วันเสาร์"
-#: templates/layout.guest.php:17 templates/layout.user.php:18
+#: templates/layout.guest.php:16 templates/layout.user.php:18
msgid "January"
msgstr "มกราคม"
-#: templates/layout.guest.php:17 templates/layout.user.php:18
+#: templates/layout.guest.php:16 templates/layout.user.php:18
msgid "February"
msgstr "กุมภาพันธ์"
-#: templates/layout.guest.php:17 templates/layout.user.php:18
+#: templates/layout.guest.php:16 templates/layout.user.php:18
msgid "March"
msgstr "มีนาคม"
-#: templates/layout.guest.php:17 templates/layout.user.php:18
+#: templates/layout.guest.php:16 templates/layout.user.php:18
msgid "April"
msgstr "เมษายน"
-#: templates/layout.guest.php:17 templates/layout.user.php:18
+#: templates/layout.guest.php:16 templates/layout.user.php:18
msgid "May"
msgstr "พฤษภาคม"
-#: templates/layout.guest.php:17 templates/layout.user.php:18
+#: templates/layout.guest.php:16 templates/layout.user.php:18
msgid "June"
msgstr "มิถุนายน"
-#: templates/layout.guest.php:17 templates/layout.user.php:18
+#: templates/layout.guest.php:16 templates/layout.user.php:18
msgid "July"
msgstr "กรกฏาคม"
-#: templates/layout.guest.php:17 templates/layout.user.php:18
+#: templates/layout.guest.php:16 templates/layout.user.php:18
msgid "August"
msgstr "สิงหาคม"
-#: templates/layout.guest.php:17 templates/layout.user.php:18
+#: templates/layout.guest.php:16 templates/layout.user.php:18
msgid "September"
msgstr "กันยายน"
-#: templates/layout.guest.php:17 templates/layout.user.php:18
+#: templates/layout.guest.php:16 templates/layout.user.php:18
msgid "October"
msgstr "ตุลาคม"
-#: templates/layout.guest.php:17 templates/layout.user.php:18
+#: templates/layout.guest.php:16 templates/layout.user.php:18
msgid "November"
msgstr "พฤศจิกายน"
-#: templates/layout.guest.php:17 templates/layout.user.php:18
+#: templates/layout.guest.php:16 templates/layout.user.php:18
msgid "December"
msgstr "ธันวาคม"
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:41
msgid "web services under your control"
msgstr "web services under your control"
@@ -565,18 +564,4 @@ msgstr "ถัดไป"
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
-msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "คำเตือนเพื่อความปลอดภัย!"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "กรุณายืนยันรหัสผ่านของคุณ <br/> เพื่อความปลอดภัย คุณจะถูกขอให้กรอกรหัสผ่านอีกครั้ง"
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "ยืนยัน"
+msgstr "กำลังอัพเดท ownCloud ไปเป็นรุ่น %s, กรุณารอสักครู่"
diff --git a/l10n/th_TH/files.po b/l10n/th_TH/files.po
index 290a7cebd89..691310546f2 100644
--- a/l10n/th_TH/files.po
+++ b/l10n/th_TH/files.po
@@ -3,15 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012.
+# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012-2013.
# AriesAnywhere Anywhere <ariesanywherer@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 01:13+0000\n"
+"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,62 +19,67 @@ msgstr ""
"Language: th_TH\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#: ajax/delete.php:28 ajax/getstoragestats.php:11 ajax/upload.php:17
+#: ajax/upload.php:76 templates/index.php:18
+msgid "Upload"
+msgstr "อัพโหลด"
+
#: ajax/move.php:17
#, php-format
msgid "Could not move %s - File with this name already exists"
-msgstr ""
+msgstr "ไม่สามารถย้าย %s ได้ - ไฟล์ที่ใช้ชื่อนี้มีอยู่แล้ว"
#: ajax/move.php:24
#, php-format
msgid "Could not move %s"
-msgstr ""
+msgstr "ไม่สามารถย้าย %s ได้"
#: ajax/rename.php:19
msgid "Unable to rename file"
-msgstr ""
+msgstr "ไม่สามารถเปลี่ยนชื่อไฟล์ได้"
-#: ajax/upload.php:14
+#: ajax/upload.php:20
msgid "No file was uploaded. Unknown error"
msgstr "ยังไม่มีไฟล์ใดที่ถูกอัพโหลด เกิดข้อผิดพลาดที่ไม่ทราบสาเหตุ"
-#: ajax/upload.php:21
+#: ajax/upload.php:30
msgid "There is no error, the file uploaded with success"
msgstr "ไม่มีข้อผิดพลาดใดๆ ไฟล์ถูกอัพโหลดเรียบร้อยแล้ว"
-#: ajax/upload.php:22
+#: ajax/upload.php:31
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr "ขนาดไฟล์ที่อัพโหลดมีขนาดเกิน upload_max_filesize ที่ระบุไว้ใน php.ini"
-#: ajax/upload.php:24
+#: ajax/upload.php:33
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "ไฟล์ที่อัพโหลดมีขนาดเกินคำสั่ง MAX_FILE_SIZE ที่ระบุเอาไว้ในรูปแบบคำสั่งในภาษา HTML"
-#: ajax/upload.php:26
+#: ajax/upload.php:35
msgid "The uploaded file was only partially uploaded"
msgstr "ไฟล์ที่อัพโหลดยังไม่ได้ถูกอัพโหลดอย่างสมบูรณ์"
-#: ajax/upload.php:27
+#: ajax/upload.php:36
msgid "No file was uploaded"
msgstr "ยังไม่มีไฟล์ที่ถูกอัพโหลด"
-#: ajax/upload.php:28
+#: ajax/upload.php:37
msgid "Missing a temporary folder"
msgstr "แฟ้มเอกสารชั่วคราวเกิดการสูญหาย"
-#: ajax/upload.php:29
+#: ajax/upload.php:38
msgid "Failed to write to disk"
msgstr "เขียนข้อมูลลงแผ่นดิสก์ล้มเหลว"
-#: ajax/upload.php:45
+#: ajax/upload.php:57
msgid "Not enough space available"
-msgstr ""
+msgstr "มีพื้นที่เหลือไม่เพียงพอ"
-#: ajax/upload.php:69
+#: ajax/upload.php:91
msgid "Invalid directory."
-msgstr ""
+msgstr "ไดเร็กทอรี่ไม่ถูกต้อง"
#: appinfo/app.php:10
msgid "Files"
@@ -128,98 +133,100 @@ msgstr "ยกเลิกการแชร์แล้ว {files} ไฟล์
msgid "deleted {files}"
msgstr "ลบไฟล์แล้ว {files} ไฟล์"
-#: js/files.js:31
+#: js/files.js:48
msgid "'.' is an invalid file name."
-msgstr ""
+msgstr "'.' เป็นชื่อไฟล์ที่ไม่ถูกต้อง"
-#: js/files.js:36
+#: js/files.js:53
msgid "File name cannot be empty."
-msgstr ""
+msgstr "ชื่อไฟล์ไม่สามารถเว้นว่างได้"
-#: js/files.js:45
+#: js/files.js:62
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "ชื่อที่ใช้ไม่ถูกต้อง, '\\', '/', '<', '>', ':', '\"', '|', '?' และ '*' ไม่ได้รับอนุญาตให้ใช้งานได้"
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "กำลังสร้างไฟล์บีบอัด ZIP อาจใช้เวลาสักครู่"
+#: js/files.js:204
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr "กำลังเตรียมดาวน์โหลดข้อมูล หากไฟล์มีขนาดใหญ่ อาจใช้เวลาสักครู่"
-#: js/files.js:224
+#: js/files.js:242
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "ไม่สามารถอัพโหลดไฟล์ของคุณได้ เนื่องจากไฟล์ดังกล่าวเป็นไดเร็กทอรี่หรือมีขนาด 0 ไบต์"
-#: js/files.js:224
+#: js/files.js:242
msgid "Upload Error"
msgstr "เกิดข้อผิดพลาดในการอัพโหลด"
-#: js/files.js:241
+#: js/files.js:259
msgid "Close"
msgstr "ปิด"
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:278 js/files.js:397 js/files.js:431
msgid "Pending"
msgstr "อยู่ระหว่างดำเนินการ"
-#: js/files.js:280
+#: js/files.js:298
msgid "1 file uploading"
msgstr "กำลังอัพโหลดไฟล์ 1 ไฟล์"
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:301 js/files.js:357 js/files.js:372
msgid "{count} files uploading"
msgstr "กำลังอัพโหลด {count} ไฟล์"
-#: js/files.js:357 js/files.js:393
+#: js/files.js:376 js/files.js:414
msgid "Upload cancelled."
msgstr "การอัพโหลดถูกยกเลิก"
-#: js/files.js:464
+#: js/files.js:486
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "การอัพโหลดไฟล์กำลังอยู่ในระหว่างดำเนินการ การออกจากหน้าเว็บนี้จะทำให้การอัพโหลดถูกยกเลิก"
-#: js/files.js:537
+#: js/files.js:559
msgid "URL cannot be empty."
msgstr "URL ไม่สามารถเว้นว่างได้"
-#: js/files.js:543
+#: js/files.js:565
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
+msgstr "ชื่อโฟลเดอร์ไม่ถูกต้อง การใช้งาน 'แชร์' สงวนไว้สำหรับ Owncloud เท่านั้น"
-#: js/files.js:727
+#: js/files.js:775
msgid "{count} files scanned"
msgstr "สแกนไฟล์แล้ว {count} ไฟล์"
-#: js/files.js:735
+#: js/files.js:783
msgid "error while scanning"
msgstr "พบข้อผิดพลาดในระหว่างการสแกนไฟล์"
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:857 templates/index.php:64
msgid "Name"
msgstr "ชื่อ"
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:858 templates/index.php:75
msgid "Size"
msgstr "ขนาด"
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:859 templates/index.php:77
msgid "Modified"
msgstr "ปรับปรุงล่าสุด"
-#: js/files.js:829
+#: js/files.js:878
msgid "1 folder"
msgstr "1 โฟลเดอร์"
-#: js/files.js:831
+#: js/files.js:880
msgid "{count} folders"
msgstr "{count} โฟลเดอร์"
-#: js/files.js:839
+#: js/files.js:888
msgid "1 file"
msgstr "1 ไฟล์"
-#: js/files.js:841
+#: js/files.js:890
msgid "{count} files"
msgstr "{count} ไฟล์"
@@ -271,10 +278,6 @@ msgstr "แฟ้มเอกสาร"
msgid "From link"
msgstr "จากลิงก์"
-#: templates/index.php:18
-msgid "Upload"
-msgstr "อัพโหลด"
-
#: templates/index.php:41
msgid "Cancel upload"
msgstr "ยกเลิกการอัพโหลด"
diff --git a/l10n/th_TH/files_encryption.po b/l10n/th_TH/files_encryption.po
index f396eed4dab..747fd64f1a5 100644
--- a/l10n/th_TH/files_encryption.po
+++ b/l10n/th_TH/files_encryption.po
@@ -8,28 +8,76 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-15 02:02+0200\n"
-"PO-Revision-Date: 2012-08-14 13:12+0000\n"
-"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: th_TH\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
msgid "Encryption"
msgstr "การเข้ารหัส"
-#: templates/settings.php:4
+#: templates/settings.php:67
msgid "Exclude the following file types from encryption"
msgstr "ไม่ต้องรวมชนิดของไฟล์ดังต่อไปนี้จากการเข้ารหัส"
-#: templates/settings.php:5
+#: templates/settings.php:71
msgid "None"
msgstr "ไม่ต้อง"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "เปิดใช้งานการเข้ารหัส"
diff --git a/l10n/th_TH/files_external.po b/l10n/th_TH/files_external.po
index efca59c6be0..6d58bbeaf81 100644
--- a/l10n/th_TH/files_external.po
+++ b/l10n/th_TH/files_external.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012.
+# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012-2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-11 23:22+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 00:50+0000\n"
+"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -46,14 +46,14 @@ msgstr "เกิดข้อผิดพลาดในการกำหนด
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
-msgstr ""
+msgstr "<b>คำเตือน:</b> \"smbclient\" ยังไม่ได้ถูกติดตั้ง. การชี้ CIFS/SMB เพื่อแชร์ข้อมูลไม่สามารถกระทำได้ กรุณาสอบถามข้อมูลเพิ่มเติมจากผู้ดูแลระบบเพื่อติดตั้ง."
#: lib/config.php:435
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
-msgstr ""
+msgstr "<b>คำเตือน:</b> การสนับสนุนการใช้งาน FTP ในภาษา PHP ยังไม่ได้ถูกเปิดใช้งานหรือถูกติดตั้ง. การชี้ FTP เพื่อแชร์ข้อมูลไม่สามารถดำเนินการได้ กรุณาสอบถามข้อมูลเพิ่มเติมจากผู้ดูแลระบบเพื่อติดตั้ง"
#: templates/settings.php:3
msgid "External Storage"
@@ -100,7 +100,7 @@ msgid "Users"
msgstr "ผู้ใช้งาน"
#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:144 templates/settings.php:145
msgid "Delete"
msgstr "ลบ"
@@ -112,10 +112,10 @@ msgstr "เปิดให้มีการใช้พื้นที่จั
msgid "Allow users to mount their own external storage"
msgstr "อนุญาตให้ผู้ใช้งานสามารถชี้ตำแหน่งไปที่พื้นที่จัดเก็บข้อมูลภายนอกของตนเองได้"
-#: templates/settings.php:139
+#: templates/settings.php:136
msgid "SSL root certificates"
msgstr "ใบรับรองความปลอดภัยด้วยระบบ SSL จาก Root"
-#: templates/settings.php:158
+#: templates/settings.php:153
msgid "Import Root Certificate"
msgstr "นำเข้าข้อมูลใบรับรองความปลอดภัยจาก Root"
diff --git a/l10n/th_TH/files_versions.po b/l10n/th_TH/files_versions.po
index 7582be9f673..c36c1b5941b 100644
--- a/l10n/th_TH/files_versions.po
+++ b/l10n/th_TH/files_versions.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-23 02:01+0200\n"
-"PO-Revision-Date: 2012-09-22 11:09+0000\n"
-"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,22 +18,10 @@ msgstr ""
"Language: th_TH\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "หมดอายุทุกรุ่น"
-
#: js/versions.js:16
msgid "History"
msgstr "ประวัติ"
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "รุ่น"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "นี่จะเป็นลบทิ้งไฟล์รุ่นที่ทำการสำรองข้อมูลทั้งหมดที่มีอยู่ของคุณทิ้งไป"
-
#: templates/settings.php:3
msgid "Files Versioning"
msgstr "การกำหนดเวอร์ชั่นของไฟล์"
diff --git a/l10n/th_TH/lib.po b/l10n/th_TH/lib.po
index 93bec7510e5..ab2e3132762 100644
--- a/l10n/th_TH/lib.po
+++ b/l10n/th_TH/lib.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012.
+# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012-2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-23 00:01+0100\n"
-"PO-Revision-Date: 2012-11-22 10:45+0000\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 00:44+0000\n"
"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
@@ -18,51 +18,55 @@ msgstr ""
"Language: th_TH\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: app.php:285
+#: app.php:301
msgid "Help"
msgstr "ช่วยเหลือ"
-#: app.php:292
+#: app.php:308
msgid "Personal"
msgstr "ส่วนตัว"
-#: app.php:297
+#: app.php:313
msgid "Settings"
msgstr "ตั้งค่า"
-#: app.php:302
+#: app.php:318
msgid "Users"
msgstr "ผู้ใช้งาน"
-#: app.php:309
+#: app.php:325
msgid "Apps"
msgstr "แอปฯ"
-#: app.php:311
+#: app.php:327
msgid "Admin"
msgstr "ผู้ดูแล"
-#: files.php:361
+#: files.php:365
msgid "ZIP download is turned off."
msgstr "คุณสมบัติการดาวน์โหลด zip ถูกปิดการใช้งานไว้"
-#: files.php:362
+#: files.php:366
msgid "Files need to be downloaded one by one."
msgstr "ไฟล์สามารถดาวน์โหลดได้ทีละครั้งเท่านั้น"
-#: files.php:362 files.php:387
+#: files.php:366 files.php:391
msgid "Back to Files"
msgstr "กลับไปที่ไฟล์"
-#: files.php:386
+#: files.php:390
msgid "Selected files too large to generate zip file."
msgstr "ไฟล์ที่เลือกมีขนาดใหญ่เกินกว่าที่จะสร้างเป็นไฟล์ zip"
+#: helper.php:229
+msgid "couldn't be determined"
+msgstr "ไม่สามารถกำหนดได้"
+
#: json.php:28
msgid "Application is not enabled"
msgstr "แอพพลิเคชั่นดังกล่าวยังไม่ได้เปิดใช้งาน"
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
msgstr "เกิดข้อผิดพลาดในสิทธิ์การเข้าใช้งาน"
@@ -82,55 +86,55 @@ msgstr "ข้อความ"
msgid "Images"
msgstr "รูปภาพ"
-#: template.php:103
+#: template.php:113
msgid "seconds ago"
msgstr "วินาทีที่ผ่านมา"
-#: template.php:104
+#: template.php:114
msgid "1 minute ago"
msgstr "1 นาทีมาแล้ว"
-#: template.php:105
+#: template.php:115
#, php-format
msgid "%d minutes ago"
msgstr "%d นาทีที่ผ่านมา"
-#: template.php:106
+#: template.php:116
msgid "1 hour ago"
msgstr "1 ชั่วโมงก่อนหน้านี้"
-#: template.php:107
+#: template.php:117
#, php-format
msgid "%d hours ago"
msgstr "%d ชั่วโมงก่อนหน้านี้"
-#: template.php:108
+#: template.php:118
msgid "today"
msgstr "วันนี้"
-#: template.php:109
+#: template.php:119
msgid "yesterday"
msgstr "เมื่อวานนี้"
-#: template.php:110
+#: template.php:120
#, php-format
msgid "%d days ago"
msgstr "%d วันที่ผ่านมา"
-#: template.php:111
+#: template.php:121
msgid "last month"
msgstr "เดือนที่แล้ว"
-#: template.php:112
+#: template.php:122
#, php-format
msgid "%d months ago"
msgstr "%d เดือนมาแล้ว"
-#: template.php:113
+#: template.php:123
msgid "last year"
msgstr "ปีที่แล้ว"
-#: template.php:114
+#: template.php:124
msgid "years ago"
msgstr "ปีที่ผ่านมา"
diff --git a/l10n/th_TH/settings.po b/l10n/th_TH/settings.po
index a024b5901ae..9e7676e802b 100644
--- a/l10n/th_TH/settings.po
+++ b/l10n/th_TH/settings.po
@@ -3,16 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012.
+# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012-2013.
# AriesAnywhere Anywhere <ariesanywherer@gmail.com>, 2012.
# <icewind1991@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 00:59+0000\n"
+"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -66,7 +66,7 @@ msgstr "คำร้องขอไม่ถูกต้อง"
#: ajax/togglegroups.php:12
msgid "Admins can't remove themself from the admin group"
-msgstr ""
+msgstr "ผู้ดูแลระบบไม่สามารถลบตัวเองออกจากกลุ่มผู้ดูแลได้"
#: ajax/togglegroups.php:28
#, php-format
@@ -116,27 +116,27 @@ msgstr "<span class=\"licence\"></span>-ลิขสิทธิ์การใ
#: templates/help.php:3
msgid "User Documentation"
-msgstr ""
+msgstr "เอกสารคู่มือการใช้งานสำหรับผู้ใช้งาน"
#: templates/help.php:4
msgid "Administrator Documentation"
-msgstr ""
+msgstr "เอกสารคู่มือการใช้งานสำหรับผู้ดูแลระบบ"
#: templates/help.php:6
msgid "Online Documentation"
-msgstr ""
+msgstr "เอกสารคู่มือการใช้งานออนไลน์"
#: templates/help.php:7
msgid "Forum"
-msgstr ""
+msgstr "กระดานสนทนา"
#: templates/help.php:9
msgid "Bugtracker"
-msgstr ""
+msgstr "Bugtracker"
#: templates/help.php:11
msgid "Commercial Support"
-msgstr ""
+msgstr "บริการลูกค้าแบบเสียค่าใช้จ่าย"
#: templates/personal.php:8
#, php-format
@@ -149,15 +149,15 @@ msgstr "ลูกค้า"
#: templates/personal.php:13
msgid "Download Desktop Clients"
-msgstr ""
+msgstr "ดาวน์โหลดโปรแกรมไคลเอนต์สำหรับเครื่องเดสก์ท็อป"
#: templates/personal.php:14
msgid "Download Android Client"
-msgstr ""
+msgstr "ดาวน์โหลดโปรแกรมไคลเอนต์สำหรับแอนดรอยด์"
#: templates/personal.php:15
msgid "Download iOS Client"
-msgstr ""
+msgstr "ดาวน์โหลดโปรแกรมไคลเอนต์สำหรับ iOS"
#: templates/personal.php:21 templates/users.php:23 templates/users.php:82
msgid "Password"
@@ -209,15 +209,15 @@ msgstr "ช่วยกันแปล"
#: templates/personal.php:52
msgid "WebDAV"
-msgstr ""
+msgstr "WebDAV"
#: templates/personal.php:54
msgid "Use this address to connect to your ownCloud in your file manager"
-msgstr ""
+msgstr "ใช้ที่อยู่นี้เพื่อเชื่อมต่อกับ ownCloud ในโปรแกรมจัดการไฟล์ของคุณ"
#: templates/personal.php:63
msgid "Version"
-msgstr ""
+msgstr "รุ่น"
#: templates/personal.php:65
msgid ""
@@ -243,11 +243,11 @@ msgstr "สร้าง"
#: templates/users.php:35
msgid "Default Storage"
-msgstr ""
+msgstr "พื้นที่จำกัดข้อมูลเริ่มต้น"
#: templates/users.php:42 templates/users.php:138
msgid "Unlimited"
-msgstr ""
+msgstr "ไม่จำกัดจำนวน"
#: templates/users.php:60 templates/users.php:153
msgid "Other"
@@ -259,11 +259,11 @@ msgstr "ผู้ดูแลกลุ่ม"
#: templates/users.php:87
msgid "Storage"
-msgstr ""
+msgstr "พื้นที่จัดเก็บข้อมูล"
#: templates/users.php:133
msgid "Default"
-msgstr ""
+msgstr "ค่าเริ่มต้น"
#: templates/users.php:161
msgid "Delete"
diff --git a/l10n/th_TH/user_ldap.po b/l10n/th_TH/user_ldap.po
index c8a7bd651bd..bb0c9b64412 100644
--- a/l10n/th_TH/user_ldap.po
+++ b/l10n/th_TH/user_ldap.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012.
+# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012-2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 01:21+0000\n"
+"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -23,13 +23,13 @@ msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
-msgstr ""
+msgstr "<b>คำเตือน:</b> แอปฯ user_ldap และ user_webdavauth ไม่สามารถใช้งานร่วมกันได้. คุณอาจประสพปัญหาที่ไม่คาดคิดจากเหตุการณ์ดังกล่าว กรุณาติดต่อผู้ดูแลระบบของคุณเพื่อระงับการใช้งานแอปฯ ตัวใดตัวหนึ่งข้างต้น"
#: templates/settings.php:11
msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
-msgstr ""
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
+msgstr "<b>คำเตือน:</b> โมดูล PHP LDAP ยังไม่ได้ถูกติดตั้ง, ระบบด้านหลังจะไม่สามารถทำงานได้ กรุณาติดต่อผู้ดูแลระบบของคุณเพื่อทำการติดตั้งโมดูลดังกล่าว"
#: templates/settings.php:15
msgid "Host"
@@ -45,6 +45,10 @@ msgid "Base DN"
msgstr "DN ฐาน"
#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr "หนึ่ง Base DN ต่อบรรทัด"
+
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "คุณสามารถระบุ DN หลักสำหรับผู้ใช้งานและกลุ่มต่างๆในแท็บขั้นสูงได้"
@@ -115,10 +119,18 @@ msgstr "พอร์ต"
msgid "Base User Tree"
msgstr "รายการผู้ใช้งานหลักแบบ Tree"
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr "หนึ่ง User Base DN ต่อบรรทัด"
+
#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "รายการกลุ่มหลักแบบ Tree"
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr "หนึ่ง Group Base DN ต่อบรรทัด"
+
#: templates/settings.php:27
msgid "Group-Member association"
msgstr "ความสัมพันธ์ของสมาชิกในกลุ่ม"
diff --git a/l10n/th_TH/user_webdavauth.po b/l10n/th_TH/user_webdavauth.po
index e169eac8418..3493831b2c1 100644
--- a/l10n/th_TH/user_webdavauth.po
+++ b/l10n/th_TH/user_webdavauth.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012.
+# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012-2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-20 00:11+0100\n"
-"PO-Revision-Date: 2012-12-19 23:12+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 00:54+0000\n"
+"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,13 +18,17 @@ msgstr ""
"Language: th_TH\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr "WebDAV Authentication"
+
#: templates/settings.php:4
msgid "URL: http://"
-msgstr ""
+msgstr "URL: http://"
#: templates/settings.php:6
msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
-msgstr ""
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
+msgstr "ownCloud จะส่งข้อมูลการเข้าใช้งานของผู้ใช้งานไปยังที่อยู่ URL ดังกล่าวนี้ ปลั๊กอินดังกล่าวจะทำการตรวจสอบข้อมูลที่โต้ตอบกลับมาและจะทำการแปลรหัส HTTP statuscodes 401 และ 403 ให้เป็นข้อมูลการเข้าใช้งานที่ไม่สามารถใช้งานได้ ส่วนข้อมูลอื่นๆที่เหลือทั้งหมดจะเป็นข้อมูลการเข้าใช้งานที่สามารถใช้งานได้"
diff --git a/l10n/tr/core.po b/l10n/tr/core.po
index 0057c9b5064..b35d17c7b5d 100644
--- a/l10n/tr/core.po
+++ b/l10n/tr/core.po
@@ -6,14 +6,15 @@
# Aranel Surion <aranel@aranelsurion.org>, 2011, 2012.
# Caner Başaran <basaran.caner@gmail.com>, 2012.
# <info@beyboo.de>, 2012.
+# ismail yenigul <ismail.yenigul@surgate.com>, 2013.
# Necdet Yücel <necdetyucel@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:04+0000\n"
+"Last-Translator: ismail yenigül <ismail.yenigul@surgate.com>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -24,26 +25,26 @@ msgstr ""
#: ajax/share.php:84
#, php-format
msgid "User %s shared a file with you"
-msgstr ""
+msgstr "%s kullanıcısı sizinle bir dosyayı paylaştı"
#: ajax/share.php:86
#, php-format
msgid "User %s shared a folder with you"
-msgstr ""
+msgstr "%s kullanıcısı sizinle bir dizini paylaştı"
#: ajax/share.php:88
#, php-format
msgid ""
"User %s shared the file \"%s\" with you. It is available for download here: "
"%s"
-msgstr ""
+msgstr "%s kullanıcısı \"%s\" dosyasını sizinle paylaştı. %s adresinden indirilebilir"
#: ajax/share.php:90
#, php-format
msgid ""
"User %s shared the folder \"%s\" with you. It is available for download "
"here: %s"
-msgstr ""
+msgstr "%s kullanıcısı \"%s\" dizinini sizinle paylaştı. %s adresinden indirilebilir"
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
@@ -67,12 +68,12 @@ msgstr "Nesne türü desteklenmemektedir."
#: ajax/vcategories/removeFromFavorites.php:30
#, php-format
msgid "%s ID not provided."
-msgstr ""
+msgstr "%s ID belirtilmedi."
#: ajax/vcategories/addToFavorites.php:35
#, php-format
msgid "Error adding %s to favorites."
-msgstr ""
+msgstr "%s favorilere eklenirken hata oluştu"
#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
msgid "No categories selected for deletion."
@@ -81,61 +82,61 @@ msgstr "Silmek için bir kategori seçilmedi"
#: ajax/vcategories/removeFromFavorites.php:35
#, php-format
msgid "Error removing %s from favorites."
-msgstr ""
+msgstr "%s favorilere çıkarılırken hata oluştu"
#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
msgid "Settings"
msgstr "Ayarlar"
-#: js/js.js:711
+#: js/js.js:706
msgid "seconds ago"
msgstr "saniye önce"
-#: js/js.js:712
+#: js/js.js:707
msgid "1 minute ago"
msgstr "1 dakika önce"
-#: js/js.js:713
+#: js/js.js:708
msgid "{minutes} minutes ago"
msgstr "{minutes} dakika önce"
-#: js/js.js:714
+#: js/js.js:709
msgid "1 hour ago"
msgstr "1 saat önce"
-#: js/js.js:715
+#: js/js.js:710
msgid "{hours} hours ago"
msgstr "{hours} saat önce"
-#: js/js.js:716
+#: js/js.js:711
msgid "today"
msgstr "bugün"
-#: js/js.js:717
+#: js/js.js:712
msgid "yesterday"
msgstr "dün"
-#: js/js.js:718
+#: js/js.js:713
msgid "{days} days ago"
msgstr "{days} gün önce"
-#: js/js.js:719
+#: js/js.js:714
msgid "last month"
msgstr "geçen ay"
-#: js/js.js:720
+#: js/js.js:715
msgid "{months} months ago"
msgstr "{months} ay önce"
-#: js/js.js:721
+#: js/js.js:716
msgid "months ago"
msgstr "ay önce"
-#: js/js.js:722
+#: js/js.js:717
msgid "last year"
msgstr "geçen yıl"
-#: js/js.js:723
+#: js/js.js:718
msgid "years ago"
msgstr "yıl önce"
@@ -172,11 +173,11 @@ msgstr "Hata"
#: js/oc-vcategories.js:179
msgid "The app name is not specified."
-msgstr ""
+msgstr "uygulama adı belirtilmedi."
#: js/oc-vcategories.js:194
msgid "The required file {file} is not installed!"
-msgstr ""
+msgstr "İhtiyaç duyulan {file} dosyası kurulu değil."
#: js/share.js:124 js/share.js:594
msgid "Error while sharing"
@@ -184,7 +185,7 @@ msgstr "Paylaşım sırasında hata "
#: js/share.js:135
msgid "Error while unsharing"
-msgstr ""
+msgstr "Paylaşım iptal ediliyorken hata"
#: js/share.js:142
msgid "Error while changing permissions"
@@ -192,11 +193,11 @@ msgstr "İzinleri değiştirirken hata oluştu"
#: js/share.js:151
msgid "Shared with you and the group {group} by {owner}"
-msgstr ""
+msgstr " {owner} tarafından sizinle ve {group} ile paylaştırılmış"
#: js/share.js:153
msgid "Shared with you by {owner}"
-msgstr ""
+msgstr "{owner} trafından sizinle paylaştırıldı"
#: js/share.js:158
msgid "Share with"
@@ -211,13 +212,12 @@ msgid "Password protect"
msgstr "Şifre korunması"
#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
msgid "Password"
msgstr "Parola"
#: js/share.js:172
msgid "Email link to person"
-msgstr ""
+msgstr "Kişiye e-posta linki"
#: js/share.js:173
msgid "Send"
@@ -245,7 +245,7 @@ msgstr "Tekrar paylaşmaya izin verilmiyor"
#: js/share.js:275
msgid "Shared in {item} with {user}"
-msgstr ""
+msgstr " {item} içinde {user} ile paylaşılanlarlar"
#: js/share.js:296
msgid "Unshare"
@@ -281,11 +281,11 @@ msgstr "Paralo korumalı"
#: js/share.js:554
msgid "Error unsetting expiration date"
-msgstr ""
+msgstr "Geçerlilik tarihi tanımlama kaldırma hatası"
#: js/share.js:566
msgid "Error setting expiration date"
-msgstr ""
+msgstr "Geçerlilik tarihi tanımlama hatası"
#: js/share.js:581
msgid "Sending ..."
@@ -384,13 +384,13 @@ msgstr "Güvenlik Uyarisi"
msgid ""
"No secure random number generator is available, please enable the PHP "
"OpenSSL extension."
-msgstr ""
+msgstr "Güvenli rasgele sayı üreticisi bulunamadı. Lütfen PHP OpenSSL eklentisini etkinleştirin."
#: templates/installation.php:26
msgid ""
"Without a secure random number generator an attacker may be able to predict "
"password reset tokens and take over your account."
-msgstr ""
+msgstr "Güvenli rasgele sayı üreticisi olmadan saldırganlar parola sıfırlama simgelerini tahmin edip hesabınızı ele geçirebilir."
#: templates/installation.php:32
msgid ""
@@ -399,7 +399,7 @@ msgid ""
"strongly suggest that you configure your webserver in a way that the data "
"directory is no longer accessible or you move the data directory outside the"
" webserver document root."
-msgstr ""
+msgstr "data dizininiz ve dosyalarınız büyük ihtimalle internet üzerinden erişilebilir. Owncloud tarafından sağlanan .htaccess dosyası çalışmıyor. Web sunucunuzu yapılandırarak data dizinine erişimi kapatmanızı veya data dizinini web sunucu döküman dizini dışına almanızı şiddetle tavsiye ederiz."
#: templates/installation.php:36
msgid "Create an <strong>admin account</strong>"
@@ -446,83 +446,83 @@ msgstr "Veritabanı sunucusu"
msgid "Finish setup"
msgstr "Kurulumu tamamla"
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:15 templates/layout.user.php:17
msgid "Sunday"
msgstr "Pazar"
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:15 templates/layout.user.php:17
msgid "Monday"
msgstr "Pazartesi"
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:15 templates/layout.user.php:17
msgid "Tuesday"
msgstr "Salı"
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:15 templates/layout.user.php:17
msgid "Wednesday"
msgstr "Çarşamba"
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:15 templates/layout.user.php:17
msgid "Thursday"
msgstr "Perşembe"
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:15 templates/layout.user.php:17
msgid "Friday"
msgstr "Cuma"
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:15 templates/layout.user.php:17
msgid "Saturday"
msgstr "Cumartesi"
-#: templates/layout.guest.php:17 templates/layout.user.php:18
+#: templates/layout.guest.php:16 templates/layout.user.php:18
msgid "January"
msgstr "Ocak"
-#: templates/layout.guest.php:17 templates/layout.user.php:18
+#: templates/layout.guest.php:16 templates/layout.user.php:18
msgid "February"
msgstr "Şubat"
-#: templates/layout.guest.php:17 templates/layout.user.php:18
+#: templates/layout.guest.php:16 templates/layout.user.php:18
msgid "March"
msgstr "Mart"
-#: templates/layout.guest.php:17 templates/layout.user.php:18
+#: templates/layout.guest.php:16 templates/layout.user.php:18
msgid "April"
msgstr "Nisan"
-#: templates/layout.guest.php:17 templates/layout.user.php:18
+#: templates/layout.guest.php:16 templates/layout.user.php:18
msgid "May"
msgstr "Mayıs"
-#: templates/layout.guest.php:17 templates/layout.user.php:18
+#: templates/layout.guest.php:16 templates/layout.user.php:18
msgid "June"
msgstr "Haziran"
-#: templates/layout.guest.php:17 templates/layout.user.php:18
+#: templates/layout.guest.php:16 templates/layout.user.php:18
msgid "July"
msgstr "Temmuz"
-#: templates/layout.guest.php:17 templates/layout.user.php:18
+#: templates/layout.guest.php:16 templates/layout.user.php:18
msgid "August"
msgstr "Ağustos"
-#: templates/layout.guest.php:17 templates/layout.user.php:18
+#: templates/layout.guest.php:16 templates/layout.user.php:18
msgid "September"
msgstr "Eylül"
-#: templates/layout.guest.php:17 templates/layout.user.php:18
+#: templates/layout.guest.php:16 templates/layout.user.php:18
msgid "October"
msgstr "Ekim"
-#: templates/layout.guest.php:17 templates/layout.user.php:18
+#: templates/layout.guest.php:16 templates/layout.user.php:18
msgid "November"
msgstr "Kasım"
-#: templates/layout.guest.php:17 templates/layout.user.php:18
+#: templates/layout.guest.php:16 templates/layout.user.php:18
msgid "December"
msgstr "Aralık"
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:41
msgid "web services under your control"
msgstr "kontrolünüzdeki web servisleri"
@@ -538,11 +538,11 @@ msgstr "Otomatik oturum açma reddedildi!"
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
-msgstr ""
+msgstr "Yakın zamanda parolanızı değiştirmedi iseniz hesabınız riske girebilir."
#: templates/login.php:13
msgid "Please change your password to secure your account again."
-msgstr ""
+msgstr "Hesabınızı korumak için lütfen parolanızı değiştirin."
#: templates/login.php:19
msgid "Lost your password?"
@@ -567,18 +567,4 @@ msgstr "sonraki"
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
-msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "Güvenlik Uyarısı!"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr ""
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "Doğrula"
+msgstr "Owncloud %s versiyonuna güncelleniyor. Biraz zaman alabilir."
diff --git a/l10n/tr/files.po b/l10n/tr/files.po
index 641b6c26f92..6a8b2bf601b 100644
--- a/l10n/tr/files.po
+++ b/l10n/tr/files.po
@@ -7,14 +7,15 @@
# Caner Başaran <basaran.caner@gmail.com>, 2012.
# Emre <emresaracoglu@live.com>, 2012.
# <info@beyboo.de>, 2012.
+# ismail yenigul <ismail.yenigul@surgate.com>, 2013.
# Necdet Yücel <necdetyucel@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 21:35+0000\n"
+"Last-Translator: ismail yenigül <ismail.yenigul@surgate.com>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -22,62 +23,67 @@ msgstr ""
"Language: tr\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#: ajax/delete.php:28 ajax/getstoragestats.php:11 ajax/upload.php:17
+#: ajax/upload.php:76 templates/index.php:18
+msgid "Upload"
+msgstr "Yükle"
+
#: ajax/move.php:17
#, php-format
msgid "Could not move %s - File with this name already exists"
-msgstr ""
+msgstr "%s taşınamadı. Bu isimde dosya zaten var."
#: ajax/move.php:24
#, php-format
msgid "Could not move %s"
-msgstr ""
+msgstr "%s taşınamadı"
#: ajax/rename.php:19
msgid "Unable to rename file"
-msgstr ""
+msgstr "Dosya adı değiştirilemedi"
-#: ajax/upload.php:14
+#: ajax/upload.php:20
msgid "No file was uploaded. Unknown error"
msgstr "Dosya yüklenmedi. Bilinmeyen hata"
-#: ajax/upload.php:21
+#: ajax/upload.php:30
msgid "There is no error, the file uploaded with success"
msgstr "Bir hata yok, dosya başarıyla yüklendi"
-#: ajax/upload.php:22
+#: ajax/upload.php:31
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr "php.ini dosyasında upload_max_filesize ile belirtilen dosya yükleme sınırı aşıldı."
-#: ajax/upload.php:24
+#: ajax/upload.php:33
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "Yüklenen dosya HTML formundaki MAX_FILE_SIZE sınırını aşıyor"
-#: ajax/upload.php:26
+#: ajax/upload.php:35
msgid "The uploaded file was only partially uploaded"
msgstr "Yüklenen dosyanın sadece bir kısmı yüklendi"
-#: ajax/upload.php:27
+#: ajax/upload.php:36
msgid "No file was uploaded"
msgstr "Hiç dosya yüklenmedi"
-#: ajax/upload.php:28
+#: ajax/upload.php:37
msgid "Missing a temporary folder"
msgstr "Geçici bir klasör eksik"
-#: ajax/upload.php:29
+#: ajax/upload.php:38
msgid "Failed to write to disk"
msgstr "Diske yazılamadı"
-#: ajax/upload.php:45
+#: ajax/upload.php:57
msgid "Not enough space available"
-msgstr ""
+msgstr "Yeterli disk alanı yok"
-#: ajax/upload.php:69
+#: ajax/upload.php:91
msgid "Invalid directory."
-msgstr ""
+msgstr "Geçersiz dizin."
#: appinfo/app.php:10
msgid "Files"
@@ -131,98 +137,100 @@ msgstr "paylaşılmamış {files}"
msgid "deleted {files}"
msgstr "silinen {files}"
-#: js/files.js:31
+#: js/files.js:48
msgid "'.' is an invalid file name."
-msgstr ""
+msgstr "'.' geçersiz dosya adı."
-#: js/files.js:36
+#: js/files.js:53
msgid "File name cannot be empty."
-msgstr ""
+msgstr "Dosya adı boş olamaz."
-#: js/files.js:45
+#: js/files.js:62
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Geçersiz isim, '\\', '/', '<', '>', ':', '\"', '|', '?' ve '*' karakterlerine izin verilmemektedir."
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "ZIP dosyası oluşturuluyor, biraz sürebilir."
+#: js/files.js:204
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr "İndirmeniz hazırlanıyor. Dosya büyük ise biraz zaman alabilir."
-#: js/files.js:224
+#: js/files.js:242
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Dosyanızın boyutu 0 byte olduğundan veya bir dizin olduğundan yüklenemedi"
-#: js/files.js:224
+#: js/files.js:242
msgid "Upload Error"
msgstr "Yükleme hatası"
-#: js/files.js:241
+#: js/files.js:259
msgid "Close"
msgstr "Kapat"
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:278 js/files.js:397 js/files.js:431
msgid "Pending"
msgstr "Bekliyor"
-#: js/files.js:280
+#: js/files.js:298
msgid "1 file uploading"
msgstr "1 dosya yüklendi"
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:301 js/files.js:357 js/files.js:372
msgid "{count} files uploading"
msgstr "{count} dosya yükleniyor"
-#: js/files.js:357 js/files.js:393
+#: js/files.js:376 js/files.js:414
msgid "Upload cancelled."
msgstr "Yükleme iptal edildi."
-#: js/files.js:464
+#: js/files.js:486
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Dosya yükleme işlemi sürüyor. Şimdi sayfadan ayrılırsanız işleminiz iptal olur."
-#: js/files.js:537
+#: js/files.js:559
msgid "URL cannot be empty."
msgstr "URL boş olamaz."
-#: js/files.js:543
+#: js/files.js:565
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
+msgstr "Geçersiz dizin adı. Shared isminin kullanımı Owncloud tarafından rezerver edilmiştir."
-#: js/files.js:727
+#: js/files.js:775
msgid "{count} files scanned"
msgstr "{count} dosya tarandı"
-#: js/files.js:735
+#: js/files.js:783
msgid "error while scanning"
msgstr "tararamada hata oluşdu"
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:857 templates/index.php:64
msgid "Name"
msgstr "Ad"
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:858 templates/index.php:75
msgid "Size"
msgstr "Boyut"
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:859 templates/index.php:77
msgid "Modified"
msgstr "Değiştirilme"
-#: js/files.js:829
+#: js/files.js:878
msgid "1 folder"
msgstr "1 dizin"
-#: js/files.js:831
+#: js/files.js:880
msgid "{count} folders"
msgstr "{count} dizin"
-#: js/files.js:839
+#: js/files.js:888
msgid "1 file"
msgstr "1 dosya"
-#: js/files.js:841
+#: js/files.js:890
msgid "{count} files"
msgstr "{count} dosya"
@@ -274,10 +282,6 @@ msgstr "Klasör"
msgid "From link"
msgstr "Bağlantıdan"
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Yükle"
-
#: templates/index.php:41
msgid "Cancel upload"
msgstr "Yüklemeyi iptal et"
diff --git a/l10n/tr/files_encryption.po b/l10n/tr/files_encryption.po
index c48e3908ae6..e95281ce029 100644
--- a/l10n/tr/files_encryption.po
+++ b/l10n/tr/files_encryption.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-28 00:20+0100\n"
-"PO-Revision-Date: 2012-12-27 10:35+0000\n"
-"Last-Translator: Necdet Yücel <necdetyucel@gmail.com>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,18 +18,66 @@ msgstr ""
"Language: tr\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
msgid "Encryption"
msgstr "Şifreleme"
-#: templates/settings.php:6
-msgid "Enable Encryption"
-msgstr "Şifrelemeyi Etkinleştir"
+#: templates/settings.php:67
+msgid "Exclude the following file types from encryption"
+msgstr "Aşağıdaki dosya tiplerini şifrelemeye dahil etme"
-#: templates/settings.php:7
+#: templates/settings.php:71
msgid "None"
msgstr "Hiçbiri"
-
-#: templates/settings.php:12
-msgid "Exclude the following file types from encryption"
-msgstr "Aşağıdaki dosya tiplerini şifrelemeye dahil etme"
diff --git a/l10n/tr/files_versions.po b/l10n/tr/files_versions.po
index 1d3dff15348..6f30f6794a2 100644
--- a/l10n/tr/files_versions.po
+++ b/l10n/tr/files_versions.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-28 00:20+0100\n"
-"PO-Revision-Date: 2012-12-27 09:24+0000\n"
-"Last-Translator: Necdet Yücel <necdetyucel@gmail.com>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,22 +18,10 @@ msgstr ""
"Language: tr\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: js/settings-personal.js:31 templates/settings-personal.php:7
-msgid "Expire all versions"
-msgstr "Tüm sürümleri sona erdir"
-
#: js/versions.js:16
msgid "History"
msgstr "Geçmiş"
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "Sürümler"
-
-#: templates/settings-personal.php:10
-msgid "This will delete all existing backup versions of your files"
-msgstr "Bu dosyalarınızın tüm yedek sürümlerini silecektir"
-
#: templates/settings.php:3
msgid "Files Versioning"
msgstr "Dosya Sürümleri"
diff --git a/l10n/tr/lib.po b/l10n/tr/lib.po
index 66590bc8eb0..fadb1957cfb 100644
--- a/l10n/tr/lib.po
+++ b/l10n/tr/lib.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# ismail yenigul <ismail.yenigul@surgate.com>, 2013.
# Necdet Yücel <necdetyucel@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-28 00:20+0100\n"
-"PO-Revision-Date: 2012-12-27 11:03+0000\n"
-"Last-Translator: Necdet Yücel <necdetyucel@gmail.com>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 09:28+0000\n"
+"Last-Translator: ismail yenigül <ismail.yenigul@surgate.com>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,27 +19,27 @@ msgstr ""
"Language: tr\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: app.php:287
+#: app.php:301
msgid "Help"
msgstr "Yardı"
-#: app.php:294
+#: app.php:308
msgid "Personal"
msgstr "Kişisel"
-#: app.php:299
+#: app.php:313
msgid "Settings"
msgstr "Ayarlar"
-#: app.php:304
+#: app.php:318
msgid "Users"
msgstr "Kullanıcılar"
-#: app.php:311
+#: app.php:325
msgid "Apps"
msgstr "Uygulamalar"
-#: app.php:313
+#: app.php:327
msgid "Admin"
msgstr "Yönetici"
@@ -58,11 +59,15 @@ msgstr "Dosyalara dön"
msgid "Selected files too large to generate zip file."
msgstr "Seçilen dosyalar bir zip dosyası oluşturmak için fazla büyüktür."
+#: helper.php:229
+msgid "couldn't be determined"
+msgstr "tespit edilemedi"
+
#: json.php:28
msgid "Application is not enabled"
msgstr "Uygulama etkinleştirilmedi"
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
msgstr "Kimlik doğrulama hatası"
@@ -82,55 +87,55 @@ msgstr "Metin"
msgid "Images"
msgstr "Resimler"
-#: template.php:103
+#: template.php:113
msgid "seconds ago"
msgstr "saniye önce"
-#: template.php:104
+#: template.php:114
msgid "1 minute ago"
msgstr "1 dakika önce"
-#: template.php:105
+#: template.php:115
#, php-format
msgid "%d minutes ago"
msgstr "%d dakika önce"
-#: template.php:106
+#: template.php:116
msgid "1 hour ago"
msgstr "1 saat önce"
-#: template.php:107
+#: template.php:117
#, php-format
msgid "%d hours ago"
msgstr "%d saat önce"
-#: template.php:108
+#: template.php:118
msgid "today"
msgstr "bugün"
-#: template.php:109
+#: template.php:119
msgid "yesterday"
msgstr "dün"
-#: template.php:110
+#: template.php:120
#, php-format
msgid "%d days ago"
msgstr "%d gün önce"
-#: template.php:111
+#: template.php:121
msgid "last month"
msgstr "geçen ay"
-#: template.php:112
+#: template.php:122
#, php-format
msgid "%d months ago"
msgstr "%d ay önce"
-#: template.php:113
+#: template.php:123
msgid "last year"
msgstr "geçen yıl"
-#: template.php:114
+#: template.php:124
msgid "years ago"
msgstr "yıl önce"
diff --git a/l10n/tr/user_ldap.po b/l10n/tr/user_ldap.po
index 66d4941f8de..306152d4493 100644
--- a/l10n/tr/user_ldap.po
+++ b/l10n/tr/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-29 00:07+0100\n"
-"PO-Revision-Date: 2012-12-28 09:39+0000\n"
-"Last-Translator: Necdet Yücel <necdetyucel@gmail.com>\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 23:20+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -27,8 +27,8 @@ msgstr ""
#: templates/settings.php:11
msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
msgstr ""
#: templates/settings.php:15
@@ -45,6 +45,10 @@ msgid "Base DN"
msgstr "Base DN"
#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
@@ -115,10 +119,18 @@ msgstr "Port"
msgid "Base User Tree"
msgstr "Temel Kullanıcı Ağacı"
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "Temel Grup Ağacı"
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Grup-Üye işbirliği"
diff --git a/l10n/tr/user_webdavauth.po b/l10n/tr/user_webdavauth.po
index ca1186efbec..912a2ff24d2 100644
--- a/l10n/tr/user_webdavauth.po
+++ b/l10n/tr/user_webdavauth.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-28 00:20+0100\n"
-"PO-Revision-Date: 2012-12-27 09:06+0000\n"
-"Last-Translator: Necdet Yücel <necdetyucel@gmail.com>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,13 +19,17 @@ msgstr ""
"Language: tr\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
#: templates/settings.php:4
msgid "URL: http://"
msgstr "URL: http://"
#: templates/settings.php:6
msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
msgstr ""
diff --git a/l10n/uk/core.po b/l10n/uk/core.po
index 213c9995297..21be89f3a48 100644
--- a/l10n/uk/core.po
+++ b/l10n/uk/core.po
@@ -7,13 +7,14 @@
# <skoptev@ukr.net>, 2012.
# Soul Kim <warlock.rf@gmail.com>, 2012.
# <victor.dubiniuk@gmail.com>, 2012.
+# <volodya327@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-01-18 00:03+0100\n"
+"PO-Revision-Date: 2013-01-17 13:18+0000\n"
+"Last-Translator: volodya327 <volodya327@gmail.com>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -87,55 +88,55 @@ msgstr "Помилка при видалені %s із обраного."
msgid "Settings"
msgstr "Налаштування"
-#: js/js.js:711
+#: js/js.js:706
msgid "seconds ago"
msgstr "секунди тому"
-#: js/js.js:712
+#: js/js.js:707
msgid "1 minute ago"
msgstr "1 хвилину тому"
-#: js/js.js:713
+#: js/js.js:708
msgid "{minutes} minutes ago"
msgstr "{minutes} хвилин тому"
-#: js/js.js:714
+#: js/js.js:709
msgid "1 hour ago"
msgstr "1 годину тому"
-#: js/js.js:715
+#: js/js.js:710
msgid "{hours} hours ago"
msgstr "{hours} години тому"
-#: js/js.js:716
+#: js/js.js:711
msgid "today"
msgstr "сьогодні"
-#: js/js.js:717
+#: js/js.js:712
msgid "yesterday"
msgstr "вчора"
-#: js/js.js:718
+#: js/js.js:713
msgid "{days} days ago"
msgstr "{days} днів тому"
-#: js/js.js:719
+#: js/js.js:714
msgid "last month"
msgstr "минулого місяця"
-#: js/js.js:720
+#: js/js.js:715
msgid "{months} months ago"
msgstr "{months} місяців тому"
-#: js/js.js:721
+#: js/js.js:716
msgid "months ago"
msgstr "місяці тому"
-#: js/js.js:722
+#: js/js.js:717
msgid "last year"
msgstr "минулого року"
-#: js/js.js:723
+#: js/js.js:718
msgid "years ago"
msgstr "роки тому"
@@ -211,7 +212,6 @@ msgid "Password protect"
msgstr "Захистити паролем"
#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
msgid "Password"
msgstr "Пароль"
@@ -567,18 +567,4 @@ msgstr "наступний"
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
-msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "Попередження про небезпеку!"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "Будь ласка, повторно введіть свій пароль. <br/>З питань безпеки, Вам інколи доведеться повторно вводити свій пароль."
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "Підтвердити"
+msgstr "Оновлення ownCloud до версії %s, це може зайняти деякий час."
diff --git a/l10n/uk/files.po b/l10n/uk/files.po
index 12e46e92ae8..5b1e3c16286 100644
--- a/l10n/uk/files.po
+++ b/l10n/uk/files.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"POT-Creation-Date: 2013-01-20 00:05+0100\n"
+"PO-Revision-Date: 2013-01-19 23:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
@@ -20,6 +20,11 @@ msgstr ""
"Language: uk\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+#: ajax/delete.php:28 ajax/getstoragestats.php:11 ajax/upload.php:17
+#: ajax/upload.php:76 templates/index.php:18
+msgid "Upload"
+msgstr "Відвантажити"
+
#: ajax/move.php:17
#, php-format
msgid "Could not move %s - File with this name already exists"
@@ -34,46 +39,46 @@ msgstr ""
msgid "Unable to rename file"
msgstr ""
-#: ajax/upload.php:14
+#: ajax/upload.php:20
msgid "No file was uploaded. Unknown error"
msgstr "Не завантажено жодного файлу. Невідома помилка"
-#: ajax/upload.php:21
+#: ajax/upload.php:30
msgid "There is no error, the file uploaded with success"
msgstr "Файл успішно вивантажено без помилок."
-#: ajax/upload.php:22
+#: ajax/upload.php:31
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr "Розмір звантаження перевищує upload_max_filesize параметра в php.ini: "
-#: ajax/upload.php:24
+#: ajax/upload.php:33
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "Розмір відвантаженого файлу перевищує директиву MAX_FILE_SIZE вказану в HTML формі"
-#: ajax/upload.php:26
+#: ajax/upload.php:35
msgid "The uploaded file was only partially uploaded"
msgstr "Файл відвантажено лише частково"
-#: ajax/upload.php:27
+#: ajax/upload.php:36
msgid "No file was uploaded"
msgstr "Не відвантажено жодного файлу"
-#: ajax/upload.php:28
+#: ajax/upload.php:37
msgid "Missing a temporary folder"
msgstr "Відсутній тимчасовий каталог"
-#: ajax/upload.php:29
+#: ajax/upload.php:38
msgid "Failed to write to disk"
msgstr "Невдалося записати на диск"
-#: ajax/upload.php:45
+#: ajax/upload.php:57
msgid "Not enough space available"
msgstr ""
-#: ajax/upload.php:69
+#: ajax/upload.php:91
msgid "Invalid directory."
msgstr ""
@@ -129,98 +134,100 @@ msgstr "неопубліковано {files}"
msgid "deleted {files}"
msgstr "видалено {files}"
-#: js/files.js:31
+#: js/files.js:48
msgid "'.' is an invalid file name."
msgstr ""
-#: js/files.js:36
+#: js/files.js:53
msgid "File name cannot be empty."
msgstr ""
-#: js/files.js:45
+#: js/files.js:62
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Невірне ім'я, '\\', '/', '<', '>', ':', '\"', '|', '?' та '*' не дозволені."
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "Створення ZIP-файлу, це може зайняти певний час."
+#: js/files.js:204
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
-#: js/files.js:224
+#: js/files.js:242
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Неможливо завантажити ваш файл тому, що він тека або файл розміром 0 байт"
-#: js/files.js:224
+#: js/files.js:242
msgid "Upload Error"
msgstr "Помилка завантаження"
-#: js/files.js:241
+#: js/files.js:259
msgid "Close"
msgstr "Закрити"
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:278 js/files.js:397 js/files.js:431
msgid "Pending"
msgstr "Очікування"
-#: js/files.js:280
+#: js/files.js:298
msgid "1 file uploading"
msgstr "1 файл завантажується"
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:301 js/files.js:357 js/files.js:372
msgid "{count} files uploading"
msgstr "{count} файлів завантажується"
-#: js/files.js:357 js/files.js:393
+#: js/files.js:376 js/files.js:414
msgid "Upload cancelled."
msgstr "Завантаження перервано."
-#: js/files.js:464
+#: js/files.js:486
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Виконується завантаження файлу. Закриття цієї сторінки приведе до відміни завантаження."
-#: js/files.js:537
+#: js/files.js:559
msgid "URL cannot be empty."
msgstr "URL не може бути пустим."
-#: js/files.js:543
+#: js/files.js:565
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:727
+#: js/files.js:775
msgid "{count} files scanned"
msgstr "{count} файлів проскановано"
-#: js/files.js:735
+#: js/files.js:783
msgid "error while scanning"
msgstr "помилка при скануванні"
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:857 templates/index.php:64
msgid "Name"
msgstr "Ім'я"
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:858 templates/index.php:75
msgid "Size"
msgstr "Розмір"
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:859 templates/index.php:77
msgid "Modified"
msgstr "Змінено"
-#: js/files.js:829
+#: js/files.js:878
msgid "1 folder"
msgstr "1 папка"
-#: js/files.js:831
+#: js/files.js:880
msgid "{count} folders"
msgstr "{count} папок"
-#: js/files.js:839
+#: js/files.js:888
msgid "1 file"
msgstr "1 файл"
-#: js/files.js:841
+#: js/files.js:890
msgid "{count} files"
msgstr "{count} файлів"
@@ -272,10 +279,6 @@ msgstr "Папка"
msgid "From link"
msgstr "З посилання"
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Відвантажити"
-
#: templates/index.php:41
msgid "Cancel upload"
msgstr "Перервати завантаження"
diff --git a/l10n/uk/files_encryption.po b/l10n/uk/files_encryption.po
index 9b00d3b7a30..884db2f7afa 100644
--- a/l10n/uk/files_encryption.po
+++ b/l10n/uk/files_encryption.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-23 02:02+0200\n"
-"PO-Revision-Date: 2012-10-22 12:05+0000\n"
-"Last-Translator: skoptev <skoptev@ukr.net>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,18 +18,66 @@ msgstr ""
"Language: uk\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
msgid "Encryption"
msgstr "Шифрування"
-#: templates/settings.php:4
+#: templates/settings.php:67
msgid "Exclude the following file types from encryption"
msgstr "Не шифрувати файли наступних типів"
-#: templates/settings.php:5
+#: templates/settings.php:71
msgid "None"
msgstr "Жоден"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "Включити шифрування"
diff --git a/l10n/uk/files_versions.po b/l10n/uk/files_versions.po
index 91a6d8643b1..1a8bb981db6 100644
--- a/l10n/uk/files_versions.po
+++ b/l10n/uk/files_versions.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-23 02:02+0200\n"
-"PO-Revision-Date: 2012-10-22 12:22+0000\n"
-"Last-Translator: skoptev <skoptev@ukr.net>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,22 +18,10 @@ msgstr ""
"Language: uk\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "Термін дії всіх версій"
-
#: js/versions.js:16
msgid "History"
msgstr "Історія"
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "Версії"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "Це призведе до знищення всіх існуючих збережених версій Ваших файлів"
-
#: templates/settings.php:3
msgid "Files Versioning"
msgstr "Версії файлів"
diff --git a/l10n/uk/lib.po b/l10n/uk/lib.po
index f2a86e71708..8d1708aa24e 100644
--- a/l10n/uk/lib.po
+++ b/l10n/uk/lib.po
@@ -6,13 +6,14 @@
# <dzubchikd@gmail.com>, 2012.
# <skoptev@ukr.net>, 2012.
# <victor.dubiniuk@gmail.com>, 2012.
+# <volodya327@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-27 00:10+0100\n"
-"PO-Revision-Date: 2012-11-26 15:40+0000\n"
-"Last-Translator: skoptev <skoptev@ukr.net>\n"
+"POT-Creation-Date: 2013-01-18 00:03+0100\n"
+"PO-Revision-Date: 2013-01-17 13:24+0000\n"
+"Last-Translator: volodya327 <volodya327@gmail.com>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,51 +21,55 @@ msgstr ""
"Language: uk\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: app.php:285
+#: app.php:301
msgid "Help"
msgstr "Допомога"
-#: app.php:292
+#: app.php:308
msgid "Personal"
msgstr "Особисте"
-#: app.php:297
+#: app.php:313
msgid "Settings"
msgstr "Налаштування"
-#: app.php:302
+#: app.php:318
msgid "Users"
msgstr "Користувачі"
-#: app.php:309
+#: app.php:325
msgid "Apps"
msgstr "Додатки"
-#: app.php:311
+#: app.php:327
msgid "Admin"
msgstr "Адмін"
-#: files.php:361
+#: files.php:365
msgid "ZIP download is turned off."
msgstr "ZIP завантаження вимкнено."
-#: files.php:362
+#: files.php:366
msgid "Files need to be downloaded one by one."
msgstr "Файли повинні бути завантаженні послідовно."
-#: files.php:362 files.php:387
+#: files.php:366 files.php:391
msgid "Back to Files"
msgstr "Повернутися до файлів"
-#: files.php:386
+#: files.php:390
msgid "Selected files too large to generate zip file."
msgstr "Вибрані фали завеликі для генерування zip файлу."
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr "не може бути визначено"
+
#: json.php:28
msgid "Application is not enabled"
msgstr "Додаток не увімкнений"
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
msgstr "Помилка автентифікації"
@@ -84,55 +89,55 @@ msgstr "Текст"
msgid "Images"
msgstr "Зображення"
-#: template.php:103
+#: template.php:113
msgid "seconds ago"
msgstr "секунди тому"
-#: template.php:104
+#: template.php:114
msgid "1 minute ago"
msgstr "1 хвилину тому"
-#: template.php:105
+#: template.php:115
#, php-format
msgid "%d minutes ago"
msgstr "%d хвилин тому"
-#: template.php:106
+#: template.php:116
msgid "1 hour ago"
msgstr "1 годину тому"
-#: template.php:107
+#: template.php:117
#, php-format
msgid "%d hours ago"
msgstr "%d годин тому"
-#: template.php:108
+#: template.php:118
msgid "today"
msgstr "сьогодні"
-#: template.php:109
+#: template.php:119
msgid "yesterday"
msgstr "вчора"
-#: template.php:110
+#: template.php:120
#, php-format
msgid "%d days ago"
msgstr "%d днів тому"
-#: template.php:111
+#: template.php:121
msgid "last month"
msgstr "минулого місяця"
-#: template.php:112
+#: template.php:122
#, php-format
msgid "%d months ago"
msgstr "%d місяців тому"
-#: template.php:113
+#: template.php:123
msgid "last year"
msgstr "минулого року"
-#: template.php:114
+#: template.php:124
msgid "years ago"
msgstr "роки тому"
diff --git a/l10n/uk/settings.po b/l10n/uk/settings.po
index 372163ef68a..5d40f09facf 100644
--- a/l10n/uk/settings.po
+++ b/l10n/uk/settings.po
@@ -5,14 +5,14 @@
# Translators:
# <dzubchikd@gmail.com>, 2012.
# <skoptev@ukr.net>, 2012.
-# <volodya327@gmail.com>, 2012.
+# <volodya327@gmail.com>, 2012-2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-01-18 00:03+0100\n"
+"PO-Revision-Date: 2013-01-17 13:26+0000\n"
+"Last-Translator: volodya327 <volodya327@gmail.com>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -243,11 +243,11 @@ msgstr "Створити"
#: templates/users.php:35
msgid "Default Storage"
-msgstr ""
+msgstr "сховище за замовчуванням"
#: templates/users.php:42 templates/users.php:138
msgid "Unlimited"
-msgstr ""
+msgstr "Необмежено"
#: templates/users.php:60 templates/users.php:153
msgid "Other"
@@ -259,11 +259,11 @@ msgstr "Адміністратор групи"
#: templates/users.php:87
msgid "Storage"
-msgstr ""
+msgstr "Сховище"
#: templates/users.php:133
msgid "Default"
-msgstr ""
+msgstr "За замовчуванням"
#: templates/users.php:161
msgid "Delete"
diff --git a/l10n/uk/user_ldap.po b/l10n/uk/user_ldap.po
index b6601497ecb..24f0b5ffdbb 100644
--- a/l10n/uk/user_ldap.po
+++ b/l10n/uk/user_ldap.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-19 00:03+0100\n"
-"PO-Revision-Date: 2012-12-18 12:52+0000\n"
-"Last-Translator: volodya327 <volodya327@gmail.com>\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 23:20+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -28,9 +28,9 @@ msgstr "<b>Увага:</b> Застосунки user_ldap та user_webdavauth
#: templates/settings.php:11
msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
-msgstr "<b>Увага:</ b> Потрібний модуль PHP LDAP не встановлено, базова програма працювати не буде. Будь ласка, зверніться до системного адміністратора, щоб встановити його."
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
+msgstr ""
#: templates/settings.php:15
msgid "Host"
@@ -46,6 +46,10 @@ msgid "Base DN"
msgstr "Базовий DN"
#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Ви можете задати Базовий DN для користувачів і груп на вкладинці Додатково"
@@ -116,10 +120,18 @@ msgstr "Порт"
msgid "Base User Tree"
msgstr "Основне Дерево Користувачів"
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "Основне Дерево Груп"
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Асоціація Група-Член"
diff --git a/l10n/uk/user_webdavauth.po b/l10n/uk/user_webdavauth.po
index d81333a1909..eec04d63355 100644
--- a/l10n/uk/user_webdavauth.po
+++ b/l10n/uk/user_webdavauth.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-23 00:09+0100\n"
-"PO-Revision-Date: 2012-12-22 01:58+0000\n"
-"Last-Translator: volodya327 <volodya327@gmail.com>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,13 +19,17 @@ msgstr ""
"Language: uk\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
#: templates/settings.php:4
msgid "URL: http://"
msgstr "URL: http://"
#: templates/settings.php:6
msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
-msgstr "ownCloud відправить облікові дані на цей URL та буде інтерпретувати http 401 і http 403, як невірні облікові дані, а всі інші коди, як вірні."
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
+msgstr ""
diff --git a/l10n/vi/core.po b/l10n/vi/core.po
index b3b6244ffca..e86e7e5911f 100644
--- a/l10n/vi/core.po
+++ b/l10n/vi/core.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
@@ -212,7 +212,6 @@ msgid "Password protect"
msgstr "Mật khẩu bảo vệ"
#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
msgid "Password"
msgstr "Mật khẩu"
@@ -569,17 +568,3 @@ msgstr "Kế tiếp"
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "Cảnh báo bảo mật !"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "Vui lòng xác nhận mật khẩu của bạn. <br/> Vì lý do bảo mật thỉnh thoảng bạn có thể được yêu cầu nhập lại mật khẩu."
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "Kiểm tra"
diff --git a/l10n/vi/files.po b/l10n/vi/files.po
index 972bed79676..f2e3a48fce4 100644
--- a/l10n/vi/files.po
+++ b/l10n/vi/files.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"POT-Creation-Date: 2013-01-20 00:05+0100\n"
+"PO-Revision-Date: 2013-01-19 23:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
@@ -21,6 +21,11 @@ msgstr ""
"Language: vi\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#: ajax/delete.php:28 ajax/getstoragestats.php:11 ajax/upload.php:17
+#: ajax/upload.php:76 templates/index.php:18
+msgid "Upload"
+msgstr "Tải lên"
+
#: ajax/move.php:17
#, php-format
msgid "Could not move %s - File with this name already exists"
@@ -35,46 +40,46 @@ msgstr ""
msgid "Unable to rename file"
msgstr ""
-#: ajax/upload.php:14
+#: ajax/upload.php:20
msgid "No file was uploaded. Unknown error"
msgstr "Không có tập tin nào được tải lên. Lỗi không xác định"
-#: ajax/upload.php:21
+#: ajax/upload.php:30
msgid "There is no error, the file uploaded with success"
msgstr "Không có lỗi, các tập tin đã được tải lên thành công"
-#: ajax/upload.php:22
+#: ajax/upload.php:31
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr ""
-#: ajax/upload.php:24
+#: ajax/upload.php:33
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "Kích thước những tập tin tải lên vượt quá MAX_FILE_SIZE đã được quy định"
-#: ajax/upload.php:26
+#: ajax/upload.php:35
msgid "The uploaded file was only partially uploaded"
msgstr "Tập tin tải lên mới chỉ tải lên được một phần"
-#: ajax/upload.php:27
+#: ajax/upload.php:36
msgid "No file was uploaded"
msgstr "Không có tập tin nào được tải lên"
-#: ajax/upload.php:28
+#: ajax/upload.php:37
msgid "Missing a temporary folder"
msgstr "Không tìm thấy thư mục tạm"
-#: ajax/upload.php:29
+#: ajax/upload.php:38
msgid "Failed to write to disk"
msgstr "Không thể ghi "
-#: ajax/upload.php:45
+#: ajax/upload.php:57
msgid "Not enough space available"
msgstr ""
-#: ajax/upload.php:69
+#: ajax/upload.php:91
msgid "Invalid directory."
msgstr ""
@@ -130,98 +135,100 @@ msgstr "hủy chia sẽ {files}"
msgid "deleted {files}"
msgstr "đã xóa {files}"
-#: js/files.js:31
+#: js/files.js:48
msgid "'.' is an invalid file name."
msgstr ""
-#: js/files.js:36
+#: js/files.js:53
msgid "File name cannot be empty."
msgstr ""
-#: js/files.js:45
+#: js/files.js:62
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Tên không hợp lệ, '\\', '/', '<', '>', ':', '\"', '|', '?' và '*' thì không được phép dùng."
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "Tạo tập tin ZIP, điều này có thể làm mất một chút thời gian"
+#: js/files.js:204
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
-#: js/files.js:224
+#: js/files.js:242
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Không thể tải lên tập tin này do nó là một thư mục hoặc kích thước tập tin bằng 0 byte"
-#: js/files.js:224
+#: js/files.js:242
msgid "Upload Error"
msgstr "Tải lên lỗi"
-#: js/files.js:241
+#: js/files.js:259
msgid "Close"
msgstr "Đóng"
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:278 js/files.js:397 js/files.js:431
msgid "Pending"
msgstr "Chờ"
-#: js/files.js:280
+#: js/files.js:298
msgid "1 file uploading"
msgstr "1 tệp tin đang được tải lên"
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:301 js/files.js:357 js/files.js:372
msgid "{count} files uploading"
msgstr "{count} tập tin đang tải lên"
-#: js/files.js:357 js/files.js:393
+#: js/files.js:376 js/files.js:414
msgid "Upload cancelled."
msgstr "Hủy tải lên"
-#: js/files.js:464
+#: js/files.js:486
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Tập tin tải lên đang được xử lý. Nếu bạn rời khỏi trang bây giờ sẽ hủy quá trình này."
-#: js/files.js:537
+#: js/files.js:559
msgid "URL cannot be empty."
msgstr "URL không được để trống."
-#: js/files.js:543
+#: js/files.js:565
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:727
+#: js/files.js:775
msgid "{count} files scanned"
msgstr "{count} tập tin đã được quét"
-#: js/files.js:735
+#: js/files.js:783
msgid "error while scanning"
msgstr "lỗi trong khi quét"
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:857 templates/index.php:64
msgid "Name"
msgstr "Tên"
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:858 templates/index.php:75
msgid "Size"
msgstr "Kích cỡ"
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:859 templates/index.php:77
msgid "Modified"
msgstr "Thay đổi"
-#: js/files.js:829
+#: js/files.js:878
msgid "1 folder"
msgstr "1 thư mục"
-#: js/files.js:831
+#: js/files.js:880
msgid "{count} folders"
msgstr "{count} thư mục"
-#: js/files.js:839
+#: js/files.js:888
msgid "1 file"
msgstr "1 tập tin"
-#: js/files.js:841
+#: js/files.js:890
msgid "{count} files"
msgstr "{count} tập tin"
@@ -273,10 +280,6 @@ msgstr "Thư mục"
msgid "From link"
msgstr "Từ liên kết"
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Tải lên"
-
#: templates/index.php:41
msgid "Cancel upload"
msgstr "Hủy upload"
diff --git a/l10n/vi/files_encryption.po b/l10n/vi/files_encryption.po
index 0ac3a53087c..a6019e03022 100644
--- a/l10n/vi/files_encryption.po
+++ b/l10n/vi/files_encryption.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-21 00:01+0100\n"
-"PO-Revision-Date: 2012-11-20 05:48+0000\n"
-"Last-Translator: Sơn Nguyễn <sonnghit@gmail.com>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,18 +18,66 @@ msgstr ""
"Language: vi\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
msgid "Encryption"
msgstr "Mã hóa"
-#: templates/settings.php:4
+#: templates/settings.php:67
msgid "Exclude the following file types from encryption"
msgstr "Loại trừ các loại tập tin sau đây từ mã hóa"
-#: templates/settings.php:5
+#: templates/settings.php:71
msgid "None"
msgstr "Không có gì hết"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "BẬT mã hóa"
diff --git a/l10n/vi/files_versions.po b/l10n/vi/files_versions.po
index c06b31deb15..4de9dbf8467 100644
--- a/l10n/vi/files_versions.po
+++ b/l10n/vi/files_versions.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-21 00:01+0100\n"
-"PO-Revision-Date: 2012-11-20 04:32+0000\n"
-"Last-Translator: Sơn Nguyễn <sonnghit@gmail.com>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,22 +19,10 @@ msgstr ""
"Language: vi\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "Hết hạn tất cả các phiên bản"
-
#: js/versions.js:16
msgid "History"
msgstr "Lịch sử"
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "Phiên bản"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "Khi bạn thực hiện thao tác này sẽ xóa tất cả các phiên bản sao lưu hiện có "
-
#: templates/settings.php:3
msgid "Files Versioning"
msgstr "Phiên bản tập tin"
diff --git a/l10n/vi/lib.po b/l10n/vi/lib.po
index 915964d52ff..d838960fd97 100644
--- a/l10n/vi/lib.po
+++ b/l10n/vi/lib.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-21 00:01+0100\n"
-"PO-Revision-Date: 2012-11-20 01:33+0000\n"
-"Last-Translator: mattheu_9x <mattheu.9x@gmail.com>\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,51 +20,55 @@ msgstr ""
"Language: vi\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: app.php:285
+#: app.php:301
msgid "Help"
msgstr "Giúp đỡ"
-#: app.php:292
+#: app.php:308
msgid "Personal"
msgstr "Cá nhân"
-#: app.php:297
+#: app.php:313
msgid "Settings"
msgstr "Cài đặt"
-#: app.php:302
+#: app.php:318
msgid "Users"
msgstr "Người dùng"
-#: app.php:309
+#: app.php:325
msgid "Apps"
msgstr "Ứng dụng"
-#: app.php:311
+#: app.php:327
msgid "Admin"
msgstr "Quản trị"
-#: files.php:361
+#: files.php:365
msgid "ZIP download is turned off."
msgstr "Tải về ZIP đã bị tắt."
-#: files.php:362
+#: files.php:366
msgid "Files need to be downloaded one by one."
msgstr "Tập tin cần phải được tải về từng người một."
-#: files.php:362 files.php:387
+#: files.php:366 files.php:391
msgid "Back to Files"
msgstr "Trở lại tập tin"
-#: files.php:386
+#: files.php:390
msgid "Selected files too large to generate zip file."
msgstr "Tập tin được chọn quá lớn để tạo tập tin ZIP."
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr ""
+
#: json.php:28
msgid "Application is not enabled"
msgstr "Ứng dụng không được BẬT"
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
msgstr "Lỗi xác thực"
@@ -84,55 +88,55 @@ msgstr "Văn bản"
msgid "Images"
msgstr "Hình ảnh"
-#: template.php:103
+#: template.php:113
msgid "seconds ago"
msgstr "1 giây trước"
-#: template.php:104
+#: template.php:114
msgid "1 minute ago"
msgstr "1 phút trước"
-#: template.php:105
+#: template.php:115
#, php-format
msgid "%d minutes ago"
msgstr "%d phút trước"
-#: template.php:106
+#: template.php:116
msgid "1 hour ago"
msgstr "1 giờ trước"
-#: template.php:107
+#: template.php:117
#, php-format
msgid "%d hours ago"
msgstr "%d giờ trước"
-#: template.php:108
+#: template.php:118
msgid "today"
msgstr "hôm nay"
-#: template.php:109
+#: template.php:119
msgid "yesterday"
msgstr "hôm qua"
-#: template.php:110
+#: template.php:120
#, php-format
msgid "%d days ago"
msgstr "%d ngày trước"
-#: template.php:111
+#: template.php:121
msgid "last month"
msgstr "tháng trước"
-#: template.php:112
+#: template.php:122
#, php-format
msgid "%d months ago"
msgstr "%d tháng trước"
-#: template.php:113
+#: template.php:123
msgid "last year"
msgstr "năm trước"
-#: template.php:114
+#: template.php:124
msgid "years ago"
msgstr "năm trước"
diff --git a/l10n/vi/user_ldap.po b/l10n/vi/user_ldap.po
index c6157201e51..6e334612607 100644
--- a/l10n/vi/user_ldap.po
+++ b/l10n/vi/user_ldap.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 23:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
@@ -28,8 +28,8 @@ msgstr ""
#: templates/settings.php:11
msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
msgstr ""
#: templates/settings.php:15
@@ -46,6 +46,10 @@ msgid "Base DN"
msgstr "DN cơ bản"
#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Bạn có thể chỉ định DN cơ bản cho người dùng và các nhóm trong tab Advanced"
@@ -116,10 +120,18 @@ msgstr "Cổng"
msgid "Base User Tree"
msgstr "Cây người dùng cơ bản"
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "Cây nhóm cơ bản"
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Nhóm thành viên Cộng đồng"
diff --git a/l10n/vi/user_webdavauth.po b/l10n/vi/user_webdavauth.po
index 5faffd6c9af..5442bdaff42 100644
--- a/l10n/vi/user_webdavauth.po
+++ b/l10n/vi/user_webdavauth.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-20 00:11+0100\n"
-"PO-Revision-Date: 2012-12-19 23:12+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
@@ -18,13 +18,17 @@ msgstr ""
"Language: vi\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
#: templates/settings.php:4
msgid "URL: http://"
msgstr ""
#: templates/settings.php:6
msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
msgstr ""
diff --git a/l10n/zh_CN.GB2312/core.po b/l10n/zh_CN.GB2312/core.po
index 237822bce71..0e81b175791 100644
--- a/l10n/zh_CN.GB2312/core.po
+++ b/l10n/zh_CN.GB2312/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
"MIME-Version: 1.0\n"
@@ -209,7 +209,6 @@ msgid "Password protect"
msgstr "密码保护"
#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
msgid "Password"
msgstr "密码"
@@ -566,17 +565,3 @@ msgstr "前进"
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "安全警告!"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "请确认您的密码。<br/>处于安全原因你偶尔也会被要求再次输入您的密码。"
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "确认"
diff --git a/l10n/zh_CN.GB2312/files.po b/l10n/zh_CN.GB2312/files.po
index b066b89ba00..84a0e059f37 100644
--- a/l10n/zh_CN.GB2312/files.po
+++ b/l10n/zh_CN.GB2312/files.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"POT-Creation-Date: 2013-01-20 00:05+0100\n"
+"PO-Revision-Date: 2013-01-19 23:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
"MIME-Version: 1.0\n"
@@ -19,6 +19,11 @@ msgstr ""
"Language: zh_CN.GB2312\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#: ajax/delete.php:28 ajax/getstoragestats.php:11 ajax/upload.php:17
+#: ajax/upload.php:76 templates/index.php:18
+msgid "Upload"
+msgstr "上传"
+
#: ajax/move.php:17
#, php-format
msgid "Could not move %s - File with this name already exists"
@@ -33,46 +38,46 @@ msgstr ""
msgid "Unable to rename file"
msgstr ""
-#: ajax/upload.php:14
+#: ajax/upload.php:20
msgid "No file was uploaded. Unknown error"
msgstr "没有上传文件。未知错误"
-#: ajax/upload.php:21
+#: ajax/upload.php:30
msgid "There is no error, the file uploaded with success"
msgstr "没有任何错误,文件上传成功了"
-#: ajax/upload.php:22
+#: ajax/upload.php:31
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr ""
-#: ajax/upload.php:24
+#: ajax/upload.php:33
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "上传的文件超过了HTML表单指定的MAX_FILE_SIZE"
-#: ajax/upload.php:26
+#: ajax/upload.php:35
msgid "The uploaded file was only partially uploaded"
msgstr "文件只有部分被上传"
-#: ajax/upload.php:27
+#: ajax/upload.php:36
msgid "No file was uploaded"
msgstr "没有上传完成的文件"
-#: ajax/upload.php:28
+#: ajax/upload.php:37
msgid "Missing a temporary folder"
msgstr "丢失了一个临时文件夹"
-#: ajax/upload.php:29
+#: ajax/upload.php:38
msgid "Failed to write to disk"
msgstr "写磁盘失败"
-#: ajax/upload.php:45
+#: ajax/upload.php:57
msgid "Not enough space available"
msgstr ""
-#: ajax/upload.php:69
+#: ajax/upload.php:91
msgid "Invalid directory."
msgstr ""
@@ -128,98 +133,100 @@ msgstr "未分享的 {files}"
msgid "deleted {files}"
msgstr "已删除的 {files}"
-#: js/files.js:31
+#: js/files.js:48
msgid "'.' is an invalid file name."
msgstr ""
-#: js/files.js:36
+#: js/files.js:53
msgid "File name cannot be empty."
msgstr ""
-#: js/files.js:45
+#: js/files.js:62
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "正在生成ZIP文件,这可能需要点时间"
+#: js/files.js:204
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
-#: js/files.js:224
+#: js/files.js:242
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "不能上传你指定的文件,可能因为它是个文件夹或者大小为0"
-#: js/files.js:224
+#: js/files.js:242
msgid "Upload Error"
msgstr "上传错误"
-#: js/files.js:241
+#: js/files.js:259
msgid "Close"
msgstr "关闭"
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:278 js/files.js:397 js/files.js:431
msgid "Pending"
msgstr "Pending"
-#: js/files.js:280
+#: js/files.js:298
msgid "1 file uploading"
msgstr "1 个文件正在上传"
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:301 js/files.js:357 js/files.js:372
msgid "{count} files uploading"
msgstr "{count} 个文件正在上传"
-#: js/files.js:357 js/files.js:393
+#: js/files.js:376 js/files.js:414
msgid "Upload cancelled."
msgstr "上传取消了"
-#: js/files.js:464
+#: js/files.js:486
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "文件正在上传。关闭页面会取消上传。"
-#: js/files.js:537
+#: js/files.js:559
msgid "URL cannot be empty."
msgstr "网址不能为空。"
-#: js/files.js:543
+#: js/files.js:565
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:727
+#: js/files.js:775
msgid "{count} files scanned"
msgstr "{count} 个文件已扫描"
-#: js/files.js:735
+#: js/files.js:783
msgid "error while scanning"
msgstr "扫描出错"
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:857 templates/index.php:64
msgid "Name"
msgstr "名字"
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:858 templates/index.php:75
msgid "Size"
msgstr "大小"
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:859 templates/index.php:77
msgid "Modified"
msgstr "修改日期"
-#: js/files.js:829
+#: js/files.js:878
msgid "1 folder"
msgstr "1 个文件夹"
-#: js/files.js:831
+#: js/files.js:880
msgid "{count} folders"
msgstr "{count} 个文件夹"
-#: js/files.js:839
+#: js/files.js:888
msgid "1 file"
msgstr "1 个文件"
-#: js/files.js:841
+#: js/files.js:890
msgid "{count} files"
msgstr "{count} 个文件"
@@ -271,10 +278,6 @@ msgstr "文件夹"
msgid "From link"
msgstr "来自链接"
-#: templates/index.php:18
-msgid "Upload"
-msgstr "上传"
-
#: templates/index.php:41
msgid "Cancel upload"
msgstr "取消上传"
diff --git a/l10n/zh_CN.GB2312/files_encryption.po b/l10n/zh_CN.GB2312/files_encryption.po
index eb4ddd9c548..f85989afca2 100644
--- a/l10n/zh_CN.GB2312/files_encryption.po
+++ b/l10n/zh_CN.GB2312/files_encryption.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-18 02:01+0200\n"
-"PO-Revision-Date: 2012-09-17 10:51+0000\n"
-"Last-Translator: marguerite su <i@marguerite.su>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,18 +18,66 @@ msgstr ""
"Language: zh_CN.GB2312\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
msgid "Encryption"
msgstr "加密"
-#: templates/settings.php:4
+#: templates/settings.php:67
msgid "Exclude the following file types from encryption"
msgstr "从加密中排除如下文件类型"
-#: templates/settings.php:5
+#: templates/settings.php:71
msgid "None"
msgstr "无"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "启用加密"
diff --git a/l10n/zh_CN.GB2312/files_versions.po b/l10n/zh_CN.GB2312/files_versions.po
index 493edd7cfe6..7676ba278c2 100644
--- a/l10n/zh_CN.GB2312/files_versions.po
+++ b/l10n/zh_CN.GB2312/files_versions.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-12 02:03+0200\n"
-"PO-Revision-Date: 2012-10-11 23:49+0000\n"
-"Last-Translator: marguerite su <i@marguerite.su>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,22 +18,10 @@ msgstr ""
"Language: zh_CN.GB2312\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "作废所有版本"
-
#: js/versions.js:16
msgid "History"
msgstr "历史"
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "版本"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "这将删除所有您现有文件的备份版本"
-
#: templates/settings.php:3
msgid "Files Versioning"
msgstr "文件版本"
diff --git a/l10n/zh_CN.GB2312/lib.po b/l10n/zh_CN.GB2312/lib.po
index c32ef2de62c..d03b24aa3aa 100644
--- a/l10n/zh_CN.GB2312/lib.po
+++ b/l10n/zh_CN.GB2312/lib.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-14 23:13+0000\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
"MIME-Version: 1.0\n"
@@ -18,51 +18,55 @@ msgstr ""
"Language: zh_CN.GB2312\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: app.php:285
+#: app.php:301
msgid "Help"
msgstr "帮助"
-#: app.php:292
+#: app.php:308
msgid "Personal"
msgstr "私人"
-#: app.php:297
+#: app.php:313
msgid "Settings"
msgstr "设置"
-#: app.php:302
+#: app.php:318
msgid "Users"
msgstr "用户"
-#: app.php:309
+#: app.php:325
msgid "Apps"
msgstr "程序"
-#: app.php:311
+#: app.php:327
msgid "Admin"
msgstr "管理员"
-#: files.php:332
+#: files.php:365
msgid "ZIP download is turned off."
msgstr "ZIP 下载已关闭"
-#: files.php:333
+#: files.php:366
msgid "Files need to be downloaded one by one."
msgstr "需要逐个下载文件。"
-#: files.php:333 files.php:358
+#: files.php:366 files.php:391
msgid "Back to Files"
msgstr "返回到文件"
-#: files.php:357
+#: files.php:390
msgid "Selected files too large to generate zip file."
msgstr "选择的文件太大而不能生成 zip 文件。"
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr ""
+
#: json.php:28
msgid "Application is not enabled"
msgstr "应用未启用"
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
msgstr "验证错误"
@@ -82,55 +86,55 @@ msgstr "文本"
msgid "Images"
msgstr "图片"
-#: template.php:103
+#: template.php:113
msgid "seconds ago"
msgstr "秒前"
-#: template.php:104
+#: template.php:114
msgid "1 minute ago"
msgstr "1 分钟前"
-#: template.php:105
+#: template.php:115
#, php-format
msgid "%d minutes ago"
msgstr "%d 分钟前"
-#: template.php:106
+#: template.php:116
msgid "1 hour ago"
msgstr ""
-#: template.php:107
+#: template.php:117
#, php-format
msgid "%d hours ago"
msgstr ""
-#: template.php:108
+#: template.php:118
msgid "today"
msgstr "今天"
-#: template.php:109
+#: template.php:119
msgid "yesterday"
msgstr "昨天"
-#: template.php:110
+#: template.php:120
#, php-format
msgid "%d days ago"
msgstr "%d 天前"
-#: template.php:111
+#: template.php:121
msgid "last month"
msgstr "上个月"
-#: template.php:112
+#: template.php:122
#, php-format
msgid "%d months ago"
msgstr ""
-#: template.php:113
+#: template.php:123
msgid "last year"
msgstr "去年"
-#: template.php:114
+#: template.php:124
msgid "years ago"
msgstr "年前"
diff --git a/l10n/zh_CN.GB2312/user_ldap.po b/l10n/zh_CN.GB2312/user_ldap.po
index 75ea9d9c0e9..0e45bb6b182 100644
--- a/l10n/zh_CN.GB2312/user_ldap.po
+++ b/l10n/zh_CN.GB2312/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 23:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
"MIME-Version: 1.0\n"
@@ -27,8 +27,8 @@ msgstr ""
#: templates/settings.php:11
msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
msgstr ""
#: templates/settings.php:15
@@ -45,6 +45,10 @@ msgid "Base DN"
msgstr "基本判别名"
#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "您可以在高级选项卡中为用户和群组指定基本判别名"
@@ -115,10 +119,18 @@ msgstr "端口"
msgid "Base User Tree"
msgstr "基本用户树"
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "基本群组树"
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
#: templates/settings.php:27
msgid "Group-Member association"
msgstr "群组-成员组合"
diff --git a/l10n/zh_CN.GB2312/user_webdavauth.po b/l10n/zh_CN.GB2312/user_webdavauth.po
index 4c2e6b80abe..e9984fbe007 100644
--- a/l10n/zh_CN.GB2312/user_webdavauth.po
+++ b/l10n/zh_CN.GB2312/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-20 00:11+0100\n"
-"PO-Revision-Date: 2012-12-19 23:12+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
"MIME-Version: 1.0\n"
@@ -17,13 +17,17 @@ msgstr ""
"Language: zh_CN.GB2312\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
#: templates/settings.php:4
msgid "URL: http://"
msgstr ""
#: templates/settings.php:6
msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
msgstr ""
diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po
index 82cad2ce6b3..727cb475164 100644
--- a/l10n/zh_CN/core.po
+++ b/l10n/zh_CN/core.po
@@ -6,15 +6,16 @@
# <appweb.cn@gmail.com>, 2012.
# Dianjin Wang <1132321739qq@gmail.com>, 2012.
# Phoenix Nemo <>, 2012.
+# <rainofchaos@gmail.com>, 2013.
# <suiy02@gmail.com>, 2012.
# <wengxt@gmail.com>, 2011, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-01-20 00:05+0100\n"
+"PO-Revision-Date: 2013-01-19 14:38+0000\n"
+"Last-Translator: leonfeng <rainofchaos@gmail.com>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -88,55 +89,55 @@ msgstr "从收藏夹中移除%s时出错。"
msgid "Settings"
msgstr "设置"
-#: js/js.js:711
+#: js/js.js:706
msgid "seconds ago"
msgstr "秒前"
-#: js/js.js:712
+#: js/js.js:707
msgid "1 minute ago"
msgstr "一分钟前"
-#: js/js.js:713
+#: js/js.js:708
msgid "{minutes} minutes ago"
msgstr "{minutes} 分钟前"
-#: js/js.js:714
+#: js/js.js:709
msgid "1 hour ago"
msgstr "1小时前"
-#: js/js.js:715
+#: js/js.js:710
msgid "{hours} hours ago"
msgstr "{hours} 小时前"
-#: js/js.js:716
+#: js/js.js:711
msgid "today"
msgstr "今天"
-#: js/js.js:717
+#: js/js.js:712
msgid "yesterday"
msgstr "昨天"
-#: js/js.js:718
+#: js/js.js:713
msgid "{days} days ago"
msgstr "{days} 天前"
-#: js/js.js:719
+#: js/js.js:714
msgid "last month"
msgstr "上月"
-#: js/js.js:720
+#: js/js.js:715
msgid "{months} months ago"
msgstr "{months} 月前"
-#: js/js.js:721
+#: js/js.js:716
msgid "months ago"
msgstr "月前"
-#: js/js.js:722
+#: js/js.js:717
msgid "last year"
msgstr "去年"
-#: js/js.js:723
+#: js/js.js:718
msgid "years ago"
msgstr "年前"
@@ -212,13 +213,12 @@ msgid "Password protect"
msgstr "密码保护"
#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
msgid "Password"
msgstr "密码"
#: js/share.js:172
msgid "Email link to person"
-msgstr ""
+msgstr "发送链接到个人"
#: js/share.js:173
msgid "Send"
@@ -568,18 +568,4 @@ msgstr "下一页"
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
-msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "安全警告!"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "请验证您的密码。 <br/>出于安全考虑,你可能偶尔会被要求再次输入密码。"
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "验证"
+msgstr "更新 ownCloud 到版本 %s,这可能需要一些时间。"
diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po
index 9d7a6aacba4..c5a96d20133 100644
--- a/l10n/zh_CN/files.po
+++ b/l10n/zh_CN/files.po
@@ -5,16 +5,18 @@
# Translators:
# <appweb.cn@gmail.com>, 2012.
# Dianjin Wang <1132321739qq@gmail.com>, 2012.
+# marguerite su <i@marguerite.su>, 2013.
# <rainofchaos@gmail.com>, 2012.
# <suiy02@gmail.com>, 2012.
+# <wengxt@gmail.com>, 2013.
# <wengxt@gmail.com>, 2011, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-21 23:17+0000\n"
+"Last-Translator: Xuetian Weng <wengxt@gmail.com>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -22,62 +24,67 @@ msgstr ""
"Language: zh_CN\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#: ajax/delete.php:28 ajax/getstoragestats.php:11 ajax/upload.php:17
+#: ajax/upload.php:76 templates/index.php:18
+msgid "Upload"
+msgstr "上传"
+
#: ajax/move.php:17
#, php-format
msgid "Could not move %s - File with this name already exists"
-msgstr ""
+msgstr "无法移动 %s - 同名文件已存在"
#: ajax/move.php:24
#, php-format
msgid "Could not move %s"
-msgstr ""
+msgstr "无法移动 %s"
#: ajax/rename.php:19
msgid "Unable to rename file"
-msgstr ""
+msgstr "无法重命名文件"
-#: ajax/upload.php:14
+#: ajax/upload.php:20
msgid "No file was uploaded. Unknown error"
msgstr "没有文件被上传。未知错误"
-#: ajax/upload.php:21
+#: ajax/upload.php:30
msgid "There is no error, the file uploaded with success"
msgstr "没有发生错误,文件上传成功。"
-#: ajax/upload.php:22
+#: ajax/upload.php:31
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr "上传文件大小已超过php.ini中upload_max_filesize所规定的值"
-#: ajax/upload.php:24
+#: ajax/upload.php:33
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "上传的文件超过了在HTML 表单中指定的MAX_FILE_SIZE"
-#: ajax/upload.php:26
+#: ajax/upload.php:35
msgid "The uploaded file was only partially uploaded"
msgstr "只上传了文件的一部分"
-#: ajax/upload.php:27
+#: ajax/upload.php:36
msgid "No file was uploaded"
msgstr "文件没有上传"
-#: ajax/upload.php:28
+#: ajax/upload.php:37
msgid "Missing a temporary folder"
msgstr "缺少临时目录"
-#: ajax/upload.php:29
+#: ajax/upload.php:38
msgid "Failed to write to disk"
msgstr "写入磁盘失败"
-#: ajax/upload.php:45
+#: ajax/upload.php:57
msgid "Not enough space available"
-msgstr ""
+msgstr "没有足够可用空间"
-#: ajax/upload.php:69
+#: ajax/upload.php:91
msgid "Invalid directory."
-msgstr ""
+msgstr "无效文件夹。"
#: appinfo/app.php:10
msgid "Files"
@@ -131,98 +138,100 @@ msgstr "取消了共享 {files}"
msgid "deleted {files}"
msgstr "删除了 {files}"
-#: js/files.js:31
+#: js/files.js:48
msgid "'.' is an invalid file name."
-msgstr ""
+msgstr "'.' 是一个无效的文件名。"
-#: js/files.js:36
+#: js/files.js:53
msgid "File name cannot be empty."
-msgstr ""
+msgstr "文件名不能为空。"
-#: js/files.js:45
+#: js/files.js:62
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "无效名称,'\\', '/', '<', '>', ':', '\"', '|', '?' 和 '*' 不被允许使用。"
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "正在生成 ZIP 文件,可能需要一些时间"
+#: js/files.js:204
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr "下载正在准备中。如果文件较大可能会花费一些时间。"
-#: js/files.js:224
+#: js/files.js:242
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "无法上传文件,因为它是一个目录或者大小为 0 字节"
-#: js/files.js:224
+#: js/files.js:242
msgid "Upload Error"
msgstr "上传错误"
-#: js/files.js:241
+#: js/files.js:259
msgid "Close"
msgstr "关闭"
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:278 js/files.js:397 js/files.js:431
msgid "Pending"
msgstr "操作等待中"
-#: js/files.js:280
+#: js/files.js:298
msgid "1 file uploading"
msgstr "1个文件上传中"
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:301 js/files.js:357 js/files.js:372
msgid "{count} files uploading"
msgstr "{count} 个文件上传中"
-#: js/files.js:357 js/files.js:393
+#: js/files.js:376 js/files.js:414
msgid "Upload cancelled."
msgstr "上传已取消"
-#: js/files.js:464
+#: js/files.js:486
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "文件正在上传中。现在离开此页会导致上传动作被取消。"
-#: js/files.js:537
+#: js/files.js:559
msgid "URL cannot be empty."
msgstr "URL不能为空"
-#: js/files.js:543
+#: js/files.js:565
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
+msgstr "无效文件夹名。'共享' 是 Owncloud 预留的文件夹名。"
-#: js/files.js:727
+#: js/files.js:775
msgid "{count} files scanned"
msgstr "{count} 个文件已扫描。"
-#: js/files.js:735
+#: js/files.js:783
msgid "error while scanning"
msgstr "扫描时出错"
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:857 templates/index.php:64
msgid "Name"
msgstr "名称"
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:858 templates/index.php:75
msgid "Size"
msgstr "大小"
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:859 templates/index.php:77
msgid "Modified"
msgstr "修改日期"
-#: js/files.js:829
+#: js/files.js:878
msgid "1 folder"
msgstr "1个文件夹"
-#: js/files.js:831
+#: js/files.js:880
msgid "{count} folders"
msgstr "{count} 个文件夹"
-#: js/files.js:839
+#: js/files.js:888
msgid "1 file"
msgstr "1 个文件"
-#: js/files.js:841
+#: js/files.js:890
msgid "{count} files"
msgstr "{count} 个文件"
@@ -274,10 +283,6 @@ msgstr "文件夹"
msgid "From link"
msgstr "来自链接"
-#: templates/index.php:18
-msgid "Upload"
-msgstr "上传"
-
#: templates/index.php:41
msgid "Cancel upload"
msgstr "取消上传"
diff --git a/l10n/zh_CN/files_encryption.po b/l10n/zh_CN/files_encryption.po
index 502f4e08a6f..5395d6734d1 100644
--- a/l10n/zh_CN/files_encryption.po
+++ b/l10n/zh_CN/files_encryption.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-08 02:01+0200\n"
-"PO-Revision-Date: 2012-09-07 09:38+0000\n"
-"Last-Translator: hanfeng <appweb.cn@gmail.com>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,18 +18,66 @@ msgstr ""
"Language: zh_CN\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
msgid "Encryption"
msgstr "加密"
-#: templates/settings.php:4
+#: templates/settings.php:67
msgid "Exclude the following file types from encryption"
msgstr "从加密中排除列出的文件类型"
-#: templates/settings.php:5
+#: templates/settings.php:71
msgid "None"
msgstr "None"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "开启加密"
diff --git a/l10n/zh_CN/files_versions.po b/l10n/zh_CN/files_versions.po
index df61cf98da4..8427a53caaf 100644
--- a/l10n/zh_CN/files_versions.po
+++ b/l10n/zh_CN/files_versions.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-28 23:34+0200\n"
-"PO-Revision-Date: 2012-09-28 09:58+0000\n"
-"Last-Translator: hanfeng <appweb.cn@gmail.com>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,22 +18,10 @@ msgstr ""
"Language: zh_CN\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "过期所有版本"
-
#: js/versions.js:16
msgid "History"
msgstr "历史"
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "版本"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "将会删除您的文件的所有备份版本"
-
#: templates/settings.php:3
msgid "Files Versioning"
msgstr "文件版本"
diff --git a/l10n/zh_CN/lib.po b/l10n/zh_CN/lib.po
index aebc5a42f35..7dd9eb38371 100644
--- a/l10n/zh_CN/lib.po
+++ b/l10n/zh_CN/lib.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-19 00:01+0100\n"
-"PO-Revision-Date: 2012-11-18 16:17+0000\n"
-"Last-Translator: hanfeng <appweb.cn@gmail.com>\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,51 +19,55 @@ msgstr ""
"Language: zh_CN\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: app.php:285
+#: app.php:301
msgid "Help"
msgstr "帮助"
-#: app.php:292
+#: app.php:308
msgid "Personal"
msgstr "个人"
-#: app.php:297
+#: app.php:313
msgid "Settings"
msgstr "设置"
-#: app.php:302
+#: app.php:318
msgid "Users"
msgstr "用户"
-#: app.php:309
+#: app.php:325
msgid "Apps"
msgstr "应用"
-#: app.php:311
+#: app.php:327
msgid "Admin"
msgstr "管理"
-#: files.php:361
+#: files.php:365
msgid "ZIP download is turned off."
msgstr "ZIP 下载已经关闭"
-#: files.php:362
+#: files.php:366
msgid "Files need to be downloaded one by one."
msgstr "需要逐一下载文件"
-#: files.php:362 files.php:387
+#: files.php:366 files.php:391
msgid "Back to Files"
msgstr "回到文件"
-#: files.php:386
+#: files.php:390
msgid "Selected files too large to generate zip file."
msgstr "选择的文件太大,无法生成 zip 文件。"
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr ""
+
#: json.php:28
msgid "Application is not enabled"
msgstr "不需要程序"
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
msgstr "认证错误"
@@ -83,55 +87,55 @@ msgstr "文本"
msgid "Images"
msgstr "图像"
-#: template.php:103
+#: template.php:113
msgid "seconds ago"
msgstr "几秒前"
-#: template.php:104
+#: template.php:114
msgid "1 minute ago"
msgstr "1分钟前"
-#: template.php:105
+#: template.php:115
#, php-format
msgid "%d minutes ago"
msgstr "%d 分钟前"
-#: template.php:106
+#: template.php:116
msgid "1 hour ago"
msgstr "1小时前"
-#: template.php:107
+#: template.php:117
#, php-format
msgid "%d hours ago"
msgstr "%d小时前"
-#: template.php:108
+#: template.php:118
msgid "today"
msgstr "今天"
-#: template.php:109
+#: template.php:119
msgid "yesterday"
msgstr "昨天"
-#: template.php:110
+#: template.php:120
#, php-format
msgid "%d days ago"
msgstr "%d 天前"
-#: template.php:111
+#: template.php:121
msgid "last month"
msgstr "上月"
-#: template.php:112
+#: template.php:122
#, php-format
msgid "%d months ago"
msgstr "%d 月前"
-#: template.php:113
+#: template.php:123
msgid "last year"
msgstr "上年"
-#: template.php:114
+#: template.php:124
msgid "years ago"
msgstr "几年前"
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index 8e151adfe07..a0a2353d6d4 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/settings.po
@@ -4,7 +4,7 @@
#
# Translators:
# <appweb.cn@gmail.com>, 2012.
-# Dianjin Wang <1132321739qq@gmail.com>, 2012.
+# Dianjin Wang <1132321739qq@gmail.com>, 2012-2013.
# Phoenix Nemo <>, 2012.
# <rainofchaos@gmail.com>, 2012.
# <suiy02@gmail.com>, 2012.
@@ -13,9 +13,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 12:51+0000\n"
+"Last-Translator: Dianjin Wang <1132321739qq@gmail.com>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -246,11 +246,11 @@ msgstr "创建"
#: templates/users.php:35
msgid "Default Storage"
-msgstr ""
+msgstr "默认存储"
#: templates/users.php:42 templates/users.php:138
msgid "Unlimited"
-msgstr ""
+msgstr "无限"
#: templates/users.php:60 templates/users.php:153
msgid "Other"
@@ -262,11 +262,11 @@ msgstr "组管理员"
#: templates/users.php:87
msgid "Storage"
-msgstr ""
+msgstr "存储"
#: templates/users.php:133
msgid "Default"
-msgstr ""
+msgstr "默认"
#: templates/users.php:161
msgid "Delete"
diff --git a/l10n/zh_CN/user_ldap.po b/l10n/zh_CN/user_ldap.po
index be239585259..b9c039f6bf8 100644
--- a/l10n/zh_CN/user_ldap.po
+++ b/l10n/zh_CN/user_ldap.po
@@ -4,12 +4,13 @@
#
# Translators:
# <appweb.cn@gmail.com>, 2012.
+# marguerite su <i@marguerite.su>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 23:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
@@ -23,12 +24,12 @@ msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
-msgstr ""
+msgstr "<b>警告:</b>应用 user_ldap 和 user_webdavauth 不兼容。您可能遭遇未预料的行为。请垂询您的系统管理员禁用其中一个。"
#: templates/settings.php:11
msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
msgstr ""
#: templates/settings.php:15
@@ -45,6 +46,10 @@ msgid "Base DN"
msgstr "Base DN"
#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "您可以在高级选项卡里为用户和组指定Base DN"
@@ -115,10 +120,18 @@ msgstr "端口"
msgid "Base User Tree"
msgstr "基础用户树"
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "基础组树"
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
#: templates/settings.php:27
msgid "Group-Member association"
msgstr "组成员关联"
@@ -171,7 +184,7 @@ msgstr "字节数"
#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
-msgstr ""
+msgstr "以秒计。修改将清空缓存。"
#: templates/settings.php:37
msgid ""
diff --git a/l10n/zh_CN/user_webdavauth.po b/l10n/zh_CN/user_webdavauth.po
index fc3ccc1393b..a642c9b21d8 100644
--- a/l10n/zh_CN/user_webdavauth.po
+++ b/l10n/zh_CN/user_webdavauth.po
@@ -5,13 +5,15 @@
# Translators:
# <appweb.cn@gmail.com>, 2012.
# Dianjin Wang <1132321739qq@gmail.com>, 2012.
+# marguerite su <i@marguerite.su>, 2013.
+# <wengxt@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-24 00:10+0100\n"
-"PO-Revision-Date: 2012-12-23 13:55+0000\n"
-"Last-Translator: Dianjin Wang <1132321739qq@gmail.com>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-21 23:23+0000\n"
+"Last-Translator: Xuetian Weng <wengxt@gmail.com>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,13 +21,17 @@ msgstr ""
"Language: zh_CN\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr "WebDAV 认证"
+
#: templates/settings.php:4
msgid "URL: http://"
msgstr "URL:http://"
#: templates/settings.php:6
msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
-msgstr ""
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
+msgstr "ownCloud 将会发送用户的身份到此 URL。这个插件检查返回值并且将 HTTP 状态编码 401 和 403 解释为非法身份,其他所有返回值为合法身份。"
diff --git a/l10n/zh_HK/core.po b/l10n/zh_HK/core.po
index b1e7ea8b73d..d58ec8a3911 100644
--- a/l10n/zh_HK/core.po
+++ b/l10n/zh_HK/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
@@ -208,7 +208,6 @@ msgid "Password protect"
msgstr ""
#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
msgid "Password"
msgstr ""
@@ -565,17 +564,3 @@ msgstr ""
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr ""
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr ""
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr ""
diff --git a/l10n/zh_HK/files.po b/l10n/zh_HK/files.po
index 56eb4f59e2b..56f4ec9477e 100644
--- a/l10n/zh_HK/files.po
+++ b/l10n/zh_HK/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"POT-Creation-Date: 2013-01-20 00:05+0100\n"
+"PO-Revision-Date: 2013-01-19 23:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,11 @@ msgstr ""
"Language: zh_HK\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#: ajax/delete.php:28 ajax/getstoragestats.php:11 ajax/upload.php:17
+#: ajax/upload.php:76 templates/index.php:18
+msgid "Upload"
+msgstr ""
+
#: ajax/move.php:17
#, php-format
msgid "Could not move %s - File with this name already exists"
@@ -31,46 +36,46 @@ msgstr ""
msgid "Unable to rename file"
msgstr ""
-#: ajax/upload.php:14
+#: ajax/upload.php:20
msgid "No file was uploaded. Unknown error"
msgstr ""
-#: ajax/upload.php:21
+#: ajax/upload.php:30
msgid "There is no error, the file uploaded with success"
msgstr ""
-#: ajax/upload.php:22
+#: ajax/upload.php:31
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr ""
-#: ajax/upload.php:24
+#: ajax/upload.php:33
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr ""
-#: ajax/upload.php:26
+#: ajax/upload.php:35
msgid "The uploaded file was only partially uploaded"
msgstr ""
-#: ajax/upload.php:27
+#: ajax/upload.php:36
msgid "No file was uploaded"
msgstr ""
-#: ajax/upload.php:28
+#: ajax/upload.php:37
msgid "Missing a temporary folder"
msgstr ""
-#: ajax/upload.php:29
+#: ajax/upload.php:38
msgid "Failed to write to disk"
msgstr ""
-#: ajax/upload.php:45
+#: ajax/upload.php:57
msgid "Not enough space available"
msgstr ""
-#: ajax/upload.php:69
+#: ajax/upload.php:91
msgid "Invalid directory."
msgstr ""
@@ -126,98 +131,100 @@ msgstr ""
msgid "deleted {files}"
msgstr ""
-#: js/files.js:31
+#: js/files.js:48
msgid "'.' is an invalid file name."
msgstr ""
-#: js/files.js:36
+#: js/files.js:53
msgid "File name cannot be empty."
msgstr ""
-#: js/files.js:45
+#: js/files.js:62
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
+#: js/files.js:204
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
msgstr ""
-#: js/files.js:224
+#: js/files.js:242
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr ""
-#: js/files.js:224
+#: js/files.js:242
msgid "Upload Error"
msgstr ""
-#: js/files.js:241
+#: js/files.js:259
msgid "Close"
msgstr ""
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:278 js/files.js:397 js/files.js:431
msgid "Pending"
msgstr ""
-#: js/files.js:280
+#: js/files.js:298
msgid "1 file uploading"
msgstr ""
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:301 js/files.js:357 js/files.js:372
msgid "{count} files uploading"
msgstr ""
-#: js/files.js:357 js/files.js:393
+#: js/files.js:376 js/files.js:414
msgid "Upload cancelled."
msgstr ""
-#: js/files.js:464
+#: js/files.js:486
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/files.js:537
+#: js/files.js:559
msgid "URL cannot be empty."
msgstr ""
-#: js/files.js:543
+#: js/files.js:565
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:727
+#: js/files.js:775
msgid "{count} files scanned"
msgstr ""
-#: js/files.js:735
+#: js/files.js:783
msgid "error while scanning"
msgstr ""
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:857 templates/index.php:64
msgid "Name"
msgstr ""
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:858 templates/index.php:75
msgid "Size"
msgstr ""
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:859 templates/index.php:77
msgid "Modified"
msgstr ""
-#: js/files.js:829
+#: js/files.js:878
msgid "1 folder"
msgstr ""
-#: js/files.js:831
+#: js/files.js:880
msgid "{count} folders"
msgstr ""
-#: js/files.js:839
+#: js/files.js:888
msgid "1 file"
msgstr ""
-#: js/files.js:841
+#: js/files.js:890
msgid "{count} files"
msgstr ""
@@ -269,10 +276,6 @@ msgstr ""
msgid "From link"
msgstr ""
-#: templates/index.php:18
-msgid "Upload"
-msgstr ""
-
#: templates/index.php:41
msgid "Cancel upload"
msgstr ""
diff --git a/l10n/zh_HK/files_encryption.po b/l10n/zh_HK/files_encryption.po
index 52a31f20bac..adf957c6ee4 100644
--- a/l10n/zh_HK/files_encryption.po
+++ b/l10n/zh_HK/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-19 00:01+0100\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,18 +17,66 @@ msgstr ""
"Language: zh_HK\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: templates/settings.php:3
-msgid "Encryption"
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
msgstr ""
-#: templates/settings.php:4
-msgid "Exclude the following file types from encryption"
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
msgstr ""
-#: templates/settings.php:5
-msgid "None"
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
msgstr ""
#: templates/settings.php:10
-msgid "Enable Encryption"
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:67
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:71
+msgid "None"
msgstr ""
diff --git a/l10n/zh_HK/files_versions.po b/l10n/zh_HK/files_versions.po
index 392cfcc9935..4859a33c5a0 100644
--- a/l10n/zh_HK/files_versions.po
+++ b/l10n/zh_HK/files_versions.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-19 00:01+0100\n"
-"PO-Revision-Date: 2012-08-12 22:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,22 +17,10 @@ msgstr ""
"Language: zh_HK\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr ""
-
#: js/versions.js:16
msgid "History"
msgstr ""
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr ""
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr ""
-
#: templates/settings.php:3
msgid "Files Versioning"
msgstr ""
diff --git a/l10n/zh_HK/lib.po b/l10n/zh_HK/lib.po
index e4752fd9c27..f3bc0dc6e13 100644
--- a/l10n/zh_HK/lib.po
+++ b/l10n/zh_HK/lib.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-19 00:01+0100\n"
-"PO-Revision-Date: 2012-07-27 22:23+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,51 +17,55 @@ msgstr ""
"Language: zh_HK\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: app.php:285
+#: app.php:301
msgid "Help"
msgstr ""
-#: app.php:292
+#: app.php:308
msgid "Personal"
msgstr ""
-#: app.php:297
+#: app.php:313
msgid "Settings"
msgstr ""
-#: app.php:302
+#: app.php:318
msgid "Users"
msgstr ""
-#: app.php:309
+#: app.php:325
msgid "Apps"
msgstr ""
-#: app.php:311
+#: app.php:327
msgid "Admin"
msgstr ""
-#: files.php:361
+#: files.php:365
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:362
+#: files.php:366
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:362 files.php:387
+#: files.php:366 files.php:391
msgid "Back to Files"
msgstr ""
-#: files.php:386
+#: files.php:390
msgid "Selected files too large to generate zip file."
msgstr ""
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr ""
+
#: json.php:28
msgid "Application is not enabled"
msgstr ""
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
msgstr ""
@@ -81,55 +85,55 @@ msgstr ""
msgid "Images"
msgstr ""
-#: template.php:103
+#: template.php:113
msgid "seconds ago"
msgstr ""
-#: template.php:104
+#: template.php:114
msgid "1 minute ago"
msgstr ""
-#: template.php:105
+#: template.php:115
#, php-format
msgid "%d minutes ago"
msgstr ""
-#: template.php:106
+#: template.php:116
msgid "1 hour ago"
msgstr ""
-#: template.php:107
+#: template.php:117
#, php-format
msgid "%d hours ago"
msgstr ""
-#: template.php:108
+#: template.php:118
msgid "today"
msgstr ""
-#: template.php:109
+#: template.php:119
msgid "yesterday"
msgstr ""
-#: template.php:110
+#: template.php:120
#, php-format
msgid "%d days ago"
msgstr ""
-#: template.php:111
+#: template.php:121
msgid "last month"
msgstr ""
-#: template.php:112
+#: template.php:122
#, php-format
msgid "%d months ago"
msgstr ""
-#: template.php:113
+#: template.php:123
msgid "last year"
msgstr ""
-#: template.php:114
+#: template.php:124
msgid "years ago"
msgstr ""
diff --git a/l10n/zh_HK/user_ldap.po b/l10n/zh_HK/user_ldap.po
index 24846079f01..8a7d8cdab9c 100644
--- a/l10n/zh_HK/user_ldap.po
+++ b/l10n/zh_HK/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 23:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
@@ -26,8 +26,8 @@ msgstr ""
#: templates/settings.php:11
msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
msgstr ""
#: templates/settings.php:15
@@ -44,6 +44,10 @@ msgid "Base DN"
msgstr ""
#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
@@ -114,10 +118,18 @@ msgstr ""
msgid "Base User Tree"
msgstr ""
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
diff --git a/l10n/zh_HK/user_webdavauth.po b/l10n/zh_HK/user_webdavauth.po
index c1f1ee6edb2..5a2c43c09ce 100644
--- a/l10n/zh_HK/user_webdavauth.po
+++ b/l10n/zh_HK/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-20 00:11+0100\n"
-"PO-Revision-Date: 2012-12-19 23:12+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
@@ -17,13 +17,17 @@ msgstr ""
"Language: zh_HK\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
#: templates/settings.php:4
msgid "URL: http://"
msgstr ""
#: templates/settings.php:6
msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
msgstr ""
diff --git a/l10n/zh_TW/core.po b/l10n/zh_TW/core.po
index 4f38d77222b..a331ba2944f 100644
--- a/l10n/zh_TW/core.po
+++ b/l10n/zh_TW/core.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
@@ -211,7 +211,6 @@ msgid "Password protect"
msgstr "密碼保護"
#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
msgid "Password"
msgstr "密碼"
@@ -568,17 +567,3 @@ msgstr "下一頁"
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
msgstr "正在將 Owncloud 升級至版本 %s ,這可能需要一點時間。"
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "安全性警告!"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "請輸入您的密碼。<br/>基於安全性的理由,您有時候可能會被要求再次輸入密碼。"
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "驗證"
diff --git a/l10n/zh_TW/files.po b/l10n/zh_TW/files.po
index bed97e748a0..baa21b71fbf 100644
--- a/l10n/zh_TW/files.po
+++ b/l10n/zh_TW/files.po
@@ -12,9 +12,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-11 00:05+0100\n"
-"PO-Revision-Date: 2013-01-10 06:24+0000\n"
-"Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
+"POT-Creation-Date: 2013-01-20 00:05+0100\n"
+"PO-Revision-Date: 2013-01-19 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -22,6 +22,11 @@ msgstr ""
"Language: zh_TW\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#: ajax/delete.php:28 ajax/getstoragestats.php:11 ajax/upload.php:17
+#: ajax/upload.php:76 templates/index.php:18
+msgid "Upload"
+msgstr "上傳"
+
#: ajax/move.php:17
#, php-format
msgid "Could not move %s - File with this name already exists"
@@ -36,46 +41,46 @@ msgstr "無法移動 %s"
msgid "Unable to rename file"
msgstr "無法重新命名檔案"
-#: ajax/upload.php:14
+#: ajax/upload.php:20
msgid "No file was uploaded. Unknown error"
msgstr "沒有檔案被上傳。未知的錯誤。"
-#: ajax/upload.php:21
+#: ajax/upload.php:30
msgid "There is no error, the file uploaded with success"
msgstr "無錯誤,檔案上傳成功"
-#: ajax/upload.php:22
+#: ajax/upload.php:31
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr "上傳的檔案大小超過 php.ini 當中 upload_max_filesize 參數的設定:"
-#: ajax/upload.php:24
+#: ajax/upload.php:33
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "上傳的檔案大小超過 HTML 表單中 MAX_FILE_SIZE 的限制"
-#: ajax/upload.php:26
+#: ajax/upload.php:35
msgid "The uploaded file was only partially uploaded"
msgstr "只有檔案的一部分被上傳"
-#: ajax/upload.php:27
+#: ajax/upload.php:36
msgid "No file was uploaded"
msgstr "無已上傳檔案"
-#: ajax/upload.php:28
+#: ajax/upload.php:37
msgid "Missing a temporary folder"
msgstr "遺失暫存資料夾"
-#: ajax/upload.php:29
+#: ajax/upload.php:38
msgid "Failed to write to disk"
msgstr "寫入硬碟失敗"
-#: ajax/upload.php:45
+#: ajax/upload.php:57
msgid "Not enough space available"
msgstr "沒有足夠的可用空間"
-#: ajax/upload.php:69
+#: ajax/upload.php:91
msgid "Invalid directory."
msgstr "無效的資料夾。"
@@ -131,98 +136,100 @@ msgstr "已取消分享 {files}"
msgid "deleted {files}"
msgstr "已刪除 {files}"
-#: js/files.js:31
+#: js/files.js:48
msgid "'.' is an invalid file name."
msgstr "'.' 是不合法的檔名。"
-#: js/files.js:36
+#: js/files.js:53
msgid "File name cannot be empty."
msgstr "檔名不能為空。"
-#: js/files.js:45
+#: js/files.js:62
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "檔名不合法,不允許 '\\', '/', '<', '>', ':', '\"', '|', '?' 和 '*' 。"
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "產生 ZIP 壓縮檔,這可能需要一段時間。"
+#: js/files.js:204
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
-#: js/files.js:224
+#: js/files.js:242
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "無法上傳您的檔案因為它可能是一個目錄或檔案大小為0"
-#: js/files.js:224
+#: js/files.js:242
msgid "Upload Error"
msgstr "上傳發生錯誤"
-#: js/files.js:241
+#: js/files.js:259
msgid "Close"
msgstr "關閉"
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:278 js/files.js:397 js/files.js:431
msgid "Pending"
msgstr "等候中"
-#: js/files.js:280
+#: js/files.js:298
msgid "1 file uploading"
msgstr "1 個檔案正在上傳"
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:301 js/files.js:357 js/files.js:372
msgid "{count} files uploading"
msgstr "{count} 個檔案正在上傳"
-#: js/files.js:357 js/files.js:393
+#: js/files.js:376 js/files.js:414
msgid "Upload cancelled."
msgstr "上傳取消"
-#: js/files.js:464
+#: js/files.js:486
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "檔案上傳中。離開此頁面將會取消上傳。"
-#: js/files.js:537
+#: js/files.js:559
msgid "URL cannot be empty."
msgstr "URL 不能為空白."
-#: js/files.js:543
+#: js/files.js:565
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "無效的資料夾名稱,'Shared' 的使用被 Owncloud 保留"
-#: js/files.js:727
+#: js/files.js:775
msgid "{count} files scanned"
msgstr "{count} 個檔案已掃描"
-#: js/files.js:735
+#: js/files.js:783
msgid "error while scanning"
msgstr "掃描時發生錯誤"
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:857 templates/index.php:64
msgid "Name"
msgstr "名稱"
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:858 templates/index.php:75
msgid "Size"
msgstr "大小"
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:859 templates/index.php:77
msgid "Modified"
msgstr "修改"
-#: js/files.js:829
+#: js/files.js:878
msgid "1 folder"
msgstr "1 個資料夾"
-#: js/files.js:831
+#: js/files.js:880
msgid "{count} folders"
msgstr "{count} 個資料夾"
-#: js/files.js:839
+#: js/files.js:888
msgid "1 file"
msgstr "1 個檔案"
-#: js/files.js:841
+#: js/files.js:890
msgid "{count} files"
msgstr "{count} 個檔案"
@@ -274,10 +281,6 @@ msgstr "資料夾"
msgid "From link"
msgstr "從連結"
-#: templates/index.php:18
-msgid "Upload"
-msgstr "上傳"
-
#: templates/index.php:41
msgid "Cancel upload"
msgstr "取消上傳"
diff --git a/l10n/zh_TW/files_encryption.po b/l10n/zh_TW/files_encryption.po
index 1da95b438b9..08bcf01b0d2 100644
--- a/l10n/zh_TW/files_encryption.po
+++ b/l10n/zh_TW/files_encryption.po
@@ -8,28 +8,76 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-02 02:01+0200\n"
-"PO-Revision-Date: 2012-09-01 14:48+0000\n"
-"Last-Translator: ywang <ywang1007@gmail.com>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: zh_TW\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
msgid "Encryption"
msgstr "加密"
-#: templates/settings.php:4
+#: templates/settings.php:67
msgid "Exclude the following file types from encryption"
msgstr "下列的檔案類型不加密"
-#: templates/settings.php:5
+#: templates/settings.php:71
msgid "None"
msgstr "無"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "啟用加密"
diff --git a/l10n/zh_TW/files_versions.po b/l10n/zh_TW/files_versions.po
index de8f1475443..1d41bf764bc 100644
--- a/l10n/zh_TW/files_versions.po
+++ b/l10n/zh_TW/files_versions.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-29 00:04+0100\n"
-"PO-Revision-Date: 2012-11-28 01:33+0000\n"
-"Last-Translator: dw4dev <dw4dev@gmail.com>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,22 +18,10 @@ msgstr ""
"Language: zh_TW\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "所有逾期的版本"
-
#: js/versions.js:16
msgid "History"
msgstr "歷史"
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "版本"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr ""
-
#: templates/settings.php:3
msgid "Files Versioning"
msgstr "檔案版本化中..."
diff --git a/l10n/zh_TW/lib.po b/l10n/zh_TW/lib.po
index 2bc0c14b6c0..3e708c8a280 100644
--- a/l10n/zh_TW/lib.po
+++ b/l10n/zh_TW/lib.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-27 00:10+0100\n"
-"PO-Revision-Date: 2012-11-26 09:03+0000\n"
-"Last-Translator: sofiasu <sofia168@livemail.tw>\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,51 +20,55 @@ msgstr ""
"Language: zh_TW\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: app.php:285
+#: app.php:301
msgid "Help"
msgstr "說明"
-#: app.php:292
+#: app.php:308
msgid "Personal"
msgstr "個人"
-#: app.php:297
+#: app.php:313
msgid "Settings"
msgstr "設定"
-#: app.php:302
+#: app.php:318
msgid "Users"
msgstr "使用者"
-#: app.php:309
+#: app.php:325
msgid "Apps"
msgstr "應用程式"
-#: app.php:311
+#: app.php:327
msgid "Admin"
msgstr "管理"
-#: files.php:361
+#: files.php:365
msgid "ZIP download is turned off."
msgstr "ZIP 下載已關閉"
-#: files.php:362
+#: files.php:366
msgid "Files need to be downloaded one by one."
msgstr "檔案需要逐一下載"
-#: files.php:362 files.php:387
+#: files.php:366 files.php:391
msgid "Back to Files"
msgstr "回到檔案列表"
-#: files.php:386
+#: files.php:390
msgid "Selected files too large to generate zip file."
msgstr "選擇的檔案太大以致於無法產生壓縮檔"
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr ""
+
#: json.php:28
msgid "Application is not enabled"
msgstr "應用程式未啟用"
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
msgstr "認證錯誤"
@@ -84,55 +88,55 @@ msgstr "文字"
msgid "Images"
msgstr "圖片"
-#: template.php:103
+#: template.php:113
msgid "seconds ago"
msgstr "幾秒前"
-#: template.php:104
+#: template.php:114
msgid "1 minute ago"
msgstr "1 分鐘前"
-#: template.php:105
+#: template.php:115
#, php-format
msgid "%d minutes ago"
msgstr "%d 分鐘前"
-#: template.php:106
+#: template.php:116
msgid "1 hour ago"
msgstr "1小時之前"
-#: template.php:107
+#: template.php:117
#, php-format
msgid "%d hours ago"
msgstr "%d小時之前"
-#: template.php:108
+#: template.php:118
msgid "today"
msgstr "今天"
-#: template.php:109
+#: template.php:119
msgid "yesterday"
msgstr "昨天"
-#: template.php:110
+#: template.php:120
#, php-format
msgid "%d days ago"
msgstr "%d 天前"
-#: template.php:111
+#: template.php:121
msgid "last month"
msgstr "上個月"
-#: template.php:112
+#: template.php:122
#, php-format
msgid "%d months ago"
msgstr "%d個月之前"
-#: template.php:113
+#: template.php:123
msgid "last year"
msgstr "去年"
-#: template.php:114
+#: template.php:124
msgid "years ago"
msgstr "幾年前"
diff --git a/l10n/zh_TW/user_ldap.po b/l10n/zh_TW/user_ldap.po
index 2bf0669ac23..e3b5d2655d9 100644
--- a/l10n/zh_TW/user_ldap.po
+++ b/l10n/zh_TW/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"POT-Creation-Date: 2013-01-21 00:04+0100\n"
+"PO-Revision-Date: 2013-01-19 23:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
@@ -27,13 +27,13 @@ msgstr ""
#: templates/settings.php:11
msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
msgstr ""
#: templates/settings.php:15
msgid "Host"
-msgstr ""
+msgstr "主機"
#: templates/settings.php:15
msgid ""
@@ -45,6 +45,10 @@ msgid "Base DN"
msgstr ""
#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
@@ -109,16 +113,24 @@ msgstr ""
#: templates/settings.php:24
msgid "Port"
-msgstr ""
+msgstr "連接阜"
#: templates/settings.php:25
msgid "Base User Tree"
msgstr ""
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
diff --git a/l10n/zh_TW/user_webdavauth.po b/l10n/zh_TW/user_webdavauth.po
index 0870470a5c2..d99e5ba2a7f 100644
--- a/l10n/zh_TW/user_webdavauth.po
+++ b/l10n/zh_TW/user_webdavauth.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-20 00:11+0100\n"
-"PO-Revision-Date: 2012-12-19 23:12+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
@@ -18,13 +18,17 @@ msgstr ""
"Language: zh_TW\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
#: templates/settings.php:4
msgid "URL: http://"
msgstr ""
#: templates/settings.php:6
msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
msgstr ""
diff --git a/l10n/zu_ZA/core.po b/l10n/zu_ZA/core.po
index eff86f297c4..c559a642746 100644
--- a/l10n/zu_ZA/core.po
+++ b/l10n/zu_ZA/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Zulu (South Africa) (http://www.transifex.com/projects/p/owncloud/language/zu_ZA/)\n"
"MIME-Version: 1.0\n"
@@ -207,7 +207,6 @@ msgid "Password protect"
msgstr ""
#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
msgid "Password"
msgstr ""
@@ -564,17 +563,3 @@ msgstr ""
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr ""
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr ""
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr ""
diff --git a/l10n/zu_ZA/files.po b/l10n/zu_ZA/files.po
index d9c0a65c13d..ceaf28a6991 100644
--- a/l10n/zu_ZA/files.po
+++ b/l10n/zu_ZA/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"POT-Creation-Date: 2013-01-20 00:05+0100\n"
+"PO-Revision-Date: 2013-01-19 23:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Zulu (South Africa) (http://www.transifex.com/projects/p/owncloud/language/zu_ZA/)\n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,11 @@ msgstr ""
"Language: zu_ZA\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/delete.php:28 ajax/getstoragestats.php:11 ajax/upload.php:17
+#: ajax/upload.php:76 templates/index.php:18
+msgid "Upload"
+msgstr ""
+
#: ajax/move.php:17
#, php-format
msgid "Could not move %s - File with this name already exists"
@@ -31,46 +36,46 @@ msgstr ""
msgid "Unable to rename file"
msgstr ""
-#: ajax/upload.php:14
+#: ajax/upload.php:20
msgid "No file was uploaded. Unknown error"
msgstr ""
-#: ajax/upload.php:21
+#: ajax/upload.php:30
msgid "There is no error, the file uploaded with success"
msgstr ""
-#: ajax/upload.php:22
+#: ajax/upload.php:31
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr ""
-#: ajax/upload.php:24
+#: ajax/upload.php:33
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr ""
-#: ajax/upload.php:26
+#: ajax/upload.php:35
msgid "The uploaded file was only partially uploaded"
msgstr ""
-#: ajax/upload.php:27
+#: ajax/upload.php:36
msgid "No file was uploaded"
msgstr ""
-#: ajax/upload.php:28
+#: ajax/upload.php:37
msgid "Missing a temporary folder"
msgstr ""
-#: ajax/upload.php:29
+#: ajax/upload.php:38
msgid "Failed to write to disk"
msgstr ""
-#: ajax/upload.php:45
+#: ajax/upload.php:57
msgid "Not enough space available"
msgstr ""
-#: ajax/upload.php:69
+#: ajax/upload.php:91
msgid "Invalid directory."
msgstr ""
@@ -126,98 +131,100 @@ msgstr ""
msgid "deleted {files}"
msgstr ""
-#: js/files.js:31
+#: js/files.js:48
msgid "'.' is an invalid file name."
msgstr ""
-#: js/files.js:36
+#: js/files.js:53
msgid "File name cannot be empty."
msgstr ""
-#: js/files.js:45
+#: js/files.js:62
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
+#: js/files.js:204
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
msgstr ""
-#: js/files.js:224
+#: js/files.js:242
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr ""
-#: js/files.js:224
+#: js/files.js:242
msgid "Upload Error"
msgstr ""
-#: js/files.js:241
+#: js/files.js:259
msgid "Close"
msgstr ""
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:278 js/files.js:397 js/files.js:431
msgid "Pending"
msgstr ""
-#: js/files.js:280
+#: js/files.js:298
msgid "1 file uploading"
msgstr ""
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:301 js/files.js:357 js/files.js:372
msgid "{count} files uploading"
msgstr ""
-#: js/files.js:357 js/files.js:393
+#: js/files.js:376 js/files.js:414
msgid "Upload cancelled."
msgstr ""
-#: js/files.js:464
+#: js/files.js:486
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/files.js:537
+#: js/files.js:559
msgid "URL cannot be empty."
msgstr ""
-#: js/files.js:543
+#: js/files.js:565
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:727
+#: js/files.js:775
msgid "{count} files scanned"
msgstr ""
-#: js/files.js:735
+#: js/files.js:783
msgid "error while scanning"
msgstr ""
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:857 templates/index.php:64
msgid "Name"
msgstr ""
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:858 templates/index.php:75
msgid "Size"
msgstr ""
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:859 templates/index.php:77
msgid "Modified"
msgstr ""
-#: js/files.js:829
+#: js/files.js:878
msgid "1 folder"
msgstr ""
-#: js/files.js:831
+#: js/files.js:880
msgid "{count} folders"
msgstr ""
-#: js/files.js:839
+#: js/files.js:888
msgid "1 file"
msgstr ""
-#: js/files.js:841
+#: js/files.js:890
msgid "{count} files"
msgstr ""
@@ -269,10 +276,6 @@ msgstr ""
msgid "From link"
msgstr ""
-#: templates/index.php:18
-msgid "Upload"
-msgstr ""
-
#: templates/index.php:41
msgid "Cancel upload"
msgstr ""
diff --git a/l10n/zu_ZA/files_versions.po b/l10n/zu_ZA/files_versions.po
index 7bc842be419..190d72f8853 100644
--- a/l10n/zu_ZA/files_versions.po
+++ b/l10n/zu_ZA/files_versions.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-06 00:00+0100\n"
-"PO-Revision-Date: 2012-08-12 22:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Zulu (South Africa) (http://www.transifex.com/projects/p/owncloud/language/zu_ZA/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,22 +17,10 @@ msgstr ""
"Language: zu_ZA\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr ""
-
#: js/versions.js:16
msgid "History"
msgstr ""
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr ""
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr ""
-
#: templates/settings.php:3
msgid "Files Versioning"
msgstr ""
diff --git a/l10n/zu_ZA/lib.po b/l10n/zu_ZA/lib.po
index 248d04871da..f463152bf30 100644
--- a/l10n/zu_ZA/lib.po
+++ b/l10n/zu_ZA/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-14 23:13+0000\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Zulu (South Africa) (http://www.transifex.com/projects/p/owncloud/language/zu_ZA/)\n"
"MIME-Version: 1.0\n"
@@ -17,51 +17,55 @@ msgstr ""
"Language: zu_ZA\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:285
+#: app.php:301
msgid "Help"
msgstr ""
-#: app.php:292
+#: app.php:308
msgid "Personal"
msgstr ""
-#: app.php:297
+#: app.php:313
msgid "Settings"
msgstr ""
-#: app.php:302
+#: app.php:318
msgid "Users"
msgstr ""
-#: app.php:309
+#: app.php:325
msgid "Apps"
msgstr ""
-#: app.php:311
+#: app.php:327
msgid "Admin"
msgstr ""
-#: files.php:332
+#: files.php:365
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:333
+#: files.php:366
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:333 files.php:358
+#: files.php:366 files.php:391
msgid "Back to Files"
msgstr ""
-#: files.php:357
+#: files.php:390
msgid "Selected files too large to generate zip file."
msgstr ""
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr ""
+
#: json.php:28
msgid "Application is not enabled"
msgstr ""
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
msgstr ""
@@ -81,55 +85,55 @@ msgstr ""
msgid "Images"
msgstr ""
-#: template.php:103
+#: template.php:113
msgid "seconds ago"
msgstr ""
-#: template.php:104
+#: template.php:114
msgid "1 minute ago"
msgstr ""
-#: template.php:105
+#: template.php:115
#, php-format
msgid "%d minutes ago"
msgstr ""
-#: template.php:106
+#: template.php:116
msgid "1 hour ago"
msgstr ""
-#: template.php:107
+#: template.php:117
#, php-format
msgid "%d hours ago"
msgstr ""
-#: template.php:108
+#: template.php:118
msgid "today"
msgstr ""
-#: template.php:109
+#: template.php:119
msgid "yesterday"
msgstr ""
-#: template.php:110
+#: template.php:120
#, php-format
msgid "%d days ago"
msgstr ""
-#: template.php:111
+#: template.php:121
msgid "last month"
msgstr ""
-#: template.php:112
+#: template.php:122
#, php-format
msgid "%d months ago"
msgstr ""
-#: template.php:113
+#: template.php:123
msgid "last year"
msgstr ""
-#: template.php:114
+#: template.php:124
msgid "years ago"
msgstr ""
diff --git a/l10n/zu_ZA/user_ldap.po b/l10n/zu_ZA/user_ldap.po
index 3add8a2631e..e02fa17c60c 100644
--- a/l10n/zu_ZA/user_ldap.po
+++ b/l10n/zu_ZA/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 23:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Zulu (South Africa) (http://www.transifex.com/projects/p/owncloud/language/zu_ZA/)\n"
"MIME-Version: 1.0\n"
@@ -26,8 +26,8 @@ msgstr ""
#: templates/settings.php:11
msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
msgstr ""
#: templates/settings.php:15
@@ -44,6 +44,10 @@ msgid "Base DN"
msgstr ""
#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
@@ -114,10 +118,18 @@ msgstr ""
msgid "Base User Tree"
msgstr ""
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
diff --git a/l10n/zu_ZA/user_webdavauth.po b/l10n/zu_ZA/user_webdavauth.po
index 3a53e0a85e8..012774040c7 100644
--- a/l10n/zu_ZA/user_webdavauth.po
+++ b/l10n/zu_ZA/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-20 00:11+0100\n"
-"PO-Revision-Date: 2012-12-19 23:12+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Zulu (South Africa) (http://www.transifex.com/projects/p/owncloud/language/zu_ZA/)\n"
"MIME-Version: 1.0\n"
@@ -17,13 +17,17 @@ msgstr ""
"Language: zu_ZA\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
#: templates/settings.php:4
msgid "URL: http://"
msgstr ""
#: templates/settings.php:6
msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
msgstr ""
diff --git a/lib/MDB2/Driver/sqlite3.php b/lib/MDB2/Driver/sqlite3.php
index 9839dafbce1..8f057cfb6e8 100644
--- a/lib/MDB2/Driver/sqlite3.php
+++ b/lib/MDB2/Driver/sqlite3.php
@@ -98,7 +98,7 @@ class MDB2_Driver_sqlite3 extends MDB2_Driver_Common
if ($this->connection) {
$native_code = $this->connection->lastErrorCode();
}
- $native_msg = html_entity_decode($this->_lasterror);
+ $native_msg = html_entity_decode($this->_lasterror);
// PHP 5.2+ prepends the function name to $php_errormsg, so we need
// this hack to work around it, per bug #9599.
diff --git a/lib/api.php b/lib/api.php
index cb67e0c2a89..0fce109a423 100644
--- a/lib/api.php
+++ b/lib/api.php
@@ -42,12 +42,12 @@ class OC_API {
private static function init() {
self::$server = new OC_OAuth_Server(new OC_OAuth_Store());
}
-
+
/**
* api actions
*/
protected static $actions = array();
-
+
/**
* registers an api call
* @param string $method the http method
@@ -58,7 +58,7 @@ class OC_API {
* @param array $defaults
* @param array $requirements
*/
- public static function register($method, $url, $action, $app,
+ public static function register($method, $url, $action, $app,
$authLevel = OC_API::USER_AUTH,
$defaults = array(),
$requirements = array()) {
@@ -73,7 +73,7 @@ class OC_API {
}
self::$actions[$name] = array('app' => $app, 'action' => $action, 'authlevel' => $authLevel);
}
-
+
/**
* handles an api call
* @param array $parameters
@@ -92,8 +92,10 @@ class OC_API {
$response = call_user_func(self::$actions[$name]['action'], $parameters);
} else {
$response = new OC_OCS_Result(null, 998, 'Api method not found');
- }
+ }
} else {
+ header('WWW-Authenticate: Basic realm="Authorization Required"');
+ header('HTTP/1.0 401 Unauthorized');
$response = new OC_OCS_Result(null, 997, 'Unauthorised');
}
// Send the response
@@ -103,7 +105,7 @@ class OC_API {
// logout the user to be stateless
OC_User::logout();
}
-
+
/**
* authenticate the api call
* @param array $action the action details as supplied to OC_API::register()
@@ -127,8 +129,7 @@ class OC_API {
return false;
} else {
$subAdmin = OC_SubAdmin::isSubAdmin($user);
- $admin = OC_Group::inGroup($user, 'admin');
- if($subAdmin || $admin) {
+ if($subAdmin) {
return true;
} else {
return false;
@@ -141,7 +142,7 @@ class OC_API {
if(!$user) {
return false;
} else {
- return OC_Group::inGroup($user, 'admin');
+ return OC_User::isAdminUser($user);
}
break;
default:
@@ -149,18 +150,18 @@ class OC_API {
return false;
break;
}
- }
-
+ }
+
/**
* http basic auth
* @return string|false (username, or false on failure)
*/
- private static function loginUser(){
+ private static function loginUser(){
$authUser = isset($_SERVER['PHP_AUTH_USER']) ? $_SERVER['PHP_AUTH_USER'] : '';
$authPw = isset($_SERVER['PHP_AUTH_PW']) ? $_SERVER['PHP_AUTH_PW'] : '';
return OC_User::login($authUser, $authPw) ? $authUser : false;
}
-
+
/**
* respond to a call
* @param int|array $result the result from the api method
@@ -196,5 +197,5 @@ class OC_API {
}
}
}
-
+
}
diff --git a/lib/app.php b/lib/app.php
index e60bce2a201..662af56d258 100644
--- a/lib/app.php
+++ b/lib/app.php
@@ -137,7 +137,7 @@ class OC_App{
OC_Appconfig::setValue($app, 'types', $appTypes);
}
-
+
/**
* check if app is shipped
* @param string $appid the id of the app to check
@@ -313,14 +313,14 @@ class OC_App{
$settings[]=array( "id" => "settings", "order" => 1000, "href" => OC_Helper::linkToRoute( "settings_settings" ), "name" => $l->t("Settings"), "icon" => OC_Helper::imagePath( "settings", "settings.svg" ));
//SubAdmins are also allowed to access user management
- if(OC_SubAdmin::isSubAdmin($_SESSION["user_id"]) || OC_Group::inGroup( $_SESSION["user_id"], "admin" )) {
+ if(OC_SubAdmin::isSubAdmin(OC_User::getUser())) {
// admin users menu
$settings[] = array( "id" => "core_users", "order" => 2, "href" => OC_Helper::linkToRoute( "settings_users" ), "name" => $l->t("Users"), "icon" => OC_Helper::imagePath( "settings", "users.svg" ));
}
// if the user is an admin
- if(OC_Group::inGroup( $_SESSION["user_id"], "admin" )) {
+ if(OC_User::isAdminUser(OC_User::getUser())) {
// admin apps menu
$settings[] = array( "id" => "core_apps", "order" => 3, "href" => OC_Helper::linkToRoute( "settings_apps" ).'?installed', "name" => $l->t("Apps"), "icon" => OC_Helper::imagePath( "settings", "apps.svg" ));
@@ -748,7 +748,7 @@ class OC_App{
}
return new OC_FilesystemView('/'.OC_User::getUser().'/'.$appid);
}else{
- OC_Log::write('core', 'Can\'t get app storage, app, user not logged in', OC_Log::ERROR);
+ OC_Log::write('core', 'Can\'t get app storage, app '.$appid.', user not logged in', OC_Log::ERROR);
return false;
}
}else{
diff --git a/lib/backgroundjob.php b/lib/backgroundjob.php
index 28b5ce3af20..9619dcb732c 100644
--- a/lib/backgroundjob.php
+++ b/lib/backgroundjob.php
@@ -34,7 +34,7 @@ class OC_BackgroundJob{
public static function getExecutionType() {
return OC_Appconfig::getValue( 'core', 'backgroundjobs_mode', 'ajax' );
}
-
+
/**
* @brief sets the background jobs execution type
* @param $type execution type
diff --git a/lib/base.php b/lib/base.php
index 3d3e7d59f90..4b198c4f784 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -29,169 +29,169 @@ require_once 'public/constants.php';
*/
class OC
{
- /**
- * Assoziative array for autoloading. classname => filename
- */
- public static $CLASSPATH = array();
- /**
- * The installation path for owncloud on the server (e.g. /srv/http/owncloud)
- */
- public static $SERVERROOT = '';
- /**
- * the current request path relative to the owncloud root (e.g. files/index.php)
- */
- private static $SUBURI = '';
- /**
- * the owncloud root path for http requests (e.g. owncloud/)
- */
- public static $WEBROOT = '';
- /**
- * The installation path of the 3rdparty folder on the server (e.g. /srv/http/owncloud/3rdparty)
- */
- public static $THIRDPARTYROOT = '';
- /**
- * the root path of the 3rdparty folder for http requests (e.g. owncloud/3rdparty)
- */
- public static $THIRDPARTYWEBROOT = '';
- /**
- * The installation path array of the apps folder on the server (e.g. /srv/http/owncloud) 'path' and
- * web path in 'url'
- */
- public static $APPSROOTS = array();
- /*
- * requested app
- */
- public static $REQUESTEDAPP = '';
- /*
- * requested file of app
- */
- public static $REQUESTEDFILE = '';
- /**
- * check if owncloud runs in cli mode
- */
- public static $CLI = false;
- /*
- * OC router
- */
- protected static $router = null;
-
- /**
- * SPL autoload
- */
- public static function autoload($className)
- {
- if (array_key_exists($className, OC::$CLASSPATH)) {
- $path = OC::$CLASSPATH[$className];
- /** @TODO: Remove this when necessary
- Remove "apps/" from inclusion path for smooth migration to mutli app dir
- */
- if (strpos($path, 'apps/') === 0) {
- OC_Log::write('core', 'include path for class "' . $className . '" starts with "apps/"', OC_Log::DEBUG);
- $path = str_replace('apps/', '', $path);
- }
- } elseif (strpos($className, 'OC_') === 0) {
- $path = strtolower(str_replace('_', '/', substr($className, 3)) . '.php');
- } elseif (strpos($className, 'OC\\') === 0) {
- $path = strtolower(str_replace('\\', '/', substr($className, 3)) . '.php');
- } elseif (strpos($className, 'OCP\\') === 0) {
- $path = 'public/' . strtolower(str_replace('\\', '/', substr($className, 3)) . '.php');
- } elseif (strpos($className, 'OCA\\') === 0) {
- $path = 'apps/' . strtolower(str_replace('\\', '/', substr($className, 3)) . '.php');
- } elseif (strpos($className, 'Sabre_') === 0) {
- $path = str_replace('_', '/', $className) . '.php';
- } elseif (strpos($className, 'Symfony\\Component\\Routing\\') === 0) {
- $path = 'symfony/routing/' . str_replace('\\', '/', $className) . '.php';
- } elseif (strpos($className, 'Sabre\\VObject') === 0) {
- $path = str_replace('\\', '/', $className) . '.php';
- } elseif (strpos($className, 'Test_') === 0) {
- $path = 'tests/lib/' . strtolower(str_replace('_', '/', substr($className, 5)) . '.php');
- } else {
- return false;
- }
-
- if ($fullPath = stream_resolve_include_path($path)) {
- require_once $fullPath;
- }
- return false;
- }
-
- public static function initPaths()
- {
- // calculate the root directories
- OC::$SERVERROOT = str_replace("\\", '/', substr(__DIR__, 0, -4));
- OC::$SUBURI = str_replace("\\", "/", substr(realpath($_SERVER["SCRIPT_FILENAME"]), strlen(OC::$SERVERROOT)));
- $scriptName = $_SERVER["SCRIPT_NAME"];
- if (substr($scriptName, -1) == '/') {
- $scriptName .= 'index.php';
- //make sure suburi follows the same rules as scriptName
- if (substr(OC::$SUBURI, -9) != 'index.php') {
- if (substr(OC::$SUBURI, -1) != '/') {
- OC::$SUBURI = OC::$SUBURI . '/';
- }
- OC::$SUBURI = OC::$SUBURI . 'index.php';
- }
- }
-
- OC::$WEBROOT = substr($scriptName, 0, strlen($scriptName) - strlen(OC::$SUBURI));
-
- if (OC::$WEBROOT != '' and OC::$WEBROOT[0] !== '/') {
- OC::$WEBROOT = '/' . OC::$WEBROOT;
- }
-
- // ensure we can find OC_Config
- set_include_path(
- OC::$SERVERROOT . '/lib' . PATH_SEPARATOR .
- get_include_path()
- );
-
- // search the 3rdparty folder
- if (OC_Config::getValue('3rdpartyroot', '') <> '' and OC_Config::getValue('3rdpartyurl', '') <> '') {
- OC::$THIRDPARTYROOT = OC_Config::getValue('3rdpartyroot', '');
- OC::$THIRDPARTYWEBROOT = OC_Config::getValue('3rdpartyurl', '');
- } elseif (file_exists(OC::$SERVERROOT . '/3rdparty')) {
- OC::$THIRDPARTYROOT = OC::$SERVERROOT;
- OC::$THIRDPARTYWEBROOT = OC::$WEBROOT;
- } elseif (file_exists(OC::$SERVERROOT . '/../3rdparty')) {
- OC::$THIRDPARTYWEBROOT = rtrim(dirname(OC::$WEBROOT), '/');
- OC::$THIRDPARTYROOT = rtrim(dirname(OC::$SERVERROOT), '/');
- } else {
- echo("3rdparty directory not found! Please put the ownCloud 3rdparty folder in the ownCloud folder or the folder above. You can also configure the location in the config.php file.");
- exit;
- }
- // search the apps folder
- $config_paths = OC_Config::getValue('apps_paths', array());
- if (!empty($config_paths)) {
- foreach ($config_paths as $paths) {
- if (isset($paths['url']) && isset($paths['path'])) {
- $paths['url'] = rtrim($paths['url'], '/');
- $paths['path'] = rtrim($paths['path'], '/');
- OC::$APPSROOTS[] = $paths;
- }
- }
- } elseif (file_exists(OC::$SERVERROOT . '/apps')) {
- OC::$APPSROOTS[] = array('path' => OC::$SERVERROOT . '/apps', 'url' => '/apps', 'writable' => true);
- } elseif (file_exists(OC::$SERVERROOT . '/../apps')) {
- OC::$APPSROOTS[] = array('path' => rtrim(dirname(OC::$SERVERROOT), '/') . '/apps', 'url' => '/apps', 'writable' => true);
- }
-
- if (empty(OC::$APPSROOTS)) {
- echo("apps directory not found! Please put the ownCloud apps folder in the ownCloud folder or the folder above. You can also configure the location in the config.php file.");
- exit;
- }
- $paths = array();
- foreach (OC::$APPSROOTS as $path)
- $paths[] = $path['path'];
-
- // set the right include path
- set_include_path(
- OC::$SERVERROOT . '/lib' . PATH_SEPARATOR .
- OC::$SERVERROOT . '/config' . PATH_SEPARATOR .
- OC::$THIRDPARTYROOT . '/3rdparty' . PATH_SEPARATOR .
- implode($paths, PATH_SEPARATOR) . PATH_SEPARATOR .
- get_include_path() . PATH_SEPARATOR .
- OC::$SERVERROOT
- );
- }
+ /**
+ * Associative array for autoloading. classname => filename
+ */
+ public static $CLASSPATH = array();
+ /**
+ * The installation path for owncloud on the server (e.g. /srv/http/owncloud)
+ */
+ public static $SERVERROOT = '';
+ /**
+ * the current request path relative to the owncloud root (e.g. files/index.php)
+ */
+ private static $SUBURI = '';
+ /**
+ * the owncloud root path for http requests (e.g. owncloud/)
+ */
+ public static $WEBROOT = '';
+ /**
+ * The installation path of the 3rdparty folder on the server (e.g. /srv/http/owncloud/3rdparty)
+ */
+ public static $THIRDPARTYROOT = '';
+ /**
+ * the root path of the 3rdparty folder for http requests (e.g. owncloud/3rdparty)
+ */
+ public static $THIRDPARTYWEBROOT = '';
+ /**
+ * The installation path array of the apps folder on the server (e.g. /srv/http/owncloud) 'path' and
+ * web path in 'url'
+ */
+ public static $APPSROOTS = array();
+ /*
+ * requested app
+ */
+ public static $REQUESTEDAPP = '';
+ /*
+ * requested file of app
+ */
+ public static $REQUESTEDFILE = '';
+ /**
+ * check if owncloud runs in cli mode
+ */
+ public static $CLI = false;
+ /*
+ * OC router
+ */
+ protected static $router = null;
+
+ /**
+ * SPL autoload
+ */
+ public static function autoload($className)
+ {
+ if (array_key_exists($className, OC::$CLASSPATH)) {
+ $path = OC::$CLASSPATH[$className];
+ /** @TODO: Remove this when necessary
+ Remove "apps/" from inclusion path for smooth migration to mutli app dir
+ */
+ if (strpos($path, 'apps/') === 0) {
+ OC_Log::write('core', 'include path for class "' . $className . '" starts with "apps/"', OC_Log::DEBUG);
+ $path = str_replace('apps/', '', $path);
+ }
+ } elseif (strpos($className, 'OC_') === 0) {
+ $path = strtolower(str_replace('_', '/', substr($className, 3)) . '.php');
+ } elseif (strpos($className, 'OC\\') === 0) {
+ $path = strtolower(str_replace('\\', '/', substr($className, 3)) . '.php');
+ } elseif (strpos($className, 'OCP\\') === 0) {
+ $path = 'public/' . strtolower(str_replace('\\', '/', substr($className, 3)) . '.php');
+ } elseif (strpos($className, 'OCA\\') === 0) {
+ $path = 'apps/' . strtolower(str_replace('\\', '/', substr($className, 3)) . '.php');
+ } elseif (strpos($className, 'Sabre_') === 0) {
+ $path = str_replace('_', '/', $className) . '.php';
+ } elseif (strpos($className, 'Symfony\\Component\\Routing\\') === 0) {
+ $path = 'symfony/routing/' . str_replace('\\', '/', $className) . '.php';
+ } elseif (strpos($className, 'Sabre\\VObject') === 0) {
+ $path = str_replace('\\', '/', $className) . '.php';
+ } elseif (strpos($className, 'Test_') === 0) {
+ $path = 'tests/lib/' . strtolower(str_replace('_', '/', substr($className, 5)) . '.php');
+ } else {
+ return false;
+ }
+
+ if ($fullPath = stream_resolve_include_path($path)) {
+ require_once $fullPath;
+ }
+ return false;
+ }
+
+ public static function initPaths()
+ {
+ // calculate the root directories
+ OC::$SERVERROOT = str_replace("\\", '/', substr(__DIR__, 0, -4));
+ OC::$SUBURI = str_replace("\\", "/", substr(realpath($_SERVER["SCRIPT_FILENAME"]), strlen(OC::$SERVERROOT)));
+ $scriptName = $_SERVER["SCRIPT_NAME"];
+ if (substr($scriptName, -1) == '/') {
+ $scriptName .= 'index.php';
+ //make sure suburi follows the same rules as scriptName
+ if (substr(OC::$SUBURI, -9) != 'index.php') {
+ if (substr(OC::$SUBURI, -1) != '/') {
+ OC::$SUBURI = OC::$SUBURI . '/';
+ }
+ OC::$SUBURI = OC::$SUBURI . 'index.php';
+ }
+ }
+
+ OC::$WEBROOT = substr($scriptName, 0, strlen($scriptName) - strlen(OC::$SUBURI));
+
+ if (OC::$WEBROOT != '' and OC::$WEBROOT[0] !== '/') {
+ OC::$WEBROOT = '/' . OC::$WEBROOT;
+ }
+
+ // ensure we can find OC_Config
+ set_include_path(
+ OC::$SERVERROOT . '/lib' . PATH_SEPARATOR .
+ get_include_path()
+ );
+
+ // search the 3rdparty folder
+ if (OC_Config::getValue('3rdpartyroot', '') <> '' and OC_Config::getValue('3rdpartyurl', '') <> '') {
+ OC::$THIRDPARTYROOT = OC_Config::getValue('3rdpartyroot', '');
+ OC::$THIRDPARTYWEBROOT = OC_Config::getValue('3rdpartyurl', '');
+ } elseif (file_exists(OC::$SERVERROOT . '/3rdparty')) {
+ OC::$THIRDPARTYROOT = OC::$SERVERROOT;
+ OC::$THIRDPARTYWEBROOT = OC::$WEBROOT;
+ } elseif (file_exists(OC::$SERVERROOT . '/../3rdparty')) {
+ OC::$THIRDPARTYWEBROOT = rtrim(dirname(OC::$WEBROOT), '/');
+ OC::$THIRDPARTYROOT = rtrim(dirname(OC::$SERVERROOT), '/');
+ } else {
+ echo("3rdparty directory not found! Please put the ownCloud 3rdparty folder in the ownCloud folder or the folder above. You can also configure the location in the config.php file.");
+ exit;
+ }
+ // search the apps folder
+ $config_paths = OC_Config::getValue('apps_paths', array());
+ if (!empty($config_paths)) {
+ foreach ($config_paths as $paths) {
+ if (isset($paths['url']) && isset($paths['path'])) {
+ $paths['url'] = rtrim($paths['url'], '/');
+ $paths['path'] = rtrim($paths['path'], '/');
+ OC::$APPSROOTS[] = $paths;
+ }
+ }
+ } elseif (file_exists(OC::$SERVERROOT . '/apps')) {
+ OC::$APPSROOTS[] = array('path' => OC::$SERVERROOT . '/apps', 'url' => '/apps', 'writable' => true);
+ } elseif (file_exists(OC::$SERVERROOT . '/../apps')) {
+ OC::$APPSROOTS[] = array('path' => rtrim(dirname(OC::$SERVERROOT), '/') . '/apps', 'url' => '/apps', 'writable' => true);
+ }
+
+ if (empty(OC::$APPSROOTS)) {
+ echo("apps directory not found! Please put the ownCloud apps folder in the ownCloud folder or the folder above. You can also configure the location in the config.php file.");
+ exit;
+ }
+ $paths = array();
+ foreach (OC::$APPSROOTS as $path)
+ $paths[] = $path['path'];
+
+ // set the right include path
+ set_include_path(
+ OC::$SERVERROOT . '/lib' . PATH_SEPARATOR .
+ OC::$SERVERROOT . '/config' . PATH_SEPARATOR .
+ OC::$THIRDPARTYROOT . '/3rdparty' . PATH_SEPARATOR .
+ implode($paths, PATH_SEPARATOR) . PATH_SEPARATOR .
+ get_include_path() . PATH_SEPARATOR .
+ OC::$SERVERROOT
+ );
+ }
public static function checkConfig() {
if (file_exists(OC::$SERVERROOT . "/config/config.php") and !is_writable(OC::$SERVERROOT . "/config/config.php")) {
@@ -202,35 +202,41 @@ class OC
}
}
- public static function checkInstalled()
- {
- // Redirect to installer if not installed
- if (!OC_Config::getValue('installed', false) && OC::$SUBURI != '/index.php') {
- if (!OC::$CLI) {
- $url = 'http://' . $_SERVER['SERVER_NAME'] . OC::$WEBROOT . '/index.php';
- header("Location: $url");
- }
- exit();
- }
- }
-
- public static function checkSSL()
- {
- // redirect to https site if configured
- if (OC_Config::getValue("forcessl", false)) {
- header('Strict-Transport-Security: max-age=31536000');
- ini_set("session.cookie_secure", "on");
- if (OC_Request::serverProtocol() <> 'https' and !OC::$CLI) {
- $url = "https://" . OC_Request::serverHost() . $_SERVER['REQUEST_URI'];
- header("Location: $url");
- exit();
- }
- }
- }
+ public static function checkInstalled()
+ {
+ // Redirect to installer if not installed
+ if (!OC_Config::getValue('installed', false) && OC::$SUBURI != '/index.php') {
+ if (!OC::$CLI) {
+ $url = 'http://' . $_SERVER['SERVER_NAME'] . OC::$WEBROOT . '/index.php';
+ header("Location: $url");
+ }
+ exit();
+ }
+ }
+
+ public static function checkSSL()
+ {
+ // redirect to https site if configured
+ if (OC_Config::getValue("forcessl", false)) {
+ header('Strict-Transport-Security: max-age=31536000');
+ ini_set("session.cookie_secure", "on");
+ if (OC_Request::serverProtocol() <> 'https' and !OC::$CLI) {
+ $url = "https://" . OC_Request::serverHost() . $_SERVER['REQUEST_URI'];
+ header("Location: $url");
+ exit();
+ }
+ }
+ }
public static function checkMaintenanceMode() {
// Allow ajax update script to execute without being stopped
if (OC_Config::getValue('maintenance', false) && OC::$SUBURI != '/core/ajax/update.php') {
+ // send http status 503
+ header('HTTP/1.1 503 Service Temporarily Unavailable');
+ header('Status: 503 Service Temporarily Unavailable');
+ header('Retry-After: 120');
+
+ // render error page
$tmpl = new OC_Template('', 'error', 'guest');
$tmpl->assign('errors', array(1 => array('error' => 'ownCloud is in maintenance mode')));
$tmpl->printPage();
@@ -258,504 +264,521 @@ class OC
}
}
- public static function initTemplateEngine()
- {
- // Add the stuff we need always
- OC_Util::addScript("jquery-1.7.2.min");
- OC_Util::addScript("jquery-ui-1.8.16.custom.min");
- OC_Util::addScript("jquery-showpassword");
- OC_Util::addScript("jquery.infieldlabel");
- OC_Util::addScript("jquery-tipsy");
- OC_Util::addScript("oc-dialogs");
- OC_Util::addScript("js");
- OC_Util::addScript("eventsource");
- OC_Util::addScript("config");
- //OC_Util::addScript( "multiselect" );
- OC_Util::addScript('search', 'result');
- OC_Util::addScript('router');
-
- OC_Util::addStyle("styles");
- OC_Util::addStyle("multiselect");
- OC_Util::addStyle("jquery-ui-1.8.16.custom");
- OC_Util::addStyle("jquery-tipsy");
- }
-
- public static function initSession()
- {
- // prevents javascript from accessing php session cookies
- ini_set('session.cookie_httponly', '1;');
-
- // set the session name to the instance id - which is unique
- session_name(OC_Util::getInstanceId());
-
- // (re)-initialize session
- session_start();
-
- // regenerate session id periodically to avoid session fixation
- if (!isset($_SESSION['SID_CREATED'])) {
- $_SESSION['SID_CREATED'] = time();
- } else if (time() - $_SESSION['SID_CREATED'] > 900) {
- session_regenerate_id(true);
- $_SESSION['SID_CREATED'] = time();
- }
-
- // session timeout
- if (isset($_SESSION['LAST_ACTIVITY']) && (time() - $_SESSION['LAST_ACTIVITY'] > 3600)) {
- if (isset($_COOKIE[session_name()])) {
- setcookie(session_name(), '', time() - 42000, '/');
- }
- session_unset();
- session_destroy();
- session_start();
- }
- $_SESSION['LAST_ACTIVITY'] = time();
- }
-
- public static function getRouter()
- {
- if (!isset(OC::$router)) {
- OC::$router = new OC_Router();
- OC::$router->loadRoutes();
- }
-
- return OC::$router;
- }
-
- public static function init()
- {
- // register autoloader
- spl_autoload_register(array('OC', 'autoload'));
- setlocale(LC_ALL, 'en_US.UTF-8');
-
- // set some stuff
- //ob_start();
- error_reporting(E_ALL | E_STRICT);
- if (defined('DEBUG') && DEBUG) {
- ini_set('display_errors', 1);
- }
- self::$CLI = (php_sapi_name() == 'cli');
-
- date_default_timezone_set('UTC');
- ini_set('arg_separator.output', '&amp;');
-
- // try to switch magic quotes off.
- if (get_magic_quotes_gpc()) {
- @set_magic_quotes_runtime(false);
- }
-
- //try to configure php to enable big file uploads.
- //this doesn´t work always depending on the webserver and php configuration.
- //Let´s try to overwrite some defaults anyways
-
- //try to set the maximum execution time to 60min
- @set_time_limit(3600);
- @ini_set('max_execution_time', 3600);
- @ini_set('max_input_time', 3600);
-
- //try to set the maximum filesize to 10G
- @ini_set('upload_max_filesize', '10G');
- @ini_set('post_max_size', '10G');
- @ini_set('file_uploads', '50');
-
- //try to set the session lifetime to 60min
- @ini_set('gc_maxlifetime', '3600');
-
- //copy http auth headers for apache+php-fcgid work around
- if (isset($_SERVER['HTTP_XAUTHORIZATION']) && !isset($_SERVER['HTTP_AUTHORIZATION'])) {
- $_SERVER['HTTP_AUTHORIZATION'] = $_SERVER['HTTP_XAUTHORIZATION'];
- }
-
- //set http auth headers for apache+php-cgi work around
- if (isset($_SERVER['HTTP_AUTHORIZATION']) && preg_match('/Basic\s+(.*)$/i', $_SERVER['HTTP_AUTHORIZATION'], $matches)) {
- list($name, $password) = explode(':', base64_decode($matches[1]), 2);
- $_SERVER['PHP_AUTH_USER'] = strip_tags($name);
- $_SERVER['PHP_AUTH_PW'] = strip_tags($password);
- }
-
- //set http auth headers for apache+php-cgi work around if variable gets renamed by apache
- if (isset($_SERVER['REDIRECT_HTTP_AUTHORIZATION']) && preg_match('/Basic\s+(.*)$/i', $_SERVER['REDIRECT_HTTP_AUTHORIZATION'], $matches)) {
- list($name, $password) = explode(':', base64_decode($matches[1]), 2);
- $_SERVER['PHP_AUTH_USER'] = strip_tags($name);
- $_SERVER['PHP_AUTH_PW'] = strip_tags($password);
- }
-
- self::initPaths();
-
- register_shutdown_function(array('OC_Log', 'onShutdown'));
- set_error_handler(array('OC_Log', 'onError'));
- set_exception_handler(array('OC_Log', 'onException'));
-
- // set debug mode if an xdebug session is active
- if (!defined('DEBUG') || !DEBUG) {
- if (isset($_COOKIE['XDEBUG_SESSION'])) {
- define('DEBUG', true);
- }
- }
-
- // register the stream wrappers
- require_once 'streamwrappers.php';
- stream_wrapper_register("fakedir", "OC_FakeDirStream");
- stream_wrapper_register('static', 'OC_StaticStreamWrapper');
- stream_wrapper_register('close', 'OC_CloseStreamWrapper');
-
- self::checkConfig();
- self::checkInstalled();
- self::checkSSL();
- self::initSession();
- self::initTemplateEngine();
- self::checkMaintenanceMode();
- self::checkUpgrade();
-
- $errors = OC_Util::checkServer();
- if (count($errors) > 0) {
- OC_Template::printGuestPage('', 'error', array('errors' => $errors));
- exit;
- }
-
- // User and Groups
- if (!OC_Config::getValue("installed", false)) {
- $_SESSION['user_id'] = '';
- }
-
- OC_User::useBackend(new OC_User_Database());
- OC_Group::useBackend(new OC_Group_Database());
-
- if (isset($_SERVER['PHP_AUTH_USER']) && isset($_SESSION['user_id']) && $_SERVER['PHP_AUTH_USER'] != $_SESSION['user_id']) {
- OC_User::logout();
- }
-
- // Load Apps
- // This includes plugins for users and filesystems as well
- global $RUNTIME_NOAPPS;
- global $RUNTIME_APPTYPES;
- if (!$RUNTIME_NOAPPS) {
- if ($RUNTIME_APPTYPES) {
- OC_App::loadApps($RUNTIME_APPTYPES);
- } else {
- OC_App::loadApps();
- }
- }
-
- //setup extra user backends
- OC_User::setupBackends();
-
- self::registerCacheHooks();
- self::registerFilesystemHooks();
- self::registerShareHooks();
-
- //make sure temporary files are cleaned up
- register_shutdown_function(array('OC_Helper', 'cleanTmp'));
-
- //parse the given parameters
- self::$REQUESTEDAPP = (isset($_GET['app']) && trim($_GET['app']) != '' && !is_null($_GET['app']) ? str_replace(array('\0', '/', '\\', '..'), '', strip_tags($_GET['app'])) : OC_Config::getValue('defaultapp', 'files'));
- if (substr_count(self::$REQUESTEDAPP, '?') != 0) {
- $app = substr(self::$REQUESTEDAPP, 0, strpos(self::$REQUESTEDAPP, '?'));
- $param = substr($_GET['app'], strpos($_GET['app'], '?') + 1);
- parse_str($param, $get);
- $_GET = array_merge($_GET, $get);
- self::$REQUESTEDAPP = $app;
- $_GET['app'] = $app;
- }
- self::$REQUESTEDFILE = (isset($_GET['getfile']) ? $_GET['getfile'] : null);
- if (substr_count(self::$REQUESTEDFILE, '?') != 0) {
- $file = substr(self::$REQUESTEDFILE, 0, strpos(self::$REQUESTEDFILE, '?'));
- $param = substr(self::$REQUESTEDFILE, strpos(self::$REQUESTEDFILE, '?') + 1);
- parse_str($param, $get);
- $_GET = array_merge($_GET, $get);
- self::$REQUESTEDFILE = $file;
- $_GET['getfile'] = $file;
- }
- if (!is_null(self::$REQUESTEDFILE)) {
- $subdir = OC_App::getAppPath(OC::$REQUESTEDAPP) . '/' . self::$REQUESTEDFILE;
- $parent = OC_App::getAppPath(OC::$REQUESTEDAPP);
- if (!OC_Helper::issubdirectory($subdir, $parent)) {
- self::$REQUESTEDFILE = null;
- header('HTTP/1.0 404 Not Found');
- exit;
- }
- }
-
- // write error into log if locale can't be set
- if (OC_Util::issetlocaleworking() == false) {
- OC_Log::write('core', 'setting locate to en_US.UTF-8 failed. Support is probably not installed on your system', OC_Log::ERROR);
- }
- if (OC_Config::getValue('installed', false)) {
- if (OC_Appconfig::getValue('core', 'backgroundjobs_mode', 'ajax') == 'ajax') {
- OC_Util::addScript('backgroundjobs');
+ public static function initTemplateEngine()
+ {
+ // Add the stuff we need always
+ OC_Util::addScript("jquery-1.7.2.min");
+ OC_Util::addScript("jquery-ui-1.8.16.custom.min");
+ OC_Util::addScript("jquery-showpassword");
+ OC_Util::addScript("jquery.infieldlabel");
+ OC_Util::addScript("jquery-tipsy");
+ OC_Util::addScript("oc-dialogs");
+ OC_Util::addScript("js");
+ OC_Util::addScript("eventsource");
+ OC_Util::addScript("config");
+ //OC_Util::addScript( "multiselect" );
+ OC_Util::addScript('search', 'result');
+ OC_Util::addScript('router');
+
+ OC_Util::addStyle("styles");
+ OC_Util::addStyle("multiselect");
+ OC_Util::addStyle("jquery-ui-1.8.16.custom");
+ OC_Util::addStyle("jquery-tipsy");
+ }
+
+ public static function initSession()
+ {
+ // prevents javascript from accessing php session cookies
+ ini_set('session.cookie_httponly', '1;');
+
+ // set the session name to the instance id - which is unique
+ session_name(OC_Util::getInstanceId());
+
+ // (re)-initialize session
+ session_start();
+
+ // regenerate session id periodically to avoid session fixation
+ if (!isset($_SESSION['SID_CREATED'])) {
+ $_SESSION['SID_CREATED'] = time();
+ } else if (time() - $_SESSION['SID_CREATED'] > 900) {
+ session_regenerate_id(true);
+ $_SESSION['SID_CREATED'] = time();
+ }
+
+ // session timeout
+ if (isset($_SESSION['LAST_ACTIVITY']) && (time() - $_SESSION['LAST_ACTIVITY'] > 3600)) {
+ if (isset($_COOKIE[session_name()])) {
+ setcookie(session_name(), '', time() - 42000, '/');
+ }
+ session_unset();
+ session_destroy();
+ session_start();
+ }
+ $_SESSION['LAST_ACTIVITY'] = time();
+ }
+
+ public static function getRouter()
+ {
+ if (!isset(OC::$router)) {
+ OC::$router = new OC_Router();
+ OC::$router->loadRoutes();
+ }
+
+ return OC::$router;
+ }
+
+
+ public static function loadAppClassPaths()
+ {
+ foreach(OC_APP::getEnabledApps() as $app) {
+ $file = OC_App::getAppPath($app).'/appinfo/classpath.php';
+ if(file_exists($file)) {
+ require_once $file;
+ }
}
}
- }
-
- /**
- * register hooks for the cache
- */
- public static function registerCacheHooks()
- {
- // register cache cleanup jobs
- OC_BackgroundJob_RegularTask::register('OC_Cache_FileGlobal', 'gc');
- OC_Hook::connect('OC_User', 'post_login', 'OC_Cache_File', 'loginListener');
- }
-
- /**
- * register hooks for the filesystem
- */
- public static function registerFilesystemHooks()
- {
- // Check for blacklisted files
- OC_Hook::connect('OC_Filesystem', 'write', 'OC_Filesystem', 'isBlacklisted');
- OC_Hook::connect('OC_Filesystem', 'rename', 'OC_Filesystem', 'isBlacklisted');
- }
-
- /**
- * register hooks for sharing
- */
- public static function registerShareHooks()
- {
- OC_Hook::connect('OC_User', 'post_deleteUser', 'OCP\Share', 'post_deleteUser');
- OC_Hook::connect('OC_User', 'post_addToGroup', 'OCP\Share', 'post_addToGroup');
- OC_Hook::connect('OC_User', 'post_removeFromGroup', 'OCP\Share', 'post_removeFromGroup');
- OC_Hook::connect('OC_User', 'post_deleteGroup', 'OCP\Share', 'post_deleteGroup');
- }
-
- /**
- * @brief Handle the request
- */
- public static function handleRequest()
- {
- if (!OC_Config::getValue('installed', false)) {
- require_once 'core/setup.php';
- exit();
- }
- // Handle redirect URL for logged in users
- if (isset($_REQUEST['redirect_url']) && OC_User::isLoggedIn()) {
- $location = OC_Helper::makeURLAbsolute(urldecode($_REQUEST['redirect_url']));
- header('Location: ' . $location);
- return;
- }
- // Handle WebDAV
- if ($_SERVER['REQUEST_METHOD'] == 'PROPFIND') {
- header('location: ' . OC_Helper::linkToRemote('webdav'));
- return;
- }
- try {
- OC::getRouter()->match(OC_Request::getPathInfo());
- return;
- } catch (Symfony\Component\Routing\Exception\ResourceNotFoundException $e) {
- //header('HTTP/1.0 404 Not Found');
- } catch (Symfony\Component\Routing\Exception\MethodNotAllowedException $e) {
- OC_Response::setStatus(405);
- return;
- }
- $app = OC::$REQUESTEDAPP;
- $file = OC::$REQUESTEDFILE;
- $param = array('app' => $app, 'file' => $file);
- // Handle app css files
- if (substr($file, -3) == 'css') {
- self::loadCSSFile($param);
- return;
- }
- // Someone is logged in :
- if (OC_User::isLoggedIn()) {
- OC_App::loadApps();
- OC_User::setupBackends();
- if (isset($_GET["logout"]) and ($_GET["logout"])) {
- if (isset($_COOKIE['oc_token'])) {
- OC_Preferences::deleteKey(OC_User::getUser(), 'login_token', $_COOKIE['oc_token']);
- }
- OC_User::logout();
- header("Location: " . OC::$WEBROOT . '/');
- } else {
- if (is_null($file)) {
- $param['file'] = 'index.php';
- }
- $file_ext = substr($param['file'], -3);
- if ($file_ext != 'php'
- || !self::loadAppScriptFile($param)
- ) {
- header('HTTP/1.0 404 Not Found');
- }
- }
- return;
- }
- // Not handled and not logged in
- self::handleLogin();
- }
-
- public static function loadAppScriptFile($param)
- {
- OC_App::loadApps();
- $app = $param['app'];
- $file = $param['file'];
- $app_path = OC_App::getAppPath($app);
- $file = $app_path . '/' . $file;
- unset($app, $app_path);
- if (file_exists($file)) {
- require_once $file;
- return true;
- }
- return false;
- }
-
- public static function loadCSSFile($param)
- {
- $app = $param['app'];
- $file = $param['file'];
- $app_path = OC_App::getAppPath($app);
- if (file_exists($app_path . '/' . $file)) {
- $app_web_path = OC_App::getAppWebPath($app);
- $filepath = $app_web_path . '/' . $file;
- $minimizer = new OC_Minimizer_CSS();
- $info = array($app_path, $app_web_path, $file);
- $minimizer->output(array($info), $filepath);
- }
- }
-
- protected static function handleLogin()
- {
- OC_App::loadApps(array('prelogin'));
- $error = array();
- // remember was checked after last login
- if (OC::tryRememberLogin()) {
- $error[] = 'invalidcookie';
-
- // Someone wants to log in :
- } elseif (OC::tryFormLogin()) {
- $error[] = 'invalidpassword';
-
- // The user is already authenticated using Apaches AuthType Basic... very usable in combination with LDAP
- } elseif (OC::tryBasicAuthLogin()) {
- $error[] = 'invalidpassword';
- }
- OC_Util::displayLoginPage(array_unique($error));
- }
-
- protected static function cleanupLoginTokens($user)
- {
- $cutoff = time() - OC_Config::getValue('remember_login_cookie_lifetime', 60 * 60 * 24 * 15);
- $tokens = OC_Preferences::getKeys($user, 'login_token');
- foreach ($tokens as $token) {
- $time = OC_Preferences::getValue($user, 'login_token', $token);
- if ($time < $cutoff) {
- OC_Preferences::deleteKey($user, 'login_token', $token);
- }
- }
- }
-
- protected static function tryRememberLogin()
- {
- if (!isset($_COOKIE["oc_remember_login"])
- || !isset($_COOKIE["oc_token"])
- || !isset($_COOKIE["oc_username"])
- || !$_COOKIE["oc_remember_login"]
- ) {
- return false;
- }
- OC_App::loadApps(array('authentication'));
- if (defined("DEBUG") && DEBUG) {
- OC_Log::write('core', 'Trying to login from cookie', OC_Log::DEBUG);
- }
- // confirm credentials in cookie
- if (isset($_COOKIE['oc_token']) && OC_User::userExists($_COOKIE['oc_username'])) {
- // delete outdated cookies
- self::cleanupLoginTokens($_COOKIE['oc_username']);
- // get stored tokens
- $tokens = OC_Preferences::getKeys($_COOKIE['oc_username'], 'login_token');
- // test cookies token against stored tokens
- if (in_array($_COOKIE['oc_token'], $tokens, true)) {
- // replace successfully used token with a new one
- OC_Preferences::deleteKey($_COOKIE['oc_username'], 'login_token', $_COOKIE['oc_token']);
- $token = OC_Util::generate_random_bytes(32);
- OC_Preferences::setValue($_COOKIE['oc_username'], 'login_token', $token, time());
- OC_User::setMagicInCookie($_COOKIE['oc_username'], $token);
- // login
- OC_User::setUserId($_COOKIE['oc_username']);
- OC_Util::redirectToDefaultPage();
- // doesn't return
- }
- // if you reach this point you have changed your password
- // or you are an attacker
- // we can not delete tokens here because users may reach
- // this point multiple times after a password change
- OC_Log::write('core', 'Authentication cookie rejected for user ' . $_COOKIE['oc_username'], OC_Log::WARN);
- }
- OC_User::unsetMagicInCookie();
- return true;
- }
-
- protected static function tryFormLogin()
- {
- if (!isset($_POST["user"]) || !isset($_POST['password'])) {
- return false;
- }
-
- OC_App::loadApps();
-
- //setup extra user backends
- OC_User::setupBackends();
-
- if (OC_User::login($_POST["user"], $_POST["password"])) {
- // setting up the time zone
- if (isset($_POST['timezone-offset'])) {
- $_SESSION['timezone'] = $_POST['timezone-offset'];
- }
-
- self::cleanupLoginTokens($_POST['user']);
- if (!empty($_POST["remember_login"])) {
- if (defined("DEBUG") && DEBUG) {
- OC_Log::write('core', 'Setting remember login to cookie', OC_Log::DEBUG);
- }
- $token = OC_Util::generate_random_bytes(32);
- OC_Preferences::setValue($_POST['user'], 'login_token', $token, time());
- OC_User::setMagicInCookie($_POST["user"], $token);
- } else {
- OC_User::unsetMagicInCookie();
- }
- OC_Util::redirectToDefaultPage();
- exit();
- }
- return true;
- }
-
- protected static function tryBasicAuthLogin()
- {
- if (!isset($_SERVER["PHP_AUTH_USER"])
- || !isset($_SERVER["PHP_AUTH_PW"])
- ) {
- return false;
- }
- OC_App::loadApps(array('authentication'));
- if (OC_User::login($_SERVER["PHP_AUTH_USER"], $_SERVER["PHP_AUTH_PW"])) {
- //OC_Log::write('core',"Logged in with HTTP Authentication", OC_Log::DEBUG);
- OC_User::unsetMagicInCookie();
- $_REQUEST['redirect_url'] = (isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '');
- OC_Util::redirectToDefaultPage();
- }
- return true;
- }
+
+
+ public static function init()
+ {
+ // register autoloader
+ spl_autoload_register(array('OC', 'autoload'));
+ setlocale(LC_ALL, 'en_US.UTF-8');
+
+ // set some stuff
+ //ob_start();
+ error_reporting(E_ALL | E_STRICT);
+ if (defined('DEBUG') && DEBUG) {
+ ini_set('display_errors', 1);
+ }
+ self::$CLI = (php_sapi_name() == 'cli');
+
+ date_default_timezone_set('UTC');
+ ini_set('arg_separator.output', '&amp;');
+
+ // try to switch magic quotes off.
+ if (get_magic_quotes_gpc()) {
+ @set_magic_quotes_runtime(false);
+ }
+
+ //try to configure php to enable big file uploads.
+ //this doesn´t work always depending on the webserver and php configuration.
+ //Let´s try to overwrite some defaults anyways
+
+ //try to set the maximum execution time to 60min
+ @set_time_limit(3600);
+ @ini_set('max_execution_time', 3600);
+ @ini_set('max_input_time', 3600);
+
+ //try to set the maximum filesize to 10G
+ @ini_set('upload_max_filesize', '10G');
+ @ini_set('post_max_size', '10G');
+ @ini_set('file_uploads', '50');
+
+ //try to set the session lifetime to 60min
+ @ini_set('gc_maxlifetime', '3600');
+
+ //copy http auth headers for apache+php-fcgid work around
+ if (isset($_SERVER['HTTP_XAUTHORIZATION']) && !isset($_SERVER['HTTP_AUTHORIZATION'])) {
+ $_SERVER['HTTP_AUTHORIZATION'] = $_SERVER['HTTP_XAUTHORIZATION'];
+ }
+
+ //set http auth headers for apache+php-cgi work around
+ if (isset($_SERVER['HTTP_AUTHORIZATION']) && preg_match('/Basic\s+(.*)$/i', $_SERVER['HTTP_AUTHORIZATION'], $matches)) {
+ list($name, $password) = explode(':', base64_decode($matches[1]), 2);
+ $_SERVER['PHP_AUTH_USER'] = strip_tags($name);
+ $_SERVER['PHP_AUTH_PW'] = strip_tags($password);
+ }
+
+ //set http auth headers for apache+php-cgi work around if variable gets renamed by apache
+ if (isset($_SERVER['REDIRECT_HTTP_AUTHORIZATION']) && preg_match('/Basic\s+(.*)$/i', $_SERVER['REDIRECT_HTTP_AUTHORIZATION'], $matches)) {
+ list($name, $password) = explode(':', base64_decode($matches[1]), 2);
+ $_SERVER['PHP_AUTH_USER'] = strip_tags($name);
+ $_SERVER['PHP_AUTH_PW'] = strip_tags($password);
+ }
+
+ self::initPaths();
+
+ register_shutdown_function(array('OC_Log', 'onShutdown'));
+ set_error_handler(array('OC_Log', 'onError'));
+ set_exception_handler(array('OC_Log', 'onException'));
+
+ // set debug mode if an xdebug session is active
+ if (!defined('DEBUG') || !DEBUG) {
+ if (isset($_COOKIE['XDEBUG_SESSION'])) {
+ define('DEBUG', true);
+ }
+ }
+
+ // register the stream wrappers
+ require_once 'streamwrappers.php';
+ stream_wrapper_register("fakedir", "OC_FakeDirStream");
+ stream_wrapper_register('static', 'OC_StaticStreamWrapper');
+ stream_wrapper_register('close', 'OC_CloseStreamWrapper');
+
+ self::checkConfig();
+ self::checkInstalled();
+ self::checkSSL();
+ self::initSession();
+ self::initTemplateEngine();
+ self::checkMaintenanceMode();
+ self::checkUpgrade();
+
+ $errors = OC_Util::checkServer();
+ if (count($errors) > 0) {
+ OC_Template::printGuestPage('', 'error', array('errors' => $errors));
+ exit;
+ }
+
+ // User and Groups
+ if (!OC_Config::getValue("installed", false)) {
+ $_SESSION['user_id'] = '';
+ }
+
+ OC_User::useBackend(new OC_User_Database());
+ OC_Group::useBackend(new OC_Group_Database());
+
+ if (isset($_SERVER['PHP_AUTH_USER']) && isset($_SESSION['user_id']) && $_SERVER['PHP_AUTH_USER'] != $_SESSION['user_id']) {
+ OC_User::logout();
+ }
+
+ // Load Apps
+ // This includes plugins for users and filesystems as well
+ global $RUNTIME_NOAPPS;
+ global $RUNTIME_APPTYPES;
+ if (!$RUNTIME_NOAPPS) {
+ if ($RUNTIME_APPTYPES) {
+ OC_App::loadApps($RUNTIME_APPTYPES);
+ } else {
+ OC_App::loadApps();
+ }
+ }
+
+ //setup extra user backends
+ OC_User::setupBackends();
+
+ self::registerCacheHooks();
+ self::registerFilesystemHooks();
+ self::registerShareHooks();
+
+ //make sure temporary files are cleaned up
+ register_shutdown_function(array('OC_Helper', 'cleanTmp'));
+
+ //parse the given parameters
+ self::$REQUESTEDAPP = (isset($_GET['app']) && trim($_GET['app']) != '' && !is_null($_GET['app']) ? str_replace(array('\0', '/', '\\', '..'), '', strip_tags($_GET['app'])) : OC_Config::getValue('defaultapp', 'files'));
+ if (substr_count(self::$REQUESTEDAPP, '?') != 0) {
+ $app = substr(self::$REQUESTEDAPP, 0, strpos(self::$REQUESTEDAPP, '?'));
+ $param = substr($_GET['app'], strpos($_GET['app'], '?') + 1);
+ parse_str($param, $get);
+ $_GET = array_merge($_GET, $get);
+ self::$REQUESTEDAPP = $app;
+ $_GET['app'] = $app;
+ }
+ self::$REQUESTEDFILE = (isset($_GET['getfile']) ? $_GET['getfile'] : null);
+ if (substr_count(self::$REQUESTEDFILE, '?') != 0) {
+ $file = substr(self::$REQUESTEDFILE, 0, strpos(self::$REQUESTEDFILE, '?'));
+ $param = substr(self::$REQUESTEDFILE, strpos(self::$REQUESTEDFILE, '?') + 1);
+ parse_str($param, $get);
+ $_GET = array_merge($_GET, $get);
+ self::$REQUESTEDFILE = $file;
+ $_GET['getfile'] = $file;
+ }
+ if (!is_null(self::$REQUESTEDFILE)) {
+ $subdir = OC_App::getAppPath(OC::$REQUESTEDAPP) . '/' . self::$REQUESTEDFILE;
+ $parent = OC_App::getAppPath(OC::$REQUESTEDAPP);
+ if (!OC_Helper::issubdirectory($subdir, $parent)) {
+ self::$REQUESTEDFILE = null;
+ header('HTTP/1.0 404 Not Found');
+ exit;
+ }
+ }
+
+ // write error into log if locale can't be set
+ if (OC_Util::issetlocaleworking() == false) {
+ OC_Log::write('core', 'setting locate to en_US.UTF-8 failed. Support is probably not installed on your system', OC_Log::ERROR);
+ }
+ if (OC_Config::getValue('installed', false)) {
+ if (OC_Appconfig::getValue('core', 'backgroundjobs_mode', 'ajax') == 'ajax') {
+ OC_Util::addScript('backgroundjobs');
+ }
+ }
+ }
+
+ /**
+ * register hooks for the cache
+ */
+ public static function registerCacheHooks()
+ {
+ // register cache cleanup jobs
+ OC_BackgroundJob_RegularTask::register('OC_Cache_FileGlobal', 'gc');
+ OC_Hook::connect('OC_User', 'post_login', 'OC_Cache_File', 'loginListener');
+ }
+
+ /**
+ * register hooks for the filesystem
+ */
+ public static function registerFilesystemHooks()
+ {
+ // Check for blacklisted files
+ OC_Hook::connect('OC_Filesystem', 'write', 'OC_Filesystem', 'isBlacklisted');
+ OC_Hook::connect('OC_Filesystem', 'rename', 'OC_Filesystem', 'isBlacklisted');
+ }
+
+ /**
+ * register hooks for sharing
+ */
+ public static function registerShareHooks()
+ {
+ OC_Hook::connect('OC_User', 'post_deleteUser', 'OCP\Share', 'post_deleteUser');
+ OC_Hook::connect('OC_User', 'post_addToGroup', 'OCP\Share', 'post_addToGroup');
+ OC_Hook::connect('OC_User', 'post_removeFromGroup', 'OCP\Share', 'post_removeFromGroup');
+ OC_Hook::connect('OC_User', 'post_deleteGroup', 'OCP\Share', 'post_deleteGroup');
+ }
+
+ /**
+ * @brief Handle the request
+ */
+ public static function handleRequest()
+ {
+ if (!OC_Config::getValue('installed', false)) {
+ require_once 'core/setup.php';
+ exit();
+ }
+ // Handle redirect URL for logged in users
+ if (isset($_REQUEST['redirect_url']) && OC_User::isLoggedIn()) {
+ $location = OC_Helper::makeURLAbsolute(urldecode($_REQUEST['redirect_url']));
+ header('Location: ' . $location);
+ return;
+ }
+ // Handle WebDAV
+ if ($_SERVER['REQUEST_METHOD'] == 'PROPFIND') {
+ header('location: ' . OC_Helper::linkToRemote('webdav'));
+ return;
+ }
+
+ // load all the classpaths from the enabled apps so they are available
+ // in the routing files of each app
+ OC::loadAppClassPaths();
+
+ try {
+ OC::getRouter()->match(OC_Request::getPathInfo());
+ return;
+ } catch (Symfony\Component\Routing\Exception\ResourceNotFoundException $e) {
+ //header('HTTP/1.0 404 Not Found');
+ } catch (Symfony\Component\Routing\Exception\MethodNotAllowedException $e) {
+ OC_Response::setStatus(405);
+ return;
+ }
+ $app = OC::$REQUESTEDAPP;
+ $file = OC::$REQUESTEDFILE;
+ $param = array('app' => $app, 'file' => $file);
+ // Handle app css files
+ if (substr($file, -3) == 'css') {
+ self::loadCSSFile($param);
+ return;
+ }
+ // Someone is logged in :
+ if (OC_User::isLoggedIn()) {
+ OC_App::loadApps();
+ OC_User::setupBackends();
+ if (isset($_GET["logout"]) and ($_GET["logout"])) {
+ if (isset($_COOKIE['oc_token'])) {
+ OC_Preferences::deleteKey(OC_User::getUser(), 'login_token', $_COOKIE['oc_token']);
+ }
+ OC_User::logout();
+ header("Location: " . OC::$WEBROOT . '/');
+ } else {
+ if (is_null($file)) {
+ $param['file'] = 'index.php';
+ }
+ $file_ext = substr($param['file'], -3);
+ if ($file_ext != 'php'
+ || !self::loadAppScriptFile($param)
+ ) {
+ header('HTTP/1.0 404 Not Found');
+ }
+ }
+ return;
+ }
+ // Not handled and not logged in
+ self::handleLogin();
+ }
+
+ public static function loadAppScriptFile($param)
+ {
+ OC_App::loadApps();
+ $app = $param['app'];
+ $file = $param['file'];
+ $app_path = OC_App::getAppPath($app);
+ $file = $app_path . '/' . $file;
+ unset($app, $app_path);
+ if (file_exists($file)) {
+ require_once $file;
+ return true;
+ }
+ return false;
+ }
+
+ public static function loadCSSFile($param)
+ {
+ $app = $param['app'];
+ $file = $param['file'];
+ $app_path = OC_App::getAppPath($app);
+ if (file_exists($app_path . '/' . $file)) {
+ $app_web_path = OC_App::getAppWebPath($app);
+ $filepath = $app_web_path . '/' . $file;
+ $minimizer = new OC_Minimizer_CSS();
+ $info = array($app_path, $app_web_path, $file);
+ $minimizer->output(array($info), $filepath);
+ }
+ }
+
+ protected static function handleLogin()
+ {
+ OC_App::loadApps(array('prelogin'));
+ $error = array();
+ // remember was checked after last login
+ if (OC::tryRememberLogin()) {
+ $error[] = 'invalidcookie';
+
+ // Someone wants to log in :
+ } elseif (OC::tryFormLogin()) {
+ $error[] = 'invalidpassword';
+
+ // The user is already authenticated using Apaches AuthType Basic... very usable in combination with LDAP
+ } elseif (OC::tryBasicAuthLogin()) {
+ $error[] = 'invalidpassword';
+ }
+ OC_Util::displayLoginPage(array_unique($error));
+ }
+
+ protected static function cleanupLoginTokens($user)
+ {
+ $cutoff = time() - OC_Config::getValue('remember_login_cookie_lifetime', 60 * 60 * 24 * 15);
+ $tokens = OC_Preferences::getKeys($user, 'login_token');
+ foreach ($tokens as $token) {
+ $time = OC_Preferences::getValue($user, 'login_token', $token);
+ if ($time < $cutoff) {
+ OC_Preferences::deleteKey($user, 'login_token', $token);
+ }
+ }
+ }
+
+ protected static function tryRememberLogin()
+ {
+ if (!isset($_COOKIE["oc_remember_login"])
+ || !isset($_COOKIE["oc_token"])
+ || !isset($_COOKIE["oc_username"])
+ || !$_COOKIE["oc_remember_login"]
+ ) {
+ return false;
+ }
+ OC_App::loadApps(array('authentication'));
+ if (defined("DEBUG") && DEBUG) {
+ OC_Log::write('core', 'Trying to login from cookie', OC_Log::DEBUG);
+ }
+ // confirm credentials in cookie
+ if (isset($_COOKIE['oc_token']) && OC_User::userExists($_COOKIE['oc_username'])) {
+ // delete outdated cookies
+ self::cleanupLoginTokens($_COOKIE['oc_username']);
+ // get stored tokens
+ $tokens = OC_Preferences::getKeys($_COOKIE['oc_username'], 'login_token');
+ // test cookies token against stored tokens
+ if (in_array($_COOKIE['oc_token'], $tokens, true)) {
+ // replace successfully used token with a new one
+ OC_Preferences::deleteKey($_COOKIE['oc_username'], 'login_token', $_COOKIE['oc_token']);
+ $token = OC_Util::generate_random_bytes(32);
+ OC_Preferences::setValue($_COOKIE['oc_username'], 'login_token', $token, time());
+ OC_User::setMagicInCookie($_COOKIE['oc_username'], $token);
+ // login
+ OC_User::setUserId($_COOKIE['oc_username']);
+ OC_Util::redirectToDefaultPage();
+ // doesn't return
+ }
+ // if you reach this point you have changed your password
+ // or you are an attacker
+ // we can not delete tokens here because users may reach
+ // this point multiple times after a password change
+ OC_Log::write('core', 'Authentication cookie rejected for user ' . $_COOKIE['oc_username'], OC_Log::WARN);
+ }
+ OC_User::unsetMagicInCookie();
+ return true;
+ }
+
+ protected static function tryFormLogin()
+ {
+ if (!isset($_POST["user"]) || !isset($_POST['password'])) {
+ return false;
+ }
+
+ OC_App::loadApps();
+
+ //setup extra user backends
+ OC_User::setupBackends();
+
+ if (OC_User::login($_POST["user"], $_POST["password"])) {
+ // setting up the time zone
+ if (isset($_POST['timezone-offset'])) {
+ $_SESSION['timezone'] = $_POST['timezone-offset'];
+ }
+
+ self::cleanupLoginTokens($_POST['user']);
+ if (!empty($_POST["remember_login"])) {
+ if (defined("DEBUG") && DEBUG) {
+ OC_Log::write('core', 'Setting remember login to cookie', OC_Log::DEBUG);
+ }
+ $token = OC_Util::generate_random_bytes(32);
+ OC_Preferences::setValue($_POST['user'], 'login_token', $token, time());
+ OC_User::setMagicInCookie($_POST["user"], $token);
+ } else {
+ OC_User::unsetMagicInCookie();
+ }
+ OC_Util::redirectToDefaultPage();
+ exit();
+ }
+ return true;
+ }
+
+ protected static function tryBasicAuthLogin()
+ {
+ if (!isset($_SERVER["PHP_AUTH_USER"])
+ || !isset($_SERVER["PHP_AUTH_PW"])
+ ) {
+ return false;
+ }
+ OC_App::loadApps(array('authentication'));
+ if (OC_User::login($_SERVER["PHP_AUTH_USER"], $_SERVER["PHP_AUTH_PW"])) {
+ //OC_Log::write('core',"Logged in with HTTP Authentication", OC_Log::DEBUG);
+ OC_User::unsetMagicInCookie();
+ $_REQUEST['redirect_url'] = (isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '');
+ OC_Util::redirectToDefaultPage();
+ }
+ return true;
+ }
}
// define runtime variables - unless this already has been done
if (!isset($RUNTIME_NOAPPS)) {
- $RUNTIME_NOAPPS = false;
+ $RUNTIME_NOAPPS = false;
}
if (!function_exists('get_temp_dir')) {
- function get_temp_dir()
- {
- if ($temp = ini_get('upload_tmp_dir')) return $temp;
- if ($temp = getenv('TMP')) return $temp;
- if ($temp = getenv('TEMP')) return $temp;
- if ($temp = getenv('TMPDIR')) return $temp;
- $temp = tempnam(__FILE__, '');
- if (file_exists($temp)) {
- unlink($temp);
- return dirname($temp);
- }
- if ($temp = sys_get_temp_dir()) return $temp;
-
- return null;
- }
+ function get_temp_dir()
+ {
+ if ($temp = ini_get('upload_tmp_dir')) return $temp;
+ if ($temp = getenv('TMP')) return $temp;
+ if ($temp = getenv('TEMP')) return $temp;
+ if ($temp = getenv('TMPDIR')) return $temp;
+ $temp = tempnam(__FILE__, '');
+ if (file_exists($temp)) {
+ unlink($temp);
+ return dirname($temp);
+ }
+ if ($temp = sys_get_temp_dir()) return $temp;
+
+ return null;
+ }
}
OC::init();
diff --git a/lib/cache/apc.php b/lib/cache/apc.php
index 6dda0a0ff8c..895d307ea26 100644
--- a/lib/cache/apc.php
+++ b/lib/cache/apc.php
@@ -57,7 +57,7 @@ class OC_Cache_APC {
if(!function_exists('apc_exists')) {
function apc_exists($keys)
{
- $result;
+ $result=false;
apc_fetch($keys, $result);
return $result;
}
diff --git a/lib/connector/sabre/node.php b/lib/connector/sabre/node.php
index 52350072fb2..026ec9f7ec5 100644
--- a/lib/connector/sabre/node.php
+++ b/lib/connector/sabre/node.php
@@ -176,9 +176,9 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
* @brief Returns a list of properties for this nodes.;
* @param array $properties
* @return array
- * @note The properties list is a list of propertynames the client
- * requested, encoded as xmlnamespace#tagName, for example:
- * http://www.example.org/namespace#author If the array is empty, all
+ * @note The properties list is a list of propertynames the client
+ * requested, encoded as xmlnamespace#tagName, for example:
+ * http://www.example.org/namespace#author If the array is empty, all
* properties should be returned
*/
public function getProperties($properties) {
diff --git a/lib/db.php b/lib/db.php
index 74e7ca5b0e0..51f7c7679d4 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -41,6 +41,8 @@ class OC_DB {
const BACKEND_PDO=0;
const BACKEND_MDB2=1;
+ static private $preparedQueries = array();
+
/**
* @var MDB2_Driver_Common
*/
@@ -121,6 +123,7 @@ class OC_DB {
return true;
}
}
+ self::$preparedQueries = array();
// The global data we need
$name = OC_Config::getValue( "dbname", "owncloud" );
$host = OC_Config::getValue( "dbhost", "" );
@@ -181,7 +184,14 @@ class OC_DB {
try{
self::$PDO=new PDO($dsn, $user, $pass, $opts);
}catch(PDOException $e) {
- OC_Template::printErrorPage( 'can not connect to database, using '.$type.'. ('.$e->getMessage().')' );
+ OC_Log::write('core', $e->getMessage(), OC_Log::FATAL);
+ OC_User::setUserId(null);
+
+ // send http status 503
+ header('HTTP/1.1 503 Service Temporarily Unavailable');
+ header('Status: 503 Service Temporarily Unavailable');
+ OC_Template::printErrorPage('Failed to connect to database');
+ die();
}
// We always, really always want associative arrays
self::$PDO->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_ASSOC);
@@ -201,6 +211,7 @@ class OC_DB {
return true;
}
}
+ self::$preparedQueries = array();
// The global data we need
$name = OC_Config::getValue( "dbname", "owncloud" );
$host = OC_Config::getValue( "dbhost", "" );
@@ -277,7 +288,13 @@ class OC_DB {
if( PEAR::isError( self::$MDB2 )) {
OC_Log::write('core', self::$MDB2->getUserInfo(), OC_Log::FATAL);
OC_Log::write('core', self::$MDB2->getMessage(), OC_Log::FATAL);
- OC_Template::printErrorPage( 'can not connect to database, using '.$type.'. ('.self::$MDB2->getUserInfo().')' );
+ OC_User::setUserId(null);
+
+ // send http status 503
+ header('HTTP/1.1 503 Service Temporarily Unavailable');
+ header('Status: 503 Service Temporarily Unavailable');
+ OC_Template::printErrorPage('Failed to connect to database');
+ die();
}
// We always, really always want associative arrays
@@ -321,7 +338,12 @@ class OC_DB {
$query.=$limitsql;
}
}
+ } else {
+ if (isset(self::$preparedQueries[$query])) {
+ return self::$preparedQueries[$query];
+ }
}
+ $rawQuery = $query;
// Optimize the query
$query = self::processQuery( $query );
@@ -343,6 +365,9 @@ class OC_DB {
}
$result=new PDOStatementWrapper($result);
}
+ if (is_null($limit) || $limit == -1) {
+ self::$preparedQueries[$rawQuery] = $result;
+ }
return $result;
}
@@ -428,6 +453,9 @@ class OC_DB {
$CONFIG_DBTABLEPREFIX = OC_Config::getValue( "dbtableprefix", "oc_" );
$CONFIG_DBTYPE = OC_Config::getValue( "dbtype", "sqlite" );
+ // cleanup the cached queries
+ self::$preparedQueries = array();
+
self::connectScheme();
// read file
@@ -588,7 +616,7 @@ class OC_DB {
error_log('DB error: '.$entry);
OC_Template::printErrorPage( $entry );
}
-
+
if($result->numRows() == 0) {
$query = 'INSERT INTO "' . $table . '" ("'
. implode('","', array_keys($input)) . '") VALUES("'
@@ -623,7 +651,7 @@ class OC_DB {
return $result->execute();
}
-
+
/**
* @brief does minor changes to query
* @param string $query Query string
diff --git a/lib/filecache.php b/lib/filecache.php
index c3256c783e6..7764890ef1a 100644
--- a/lib/filecache.php
+++ b/lib/filecache.php
@@ -23,9 +23,14 @@
* provide caching for filesystem info in the database
*
* not used by OC_Filesystem for reading filesystem info,
- * instread apps should use OC_FileCache::get where possible
+ * instead apps should use OC_FileCache::get where possible
+ *
+ * It will try to keep the data up to date but changes from outside
+ * ownCloud can invalidate the cache
+ *
+ * Methods that take $path and $root params expect $path to be relative, like
+ * /admin/files/file.txt, if $root is false
*
- * It will try to keep the data up to date but changes from outside ownCloud can invalidate the cache
*/
class OC_FileCache{
@@ -59,7 +64,7 @@ class OC_FileCache{
* @param string $path
* @param array data
* @param string root (optional)
- * @note $data is an associative array in the same format as returned
+ * @note $data is an associative array in the same format as returned
* by get
*/
public static function put($path, $data, $root=false) {
@@ -206,7 +211,7 @@ class OC_FileCache{
OC_Cache::remove('fileid/'.$root.$path);
}
-
+
/**
* return array of filenames matching the querty
* @param string $query
@@ -354,7 +359,7 @@ class OC_FileCache{
public static function increaseSize($path, $sizeDiff, $root=false) {
if($sizeDiff==0) return;
$item = OC_FileCache_Cached::get($path);
- //stop walking up the filetree if we hit a non-folder or reached to root folder
+ //stop walking up the filetree if we hit a non-folder or reached the root folder
if($path == '/' || $path=='' || $item['mimetype'] !== 'httpd/unix-directory') {
return;
}
diff --git a/lib/fileproxy/quota.php b/lib/fileproxy/quota.php
index 742e02d471b..503288142aa 100644
--- a/lib/fileproxy/quota.php
+++ b/lib/fileproxy/quota.php
@@ -76,7 +76,7 @@ class OC_FileProxy_Quota extends OC_FileProxy{
$usedSpace=isset($sharedInfo['size'])?$usedSpace-$sharedInfo['size']:$usedSpace;
return $totalSpace-$usedSpace;
}
-
+
public function postFree_space($path, $space) {
$free=$this->getFreeSpace($path);
if($free==-1) {
diff --git a/lib/files.php b/lib/files.php
index 69097e41074..f4e0f140a44 100644
--- a/lib/files.php
+++ b/lib/files.php
@@ -141,7 +141,7 @@ class OC_Files {
*/
public static function get($dir, $files, $only_header = false) {
$xsendfile = false;
- if (isset($_SERVER['MOD_X_SENDFILE_ENABLED']) ||
+ if (isset($_SERVER['MOD_X_SENDFILE_ENABLED']) ||
isset($_SERVER['MOD_X_ACCEL_REDIRECT_ENABLED'])) {
$xsendfile = true;
}
diff --git a/lib/filestorage/local.php b/lib/filestorage/local.php
index 910b3fa039d..4a4019a3224 100644
--- a/lib/filestorage/local.php
+++ b/lib/filestorage/local.php
@@ -92,7 +92,7 @@ class OC_Filestorage_Local extends OC_Filestorage_Common{
public function file_get_contents($path) {
return file_get_contents($this->datadir.$path);
}
- public function file_put_contents($path, $data) {
+ public function file_put_contents($path, $data) {//trigger_error("$path = ".var_export($path, 1));
return file_put_contents($this->datadir.$path, $data);
}
public function unlink($path) {
diff --git a/lib/filesystem.php b/lib/filesystem.php
index aa03593908d..f185d777def 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -179,11 +179,11 @@ class OC_Filesystem{
$internalPath=substr($path, strlen($mountPoint));
return $internalPath;
}
-
+
static private function mountPointsLoaded($user) {
return in_array($user, self::$loadedUsers);
}
-
+
/**
* get the storage object for a path
* @param string path
@@ -216,7 +216,7 @@ class OC_Filesystem{
self::mount($options['class'], $options['options'], $mountPoint);
}
}
-
+
if(isset($mountConfig['group'])) {
foreach($mountConfig['group'] as $group=>$mounts) {
if(OC_Group::inGroup($user, $group)) {
@@ -230,7 +230,7 @@ class OC_Filesystem{
}
}
}
-
+
if(isset($mountConfig['user'])) {
foreach($mountConfig['user'] as $mountUser=>$mounts) {
if($user==='all' or strtolower($mountUser)===strtolower($user)) {
@@ -244,16 +244,16 @@ class OC_Filesystem{
}
}
}
-
+
$mtime=filemtime(OC::$SERVERROOT.'/config/mount.php');
$previousMTime=OC_Appconfig::getValue('files', 'mountconfigmtime', 0);
if($mtime>$previousMTime) {//mount config has changed, filecache needs to be updated
OC_FileCache::triggerUpdate();
OC_Appconfig::setValue('files', 'mountconfigmtime', $mtime);
}
- }
+ }
}
-
+
static public function init($root, $user = '') {
if(self::$defaultInstance) {
return false;
diff --git a/lib/filesystemview.php b/lib/filesystemview.php
index e944ae5045d..1fc8e83d68f 100644
--- a/lib/filesystemview.php
+++ b/lib/filesystemview.php
@@ -36,8 +36,12 @@
*
* Filesystem functions are not called directly; they are passed to the correct
* OC_Filestorage object
+ *
+ * @note default root (if $root is empty or '/') is /data/[user]/
+ * @note If you don't include a leading slash, you may encounter problems.
+ * e.g. use $v = new \OC_FilesystemView( '/' . $params['uid'] ); not
+ * $v = new \OC_FilesystemView( $params['uid'] );
*/
-
class OC_FilesystemView {
private $fakeRoot='';
private $internal_path_cache=array();
@@ -430,10 +434,10 @@ class OC_FilesystemView {
$target = $this->fopen($path2.$postFix2, 'w');
$result = OC_Helper::streamCopy($source, $target);
}
- if( $this->fakeRoot==OC_Filesystem::getRoot() ) {
- // If the file to be copied originates within
+ if( $this->fakeRoot==OC_Filesystem::getRoot() ) {
+ // If the file to be copied originates within
// the user's data directory
-
+
OC_Hook::emit(
OC_Filesystem::CLASSNAME,
OC_Filesystem::signal_post_copy,
@@ -454,33 +458,33 @@ class OC_FilesystemView {
OC_Filesystem::signal_post_write,
array( OC_Filesystem::signal_param_path => $path2)
);
-
- } else {
- // If this is not a normal file copy operation
- // and the file originates somewhere else
- // (e.g. a version rollback operation), do not
+
+ } else {
+ // If this is not a normal file copy operation
+ // and the file originates somewhere else
+ // (e.g. a version rollback operation), do not
// perform all the other post_write actions
-
+
// Update webdav properties
OC_Filesystem::removeETagHook(array("path" => $path2), $this->fakeRoot);
-
+
$splitPath2 = explode( '/', $path2 );
-
- // Only cache information about files
- // that are being copied from within
- // the user files directory. Caching
+
+ // Only cache information about files
+ // that are being copied from within
+ // the user files directory. Caching
// other files, like VCS backup files,
// serves no purpose
if ( $splitPath2[1] == 'files' ) {
-
+
OC_FileCache_Update::update($path2, $this->fakeRoot);
-
+
}
-
+
}
-
+
return $result;
-
+
}
}
}
diff --git a/lib/helper.php b/lib/helper.php
index 1aba2a38100..a7b2a429952 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -193,8 +193,9 @@ class OC_Helper {
if(isset($alias[$mimetype])) {
$mimetype=$alias[$mimetype];
}
- // Replace slash with a minus
+ // Replace slash and backslash with a minus
$mimetype = str_replace( "/", "-", $mimetype );
+ $mimetype = str_replace( "\\", "-", $mimetype );
// Is it a dir?
if( $mimetype == "dir" ) {
@@ -223,6 +224,10 @@ class OC_Helper {
* Makes 2048 to 2 kB.
*/
public static function humanFileSize( $bytes ) {
+ if( $bytes < 0 ) {
+ $l = OC_L10N::get('lib');
+ return $l->t("couldn't be determined");
+ }
if( $bytes < 1024 ) {
return "$bytes B";
}
@@ -549,7 +554,7 @@ class OC_Helper {
fclose($fh);
return $file;
}
-
+
/**
* create a temporary folder with an unique filename
* @return string
@@ -625,37 +630,17 @@ class OC_Helper {
return $newpath;
}
- /*
- * checks if $sub is a subdirectory of $parent
+ /**
+ * @brief Checks if $sub is a subdirectory of $parent
*
* @param string $sub
* @param string $parent
* @return bool
*/
public static function issubdirectory($sub, $parent) {
- if($sub == null || $sub == '' || $parent == null || $parent == '') {
- return false;
- }
- $realpath_sub = realpath($sub);
- $realpath_parent = realpath($parent);
- if(($realpath_sub == false && substr_count($realpath_sub, './') != 0) || ($realpath_parent == false && substr_count($realpath_parent, './') != 0)) { //it checks for both ./ and ../
- return false;
- }
- if($realpath_sub && $realpath_sub != '' && $realpath_parent && $realpath_parent != '') {
- if(substr($realpath_sub, 0, strlen($realpath_parent)) == $realpath_parent) {
- return true;
- }
- }else{
- if(substr($sub, 0, strlen($parent)) == $parent) {
- return true;
- }
+ if (strpos(realpath($sub), realpath($parent)) === 0) {
+ return true;
}
- /*echo 'SUB: ' . $sub . "\n";
- echo 'PAR: ' . $parent . "\n";
- echo 'REALSUB: ' . $realpath_sub . "\n";
- echo 'REALPAR: ' . $realpath_parent . "\n";
- echo substr($realpath_sub, 0, strlen($realpath_parent));
- exit;*/
return false;
}
@@ -695,8 +680,8 @@ class OC_Helper {
$start = intval($start);
$length = intval($length);
$string = mb_substr($string, 0, $start, $encoding) .
- $replacement .
- mb_substr($string, $start+$length, mb_strlen($string, 'UTF-8')-$start, $encoding);
+ $replacement .
+ mb_substr($string, $start+$length, mb_strlen($string, 'UTF-8')-$start, $encoding);
return $string;
}
@@ -765,6 +750,23 @@ class OC_Helper {
}
/**
+ * @brief calculates the maximum upload size respecting system settings, free space and user quota
+ *
+ * @param $dir the current folder where the user currently operates
+ * @return number of bytes representing
+ */
+ public static function maxUploadFilesize($dir) {
+ $upload_max_filesize = OCP\Util::computerFileSize(ini_get('upload_max_filesize'));
+ $post_max_size = OCP\Util::computerFileSize(ini_get('post_max_size'));
+ $maxUploadFilesize = min($upload_max_filesize, $post_max_size);
+
+ $freeSpace = OC_Filesystem::free_space($dir);
+ $freeSpace = max($freeSpace, 0);
+
+ return min($maxUploadFilesize, $freeSpace);
+ }
+
+ /**
* Checks if a function is available
* @param string $function_name
* @return bool
diff --git a/lib/image.php b/lib/image.php
index 2043a452541..cfc6d477395 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -646,7 +646,7 @@ class OC_Image {
fclose($fh);
return $im;
}
-
+
/**
* @brief Resizes the image preserving ratio.
* @param $maxsize The maximum size of either the width or height.
diff --git a/lib/json.php b/lib/json.php
index 204430411c0..f929e958957 100644
--- a/lib/json.php
+++ b/lib/json.php
@@ -57,9 +57,7 @@ class OC_JSON{
* Check if the user is a admin, send json error msg if not
*/
public static function checkAdminUser() {
- self::checkLoggedIn();
- self::verifyUser();
- if( !OC_Group::inGroup( OC_User::getUser(), 'admin' )) {
+ if( !OC_User::isAdminUser(OC_User::getUser())) {
$l = OC_L10N::get('lib');
self::error(array( 'data' => array( 'message' => $l->t('Authentication error') )));
exit();
@@ -70,9 +68,7 @@ class OC_JSON{
* Check if the user is a subadmin, send json error msg if not
*/
public static function checkSubAdminUser() {
- self::checkLoggedIn();
- self::verifyUser();
- if(!OC_Group::inGroup(OC_User::getUser(), 'admin') && !OC_SubAdmin::isSubAdmin(OC_User::getUser())) {
+ if(!OC_SubAdmin::isSubAdmin(OC_User::getUser())) {
$l = OC_L10N::get('lib');
self::error(array( 'data' => array( 'message' => $l->t('Authentication error') )));
exit();
@@ -80,19 +76,6 @@ class OC_JSON{
}
/**
- * Check if the user verified the login with his password
- */
- public static function verifyUser() {
- if(OC_Config::getValue('enhancedauth', false) === true) {
- if(!isset($_SESSION['verifiedLogin']) OR $_SESSION['verifiedLogin'] < time()) {
- $l = OC_L10N::get('lib');
- self::error(array( 'data' => array( 'message' => $l->t('Authentication error') )));
- exit();
- }
- }
- }
-
- /**
* Send json error msg
*/
public static function error($data = array()) {
diff --git a/lib/l10n.php b/lib/l10n.php
index f70dfa5e34e..ca53b3cf65c 100644
--- a/lib/l10n.php
+++ b/lib/l10n.php
@@ -141,15 +141,15 @@ class OC_L10N{
}
}
- /**
- * @brief Translating
- * @param $text String The text we need a translation for
- * @param array $parameters default:array() Parameters for sprintf
- * @return \OC_L10N_String Translation or the same text
- *
- * Returns the translation. If no translation is found, $text will be
- * returned.
- */
+ /**
+ * @brief Translating
+ * @param $text String The text we need a translation for
+ * @param array $parameters default:array() Parameters for sprintf
+ * @return \OC_L10N_String Translation or the same text
+ *
+ * Returns the translation. If no translation is found, $text will be
+ * returned.
+ */
public function t($text, $parameters = array()) {
return new OC_L10N_String($this, $text, $parameters);
}
diff --git a/lib/l10n/ca.php b/lib/l10n/ca.php
index b3321ef82e1..f6401fa39b6 100644
--- a/lib/l10n/ca.php
+++ b/lib/l10n/ca.php
@@ -9,6 +9,7 @@
"Files need to be downloaded one by one." => "Els fitxers s'han de baixar d'un en un.",
"Back to Files" => "Torna a Fitxers",
"Selected files too large to generate zip file." => "Els fitxers seleccionats son massa grans per generar un fitxer zip.",
+"couldn't be determined" => "no s'ha pogut determinar",
"Application is not enabled" => "L'aplicació no està habilitada",
"Authentication error" => "Error d'autenticació",
"Token expired. Please reload page." => "El testimoni ha expirat. Torneu a carregar la pàgina.",
diff --git a/lib/l10n/cs_CZ.php b/lib/l10n/cs_CZ.php
index fa11e886774..2c823194b96 100644
--- a/lib/l10n/cs_CZ.php
+++ b/lib/l10n/cs_CZ.php
@@ -9,6 +9,7 @@
"Files need to be downloaded one by one." => "Soubory musí být stahovány jednotlivě.",
"Back to Files" => "Zpět k souborům",
"Selected files too large to generate zip file." => "Vybrané soubory jsou příliš velké pro vytvoření zip souboru.",
+"couldn't be determined" => "nelze zjistit",
"Application is not enabled" => "Aplikace není povolena",
"Authentication error" => "Chyba ověření",
"Token expired. Please reload page." => "Token vypršel. Obnovte prosím stránku.",
diff --git a/lib/l10n/de.php b/lib/l10n/de.php
index 4b77bf7210d..c285a07f63a 100644
--- a/lib/l10n/de.php
+++ b/lib/l10n/de.php
@@ -9,6 +9,7 @@
"Files need to be downloaded one by one." => "Die Dateien müssen einzeln heruntergeladen werden.",
"Back to Files" => "Zurück zu \"Dateien\"",
"Selected files too large to generate zip file." => "Die gewählten Dateien sind zu groß, um eine ZIP-Datei zu erstellen.",
+"couldn't be determined" => "Konnte nicht festgestellt werden",
"Application is not enabled" => "Die Anwendung ist nicht aktiviert",
"Authentication error" => "Authentifizierungs-Fehler",
"Token expired. Please reload page." => "Token abgelaufen. Bitte lade die Seite neu.",
diff --git a/lib/l10n/de_DE.php b/lib/l10n/de_DE.php
index e9f0f34a0e1..625ba2ecf20 100644
--- a/lib/l10n/de_DE.php
+++ b/lib/l10n/de_DE.php
@@ -9,6 +9,7 @@
"Files need to be downloaded one by one." => "Die Dateien müssen einzeln heruntergeladen werden.",
"Back to Files" => "Zurück zu \"Dateien\"",
"Selected files too large to generate zip file." => "Die gewählten Dateien sind zu groß, um eine ZIP-Datei zu erstellen.",
+"couldn't be determined" => "konnte nicht ermittelt werden",
"Application is not enabled" => "Die Anwendung ist nicht aktiviert",
"Authentication error" => "Authentifizierungs-Fehler",
"Token expired. Please reload page." => "Token abgelaufen. Bitte laden Sie die Seite neu.",
diff --git a/lib/l10n/el.php b/lib/l10n/el.php
index 315b995ecc9..cf0be24b432 100644
--- a/lib/l10n/el.php
+++ b/lib/l10n/el.php
@@ -9,6 +9,7 @@
"Files need to be downloaded one by one." => "Τα αρχεία πρέπει να ληφθούν ένα-ένα.",
"Back to Files" => "Πίσω στα Αρχεία",
"Selected files too large to generate zip file." => "Τα επιλεγμένα αρχεία είναι μεγάλα ώστε να δημιουργηθεί αρχείο zip.",
+"couldn't be determined" => "δεν μπορούσε να προσδιορισθεί",
"Application is not enabled" => "Δεν ενεργοποιήθηκε η εφαρμογή",
"Authentication error" => "Σφάλμα πιστοποίησης",
"Token expired. Please reload page." => "Το αναγνωριστικό έληξε. Παρακαλώ φορτώστε ξανά την σελίδα.",
diff --git a/lib/l10n/es.php b/lib/l10n/es.php
index f843c42dfd3..8bbc8a8f7b4 100644
--- a/lib/l10n/es.php
+++ b/lib/l10n/es.php
@@ -9,6 +9,7 @@
"Files need to be downloaded one by one." => "Los archivos deben ser descargados uno por uno.",
"Back to Files" => "Volver a Archivos",
"Selected files too large to generate zip file." => "Los archivos seleccionados son demasiado grandes para generar el archivo zip.",
+"couldn't be determined" => "no pudo ser determinado",
"Application is not enabled" => "La aplicación no está habilitada",
"Authentication error" => "Error de autenticación",
"Token expired. Please reload page." => "Token expirado. Por favor, recarga la página.",
diff --git a/lib/l10n/es_AR.php b/lib/l10n/es_AR.php
index 2bbffd39e9e..c32017a10f8 100644
--- a/lib/l10n/es_AR.php
+++ b/lib/l10n/es_AR.php
@@ -9,6 +9,7 @@
"Files need to be downloaded one by one." => "Los archivos deben ser descargados de a uno.",
"Back to Files" => "Volver a archivos",
"Selected files too large to generate zip file." => "Los archivos seleccionados son demasiado grandes para generar el archivo zip.",
+"couldn't be determined" => "no pudo ser determinado",
"Application is not enabled" => "La aplicación no está habilitada",
"Authentication error" => "Error de autenticación",
"Token expired. Please reload page." => "Token expirado. Por favor, recargá la página.",
diff --git a/lib/l10n/eu.php b/lib/l10n/eu.php
index 5d47ecbda23..1941551b176 100644
--- a/lib/l10n/eu.php
+++ b/lib/l10n/eu.php
@@ -9,6 +9,7 @@
"Files need to be downloaded one by one." => "Fitxategiak banan-banan deskargatu behar dira.",
"Back to Files" => "Itzuli fitxategietara",
"Selected files too large to generate zip file." => "Hautatuko fitxategiak oso handiak dira zip fitxategia sortzeko.",
+"couldn't be determined" => "ezin izan da zehaztu",
"Application is not enabled" => "Aplikazioa ez dago gaituta",
"Authentication error" => "Autentikazio errorea",
"Token expired. Please reload page." => "Tokena iraungitu da. Mesedez birkargatu orria.",
diff --git a/lib/l10n/fi_FI.php b/lib/l10n/fi_FI.php
index 6a5734e978d..b8d4b137431 100644
--- a/lib/l10n/fi_FI.php
+++ b/lib/l10n/fi_FI.php
@@ -9,6 +9,7 @@
"Files need to be downloaded one by one." => "Tiedostot on ladattava yksittäin.",
"Back to Files" => "Takaisin tiedostoihin",
"Selected files too large to generate zip file." => "Valitut tiedostot ovat liian suurikokoisia mahtuakseen zip-tiedostoon.",
+"couldn't be determined" => "ei voitu määrittää",
"Application is not enabled" => "Sovellusta ei ole otettu käyttöön",
"Authentication error" => "Todennusvirhe",
"Token expired. Please reload page." => "Valtuutus vanheni. Lataa sivu uudelleen.",
diff --git a/lib/l10n/gl.php b/lib/l10n/gl.php
index 1e897959e41..532b3443b44 100644
--- a/lib/l10n/gl.php
+++ b/lib/l10n/gl.php
@@ -9,6 +9,7 @@
"Files need to be downloaded one by one." => "Os ficheiros necesitan seren descargados de un en un.",
"Back to Files" => "Volver aos ficheiros",
"Selected files too large to generate zip file." => "Os ficheiros seleccionados son demasiado grandes como para xerar un ficheiro zip.",
+"couldn't be determined" => "non puido ser determinado",
"Application is not enabled" => "O aplicativo non está activado",
"Authentication error" => "Produciuse un erro na autenticación",
"Token expired. Please reload page." => "Testemuña caducada. Recargue a páxina.",
diff --git a/lib/l10n/hu_HU.php b/lib/l10n/hu_HU.php
index 3dcf0646d06..c95358011f0 100644
--- a/lib/l10n/hu_HU.php
+++ b/lib/l10n/hu_HU.php
@@ -8,7 +8,8 @@
"ZIP download is turned off." => "A ZIP-letöltés nem engedélyezett.",
"Files need to be downloaded one by one." => "A fájlokat egyenként kell letölteni",
"Back to Files" => "Vissza a Fájlokhoz",
-"Selected files too large to generate zip file." => "A kiválasztott fájlok túl nagy a zip tömörítéshez.",
+"Selected files too large to generate zip file." => "A kiválasztott fájlok túl nagyok a zip tömörítéshez.",
+"couldn't be determined" => "nem sikerült azonosítani",
"Application is not enabled" => "Az alkalmazás nincs engedélyezve",
"Authentication error" => "Hitelesítési hiba",
"Token expired. Please reload page." => "A token lejárt. Frissítse az oldalt.",
diff --git a/lib/l10n/it.php b/lib/l10n/it.php
index c0fb0babfb3..eb404db7fb5 100644
--- a/lib/l10n/it.php
+++ b/lib/l10n/it.php
@@ -9,6 +9,7 @@
"Files need to be downloaded one by one." => "I file devono essere scaricati uno alla volta.",
"Back to Files" => "Torna ai file",
"Selected files too large to generate zip file." => "I file selezionati sono troppo grandi per generare un file zip.",
+"couldn't be determined" => "non può essere determinato",
"Application is not enabled" => "L'applicazione non è abilitata",
"Authentication error" => "Errore di autenticazione",
"Token expired. Please reload page." => "Token scaduto. Ricarica la pagina.",
diff --git a/lib/l10n/ja_JP.php b/lib/l10n/ja_JP.php
index 854734c9764..11cefe900c2 100644
--- a/lib/l10n/ja_JP.php
+++ b/lib/l10n/ja_JP.php
@@ -9,6 +9,7 @@
"Files need to be downloaded one by one." => "ファイルは1つずつダウンロードする必要があります。",
"Back to Files" => "ファイルに戻る",
"Selected files too large to generate zip file." => "選択したファイルはZIPファイルの生成には大きすぎます。",
+"couldn't be determined" => "測定できませんでした",
"Application is not enabled" => "アプリケーションは無効です",
"Authentication error" => "認証エラー",
"Token expired. Please reload page." => "トークンが無効になりました。ページを再読込してください。",
diff --git a/lib/l10n/lb.php b/lib/l10n/lb.php
index baee630e897..a5a9adca187 100644
--- a/lib/l10n/lb.php
+++ b/lib/l10n/lb.php
@@ -1,6 +1,8 @@
<?php $TRANSLATIONS = array(
+"Help" => "Hëllef",
"Personal" => "Perséinlech",
"Settings" => "Astellungen",
"Authentication error" => "Authentifikatioun's Fehler",
+"Files" => "Dateien",
"Text" => "SMS"
);
diff --git a/lib/l10n/ms_MY.php b/lib/l10n/ms_MY.php
index 86c7e51b486..5afee1cb5a8 100644
--- a/lib/l10n/ms_MY.php
+++ b/lib/l10n/ms_MY.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Help" => "Bantuan",
"Personal" => "Peribadi",
"Settings" => "Tetapan",
"Users" => "Pengguna",
diff --git a/lib/l10n/nl.php b/lib/l10n/nl.php
index 087cf23a627..7ce134e3621 100644
--- a/lib/l10n/nl.php
+++ b/lib/l10n/nl.php
@@ -9,6 +9,7 @@
"Files need to be downloaded one by one." => "Bestanden moeten één voor één worden gedownload.",
"Back to Files" => "Terug naar bestanden",
"Selected files too large to generate zip file." => "De geselecteerde bestanden zijn te groot om een zip bestand te maken.",
+"couldn't be determined" => "kon niet worden vastgesteld",
"Application is not enabled" => "De applicatie is niet actief",
"Authentication error" => "Authenticatie fout",
"Token expired. Please reload page." => "Token verlopen. Herlaad de pagina.",
diff --git a/lib/l10n/pt_PT.php b/lib/l10n/pt_PT.php
index 84867c4c37c..e35bb489c49 100644
--- a/lib/l10n/pt_PT.php
+++ b/lib/l10n/pt_PT.php
@@ -9,6 +9,7 @@
"Files need to be downloaded one by one." => "Os ficheiros precisam de ser descarregados um por um.",
"Back to Files" => "Voltar a Ficheiros",
"Selected files too large to generate zip file." => "Os ficheiros seleccionados são grandes demais para gerar um ficheiro zip.",
+"couldn't be determined" => "Não foi possível determinar",
"Application is not enabled" => "A aplicação não está activada",
"Authentication error" => "Erro na autenticação",
"Token expired. Please reload page." => "O token expirou. Por favor recarregue a página.",
diff --git a/lib/l10n/sv.php b/lib/l10n/sv.php
index 5799e2dd1a8..36f00636b2b 100644
--- a/lib/l10n/sv.php
+++ b/lib/l10n/sv.php
@@ -9,6 +9,7 @@
"Files need to be downloaded one by one." => "Filer laddas ner en åt gången.",
"Back to Files" => "Tillbaka till Filer",
"Selected files too large to generate zip file." => "Valda filer är för stora för att skapa zip-fil.",
+"couldn't be determined" => "kunde inte bestämmas",
"Application is not enabled" => "Applikationen är inte aktiverad",
"Authentication error" => "Fel vid autentisering",
"Token expired. Please reload page." => "Ogiltig token. Ladda om sidan.",
diff --git a/lib/l10n/th_TH.php b/lib/l10n/th_TH.php
index 75fa02f84b0..0da607a0589 100644
--- a/lib/l10n/th_TH.php
+++ b/lib/l10n/th_TH.php
@@ -9,6 +9,7 @@
"Files need to be downloaded one by one." => "ไฟล์สามารถดาวน์โหลดได้ทีละครั้งเท่านั้น",
"Back to Files" => "กลับไปที่ไฟล์",
"Selected files too large to generate zip file." => "ไฟล์ที่เลือกมีขนาดใหญ่เกินกว่าที่จะสร้างเป็นไฟล์ zip",
+"couldn't be determined" => "ไม่สามารถกำหนดได้",
"Application is not enabled" => "แอพพลิเคชั่นดังกล่าวยังไม่ได้เปิดใช้งาน",
"Authentication error" => "เกิดข้อผิดพลาดในสิทธิ์การเข้าใช้งาน",
"Token expired. Please reload page." => "รหัสยืนยันความถูกต้องหมดอายุแล้ว กรุณาโหลดหน้าเว็บใหม่อีกครั้ง",
diff --git a/lib/l10n/tr.php b/lib/l10n/tr.php
index 9b7f1815fa3..e55caa15972 100644
--- a/lib/l10n/tr.php
+++ b/lib/l10n/tr.php
@@ -9,6 +9,7 @@
"Files need to be downloaded one by one." => "Dosyaların birer birer indirilmesi gerekmektedir.",
"Back to Files" => "Dosyalara dön",
"Selected files too large to generate zip file." => "Seçilen dosyalar bir zip dosyası oluşturmak için fazla büyüktür.",
+"couldn't be determined" => "tespit edilemedi",
"Application is not enabled" => "Uygulama etkinleştirilmedi",
"Authentication error" => "Kimlik doğrulama hatası",
"Token expired. Please reload page." => "Jetonun süresi geçti. Lütfen sayfayı yenileyin.",
diff --git a/lib/l10n/uk.php b/lib/l10n/uk.php
index f5d52f8682d..053644ddede 100644
--- a/lib/l10n/uk.php
+++ b/lib/l10n/uk.php
@@ -9,6 +9,7 @@
"Files need to be downloaded one by one." => "Файли повинні бути завантаженні послідовно.",
"Back to Files" => "Повернутися до файлів",
"Selected files too large to generate zip file." => "Вибрані фали завеликі для генерування zip файлу.",
+"couldn't be determined" => "не може бути визначено",
"Application is not enabled" => "Додаток не увімкнений",
"Authentication error" => "Помилка автентифікації",
"Token expired. Please reload page." => "Строк дії токена скінчився. Будь ласка, перезавантажте сторінку.",
diff --git a/lib/log.php b/lib/log.php
index e9cededa5c0..e869282e88c 100644
--- a/lib/log.php
+++ b/lib/log.php
@@ -39,7 +39,7 @@ class OC_Log {
$log_class::write($app, $message, $level);
}
}
-
+
//Fatal errors handler
public static function onShutdown() {
$error = error_get_last();
@@ -50,7 +50,7 @@ class OC_Log {
return true;
}
}
-
+
// Uncaught exception handler
public static function onException($exception) {
self::write('PHP', $exception->getMessage() . ' at ' . $exception->getFile() . '#' . $exception->getLine(), self::FATAL);
diff --git a/lib/migrate.php b/lib/migrate.php
index 5ff8e338a44..87bdd016fe4 100644
--- a/lib/migrate.php
+++ b/lib/migrate.php
@@ -219,7 +219,7 @@ class OC_Migrate{
// We need to be an admin if we are not importing our own data
if(($type == 'user' && self::$uid != $currentuser) || $type != 'user' ) {
- if( !OC_Group::inGroup( OC_User::getUser(), 'admin' )) {
+ if( !OC_User::isAdminUser($currentuser)) {
// Naughty.
OC_Log::write( 'migration', 'Import not permitted.', OC_Log::ERROR );
return json_encode( array( 'success' => false ) );
@@ -655,7 +655,7 @@ class OC_Migrate{
$query = OC_DB::prepare( "INSERT INTO `*PREFIX*users` ( `uid`, `password` ) VALUES( ?, ? )" );
$result = $query->execute( array( $uid, $hash));
if( !$result ) {
- OC_Log::write('migration', 'Failed to create the new user "'.$uid."");
+ OC_Log::write('migration', 'Failed to create the new user "'.$uid."", OC_Log::ERROR);
}
return $result ? true : false;
diff --git a/lib/migration/content.php b/lib/migration/content.php
index 00df62f0c7f..e81c8f217ff 100644
--- a/lib/migration/content.php
+++ b/lib/migration/content.php
@@ -66,7 +66,7 @@ class OC_Migration_Content{
// Die if we have an error (error means: bad query, not 0 results!)
if( PEAR::isError( $query ) ) {
- $entry = 'DB Error: "'.$result->getMessage().'"<br />';
+ $entry = 'DB Error: "'.$query->getMessage().'"<br />';
$entry .= 'Offending command was: '.$query.'<br />';
OC_Log::write( 'migration', $entry, OC_Log::FATAL );
return false;
diff --git a/lib/mimetypes.list.php b/lib/mimetypes.list.php
index 77b97917583..fc87d011ecd 100644
--- a/lib/mimetypes.list.php
+++ b/lib/mimetypes.list.php
@@ -95,4 +95,6 @@ return array(
'cdr' => 'application/coreldraw',
'impress' => 'text/impress',
'ai' => 'application/illustrator',
+ 'epub' => 'application/epub+zip',
+ 'mobi' => 'application/x-mobipocket-ebook',
);
diff --git a/lib/ocs/cloud.php b/lib/ocs/cloud.php
index 21095ec91e9..2d18b1db3f2 100644
--- a/lib/ocs/cloud.php
+++ b/lib/ocs/cloud.php
@@ -24,7 +24,7 @@
class OC_OCS_Cloud {
- public static function getSystemWebApps($parameters) {
+ public static function getSystemWebApps() {
OC_Util::checkLoggedIn();
$apps = OC_App::getEnabledApps();
$values = array();
@@ -37,15 +37,15 @@ class OC_OCS_Cloud {
}
return new OC_OCS_Result($values);
}
-
+
public static function getUserQuota($parameters) {
$user = OC_User::getUser();
- if(OC_Group::inGroup($user, 'admin') or ($user==$parameters['user'])) {
+ if(OC_User::isAdminUser($user) or ($user==$parameters['user'])) {
if(OC_User::userExists($parameters['user'])) {
// calculate the disc space
$userDir = '/'.$parameters['user'].'/files';
- OC_Filesystem::init($useDir);
+ OC_Filesystem::init($userDir);
$rootInfo = OC_FileCache::get('');
$sharedInfo = OC_FileCache::get('/Shared');
$used = $rootInfo['size'] - $sharedInfo['size'];
@@ -68,7 +68,7 @@ class OC_OCS_Cloud {
return new OC_OCS_Result(null, 300);
}
}
-
+
public static function getUserPublickey($parameters) {
if(OC_User::userExists($parameters['user'])) {
@@ -79,10 +79,10 @@ class OC_OCS_Cloud {
return new OC_OCS_Result(null, 300);
}
}
-
+
public static function getUserPrivatekey($parameters) {
$user = OC_User::getUser();
- if(OC_Group::inGroup($user, 'admin') or ($user==$parameters['user'])) {
+ if(OC_User::isAdminUser($user) or ($user==$parameters['user'])) {
if(OC_User::userExists($user)) {
// calculate the disc space
diff --git a/lib/ocs/config.php b/lib/ocs/config.php
index 03c54aa2314..f19121f4b2b 100644
--- a/lib/ocs/config.php
+++ b/lib/ocs/config.php
@@ -23,7 +23,7 @@
*/
class OC_OCS_Config {
-
+
public static function apiConfig($parameters) {
$xml['version'] = '1.7';
$xml['website'] = 'ownCloud';
@@ -32,5 +32,5 @@ class OC_OCS_Config {
$xml['ssl'] = 'false';
return new OC_OCS_Result($xml);
}
-
+
}
diff --git a/lib/ocs/person.php b/lib/ocs/person.php
index 169cc8211db..1c8210d0825 100644
--- a/lib/ocs/person.php
+++ b/lib/ocs/person.php
@@ -38,5 +38,5 @@ class OC_OCS_Person {
return new OC_OCS_Result(null, 101);
}
}
-
+
}
diff --git a/lib/ocs/privatedata.php b/lib/ocs/privatedata.php
index e01ed5e8b07..311b24269dd 100644
--- a/lib/ocs/privatedata.php
+++ b/lib/ocs/privatedata.php
@@ -39,7 +39,7 @@ class OC_OCS_Privatedata {
return new OC_OCS_Result($xml);
//TODO: replace 'privatedata' with 'attribute' once a new libattice has been released that works with it
}
-
+
public static function set($parameters) {
OC_Util::checkLoggedIn();
$user = OC_User::getUser();
@@ -50,7 +50,7 @@ class OC_OCS_Privatedata {
return new OC_OCS_Result(null, 100);
}
}
-
+
public static function delete($parameters) {
OC_Util::checkLoggedIn();
$user = OC_User::getUser();
diff --git a/lib/ocs/result.php b/lib/ocs/result.php
index b08d911f785..65b2067fc3f 100644
--- a/lib/ocs/result.php
+++ b/lib/ocs/result.php
@@ -21,9 +21,9 @@
*/
class OC_OCS_Result{
-
+
private $data, $message, $statusCode, $items, $perPage;
-
+
/**
* create the OCS_Result object
* @param $data mixed the data to return
@@ -33,7 +33,7 @@ class OC_OCS_Result{
$this->statusCode = $code;
$this->message = $message;
}
-
+
/**
* optionally set the total number of items available
* @param $items int
@@ -41,7 +41,7 @@ class OC_OCS_Result{
public function setTotalItems(int $items) {
$this->items = $items;
}
-
+
/**
* optionally set the the number of items per page
* @param $items int
@@ -49,7 +49,7 @@ class OC_OCS_Result{
public function setItemsPerPage(int $items) {
$this->perPage = $items;
}
-
+
/**
* returns the data associated with the api result
* @return array
@@ -70,6 +70,6 @@ class OC_OCS_Result{
// Return the result data.
return $return;
}
-
-
+
+
} \ No newline at end of file
diff --git a/lib/ocsclient.php b/lib/ocsclient.php
index 24081425f1e..ca0665da436 100644
--- a/lib/ocsclient.php
+++ b/lib/ocsclient.php
@@ -39,11 +39,11 @@ class OC_OCSClient{
return($url);
}
- /**
- * @brief Get the url of the OCS KB server.
- * @returns string of the KB server
- * This function returns the url of the OCS knowledge base server. It´s possible to set it in the config file or it will fallback to the default
- */
+ /**
+ * @brief Get the url of the OCS KB server.
+ * @returns string of the KB server
+ * This function returns the url of the OCS knowledge base server. It´s possible to set it in the config file or it will fallback to the default
+ */
private static function getKBURL() {
$url = OC_Config::getValue('knowledgebaseurl', 'http://api.apps.owncloud.com/v1');
return($url);
@@ -59,7 +59,7 @@ class OC_OCSClient{
return($data);
}
- /**
+ /**
* @brief Get all the categories from the OCS server
* @returns array with category ids
* @note returns NULL if config value appstoreenabled is set to false
@@ -242,7 +242,7 @@ class OC_OCSClient{
}
$kbe['totalitems'] = $data->meta->totalitems;
}
- return $kbe;
+ return $kbe;
}
diff --git a/lib/public/api.php b/lib/public/api.php
index a85daa1935c..95d333f2165 100644
--- a/lib/public/api.php
+++ b/lib/public/api.php
@@ -26,7 +26,7 @@ namespace OCP;
* This class provides functions to manage apps in ownCloud
*/
class API {
-
+
/**
* registers an api call
* @param string $method the http method
@@ -40,5 +40,5 @@ class API {
public static function register($method, $url, $action, $app, $authLevel = OC_API::USER_AUTH, $defaults = array(), $requirements = array()){
\OC_API::register($method, $url, $action, $app, $authLevel, $defaults, $requirements);
}
-
+
}
diff --git a/lib/public/app.php b/lib/public/app.php
index 809a656f17f..a1ecf524cc8 100644
--- a/lib/public/app.php
+++ b/lib/public/app.php
@@ -89,7 +89,7 @@ class App {
* @param $page string page to be included
*/
public static function registerPersonal( $app, $page ) {
- return \OC_App::registerPersonal( $app, $page );
+ \OC_App::registerPersonal( $app, $page );
}
/**
@@ -98,7 +98,7 @@ class App {
* @param $page string page to be included
*/
public static function registerAdmin( $app, $page ) {
- return \OC_App::registerAdmin( $app, $page );
+ \OC_App::registerAdmin( $app, $page );
}
/**
@@ -125,10 +125,9 @@ class App {
/**
* @brief Check if the app is enabled, redirects to home if not
* @param $app app
- * @returns true/false
*/
public static function checkAppEnabled( $app ) {
- return \OC_Util::checkAppEnabled( $app );
+ \OC_Util::checkAppEnabled( $app );
}
/**
diff --git a/lib/public/constants.php b/lib/public/constants.php
index bc979c9031f..1495c620dc9 100644
--- a/lib/public/constants.php
+++ b/lib/public/constants.php
@@ -35,4 +35,3 @@ const PERMISSION_UPDATE = 2;
const PERMISSION_DELETE = 8;
const PERMISSION_SHARE = 16;
const PERMISSION_ALL = 31;
-
diff --git a/lib/public/db.php b/lib/public/db.php
index 5d4aadd22ae..932e79d9ef1 100644
--- a/lib/public/db.php
+++ b/lib/public/db.php
@@ -49,9 +49,9 @@ class DB {
* @brief Insert a row if a matching row doesn't exists.
* @param $table string The table name (will replace *PREFIX*) to perform the replace on.
* @param $input array
- *
+ *
* The input array if in the form:
- *
+ *
* array ( 'id' => array ( 'value' => 6,
* 'key' => true
* ),
@@ -65,7 +65,7 @@ class DB {
public static function insertIfNotExist($table, $input) {
return(\OC_DB::insertIfNotExist($table, $input));
}
-
+
/**
* @brief gets last value of autoincrement
* @param $table string The optional table name (will replace *PREFIX*) and add sequence suffix
diff --git a/lib/public/files.php b/lib/public/files.php
index 90889c59ad8..75e1d2fbbc1 100644
--- a/lib/public/files.php
+++ b/lib/public/files.php
@@ -38,9 +38,10 @@ class Files {
* @brief Recusive deletion of folders
* @param string $dir path to the folder
*
+ * @return bool
*/
static function rmdirr( $dir ) {
- \OC_Helper::rmdirr( $dir );
+ return \OC_Helper::rmdirr( $dir );
}
/**
diff --git a/lib/public/response.php b/lib/public/response.php
index bfb84eda5d1..de0c3f25347 100644
--- a/lib/public/response.php
+++ b/lib/public/response.php
@@ -42,7 +42,7 @@ class Response {
* null cache indefinitly
*/
static public function enableCaching( $cache_time = null ) {
- return(\OC_Response::enableCaching( $cache_time ));
+ \OC_Response::enableCaching( $cache_time );
}
/**
@@ -51,7 +51,7 @@ class Response {
* @param string $lastModified time when the reponse was last modified
*/
static public function setLastModifiedHeader( $lastModified ) {
- return(\OC_Response::setLastModifiedHeader( $lastModified ));
+ \OC_Response::setLastModifiedHeader( $lastModified );
}
/**
@@ -59,7 +59,7 @@ class Response {
* @see enableCaching with cache_time = 0
*/
static public function disableCaching() {
- return(\OC_Response::disableCaching());
+ \OC_Response::disableCaching();
}
/**
@@ -68,7 +68,7 @@ class Response {
* @param string $etag token to use for modification check
*/
static public function setETagHeader( $etag ) {
- return(\OC_Response::setETagHeader( $etag ));
+ \OC_Response::setETagHeader( $etag );
}
/**
@@ -76,7 +76,7 @@ class Response {
* @param string $filepath of file to send
*/
static public function sendFile( $filepath ) {
- return(\OC_Response::sendFile( $filepath ));
+ \OC_Response::sendFile( $filepath );
}
/**
@@ -86,7 +86,7 @@ class Response {
* DateTime object when to expire response
*/
static public function setExpiresHeader( $expires ) {
- return(\OC_Response::setExpiresHeader( $expires ));
+ \OC_Response::setExpiresHeader( $expires );
}
/**
@@ -94,6 +94,6 @@ class Response {
* @param string $location to redirect to
*/
static public function redirect( $location ) {
- return(\OC_Response::redirect( $location ));
+ \OC_Response::redirect( $location );
}
}
diff --git a/lib/public/share.php b/lib/public/share.php
index 0ff68fe265a..5fd1e2e29f3 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -351,14 +351,14 @@ class Share {
//delete the old share
self::delete($checkExists['id']);
}
-
+
// Generate hash of password - same method as user passwords
if (isset($shareWith)) {
$forcePortable = (CRYPT_BLOWFISH != 1);
$hasher = new \PasswordHash(8, $forcePortable);
$shareWith = $hasher->HashPassword($shareWith.\OC_Config::getValue('passwordsalt', ''));
}
-
+
// Generate token
if (isset($oldToken)) {
$token = $oldToken;
@@ -415,7 +415,7 @@ class Share {
if ($parentFolder && $files = \OC_Files::getDirectoryContent($itemSource)) {
for ($i = 0; $i < count($files); $i++) {
$name = substr($files[$i]['name'], strpos($files[$i]['name'], $itemSource) - strlen($itemSource));
- if ($files[$i]['mimetype'] == 'httpd/unix-directory'
+ if ($files[$i]['mimetype'] == 'httpd/unix-directory'
&& $children = \OC_Files::getDirectoryContent($name, '/')
) {
// Continue scanning into child folders
@@ -761,7 +761,7 @@ class Share {
$itemTypes = $collectionTypes;
}
$placeholders = join(',', array_fill(0, count($itemTypes), '?'));
- $where .= ' WHERE `item_type` IN ('.$placeholders.'))';
+ $where = ' WHERE `item_type` IN ('.$placeholders.'))';
$queryArgs = $itemTypes;
} else {
$where = ' WHERE `item_type` = ?';
@@ -877,7 +877,7 @@ class Share {
}
} else {
if ($fileDependent) {
- if (($itemType == 'file' || $itemType == 'folder')
+ if (($itemType == 'file' || $itemType == 'folder')
&& $format == \OC_Share_Backend_File::FORMAT_FILE_APP
|| $format == \OC_Share_Backend_File::FORMAT_FILE_APP_ROOT
) {
diff --git a/lib/public/user.php b/lib/public/user.php
index 9e50115ab70..204d8e4c0f1 100644
--- a/lib/public/user.php
+++ b/lib/public/user.php
@@ -65,7 +65,7 @@ class User {
/**
* @brief check if a user exists
* @param string $uid the username
- * @param string $excludingBackend (default none)
+ * @param string $excludingBackend (default none)
* @return boolean
*/
public static function userExists( $uid, $excludingBackend = null ) {
@@ -73,12 +73,10 @@ class User {
}
/**
* @brief Loggs the user out including all the session data
- * @returns true
- *
* Logout, destroys session
*/
public static function logout() {
- return \OC_USER::logout();
+ \OC_USER::logout();
}
/**
diff --git a/lib/public/util.php b/lib/public/util.php
index df09ea81ae1..413dbcccd28 100644
--- a/lib/public/util.php
+++ b/lib/public/util.php
@@ -203,7 +203,7 @@ class Util {
$host_name = self::getServerHostName();
// handle localhost installations
if ($host_name === 'localhost') {
- $host_name = "example.com";
+ $host_name = "example.com";
}
return $user_part.'@'.$host_name;
}
@@ -298,7 +298,7 @@ class Util {
* Todo: Write howto
*/
public static function callCheck() {
- return(\OC_Util::callCheck());
+ \OC_Util::callCheck();
}
/**
@@ -367,4 +367,14 @@ class Util {
public static function recursiveArraySearch($haystack, $needle, $index = null) {
return(\OC_Helper::recursiveArraySearch($haystack, $needle, $index));
}
+
+ /**
+ * @brief calculates the maximum upload size respecting system settings, free space and user quota
+ *
+ * @param $dir the current folder where the user currently operates
+ * @return number of bytes representing
+ */
+ public static function maxUploadFilesize($dir) {
+ return \OC_Helper::maxUploadFilesize($dir);
+ }
}
diff --git a/lib/request.php b/lib/request.php
index 99a77e1b59e..f2f15c21103 100755
--- a/lib/request.php
+++ b/lib/request.php
@@ -19,7 +19,7 @@ class OC_Request {
return 'localhost';
}
if(OC_Config::getValue('overwritehost', '')<>'') {
- return OC_Config::getValue('overwritehost');
+ return OC_Config::getValue('overwritehost');
}
if (isset($_SERVER['HTTP_X_FORWARDED_HOST'])) {
if (strpos($_SERVER['HTTP_X_FORWARDED_HOST'], ",") !== false) {
@@ -44,7 +44,7 @@ class OC_Request {
*/
public static function serverProtocol() {
if(OC_Config::getValue('overwriteprotocol', '')<>'') {
- return OC_Config::getValue('overwriteprotocol');
+ return OC_Config::getValue('overwriteprotocol');
}
if (isset($_SERVER['HTTP_X_FORWARDED_PROTO'])) {
$proto = strtolower($_SERVER['HTTP_X_FORWARDED_PROTO']);
diff --git a/lib/router.php b/lib/router.php
index 27e14c38abf..746b68c2c0c 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -49,6 +49,7 @@ class OC_Router {
$files = $this->getRoutingFiles();
$files[] = 'settings/routes.php';
$files[] = 'core/routes.php';
+ $files[] = 'ocs/routes.php';
$this->cache_key = OC_Cache::generateCacheKeyFromFiles($files);
}
return $this->cache_key;
@@ -58,23 +59,6 @@ class OC_Router {
* loads the api routes
*/
public function loadRoutes() {
-
- // TODO cache
- $this->root = $this->getCollection('root');
- foreach(OC_APP::getEnabledApps() as $app){
- $file = OC_App::getAppPath($app).'/appinfo/routes.php';
- if(file_exists($file)){
- $this->useCollection($app);
- require_once($file);
- $collection = $this->getCollection($app);
- $this->root->addCollection($collection, '/apps/'.$app);
- }
- }
- // include ocs routes
- require_once(OC::$SERVERROOT.'/ocs/routes.php');
- $collection = $this->getCollection('ocs');
- $this->root->addCollection($collection, '/ocs');
-
foreach($this->getRoutingFiles() as $app => $file) {
$this->useCollection($app);
require_once $file;
@@ -85,6 +69,10 @@ class OC_Router {
require_once 'settings/routes.php';
require_once 'core/routes.php';
+ // include ocs routes
+ require_once 'ocs/routes.php';
+ $collection = $this->getCollection('ocs');
+ $this->root->addCollection($collection, '/ocs');
}
protected function getCollection($name) {
diff --git a/lib/setup.php b/lib/setup.php
index fdd10be6824..4dd190b99fb 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -1,5 +1,23 @@
<?php
+class DatabaseSetupException extends Exception
+{
+ private $hint;
+
+ public function __construct($message, $hint, $code = 0, Exception $previous = null) {
+ $this->hint = $hint;
+ parent::__construct($message, $code, $previous);
+ }
+
+ public function __toString() {
+ return __CLASS__ . ": [{$this->code}]: {$this->message} ({$this->hint})\n";
+ }
+
+ public function getHint() {
+ return $this->hint;
+ }
+}
+
class OC_Setup {
public static function install($options) {
$error = array();
@@ -19,9 +37,9 @@ class OC_Setup {
if($dbtype=='mysql')
$dbprettyname = 'MySQL';
else if($dbtype=='pgsql')
- $dbprettyname = 'PostgreSQL';
+ $dbprettyname = 'PostgreSQL';
else
- $dbprettyname = 'Oracle';
+ $dbprettyname = 'Oracle';
if(empty($options['dbuser'])) {
@@ -69,10 +87,16 @@ class OC_Setup {
try {
self::setupMySQLDatabase($dbhost, $dbuser, $dbpass, $dbname, $dbtableprefix, $username);
+ } catch (DatabaseSetupException $e) {
+ $error[] = array(
+ 'error' => $e->getMessage(),
+ 'hint' => $e->getHint()
+ );
+ return($error);
} catch (Exception $e) {
$error[] = array(
- 'error' => 'MySQL username and/or password not valid',
- 'hint' => 'You need to enter either an existing account or the administrator.'
+ 'error' => $e->getMessage(),
+ 'hint' => ''
);
return($error);
}
@@ -141,7 +165,9 @@ class OC_Setup {
if(count($error) == 0) {
OC_Appconfig::setValue('core', 'installedat', microtime(true));
OC_Appconfig::setValue('core', 'lastupdatedat', microtime(true));
-
+ OC_AppConfig::setValue('core', 'remote_core.css', '/core/minimizer.php');
+ OC_AppConfig::setValue('core', 'remote_core.js', '/core/minimizer.php');
+
OC_Group::createGroup('admin');
OC_Group::addToGroup($username, 'admin');
OC_User::login($username, $password);
@@ -153,7 +179,7 @@ class OC_Setup {
if (isset($_SERVER['SERVER_SOFTWARE']) && strstr($_SERVER['SERVER_SOFTWARE'], 'Apache')) {
self::createHtaccess();
}
-
+
//and we are done
OC_Config::setValue('installed', true);
}
@@ -166,7 +192,7 @@ class OC_Setup {
//check if the database user has admin right
$connection = @mysql_connect($dbhost, $dbuser, $dbpass);
if(!$connection) {
- throw new Exception('MySQL username and/or password not valid');
+ throw new DatabaseSetupException('MySQL username and/or password not valid','You need to enter either an existing account or the administrator.');
}
$oldUser=OC_Config::getValue('dbuser', false);
@@ -229,8 +255,14 @@ class OC_Setup {
// the anonymous user would take precedence when there is one.
$query = "CREATE USER '$name'@'localhost' IDENTIFIED BY '$password'";
$result = mysql_query($query, $connection);
+ if (!$result) {
+ throw new DatabaseSetupException("MySQL user '" . "$name" . "'@'localhost' already exists","Delete this user from MySQL.");
+ }
$query = "CREATE USER '$name'@'%' IDENTIFIED BY '$password'";
$result = mysql_query($query, $connection);
+ if (!$result) {
+ throw new DatabaseSetupException("MySQL user '" . "$name" . "'@'%' already exists","Delete this user from MySQL.");
+ }
}
private static function setupPostgreSQLDatabase($dbhost, $dbuser, $dbpass, $dbname, $dbtableprefix, $username) {
diff --git a/lib/subadmin.php b/lib/subadmin.php
index 9e83e6da430..8cda7240ac9 100644
--- a/lib/subadmin.php
+++ b/lib/subadmin.php
@@ -122,6 +122,11 @@ class OC_SubAdmin{
* @return bool
*/
public static function isSubAdmin($uid) {
+ // Check if the user is already an admin
+ if(OC_Group::inGroup($uid, 'admin' )) {
+ return true;
+ }
+
$stmt = OC_DB::prepare('SELECT COUNT(*) AS `count` FROM `*PREFIX*group_admin` WHERE `uid` = ?');
$result = $stmt->execute(array($uid));
$result = $result->fetchRow();
@@ -141,7 +146,7 @@ class OC_SubAdmin{
if(!self::isSubAdmin($subadmin)) {
return false;
}
- if(OC_Group::inGroup($user, 'admin')) {
+ if(OC_User::isAdminUser($user)) {
return false;
}
$accessiblegroups = self::getSubAdminsGroups($subadmin);
diff --git a/lib/template.php b/lib/template.php
index 04667d73a2c..f7124ebc09c 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -85,15 +85,25 @@ function human_file_size( $bytes ) {
}
function simple_file_size($bytes) {
- $mbytes = round($bytes/(1024*1024), 1);
- if($bytes == 0) { return '0'; }
- else if($mbytes < 0.1) { return '&lt; 0.1'; }
- else if($mbytes > 1000) { return '&gt; 1000'; }
- else { return number_format($mbytes, 1); }
+ if ($bytes < 0) {
+ return '?';
+ }
+ $mbytes = round($bytes / (1024 * 1024), 1);
+ if ($bytes == 0) {
+ return '0';
+ }
+ if ($mbytes < 0.1) {
+ return '&lt; 0.1';
+ }
+ if ($mbytes > 1000) {
+ return '&gt; 1000';
+ } else {
+ return number_format($mbytes, 1);
+ }
}
function relative_modified_date($timestamp) {
- $l=OC_L10N::get('lib');
+ $l=OC_L10N::get('lib');
$timediff = time() - $timestamp;
$diffminutes = round($timediff/60);
$diffhours = round($diffminutes/60);
diff --git a/lib/templatelayout.php b/lib/templatelayout.php
index 4173e008ba7..83d36199986 100644
--- a/lib/templatelayout.php
+++ b/lib/templatelayout.php
@@ -28,23 +28,16 @@ class OC_TemplateLayout extends OC_Template {
break;
}
}
+ $apps_paths = array();
+ foreach(OC_App::getEnabledApps() as $app) {
+ $apps_paths[$app] = OC_App::getAppWebPath($app);
+ }
+ $this->assign( 'apps_paths', str_replace('\\/', '/', json_encode($apps_paths)), false ); // Ugly unescape slashes waiting for better solution
} else if ($renderas == 'guest') {
parent::__construct('core', 'layout.guest');
} else {
parent::__construct('core', 'layout.base');
}
-
- $apps_paths = array();
- foreach(OC_App::getEnabledApps() as $app) {
- $apps_paths[$app] = OC_App::getAppWebPath($app);
- }
- $this->assign( 'apps_paths', str_replace('\\/', '/', json_encode($apps_paths)), false ); // Ugly unescape slashes waiting for better solution
-
- if (OC_Config::getValue('installed', false) && !OC_AppConfig::getValue('core', 'remote_core.css', false)) {
- OC_AppConfig::setValue('core', 'remote_core.css', '/core/minimizer.php');
- OC_AppConfig::setValue('core', 'remote_core.js', '/core/minimizer.php');
- }
-
// Add the js files
$jsfiles = self::findJavascriptFiles(OC_Util::$scripts);
$this->assign('jsfiles', array(), false);
diff --git a/lib/user.php b/lib/user.php
index 80f88ca7052..fd0ed6ecd3a 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -260,17 +260,13 @@ class OC_User {
/**
* @brief Sets user id for session and triggers emit
- * @returns true
- *
*/
public static function setUserId($uid) {
$_SESSION['user_id'] = $uid;
- return true;
}
/**
* @brief Logs the current user out and kills all the session data
- * @returns true
*
* Logout, destroys session
*/
@@ -279,7 +275,6 @@ class OC_User {
session_unset();
session_destroy();
OC_User::unsetMagicInCookie();
- return true;
}
/**
@@ -300,6 +295,19 @@ class OC_User {
}
/**
+ * @brief Check if the user is an admin user
+ * @param $uid uid of the admin
+ * @returns bool
+ */
+ public static function isAdminUser($uid) {
+ if(OC_Group::inGroup($uid, 'admin' )) {
+ return true;
+ }
+ return false;
+ }
+
+
+ /**
* @brief get the user id of the user currently logged in.
* @return string uid or false
*/
diff --git a/lib/util.php b/lib/util.php
index 7b1de094ead..374baa43dbe 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -342,10 +342,7 @@ class OC_Util {
* Check if the user is a admin, redirects to home if not
*/
public static function checkAdminUser() {
- // Check if we are a user
- self::checkLoggedIn();
- self::verifyUser();
- if( !OC_Group::inGroup( OC_User::getUser(), 'admin' )) {
+ if( !OC_User::isAdminUser(OC_User::getUser())) {
header( 'Location: '.OC_Helper::linkToAbsolute( '', 'index.php' ));
exit();
}
@@ -356,12 +353,6 @@ class OC_Util {
* @return array $groups where the current user is subadmin
*/
public static function checkSubAdminUser() {
- // Check if we are a user
- self::checkLoggedIn();
- self::verifyUser();
- if(OC_Group::inGroup(OC_User::getUser(), 'admin')) {
- return true;
- }
if(!OC_SubAdmin::isSubAdmin(OC_User::getUser())) {
header( 'Location: '.OC_Helper::linkToAbsolute( '', 'index.php' ));
exit();
@@ -370,40 +361,6 @@ class OC_Util {
}
/**
- * Check if the user verified the login with his password in the last 15 minutes
- * If not, the user will be shown a password verification page
- */
- public static function verifyUser() {
- if(OC_Config::getValue('enhancedauth', false) === true) {
- // Check password to set session
- if(isset($_POST['password'])) {
- if (OC_User::login(OC_User::getUser(), $_POST["password"] ) === true) {
- $_SESSION['verifiedLogin']=time() + OC_Config::getValue('enhancedauthtime', 15 * 60);
- }
- }
-
- // Check if the user verified his password
- if(!isset($_SESSION['verifiedLogin']) OR $_SESSION['verifiedLogin'] < time()) {
- OC_Template::printGuestPage("", "verify", array('username' => OC_User::getUser()));
- exit();
- }
- }
- }
-
- /**
- * Check if the user verified the login with his password
- * @return bool
- */
- public static function isUserVerified() {
- if(OC_Config::getValue('enhancedauth', false) === true) {
- if(!isset($_SESSION['verifiedLogin']) OR $_SESSION['verifiedLogin'] < time()) {
- return false;
- }
- }
- return true;
- }
-
- /**
* Redirect to the user default page
*/
public static function redirectToDefaultPage() {
@@ -510,8 +467,11 @@ class OC_Util {
* @return array with sanitized strings or a single sanitized string, depends on the input parameter.
*/
public static function sanitizeHTML( &$value ) {
- if (is_array($value) || is_object($value)) array_walk_recursive($value, 'OC_Util::sanitizeHTML');
- else $value = htmlentities($value, ENT_QUOTES, 'UTF-8'); //Specify encoding for PHP<5.4
+ if (is_array($value) || is_object($value)) {
+ array_walk_recursive($value, 'OC_Util::sanitizeHTML');
+ } else {
+ $value = htmlentities($value, ENT_QUOTES, 'UTF-8'); //Specify encoding for PHP<5.4
+ }
return $value;
}
diff --git a/lib/vcategories.php b/lib/vcategories.php
index 406a4eb1074..1700870f91f 100644
--- a/lib/vcategories.php
+++ b/lib/vcategories.php
@@ -763,4 +763,3 @@ class OC_VCategories {
return array_search(strtolower($needle), array_map('strtolower', $haystack));
}
}
-
diff --git a/ocs/routes.php b/ocs/routes.php
index d77b96fc145..d6ee589df6f 100644
--- a/ocs/routes.php
+++ b/ocs/routes.php
@@ -17,4 +17,4 @@ OC_API::register('get', '/privatedata/getattribute/{app}', array('OC_OCS_Private
OC_API::register('get', '/privatedata/getattribute/{app}/{key}', array('OC_OCS_Privatedata', 'get'), 'ocs', OC_API::USER_AUTH);
OC_API::register('post', '/privatedata/setattribute/{app}/{key}', array('OC_OCS_Privatedata', 'set'), 'ocs', OC_API::USER_AUTH);
OC_API::register('post', '/privatedata/deleteattribute/{app}/{key}', array('OC_OCS_Privatedata', 'delete'), 'ocs', OC_API::USER_AUTH);
-?>
+
diff --git a/settings/ajax/changepassword.php b/settings/ajax/changepassword.php
index b2db2611518..8d45e62e4d8 100644
--- a/settings/ajax/changepassword.php
+++ b/settings/ajax/changepassword.php
@@ -9,7 +9,7 @@ $password = $_POST["password"];
$oldPassword=isset($_POST["oldpassword"])?$_POST["oldpassword"]:'';
$userstatus = null;
-if(OC_Group::inGroup(OC_User::getUser(), 'admin')) {
+if(OC_User::isAdminUser(OC_User::getUser())) {
$userstatus = 'admin';
}
if(OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username)) {
@@ -30,10 +30,6 @@ if(is_null($userstatus)) {
exit();
}
-if($userstatus === 'admin' || $userstatus === 'subadmin') {
- OC_JSON::verifyUser();
-}
-
// Return Success story
if( OC_User::setPassword( $username, $password )) {
OC_JSON::success(array("data" => array( "username" => $username )));
diff --git a/settings/ajax/createuser.php b/settings/ajax/createuser.php
index addae78517a..09ef25d92fa 100644
--- a/settings/ajax/createuser.php
+++ b/settings/ajax/createuser.php
@@ -3,9 +3,7 @@
OCP\JSON::callCheck();
OC_JSON::checkSubAdminUser();
-$isadmin = OC_Group::inGroup(OC_User::getUser(), 'admin')?true:false;
-
-if($isadmin) {
+if(OC_User::isAdminUser(OC_User::getUser())) {
$groups = array();
if( isset( $_POST["groups"] )) {
$groups = $_POST["groups"];
diff --git a/settings/ajax/removeuser.php b/settings/ajax/removeuser.php
index 9ffb32a0b23..bf3a34f1472 100644
--- a/settings/ajax/removeuser.php
+++ b/settings/ajax/removeuser.php
@@ -10,7 +10,7 @@ if(OC_User::getUser() === $username) {
exit;
}
-if(!OC_Group::inGroup(OC_User::getUser(), 'admin') && !OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username)) {
+if(!OC_User::isAdminUser(OC_User::getUser()) && !OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username)) {
$l = OC_L10N::get('core');
OC_JSON::error(array( 'data' => array( 'message' => $l->t('Authentication error') )));
exit();
diff --git a/settings/ajax/setquota.php b/settings/ajax/setquota.php
index 845f8ea408c..356466c0c00 100644
--- a/settings/ajax/setquota.php
+++ b/settings/ajax/setquota.php
@@ -10,7 +10,7 @@ OCP\JSON::callCheck();
$username = isset($_POST["username"])?$_POST["username"]:'';
-if(($username == '' && !OC_Group::inGroup(OC_User::getUser(), 'admin')) || (!OC_Group::inGroup(OC_User::getUser(), 'admin') && !OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username))) {
+if(($username == '' && !OC_User::isAdminUser(OC_User::getUser()))|| (!OC_User::isAdminUser(OC_User::getUser()) && !OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username))) {
$l = OC_L10N::get('core');
OC_JSON::error(array( 'data' => array( 'message' => $l->t('Authentication error') )));
exit();
diff --git a/settings/ajax/togglegroups.php b/settings/ajax/togglegroups.php
index 83d455550ae..9bba9c5269d 100644
--- a/settings/ajax/togglegroups.php
+++ b/settings/ajax/togglegroups.php
@@ -7,13 +7,13 @@ $success = true;
$username = $_POST["username"];
$group = $_POST["group"];
-if($username == OC_User::getUser() && $group == "admin" && OC_Group::inGroup($username, 'admin')) {
+if($username == OC_User::getUser() && $group == "admin" && OC_User::isAdminUser($username)) {
$l = OC_L10N::get('core');
OC_JSON::error(array( 'data' => array( 'message' => $l->t('Admins can\'t remove themself from the admin group'))));
exit();
}
-if(!OC_Group::inGroup(OC_User::getUser(), 'admin') && (!OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username) || !OC_SubAdmin::isGroupAccessible(OC_User::getUser(), $group))) {
+if(!OC_User::isAdminUser(OC_User::getUser()) && (!OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username) || !OC_SubAdmin::isGroupAccessible(OC_User::getUser(), $group))) {
$l = OC_L10N::get('core');
OC_JSON::error(array( 'data' => array( 'message' => $l->t('Authentication error') )));
exit();
@@ -31,8 +31,8 @@ $action = "add";
// Toggle group
if( OC_Group::inGroup( $username, $group )) {
$action = "remove";
- $error = $l->t("Unable to remove user from group %s", $group);
- $success = OC_Group::removeFromGroup( $username, $group );
+ $error = $l->t("Unable to remove user from group %s", $group);
+ $success = OC_Group::removeFromGroup( $username, $group );
$usersInGroup=OC_Group::usersInGroup($group);
if(count($usersInGroup)==0) {
OC_Group::deleteGroup($group);
diff --git a/settings/ajax/userlist.php b/settings/ajax/userlist.php
index eaeade60a39..9bbff80ea0c 100644
--- a/settings/ajax/userlist.php
+++ b/settings/ajax/userlist.php
@@ -28,7 +28,7 @@ if (isset($_GET['offset'])) {
$offset = 0;
}
$users = array();
-if (OC_Group::inGroup(OC_User::getUser(), 'admin')) {
+if (OC_User::isAdminUser(OC_User::getUser())) {
$batch = OC_User::getUsers('', 10, $offset);
foreach ($batch as $user) {
$users[] = array(
diff --git a/settings/help.php b/settings/help.php
index cd3d615425c..a5ac11ec9a3 100644
--- a/settings/help.php
+++ b/settings/help.php
@@ -27,7 +27,7 @@ $url1=OC_Helper::linkToRoute( "settings_help" ).'?mode=user';
$url2=OC_Helper::linkToRoute( "settings_help" ).'?mode=admin';
$tmpl = new OC_Template( "settings", "help", "user" );
-$tmpl->assign( "admin", OC_Group::inGroup(OC_User::getUser(), 'admin') );
+$tmpl->assign( "admin", OC_User::isAdminUser(OC_User::getUser()));
$tmpl->assign( "url", $url );
$tmpl->assign( "url1", $url1 );
$tmpl->assign( "url2", $url2 );
diff --git a/settings/l10n/bg_BG.php b/settings/l10n/bg_BG.php
index 853e12812ed..dc4c1cf6431 100644
--- a/settings/l10n/bg_BG.php
+++ b/settings/l10n/bg_BG.php
@@ -1,5 +1,6 @@
<?php $TRANSLATIONS = array(
"Authentication error" => "Възникна проблем с идентификацията",
+"Invalid request" => "Невалидна заявка",
"Enable" => "Включено",
"Password" => "Парола",
"Email" => "E-mail",
diff --git a/settings/l10n/el.php b/settings/l10n/el.php
index 29863389048..ffd6d2a60bf 100644
--- a/settings/l10n/el.php
+++ b/settings/l10n/el.php
@@ -52,7 +52,11 @@
"Name" => "Όνομα",
"Groups" => "Ομάδες",
"Create" => "Δημιουργία",
+"Default Storage" => "Προκαθορισμένη Αποθήκευση ",
+"Unlimited" => "Απεριόριστο",
"Other" => "Άλλα",
"Group Admin" => "Ομάδα Διαχειριστών",
+"Storage" => "Αποθήκευση",
+"Default" => "Προκαθορισμένο",
"Delete" => "Διαγραφή"
);
diff --git a/settings/l10n/eo.php b/settings/l10n/eo.php
index 651403be68c..ef8615e24e4 100644
--- a/settings/l10n/eo.php
+++ b/settings/l10n/eo.php
@@ -22,8 +22,17 @@
"Select an App" => "Elekti aplikaĵon",
"See application page at apps.owncloud.com" => "Vidu la paĝon pri aplikaĵoj ĉe apps.owncloud.com",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"</span>-permesilhavigita de <span class=\"author\"></span>",
+"User Documentation" => "Dokumentaro por uzantoj",
+"Administrator Documentation" => "Dokumentaro por administrantoj",
+"Online Documentation" => "Reta dokumentaro",
+"Forum" => "Forumo",
+"Bugtracker" => "Cimoraportejo",
+"Commercial Support" => "Komerca subteno",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Vi uzas <strong>%s</strong> el la haveblaj <strong>%s</strong>",
"Clients" => "Klientoj",
+"Download Desktop Clients" => "Elŝuti labortablajn klientojn",
+"Download Android Client" => "Elŝuti Android-klienton",
+"Download iOS Client" => "Elŝuti iOS-klienton",
"Password" => "Pasvorto",
"Your password was changed" => "Via pasvorto ŝanĝiĝis",
"Unable to change your password" => "Ne eblis ŝanĝi vian pasvorton",
@@ -36,11 +45,18 @@
"Fill in an email address to enable password recovery" => "Enigu retpoŝtadreson por kapabligi pasvortan restaŭron",
"Language" => "Lingvo",
"Help translate" => "Helpu traduki",
+"WebDAV" => "WebDAV",
+"Use this address to connect to your ownCloud in your file manager" => "Uzu ĉi tiun adreson por konekti al via ownCloud vian dosieradministrilon",
+"Version" => "Eldono",
"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Ellaborita de la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunumo de ownCloud</a>, la <a href=\"https://github.com/owncloud\" target=\"_blank\">fontokodo</a> publikas laŭ la permesilo <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
"Name" => "Nomo",
"Groups" => "Grupoj",
"Create" => "Krei",
+"Default Storage" => "Defaŭlta konservejo",
+"Unlimited" => "Senlima",
"Other" => "Alia",
"Group Admin" => "Grupadministranto",
+"Storage" => "Konservejo",
+"Default" => "Defaŭlta",
"Delete" => "Forigi"
);
diff --git a/settings/l10n/eu.php b/settings/l10n/eu.php
index 78e3cc62488..c122f3b1cda 100644
--- a/settings/l10n/eu.php
+++ b/settings/l10n/eu.php
@@ -52,7 +52,11 @@
"Name" => "Izena",
"Groups" => "Taldeak",
"Create" => "Sortu",
+"Default Storage" => "Lehenetsitako Biltegiratzea",
+"Unlimited" => "Mugarik gabe",
"Other" => "Besteak",
"Group Admin" => "Talde administradorea",
+"Storage" => "Biltegiratzea",
+"Default" => "Lehenetsia",
"Delete" => "Ezabatu"
);
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index d485f7ccd13..4980d585441 100644
--- a/settings/l10n/it.php
+++ b/settings/l10n/it.php
@@ -55,7 +55,7 @@
"Default Storage" => "Archiviazione predefinita",
"Unlimited" => "Illimitata",
"Other" => "Altro",
-"Group Admin" => "Gruppo di amministrazione",
+"Group Admin" => "Gruppi amministrati",
"Storage" => "Archiviazione",
"Default" => "Predefinito",
"Delete" => "Elimina"
diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php
index c9e49f57a3e..ae4d335c72b 100644
--- a/settings/l10n/pl.php
+++ b/settings/l10n/pl.php
@@ -48,7 +48,7 @@
"WebDAV" => "WebDAV",
"Use this address to connect to your ownCloud in your file manager" => "Użyj tego adresu aby podłączyć zasób ownCloud w menedżerze plików",
"Version" => "Wersja",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Stwirzone przez <a href=\"http://ownCloud.org/contact\" target=\"_blank\"> społeczność ownCloud</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">kod źródłowy</a> na licencji <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Stworzone przez <a href=\"http://ownCloud.org/contact\" target=\"_blank\"> społeczność ownCloud</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">kod źródłowy</a> na licencji <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
"Name" => "Nazwa",
"Groups" => "Grupy",
"Create" => "Utwórz",
diff --git a/settings/l10n/pt_BR.php b/settings/l10n/pt_BR.php
index 3a1e6b86357..ebb9b72b19a 100644
--- a/settings/l10n/pt_BR.php
+++ b/settings/l10n/pt_BR.php
@@ -16,7 +16,7 @@
"Disable" => "Desabilitado",
"Enable" => "Habilitado",
"Saving..." => "Gravando...",
-"__language_name__" => "Português",
+"__language_name__" => "Português do Brasil",
"Add your App" => "Adicione seu Aplicativo",
"More Apps" => "Mais Apps",
"Select an App" => "Selecione uma Aplicação",
diff --git a/settings/l10n/th_TH.php b/settings/l10n/th_TH.php
index f4e6398ae21..c0c606662e5 100644
--- a/settings/l10n/th_TH.php
+++ b/settings/l10n/th_TH.php
@@ -10,6 +10,7 @@
"Unable to delete user" => "ไม่สามารถลบผู้ใช้งานได้",
"Language changed" => "เปลี่ยนภาษาเรียบร้อยแล้ว",
"Invalid request" => "คำร้องขอไม่ถูกต้อง",
+"Admins can't remove themself from the admin group" => "ผู้ดูแลระบบไม่สามารถลบตัวเองออกจากกลุ่มผู้ดูแลได้",
"Unable to add user to group %s" => "ไม่สามารถเพิ่มผู้ใช้งานเข้าไปที่กลุ่ม %s ได้",
"Unable to remove user from group %s" => "ไม่สามารถลบผู้ใช้งานออกจากกลุ่ม %s ได้",
"Disable" => "ปิดใช้งาน",
@@ -21,8 +22,17 @@
"Select an App" => "เลือก App",
"See application page at apps.owncloud.com" => "ดูหน้าแอพพลิเคชั่นที่ apps.owncloud.com",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-ลิขสิทธิ์การใช้งานโดย <span class=\"author\"></span>",
+"User Documentation" => "เอกสารคู่มือการใช้งานสำหรับผู้ใช้งาน",
+"Administrator Documentation" => "เอกสารคู่มือการใช้งานสำหรับผู้ดูแลระบบ",
+"Online Documentation" => "เอกสารคู่มือการใช้งานออนไลน์",
+"Forum" => "กระดานสนทนา",
+"Bugtracker" => "Bugtracker",
+"Commercial Support" => "บริการลูกค้าแบบเสียค่าใช้จ่าย",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "คุณได้ใช้งานไปแล้ว <strong>%s</strong> จากจำนวนที่สามารถใช้ได้ <strong>%s</strong>",
"Clients" => "ลูกค้า",
+"Download Desktop Clients" => "ดาวน์โหลดโปรแกรมไคลเอนต์สำหรับเครื่องเดสก์ท็อป",
+"Download Android Client" => "ดาวน์โหลดโปรแกรมไคลเอนต์สำหรับแอนดรอยด์",
+"Download iOS Client" => "ดาวน์โหลดโปรแกรมไคลเอนต์สำหรับ iOS",
"Password" => "รหัสผ่าน",
"Your password was changed" => "รหัสผ่านของคุณถูกเปลี่ยนแล้ว",
"Unable to change your password" => "ไม่สามารถเปลี่ยนรหัสผ่านของคุณได้",
@@ -35,11 +45,18 @@
"Fill in an email address to enable password recovery" => "กรอกที่อยู่อีเมล์ของคุณเพื่อเปิดให้มีการกู้คืนรหัสผ่านได้",
"Language" => "ภาษา",
"Help translate" => "ช่วยกันแปล",
+"WebDAV" => "WebDAV",
+"Use this address to connect to your ownCloud in your file manager" => "ใช้ที่อยู่นี้เพื่อเชื่อมต่อกับ ownCloud ในโปรแกรมจัดการไฟล์ของคุณ",
+"Version" => "รุ่น",
"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "พัฒนาโดย the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ชุมชนผู้ใช้งาน ownCloud</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">ซอร์สโค้ด</a>อยู่ภายใต้สัญญาอนุญาตของ <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
"Name" => "ชื่อ",
"Groups" => "กลุ่ม",
"Create" => "สร้าง",
+"Default Storage" => "พื้นที่จำกัดข้อมูลเริ่มต้น",
+"Unlimited" => "ไม่จำกัดจำนวน",
"Other" => "อื่นๆ",
"Group Admin" => "ผู้ดูแลกลุ่ม",
+"Storage" => "พื้นที่จัดเก็บข้อมูล",
+"Default" => "ค่าเริ่มต้น",
"Delete" => "ลบ"
);
diff --git a/settings/l10n/uk.php b/settings/l10n/uk.php
index ce1ced031b1..19b84edfc78 100644
--- a/settings/l10n/uk.php
+++ b/settings/l10n/uk.php
@@ -52,7 +52,11 @@
"Name" => "Ім'я",
"Groups" => "Групи",
"Create" => "Створити",
+"Default Storage" => "сховище за замовчуванням",
+"Unlimited" => "Необмежено",
"Other" => "Інше",
"Group Admin" => "Адміністратор групи",
+"Storage" => "Сховище",
+"Default" => "За замовчуванням",
"Delete" => "Видалити"
);
diff --git a/settings/l10n/zh_CN.php b/settings/l10n/zh_CN.php
index 218095b78eb..407177d2ac4 100644
--- a/settings/l10n/zh_CN.php
+++ b/settings/l10n/zh_CN.php
@@ -52,7 +52,11 @@
"Name" => "名称",
"Groups" => "组",
"Create" => "创建",
+"Default Storage" => "默认存储",
+"Unlimited" => "无限",
"Other" => "其它",
"Group Admin" => "组管理员",
+"Storage" => "存储",
+"Default" => "默认",
"Delete" => "删除"
);
diff --git a/settings/settings.php b/settings/settings.php
index add94b5b011..1e05452ec4d 100644
--- a/settings/settings.php
+++ b/settings/settings.php
@@ -6,7 +6,6 @@
*/
OC_Util::checkLoggedIn();
-OC_Util::verifyUser();
OC_App::loadApps();
OC_Util::addStyle( 'settings', 'settings' );
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 5ee0147fbcb..0097489743f 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -10,13 +10,13 @@ $levels = array('Debug', 'Info', 'Warning', 'Error', 'Fatal');
// is htaccess working ?
if (!$_['htaccessworking']) {
- ?>
+ ?>
<fieldset class="personalblock">
- <legend><strong><?php echo $l->t('Security Warning');?></strong></legend>
+ <legend><strong><?php echo $l->t('Security Warning');?></strong></legend>
<span class="securitywarning">
- <?php echo $l->t('Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root.'); ?>
- </span>
+ <?php echo $l->t('Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root.'); ?>
+ </span>
</fieldset>
<?php
@@ -24,13 +24,13 @@ if (!$_['htaccessworking']) {
// is locale working ?
if (!$_['islocaleworking']) {
- ?>
+ ?>
<fieldset class="personalblock">
- <legend><strong><?php echo $l->t('Locale not working');?></strong></legend>
+ <legend><strong><?php echo $l->t('Locale not working');?></strong></legend>
- <span class="connectionwarning">
- <?php echo $l->t('This ownCloud server can\'t set system locale to "en_US.UTF-8". This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support en_US.UTF-8.'); ?>
- </span>
+ <span class="connectionwarning">
+ <?php echo $l->t('This ownCloud server can\'t set system locale to "en_US.UTF-8". This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support en_US.UTF-8.'); ?>
+ </span>
</fieldset>
<?php
@@ -38,13 +38,13 @@ if (!$_['islocaleworking']) {
// is internet connection working ?
if (!$_['internetconnectionworking']) {
- ?>
+ ?>
<fieldset class="personalblock">
- <legend><strong><?php echo $l->t('Internet connection not working');?></strong></legend>
+ <legend><strong><?php echo $l->t('Internet connection not working');?></strong></legend>
- <span class="connectionwarning">
- <?php echo $l->t('This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud.'); ?>
- </span>
+ <span class="connectionwarning">
+ <?php echo $l->t('This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud.'); ?>
+ </span>
</fieldset>
<?php
@@ -52,152 +52,152 @@ if (!$_['internetconnectionworking']) {
?>
<?php foreach ($_['forms'] as $form) {
- echo $form;
+ echo $form;
}
;?>
<fieldset class="personalblock" id="backgroundjobs">
- <legend><strong><?php echo $l->t('Cron');?></strong></legend>
- <table class="nostyle">
- <tr>
- <td>
- <input type="radio" name="mode" value="ajax"
- id="backgroundjobs_ajax" <?php if ($_['backgroundjobs_mode'] == "ajax") {
- echo 'checked="checked"';
- } ?>>
- <label for="backgroundjobs_ajax">AJAX</label><br/>
- <em><?php echo $l->t("Execute one task with each page loaded"); ?></em>
- </td>
- </tr>
- <tr>
- <td>
- <input type="radio" name="mode" value="webcron"
- id="backgroundjobs_webcron" <?php if ($_['backgroundjobs_mode'] == "webcron") {
- echo 'checked="checked"';
- } ?>>
- <label for="backgroundjobs_webcron">Webcron</label><br/>
- <em><?php echo $l->t("cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http."); ?></em>
- </td>
- </tr>
- <tr>
- <td>
- <input type="radio" name="mode" value="cron"
- id="backgroundjobs_cron" <?php if ($_['backgroundjobs_mode'] == "cron") {
- echo 'checked="checked"';
- } ?>>
- <label for="backgroundjobs_cron">Cron</label><br/>
- <em><?php echo $l->t("Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute."); ?></em>
- </td>
- </tr>
- </table>
+ <legend><strong><?php echo $l->t('Cron');?></strong></legend>
+ <table class="nostyle">
+ <tr>
+ <td>
+ <input type="radio" name="mode" value="ajax"
+ id="backgroundjobs_ajax" <?php if ($_['backgroundjobs_mode'] == "ajax") {
+ echo 'checked="checked"';
+ } ?>>
+ <label for="backgroundjobs_ajax">AJAX</label><br/>
+ <em><?php echo $l->t("Execute one task with each page loaded"); ?></em>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <input type="radio" name="mode" value="webcron"
+ id="backgroundjobs_webcron" <?php if ($_['backgroundjobs_mode'] == "webcron") {
+ echo 'checked="checked"';
+ } ?>>
+ <label for="backgroundjobs_webcron">Webcron</label><br/>
+ <em><?php echo $l->t("cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http."); ?></em>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <input type="radio" name="mode" value="cron"
+ id="backgroundjobs_cron" <?php if ($_['backgroundjobs_mode'] == "cron") {
+ echo 'checked="checked"';
+ } ?>>
+ <label for="backgroundjobs_cron">Cron</label><br/>
+ <em><?php echo $l->t("Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute."); ?></em>
+ </td>
+ </tr>
+ </table>
</fieldset>
<fieldset class="personalblock" id="shareAPI">
- <legend><strong><?php echo $l->t('Sharing');?></strong></legend>
- <table class="shareAPI nostyle">
- <tr>
- <td id="enable">
- <input type="checkbox" name="shareapi_enabled" id="shareAPIEnabled"
- value="1" <?php if ($_['shareAPIEnabled'] == 'yes') echo 'checked="checked"'; ?> />
- <label for="shareAPIEnabled"><?php echo $l->t('Enable Share API');?></label><br/>
- <em><?php echo $l->t('Allow apps to use the Share API'); ?></em>
- </td>
- </tr>
- <tr>
- <td <?php if ($_['shareAPIEnabled'] == 'no') echo 'style="display:none"';?>>
- <input type="checkbox" name="shareapi_allow_links" id="allowLinks"
- value="1" <?php if ($_['allowLinks'] == 'yes') echo 'checked="checked"'; ?> />
- <label for="allowLinks"><?php echo $l->t('Allow links');?></label><br/>
- <em><?php echo $l->t('Allow users to share items to the public with links'); ?></em>
- </td>
- </tr>
- <tr>
- <td <?php if ($_['shareAPIEnabled'] == 'no') echo 'style="display:none"';?>>
- <input type="checkbox" name="shareapi_allow_resharing" id="allowResharing"
- value="1" <?php if ($_['allowResharing'] == 'yes') echo 'checked="checked"'; ?> />
- <label for="allowResharing"><?php echo $l->t('Allow resharing');?></label><br/>
- <em><?php echo $l->t('Allow users to share items shared with them again'); ?></em>
- </td>
- </tr>
- <tr>
- <td <?php if ($_['shareAPIEnabled'] == 'no') echo 'style="display:none"';?>>
- <input type="radio" name="shareapi_share_policy" id="sharePolicyGlobal"
- value="global" <?php if ($_['sharePolicy'] == 'global') echo 'checked="checked"'; ?> />
- <label for="sharePolicyGlobal"><?php echo $l->t('Allow users to share with anyone'); ?></label><br/>
- <input type="radio" name="shareapi_share_policy" id="sharePolicyGroupsOnly"
- value="groups_only" <?php if ($_['sharePolicy'] == 'groups_only') echo 'checked="checked"'; ?> />
- <label for="sharePolicyGroupsOnly"><?php echo $l->t('Allow users to only share with users in their groups');?></label><br/>
- </td>
- </tr>
- </table>
+ <legend><strong><?php echo $l->t('Sharing');?></strong></legend>
+ <table class="shareAPI nostyle">
+ <tr>
+ <td id="enable">
+ <input type="checkbox" name="shareapi_enabled" id="shareAPIEnabled"
+ value="1" <?php if ($_['shareAPIEnabled'] == 'yes') echo 'checked="checked"'; ?> />
+ <label for="shareAPIEnabled"><?php echo $l->t('Enable Share API');?></label><br/>
+ <em><?php echo $l->t('Allow apps to use the Share API'); ?></em>
+ </td>
+ </tr>
+ <tr>
+ <td <?php if ($_['shareAPIEnabled'] == 'no') echo 'style="display:none"';?>>
+ <input type="checkbox" name="shareapi_allow_links" id="allowLinks"
+ value="1" <?php if ($_['allowLinks'] == 'yes') echo 'checked="checked"'; ?> />
+ <label for="allowLinks"><?php echo $l->t('Allow links');?></label><br/>
+ <em><?php echo $l->t('Allow users to share items to the public with links'); ?></em>
+ </td>
+ </tr>
+ <tr>
+ <td <?php if ($_['shareAPIEnabled'] == 'no') echo 'style="display:none"';?>>
+ <input type="checkbox" name="shareapi_allow_resharing" id="allowResharing"
+ value="1" <?php if ($_['allowResharing'] == 'yes') echo 'checked="checked"'; ?> />
+ <label for="allowResharing"><?php echo $l->t('Allow resharing');?></label><br/>
+ <em><?php echo $l->t('Allow users to share items shared with them again'); ?></em>
+ </td>
+ </tr>
+ <tr>
+ <td <?php if ($_['shareAPIEnabled'] == 'no') echo 'style="display:none"';?>>
+ <input type="radio" name="shareapi_share_policy" id="sharePolicyGlobal"
+ value="global" <?php if ($_['sharePolicy'] == 'global') echo 'checked="checked"'; ?> />
+ <label for="sharePolicyGlobal"><?php echo $l->t('Allow users to share with anyone'); ?></label><br/>
+ <input type="radio" name="shareapi_share_policy" id="sharePolicyGroupsOnly"
+ value="groups_only" <?php if ($_['sharePolicy'] == 'groups_only') echo 'checked="checked"'; ?> />
+ <label for="sharePolicyGroupsOnly"><?php echo $l->t('Allow users to only share with users in their groups');?></label><br/>
+ </td>
+ </tr>
+ </table>
</fieldset>
<fieldset class="personalblock" id="security">
- <legend><strong><?php echo $l->t('Security');?></strong></legend>
- <table class="nostyle">
- <tr>
- <td id="enable">
- <input type="checkbox" name="forcessl" id="enforceHTTPSEnabled"
- <?php if ($_['enforceHTTPSEnabled']) {
- echo 'checked="checked" ';
- echo 'value="false"';
- } else {
- echo 'value="true"';
- }
- ?>
- <?php if (!$_['isConnectedViaHTTPS']) echo 'disabled'; ?> />
- <label for="forcessl"><?php echo $l->t('Enforce HTTPS');?></label><br/>
- <em><?php echo $l->t('Enforces the clients to connect to ownCloud via an encrypted connection.'); ?></em>
- <?php if (!$_['isConnectedViaHTTPS']) {
- echo "<br/><em>";
- echo $l->t('Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement.');
- echo "</em>";
- }
- ?>
- </td>
- </tr>
- </table>
+ <legend><strong><?php echo $l->t('Security');?></strong></legend>
+ <table class="nostyle">
+ <tr>
+ <td id="enable">
+ <input type="checkbox" name="forcessl" id="enforceHTTPSEnabled"
+ <?php if ($_['enforceHTTPSEnabled']) {
+ echo 'checked="checked" ';
+ echo 'value="false"';
+ } else {
+ echo 'value="true"';
+ }
+ ?>
+ <?php if (!$_['isConnectedViaHTTPS']) echo 'disabled'; ?> />
+ <label for="forcessl"><?php echo $l->t('Enforce HTTPS');?></label><br/>
+ <em><?php echo $l->t('Enforces the clients to connect to ownCloud via an encrypted connection.'); ?></em>
+ <?php if (!$_['isConnectedViaHTTPS']) {
+ echo "<br/><em>";
+ echo $l->t('Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement.');
+ echo "</em>";
+ }
+ ?>
+ </td>
+ </tr>
+ </table>
</fieldset>
<fieldset class="personalblock">
- <legend><strong><?php echo $l->t('Log');?></strong></legend>
- <?php echo $l->t('Log level');?> <select name='loglevel' id='loglevel'>
- <option value='<?php echo $_['loglevel']?>'><?php echo $levels[$_['loglevel']]?></option>
- <?php for ($i = 0; $i < 5; $i++):
- if ($i != $_['loglevel']):?>
- <option value='<?php echo $i?>'><?php echo $levels[$i]?></option>
- <?php endif;
+ <legend><strong><?php echo $l->t('Log');?></strong></legend>
+ <?php echo $l->t('Log level');?> <select name='loglevel' id='loglevel'>
+ <option value='<?php echo $_['loglevel']?>'><?php echo $levels[$_['loglevel']]?></option>
+ <?php for ($i = 0; $i < 5; $i++):
+ if ($i != $_['loglevel']):?>
+ <option value='<?php echo $i?>'><?php echo $levels[$i]?></option>
+ <?php endif;
endfor;?>
</select>
- <table id='log'>
- <?php foreach ($_['entries'] as $entry): ?>
- <tr>
- <td>
- <?php echo $levels[$entry->level];?>
- </td>
- <td>
- <?php echo $entry->app;?>
- </td>
- <td>
- <?php echo $entry->message;?>
- </td>
- <td>
- <?php echo OC_Util::formatDate($entry->time);?>
- </td>
- </tr>
- <?php endforeach;?>
- </table>
- <?php if ($_['entriesremain']): ?>
- <input id='moreLog' type='button' value='<?php echo $l->t('More');?>...'></input>
- <?php endif; ?>
+ <table id='log'>
+ <?php foreach ($_['entries'] as $entry): ?>
+ <tr>
+ <td>
+ <?php echo $levels[$entry->level];?>
+ </td>
+ <td>
+ <?php echo $entry->app;?>
+ </td>
+ <td>
+ <?php echo $entry->message;?>
+ </td>
+ <td>
+ <?php echo OC_Util::formatDate($entry->time);?>
+ </td>
+ </tr>
+ <?php endforeach;?>
+ </table>
+ <?php if ($_['entriesremain']): ?>
+ <input id='moreLog' type='button' value='<?php echo $l->t('More');?>...'>
+ <?php endif; ?>
</fieldset>
<fieldset class="personalblock">
- <legend><strong><?php echo $l->t('Version');?></strong></legend>
- <strong>ownCloud</strong> <?php echo(OC_Util::getVersionString()); ?> <?php echo(OC_Util::getEditionString()); ?>
- (<?php echo(OC_Updater::ShowUpdatingHint()); ?>)<br/>
- <?php echo $l->t('Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>, the <a href="https://github.com/owncloud" target="_blank">source code</a> is licensed under the <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank"><abbr title="Affero General Public License">AGPL</abbr></a>.'); ?>
+ <legend><strong><?php echo $l->t('Version');?></strong></legend>
+ <strong>ownCloud</strong> <?php echo(OC_Util::getVersionString()); ?> <?php echo(OC_Util::getEditionString()); ?>
+ (<?php echo(OC_Updater::ShowUpdatingHint()); ?>)<br/>
+ <?php echo $l->t('Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>, the <a href="https://github.com/owncloud" target="_blank">source code</a> is licensed under the <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank"><abbr title="Affero General Public License">AGPL</abbr></a>.'); ?>
</fieldset>
diff --git a/settings/templates/apps.php b/settings/templates/apps.php
index 179ce9c5405..0490f63fb67 100644
--- a/settings/templates/apps.php
+++ b/settings/templates/apps.php
@@ -29,7 +29,7 @@
<p class="description"></p>
<img src="" class="preview" />
<p class="appslink hidden"><a href="#" target="_blank"><?php echo $l->t('See application page at apps.owncloud.com');?></a></p>
- <p class="license hidden"><?php echo $l->t('<span class="licence"></span>-licensed by <span class="author"></span>');?></p>
+ <p class="license hidden"><?php echo $l->t('<span class="licence"></span>-licensed by <span class="author"></span>');?></p>
<input class="enable hidden" type="submit" />
</div>
</div>
diff --git a/settings/templates/help.php b/settings/templates/help.php
index b697905f7ef..8f51cd87017 100644
--- a/settings/templates/help.php
+++ b/settings/templates/help.php
@@ -1,14 +1,14 @@
<div id="controls">
- <?php if($_['admin']) { ?>
+ <?php if($_['admin']) { ?>
<a class="button newquestion <?php echo($_['style1']); ?>" href="<?php echo($_['url1']); ?>"><?php echo $l->t( 'User Documentation' ); ?></a>
- <a class="button newquestion <?php echo($_['style2']); ?>" href="<?php echo($_['url2']); ?>"><?php echo $l->t( 'Administrator Documentation' ); ?></a>
+ <a class="button newquestion <?php echo($_['style2']); ?>" href="<?php echo($_['url2']); ?>"><?php echo $l->t( 'Administrator Documentation' ); ?></a>
<?php } ?>
- <a class="button newquestion" href="http://owncloud.org/support" target="_blank"><?php echo $l->t( 'Online Documentation' ); ?></a>
- <a class="button newquestion" href="http://forum.owncloud.org" target="_blank"><?php echo $l->t( 'Forum' ); ?></a>
- <?php if($_['admin']) { ?>
+ <a class="button newquestion" href="http://owncloud.org/support" target="_blank"><?php echo $l->t( 'Online Documentation' ); ?></a>
+ <a class="button newquestion" href="http://forum.owncloud.org" target="_blank"><?php echo $l->t( 'Forum' ); ?></a>
+ <?php if($_['admin']) { ?>
<a class="button newquestion" href="https://github.com/owncloud/core/issues" target="_blank"><?php echo $l->t( 'Bugtracker' ); ?></a>
<?php } ?>
- <a class="button newquestion" href="http://owncloud.com" target="_blank"><?php echo $l->t( 'Commercial Support' ); ?></a>
+ <a class="button newquestion" href="http://owncloud.com" target="_blank"><?php echo $l->t( 'Commercial Support' ); ?></a>
</div>
<br /><br />
<iframe src="<?php echo($_['url']); ?>" width="100%" id="ifm" ></iframe>
@@ -18,14 +18,14 @@
<!--
function pageY(elem) {
- return elem.offsetParent ? (elem.offsetTop + pageY(elem.offsetParent)) : elem.offsetTop;
+ return elem.offsetParent ? (elem.offsetTop + pageY(elem.offsetParent)) : elem.offsetTop;
}
var buffer = 5; //scroll bar buffer
function resizeIframe() {
- var height = document.documentElement.clientHeight;
- height -= pageY(document.getElementById('ifm'))+ buffer ;
- height = (height < 0) ? 0 : height;
- document.getElementById('ifm').style.height = height + 'px';
+ var height = document.documentElement.clientHeight;
+ height -= pageY(document.getElementById('ifm'))+ buffer ;
+ height = (height < 0) ? 0 : height;
+ document.getElementById('ifm').style.height = height + 'px';
}
document.getElementById('ifm').onload=resizeIframe;
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index 35eb0ef5e9a..0e1677bdea8 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -62,7 +62,7 @@
<fieldset class="personalblock">
<legend><strong><?php echo $l->t('Version');?></strong></legend>
<strong>ownCloud</strong> <?php echo(OC_Util::getVersionString()); ?> <?php echo(OC_Util::getEditionString()); ?> <br />
- <?php echo $l->t('Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>, the <a href="https://github.com/owncloud" target="_blank">source code</a> is licensed under the <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank"><abbr title="Affero General Public License">AGPL</abbr></a>.'); ?>
+ <?php echo $l->t('Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>, the <a href="https://github.com/owncloud" target="_blank">source code</a> is licensed under the <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank"><abbr title="Affero General Public License">AGPL</abbr></a>.'); ?>
</fieldset>
diff --git a/settings/templates/users.php b/settings/templates/users.php
index e8bf9edf604..6cbbca24049 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -36,11 +36,11 @@ var isadmin = <?php echo $_['isadmin']?'true':'false'; ?>;
<div class="quota-select-wrapper">
<?php if((bool) $_['isadmin']): ?>
<select class='quota'>
- <option
- <?php if($_['default_quota']=='none') echo 'selected="selected"';?>
- value='none'>
- <?php echo $l->t('Unlimited');?>
- </option>
+ <option
+ <?php if($_['default_quota']=='none') echo 'selected="selected"';?>
+ value='none'>
+ <?php echo $l->t('Unlimited');?>
+ </option>
<?php foreach($_['quota_preset'] as $preset):?>
<?php if($preset!='default'):?>
<option
@@ -127,16 +127,16 @@ var isadmin = <?php echo $_['isadmin']?'true':'false'; ?>;
<td class="quota">
<div class="quota-select-wrapper">
<select class='quota-user'>
- <option
- <?php if($user['quota']=='default') echo 'selected="selected"';?>
- value='default'>
- <?php echo $l->t('Default');?>
- </option>
- <option
- <?php if($user['quota']=='none') echo 'selected="selected"';?>
- value='none'>
- <?php echo $l->t('Unlimited');?>
- </option>
+ <option
+ <?php if($user['quota']=='default') echo 'selected="selected"';?>
+ value='default'>
+ <?php echo $l->t('Default');?>
+ </option>
+ <option
+ <?php if($user['quota']=='none') echo 'selected="selected"';?>
+ value='none'>
+ <?php echo $l->t('Unlimited');?>
+ </option>
<?php foreach($_['quota_preset'] as $preset):?>
<option
<?php if($user['quota']==$preset) echo 'selected="selected"';?>
diff --git a/settings/users.php b/settings/users.php
index 07a7620d3c0..668d974693a 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -18,7 +18,8 @@ OC_App::setActiveNavigationEntry( 'core_users' );
$users = array();
$groups = array();
-$isadmin = OC_Group::inGroup(OC_User::getUser(), 'admin')?true:false;
+$isadmin = OC_User::isAdminUser(OC_User::getUser());
+
if($isadmin) {
$accessiblegroups = OC_Group::getGroups();
$accessibleusers = OC_User::getUsers('', 30);
@@ -33,7 +34,7 @@ if($isadmin) {
$quotaPreset=OC_Appconfig::getValue('files', 'quota_preset', '1 GB, 5 GB, 10 GB');
$quotaPreset=explode(',', $quotaPreset);
foreach($quotaPreset as &$preset) {
- $preset=trim($preset);
+ $preset=trim($preset);
}
$quotaPreset=array_diff($quotaPreset, array('default', 'none'));
@@ -42,14 +43,14 @@ $defaultQuotaIsUserDefined=array_search($defaultQuota, $quotaPreset)===false &&
// load users and quota
foreach($accessibleusers as $i) {
- $quota=OC_Preferences::getValue($i, 'files', 'quota', 'default');
- $isQuotaUserDefined=array_search($quota, $quotaPreset)===false && array_search($quota, array('none', 'default'))===false;
+ $quota=OC_Preferences::getValue($i, 'files', 'quota', 'default');
+ $isQuotaUserDefined=array_search($quota, $quotaPreset)===false && array_search($quota, array('none', 'default'))===false;
$users[] = array(
"name" => $i,
"groups" => join( ", ", /*array_intersect(*/OC_Group::getUserGroups($i)/*, OC_SubAdmin::getSubAdminsGroups(OC_User::getUser()))*/),
- 'quota'=>$quota,
- 'isQuotaUserDefined'=>$isQuotaUserDefined,
+ 'quota'=>$quota,
+ 'isQuotaUserDefined'=>$isQuotaUserDefined,
'subadmin'=>implode(', ', OC_SubAdmin::getSubAdminsGroups($i)));
}
diff --git a/tests/enable_all.php b/tests/enable_all.php
index 16838398f17..44af0115650 100644
--- a/tests/enable_all.php
+++ b/tests/enable_all.php
@@ -10,7 +10,8 @@ require_once __DIR__.'/../lib/base.php';
OC_App::enable('calendar');
OC_App::enable('contacts');
-OC_App::enable('apptemplate_advanced');
+OC_App::enable('apptemplateadvanced');
+OC_App::enable('appframework');
#OC_App::enable('files_archive');
#OC_App::enable('mozilla_sync');
#OC_App::enable('news');
diff --git a/tests/lib/filestorage/commontest.php b/tests/lib/filestorage/commontest.php
index 89e83589e5d..6719fcff4e8 100644
--- a/tests/lib/filestorage/commontest.php
+++ b/tests/lib/filestorage/commontest.php
@@ -38,4 +38,3 @@ class Test_Filestorage_CommonTest extends Test_FileStorage {
}
}
-?> \ No newline at end of file
diff --git a/tests/lib/filestorage/local.php b/tests/lib/filestorage/local.php
index f68fb69b97f..d7d71e8f372 100644
--- a/tests/lib/filestorage/local.php
+++ b/tests/lib/filestorage/local.php
@@ -35,4 +35,3 @@ class Test_Filestorage_Local extends Test_FileStorage {
}
}
-?> \ No newline at end of file
diff --git a/tests/lib/template.php b/tests/lib/template.php
index 736bc95255c..2899c3512b2 100644
--- a/tests/lib/template.php
+++ b/tests/lib/template.php
@@ -30,7 +30,6 @@ class Test_TemplateFunctions extends UnitTestCase {
ob_start();
p($htmlString);
$result = ob_get_clean();
- ob_end_clean();
$this->assertEqual("&lt;script&gt;alert(&#039;xss&#039;);&lt;/script&gt;", $result);
}
@@ -40,7 +39,6 @@ class Test_TemplateFunctions extends UnitTestCase {
ob_start();
p($normalString);
$result = ob_get_clean();
- ob_end_clean();
$this->assertEqual("This is a good string!", $result);
}
@@ -52,7 +50,6 @@ class Test_TemplateFunctions extends UnitTestCase {
ob_start();
print_unescaped($htmlString);
$result = ob_get_clean();
- ob_end_clean();
$this->assertEqual($htmlString, $result);
}
@@ -62,7 +59,6 @@ class Test_TemplateFunctions extends UnitTestCase {
ob_start();
print_unescaped($normalString);
$result = ob_get_clean();
- ob_end_clean();
$this->assertEqual("This is a good string!", $result);
}
diff --git a/tests/phpunit.xml b/tests/phpunit.xml
index 23cd123edc6..f5a686c3020 100644
--- a/tests/phpunit.xml
+++ b/tests/phpunit.xml
@@ -11,4 +11,7 @@
<directory suffix=".php">../3rdparty</directory>
</exclude>
</whitelist>
+ <listeners>
+ <listener class="PHPUnit_Util_Log_JSON"></listener>
+ </listeners>
</phpunit>